feat(eap): Update on Export url for eaps

Author: susilnem

api/serializers.py

@@ -15,7 +15,7 @@
 from api.utils import CountryValidator, RegionValidator
 from deployments.models import EmergencyProject, Personnel, PersonnelDeployment
 from dref.models import Dref, DrefFinalReport, DrefOperationalUpdate
-from eap.models import FullEAP, SimplifiedEAP
+from eap.models import EAPRegistration, FullEAP, SimplifiedEAP
 from lang.models import String
 from lang.serializers import ModelSerializer
 from local_units.models import DelegationOffice
@@ -2559,19 +2559,6 @@ def validate_pdf_file(self, pdf_file):
         validate_file_type(pdf_file)
         return pdf_file
 
-    def get_latest(self, model: type[SimplifiedEAP | FullEAP], eap_registration_id: int, version: int | None = None):
-        """
-        Get the latest version of the EAP (Simplified or Full) based on the eap_registration_id and optional version.
-        if version is provided, it fetches that specific version, otherwise it fetches the latest version.
-        """
-        filters = {
-            "eap_registration__id": eap_registration_id,
-        }
-        if version:
-            filters["version"] = version
-
-        return model.objects.filter(**filters).order_by("-version").first()
-
     def create(self, validated_data):
         language = django_get_language()
         export_id = validated_data.get("export_id")
@@ -2588,20 +2575,42 @@ def create(self, validated_data):
             overview = Overview.objects.filter(id=export_id).first()
             title = f"{overview.country.name}-preparedness-{overview.get_phase_display()}"
         elif export_type == Export.ExportType.SIMPLIFIED_EAP:
-            simplified_eap = self.get_latest(
-                model=SimplifiedEAP,
-                eap_registration_id=export_id,
-                version=version,
-            )
+            if version:
+                simplified_eap = SimplifiedEAP.objects.filter(
+                    eap_registration=export_id,
+                    version=version,
+                ).first()
+                if not simplified_eap:
+                    raise serializers.ValidationError("No Simplified EAP found for the given EAP Registration ID and version")
+            else:
+                eap_registration = EAPRegistration.objects.filter(id=export_id).first()
+                if not eap_registration:
+                    raise serializers.ValidationError("No EAP Registration found for the given ID")
+
+                simplified_eap = eap_registration.latest_simplified_eap
+                if not simplified_eap:
+                    serializers.ValidationError("No Simplified EAP found for the given EAP Registration ID")
+
             title = (
                 f"{simplified_eap.eap_registration.national_society.name}-{simplified_eap.eap_registration.disaster_type.name}"
             )
         elif export_type == Export.ExportType.FULL_EAP:
-            full_eap = self.get_latest(
-                model=FullEAP,
-                eap_registration_id=export_id,
-                version=version,
-            )
+            if version:
+                full_eap = FullEAP.objects.filter(
+                    eap_registration=export_id,
+                    version=version,
+                ).first()
+                if not full_eap:
+                    raise serializers.ValidationError("No Full EAP found for the given EAP Registration ID and version")
+            else:
+                eap_registration = EAPRegistration.objects.filter(id=export_id).first()
+                if not eap_registration:
+                    raise serializers.ValidationError("No EAP Registration found for the given ID")
+
+                full_eap = eap_registration.latest_full_eap
+                if not full_eap:
+                    serializers.ValidationError("No Full EAP found for the given EAP Registration ID")
+
             title = f"{full_eap.eap_registration.national_society.name}-{full_eap.eap_registration.disaster_type.name}"
         else:
             title = "Export"

assets

@@ -1614,8 +1614,11 @@ def setUp(self):
         self.partner2 = CountryFactory.create(name="partner2", iso3="AAA", iso="AA")
 
         self.user = UserFactory.create()
+        self.url = "/api/v2/pdf-export/"
 
-        self.eap_registration = EAPRegistrationFactory.create(
+    @mock.patch("api.serializers.generate_url.delay")
+    def test_simplified_eap_export(self, mock_generate_url):
+        eap_registration = EAPRegistrationFactory.create(
             eap_type=EAPType.SIMPLIFIED_EAP,
             country=self.country,
             national_society=self.national_society,
@@ -1624,13 +1627,8 @@ def setUp(self):
             created_by=self.user,
             modified_by=self.user,
         )
-
-        self.url = "/api/v2/pdf-export/"
-
-    @mock.patch("api.serializers.generate_url.delay")
-    def test_simplified_eap_export(self, mock_generate_url):
-        self.simplified_eap = SimplifiedEAPFactory.create(
-            eap_registration=self.eap_registration,
+        simplified_eap = SimplifiedEAPFactory.create(
+            eap_registration=eap_registration,
             created_by=self.user,
             modified_by=self.user,
             national_society_contact_title="NS Title Example",
@@ -1639,9 +1637,12 @@ def test_simplified_eap_export(self, mock_generate_url):
                 modified_by=self.user,
             ),
         )
+        eap_registration.latest_simplified_eap = simplified_eap
+        eap_registration.save()
+
         data = {
             "export_type": Export.ExportType.SIMPLIFIED_EAP,
-            "export_id": self.eap_registration.id,
+            "export_id": eap_registration.id,
             "is_pga": False,
         }
 
@@ -1652,7 +1653,7 @@ def test_simplified_eap_export(self, mock_generate_url):
         self.assert_201(response)
         self.assertIsNotNone(response.data["id"], response.data)
 
-        expected_url = f"{settings.GO_WEB_INTERNAL_URL}/eap/{self.eap_registration.id}/{Export.ExportType.SIMPLIFIED_EAP}/export/"
+        expected_url = f"{settings.GO_WEB_INTERNAL_URL}/eap/{eap_registration.id}/{Export.ExportType.SIMPLIFIED_EAP}/export/"
         self.assertEqual(response.data["url"], expected_url)
         self.assertEqual(response.data["status"], Export.ExportStatus.PENDING)
 
@@ -1669,12 +1670,12 @@ def test_simplified_eap_export(self, mock_generate_url):
         # Test Export Snapshot
 
         # create a new snapshot
-        simplfied_eap_snapshot = self.simplified_eap.generate_snapshot()
+        simplfied_eap_snapshot = simplified_eap.generate_snapshot()
         assert simplfied_eap_snapshot.version == 2, "Snapshot version should be 2"
 
         data = {
             "export_type": Export.ExportType.SIMPLIFIED_EAP,
-            "export_id": self.eap_registration.id,
+            "export_id": eap_registration.id,
             "version": 2,
         }
 
@@ -1684,7 +1685,7 @@ def test_simplified_eap_export(self, mock_generate_url):
         self.assertIsNotNone(response.data["id"], response.data)
 
         expected_url = (
-            f"{settings.GO_WEB_INTERNAL_URL}/eap/{self.eap_registration.id}/{Export.ExportType.SIMPLIFIED_EAP}/export/?version=2"
+            f"{settings.GO_WEB_INTERNAL_URL}/eap/{eap_registration.id}/{Export.ExportType.SIMPLIFIED_EAP}/export/?version=2"
         )
         self.assertEqual(response.data["url"], expected_url)
 
@@ -1699,7 +1700,7 @@ def test_full_eap_export(self, mock_generate_url):
             modified_by=self.user,
         )
 
-        FullEAPFactory.create(
+        full_eap = FullEAPFactory.create(
             eap_registration=eap_registration,
             created_by=self.user,
             modified_by=self.user,
@@ -1708,6 +1709,10 @@ def test_full_eap_export(self, mock_generate_url):
                 modified_by=self.user,
             ),
         )
+
+        eap_registration.latest_full_eap = full_eap
+        eap_registration.save()
+
         data = {
             "export_type": Export.ExportType.FULL_EAP,
             "export_id": eap_registration.id,
@@ -1745,7 +1750,7 @@ def test_diff_export_eap(self, mock_generate_url):
             modified_by=self.user,
         )
 
-        SimplifiedEAPFactory.create(
+        simplified_eap = SimplifiedEAPFactory.create(
             eap_registration=eap_registration,
             created_by=self.user,
             modified_by=self.user,
@@ -1755,6 +1760,9 @@ def test_diff_export_eap(self, mock_generate_url):
             ),
         )
 
+        eap_registration.latest_simplified_eap = simplified_eap
+        eap_registration.save()
+
         self.authenticate(self.user)
         data = {
             "export_type": Export.ExportType.SIMPLIFIED_EAP,