Merge pull request #2635 from IFRCGo/fix/cleanup-squash-migrations

Author: susilnem

api/migrations/0227_alter_export_export_type.py

@@ -1,18 +1,29 @@
-# Generated by Django 4.2.19 on 2025-11-18 05:22
+# Generated by Django 4.2.26 on 2026-01-14 08:51
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('api', '0226_nsdinitiativescategory_and_more'),
+        ("api", "0226_nsdinitiativescategory_and_more"),
     ]
 
     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-eap', 'Simplified EAP')], max_length=255, verbose_name='Export Type'),
+            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/migrations/0228_alter_export_export_type.py

@@ -160,23 +160,36 @@ class CountryValidator(TypedDict):
 
 def generate_eap_export_url(
     registration_id: int,
-    diff: bool = False,
     version: Optional[int] = None,
+    diff: bool = False,
     summary: bool = False,
 ) -> str:
     """
     Generate EAP export URL for given registration ID, version and diff flag.
     """
     from django.conf import settings
 
+    from eap.models import EAPRegistration, EAPType
+
+    registration = EAPRegistration.objects.filter(id=registration_id).first()
+    if not registration:
+        raise ValueError("EAP Registration with the given ID does not exist.")
+
     url = f"{settings.GO_WEB_INTERNAL_URL}/eap/{registration_id}/export/"
+    if summary:
+        return url + "summary/"
+
+    assert registration.get_eap_type_enum is not None, "EAP Type should not be None"
+    if registration.get_eap_type_enum == EAPType.SIMPLIFIED_EAP:
+        url += "simplified/"
+    else:
+        url += "full/"
+
     if version:
         url += f"?version={version}"
 
     # NOTE: EAP exports with diff view only for EAPs exports
     if diff:
         url += "&diff=true" if version else "?diff=true"
 
-    if summary:
-        url = f"{settings.GO_WEB_INTERNAL_URL}/eap/{registration_id}/summary/export/"
     return url

api/migrations/0229_alter_export_export_type.py

@@ -99,7 +99,7 @@ class SimplifiedEAPAdmin(admin.ModelAdmin):
         "risk_selected_protocols_images",
         "selected_early_actions_images",
         "planned_operations",
-        "enable_approaches",
+        "enabling_approaches",
         "parent",
         "is_locked",
         "version",
@@ -187,7 +187,7 @@ class FullEAPAdmin(admin.ModelAdmin):
         "partner_contacts",
         "cover_image",
         "planned_operations",
-        "enable_approaches",
+        "enabling_approaches",
         "planned_operations",
         "hazard_selection_images",
         "theory_of_change_table_file",

api/utils.py

@@ -9,5 +9,5 @@
     "months_timeframe_value": models.MonthsTimeFrameChoices,
     "days_timeframe_value": models.DaysTimeFrameChoices,
     "hours_timeframe_value": models.HoursTimeFrameChoices,
-    "approach": models.EnableApproach.Approach,
+    "approach": models.EnablingApproach.Approach,
 }

eap/admin.py

@@ -10,7 +10,7 @@
     EAPRegistration,
     EAPStatus,
     EAPType,
-    EnableApproach,
+    EnablingApproach,
     FullEAP,
     KeyActor,
     OperationActivity,
@@ -96,13 +96,13 @@ class Meta:
     ifrc_head_of_delegation_email = factory.LazyAttribute(lambda obj: f"{obj.ifrc_head_of_delegation_name.lower()}@example.com")
 
     @factory.post_generation
-    def enable_approaches(self, create, extracted, **kwargs):
+    def enabling_approaches(self, create, extracted, **kwargs):
         if not create:
             return
 
         if extracted:
             for approach in extracted:
-                self.enable_approaches.add(approach)
+                self.enabling_approaches.add(approach)
 
     @factory.post_generation
     def planned_operations(self, create, extracted, **kwargs):
@@ -122,11 +122,11 @@ class Meta:
     timeframe = fuzzy.FuzzyChoice(TimeFrame)
 
 
-class EnableApproachFactory(factory.django.DjangoModelFactory):
+class EnablingApproachFactory(factory.django.DjangoModelFactory):
     class Meta:
-        model = EnableApproach
+        model = EnablingApproach
 
-    approach = fuzzy.FuzzyChoice(EnableApproach.Approach)
+    approach = fuzzy.FuzzyChoice(EnablingApproach.Approach)
     budget_per_approach = fuzzy.FuzzyInteger(1000, 1000000)
     ap_code = fuzzy.FuzzyInteger(100, 999)