Merge pull request #2606 from IFRCGo/fix/export-url-eap

EAP: Update Export URLs with diff and versions

Author: susilnem

api/migrations/0229_alter_export_export_type.py

@@ -0,0 +1,29 @@
+# Generated by Django 4.2.26 on 2025-12-04 09:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("api", "0228_alter_export_export_type"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="export",
+            name="export_type",
+            field=models.CharField(
+                choices=[
+                    ("dref-applications", "DREF Application"),
+                    ("dref-operational-updates", "DREF Operational Update"),
+                    ("dref-final-reports", "DREF Final Report"),
+                    ("old-dref-final-reports", "Old DREF Final Report"),
+                    ("per", "Per"),
+                    ("simplified", "Simplified EAP"),
+                    ("full", "Full EAP"),
+                ],
+                max_length=255,
+                verbose_name="Export Type",
+            ),
+        ),
+    ]

api/models.py

@@ -2560,8 +2560,8 @@ class ExportType(models.TextChoices):
         FINAL_REPORT = "dref-final-reports", _("DREF Final Report")
         OLD_FINAL_REPORT = "old-dref-final-reports", _("Old DREF Final Report")
         PER = "per", _("Per")
-        SIMPLIFIED_EAP = "simplified-eap", _("Simplified EAP")
-        FULL_EAP = "full-eap", _("Full EAP")
+        SIMPLIFIED_EAP = "simplified", _("Simplified EAP")
+        FULL_EAP = "full", _("Full EAP")
 
     export_id = models.IntegerField(verbose_name=_("Export Id"))
     export_type = models.CharField(verbose_name=_("Export Type"), max_length=255, choices=ExportType.choices)

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
@@ -2544,6 +2544,11 @@ class ExportSerializer(serializers.ModelSerializer):
     status_display = serializers.CharField(source="get_status_display", read_only=True)
     # NOTE: is_pga is used to determine if the export contains PGA or not
     is_pga = serializers.BooleanField(default=False, required=False, write_only=True)
+    # NOTE: diff is used to determine if the export is requested for diff view or not
+    # Currently only used for EAP exports
+    diff = serializers.BooleanField(default=False, required=False, write_only=True)
+    # NOTE: Version of a EAP export being requested, only applicable for full and simplified EAP exports
+    version = serializers.IntegerField(required=False, write_only=True)
 
     class Meta:
         model = Export
@@ -2559,6 +2564,7 @@ def create(self, validated_data):
         export_id = validated_data.get("export_id")
         export_type = validated_data.get("export_type")
         country_id = validated_data.get("per_country")
+        version = validated_data.pop("version", None)
         if export_type == Export.ExportType.DREF:
             title = Dref.objects.filter(id=export_id).first().title
         elif export_type == Export.ExportType.OPS_UPDATE:
@@ -2569,19 +2575,62 @@ 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 = SimplifiedEAP.objects.filter(id=export_id).first()
+            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 = FullEAP.objects.filter(id=export_id).first()
+            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"
         user = self.context["request"].user
 
         if export_type == Export.ExportType.PER:
             validated_data["url"] = f"{settings.GO_WEB_INTERNAL_URL}/countries/{country_id}/{export_type}/{export_id}/export/"
+
+        elif export_type in [
+            Export.ExportType.SIMPLIFIED_EAP,
+            Export.ExportType.FULL_EAP,
+        ]:
+            validated_data["url"] = f"{settings.GO_WEB_INTERNAL_URL}/eap/{export_id}/{export_type}/export/"
+            # NOTE: EAP exports with diff view only for EAPs exports
+            if version:
+                validated_data["url"] += f"?version={version}"
+            diff = validated_data.pop("diff")
+            if diff:
+                validated_data["url"] += "&diff=true" if version else "?diff=true"
+
         else:
             validated_data["url"] = f"{settings.GO_WEB_INTERNAL_URL}/{export_type}/{export_id}/export/"
 

eap/migrations/0011_alter_fulleap_updated_checklist_file_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.2.26 on 2025-12-15 06:33
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("eap", "0010_eapaction_eapimpact_indicator_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="fulleap",
+            name="updated_checklist_file",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="eap.eapfile",
+                verbose_name="Updated Review Checklist File",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="simplifiedeap",
+            name="updated_checklist_file",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="eap.eapfile",
+                verbose_name="Updated Review Checklist File",
+            ),
+        ),
+    ]

eap/models.py

@@ -879,9 +879,10 @@ class CommonEAPFields(models.Model):
     )
 
     # Review Checklist
-    updated_checklist_file = SecureFileField(
-        verbose_name=_("Updated Checklist File"),
-        upload_to="eap/files/",
+    updated_checklist_file = models.ForeignKey[EAPFile | None, EAPFile | None](
+        EAPFile,
+        on_delete=models.SET_NULL,
+        verbose_name=_("Updated Review Checklist File"),
         null=True,
         blank=True,
     )

eap/serializers.py

@@ -98,6 +98,8 @@ class Meta:
             "version",
             "is_locked",
             "updated_checklist_file",
+            "created_at",
+            "modified_at",
         ]
 
 
@@ -118,6 +120,8 @@ class Meta:
             "version",
             "is_locked",
             "updated_checklist_file",
+            "created_at",
+            "modified_at",
         ]
 
 
@@ -143,6 +147,8 @@ class Meta:
             "requirement_cost",
             "activated_at",
             "approved_at",
+            "created_at",
+            "modified_at",
         ]
 
 
@@ -421,8 +427,8 @@ def validate_updated_checklist_file(self, file):
         if file is None:
             return
 
-        validate_file_extention(file.name, ALLOWED_FILE_EXTENTIONS)
-        validate_file_type(file)
+        validate_file_extention(file.file.name, ALLOWED_FILE_EXTENTIONS)
+        validate_file_type(file.file)
         return file
 
     def validate_images_field(self, field_name, images):