feat(eap): add test cases for full eap, snapshot, active-eap

- Add new fields for the seap timeframe and operations

Author: susilnem

api/tasks.py

@@ -120,6 +120,8 @@ def generate_url(url, export_id, user, title, language):
                     file_name = f'PER {title} ({datetime.now().strftime("%Y-%m-%d %H-%M-%S")}).pdf'
                 elif export.export_type == Export.ExportType.SIMPLIFIED_EAP:
                     file_name = f'SIMPLIFIED EAP {title} ({datetime.now().strftime("%Y-%m-%d %H-%M-%S")}).pdf'
+                elif export.export_type == Export.ExportType.FULL_EAP:
+                    file_name = f'FULL EAP {title} ({datetime.now().strftime("%Y-%m-%d %H-%M-%S")}).pdf'
                 else:
                     file_name = f'DREF {title} ({datetime.now().strftime("%Y-%m-%d %H-%M-%S")}).pdf'
                 file = ContentFile(

eap/enums.py

@@ -4,10 +4,10 @@
     "eap_status": models.EAPStatus,
     "eap_type": models.EAPType,
     "sector": models.PlannedOperation.Sector,
-    "timeframe": models.OperationActivity.TimeFrame,
-    "years_timeframe_value": models.OperationActivity.YearsTimeFrameChoices,
-    "months_timeframe_value": models.OperationActivity.MonthsTimeFrameChoices,
-    "days_timeframe_value": models.OperationActivity.DaysTimeFrameChoices,
-    "hours_timeframe_value": models.OperationActivity.HoursTimeFrameChoices,
+    "timeframe": models.TimeFrame,
+    "years_timeframe_value": models.YearsTimeFrameChoices,
+    "months_timeframe_value": models.MonthsTimeFrameChoices,
+    "days_timeframe_value": models.DaysTimeFrameChoices,
+    "hours_timeframe_value": models.HoursTimeFrameChoices,
     "approach": models.EnableApproach.Approach,
 }

eap/factories.py

@@ -8,9 +8,11 @@
     EAPType,
     EnableApproach,
     FullEAP,
+    KeyActor,
     OperationActivity,
     PlannedOperation,
     SimplifiedEAP,
+    TimeFrame,
 )
 
 
@@ -65,6 +67,9 @@ class Meta:
     pre_positioning_budget = fuzzy.FuzzyInteger(1000, 1000000)
     early_action_budget = fuzzy.FuzzyInteger(1000, 1000000)
     people_targeted = fuzzy.FuzzyInteger(100, 100000)
+    seap_lead_timeframe_unit = fuzzy.FuzzyInteger(TimeFrame.MONTHS)
+    seap_lead_time = fuzzy.FuzzyInteger(1, 12)
+    operational_timeframe = fuzzy.FuzzyInteger(1, 12)
 
     @factory.post_generation
     def enable_approaches(self, create, extracted, **kwargs):
@@ -90,7 +95,7 @@ class Meta:
         model = OperationActivity
 
     activity = fuzzy.FuzzyText(length=50, prefix="Activity-")
-    timeframe = fuzzy.FuzzyChoice(OperationActivity.TimeFrame)
+    timeframe = fuzzy.FuzzyChoice(TimeFrame)
 
 
 class EnableApproachFactory(factory.django.DjangoModelFactory):
@@ -167,6 +172,13 @@ def early_action_activities(self, create, extracted, **kwargs):
                 self.early_action_activities.add(activity)
 
 
+class KeyActorFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = KeyActor
+
+    description = fuzzy.FuzzyText(length=5, prefix="KeyActor-")
+
+
 class FullEAPFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = FullEAP

…n_alter_simplifiedeap_admin2_and_more.py …tions/0009_sourceinformation_and_more.pyeap/migrations/0009_sourceinformation_alter_simplifiedeap_admin2_and_more.py renamed to eap/migrations/0009_sourceinformation_and_more.py eap/migrations/0009_sourceinformation_alter_simplifiedeap_admin2_and_more.py renamed to eap/migrations/0009_sourceinformation_and_more.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.26 on 2025-11-26 15:19
+# Generated by Django 4.2.19 on 2025-11-27 05:18
 
 from django.conf import settings
 from django.db import migrations, models
@@ -40,6 +40,25 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "Source of Information",
             },
         ),
+        migrations.AddField(
+            model_name="simplifiedeap",
+            name="operational_timeframe_unit",
+            field=models.IntegerField(
+                choices=[(10, "Years"), (20, "Months"), (30, "Days"), (40, "Hours")],
+                default=20,
+                verbose_name="Operational Timeframe Unit",
+            ),
+        ),
+        migrations.AddField(
+            model_name="simplifiedeap",
+            name="seap_lead_timeframe_unit",
+            field=models.IntegerField(
+                choices=[(10, "Years"), (20, "Months"), (30, "Days"), (40, "Hours")],
+                default=20,
+                verbose_name="sEAP Lead Timeframe Unit",
+            ),
+            preserve_default=False,
+        ),
         migrations.AlterField(
             model_name="simplifiedeap",
             name="admin2",
@@ -69,11 +88,21 @@ class Migration(migrations.Migration):
                 verbose_name="cover image",
             ),
         ),
+        migrations.AlterField(
+            model_name="simplifiedeap",
+            name="operational_timeframe",
+            field=models.IntegerField(verbose_name="Operational Time"),
+        ),
         migrations.AlterField(
             model_name="simplifiedeap",
             name="people_targeted",
             field=models.IntegerField(verbose_name="People Targeted."),
         ),
+        migrations.AlterField(
+            model_name="simplifiedeap",
+            name="seap_lead_time",
+            field=models.IntegerField(verbose_name="sEAP Lead Time"),
+        ),
         migrations.AlterField(
             model_name="simplifiedeap",
             name="seap_timeframe",

eap/models.py

@@ -232,80 +232,84 @@ class Meta:
         ordering = ["-id"]
 
 
+class TimeFrame(models.IntegerChoices):
+    YEARS = 10, _("Years")
+    MONTHS = 20, _("Months")
+    DAYS = 30, _("Days")
+    HOURS = 40, _("Hours")
+
+
+class YearsTimeFrameChoices(models.IntegerChoices):
+    ONE_YEAR = 1, _("1")
+    TWO_YEARS = 2, _("2")
+    THREE_YEARS = 3, _("3")
+    FOUR_YEARS = 4, _("4")
+    FIVE_YEARS = 5, _("5")
+
+
+class MonthsTimeFrameChoices(models.IntegerChoices):
+    ONE_MONTH = 1, _("1")
+    TWO_MONTHS = 2, _("2")
+    THREE_MONTHS = 3, _("3")
+    FOUR_MONTHS = 4, _("4")
+    FIVE_MONTHS = 5, _("5")
+    SIX_MONTHS = 6, _("6")
+    SEVEN_MONTHS = 7, _("7")
+    EIGHT_MONTHS = 8, _("8")
+    NINE_MONTHS = 9, _("9")
+    TEN_MONTHS = 10, _("10")
+    ELEVEN_MONTHS = 11, _("11")
+    TWELVE_MONTHS = 12, _("12")
+
+
+class DaysTimeFrameChoices(models.IntegerChoices):
+    ONE_DAY = 1, _("1")
+    TWO_DAYS = 2, _("2")
+    THREE_DAYS = 3, _("3")
+    FOUR_DAYS = 4, _("4")
+    FIVE_DAYS = 5, _("5")
+    SIX_DAYS = 6, _("6")
+    SEVEN_DAYS = 7, _("7")
+    EIGHT_DAYS = 8, _("8")
+    NINE_DAYS = 9, _("9")
+    TEN_DAYS = 10, _("10")
+    ELEVEN_DAYS = 11, _("11")
+    TWELVE_DAYS = 12, _("12")
+    THIRTEEN_DAYS = 13, _("13")
+    FOURTEEN_DAYS = 14, _("14")
+    FIFTEEN_DAYS = 15, _("15")
+    SIXTEEN_DAYS = 16, _("16")
+    SEVENTEEN_DAYS = 17, _("17")
+    EIGHTEEN_DAYS = 18, _("18")
+    NINETEEN_DAYS = 19, _("19")
+    TWENTY_DAYS = 20, _("20")
+    TWENTY_ONE_DAYS = 21, _("21")
+    TWENTY_TWO_DAYS = 22, _("22")
+    TWENTY_THREE_DAYS = 23, _("23")
+    TWENTY_FOUR_DAYS = 24, _("24")
+    TWENTY_FIVE_DAYS = 25, _("25")
+    TWENTY_SIX_DAYS = 26, _("26")
+    TWENTY_SEVEN_DAYS = 27, _("27")
+    TWENTY_EIGHT_DAYS = 28, _("28")
+    TWENTY_NINE_DAYS = 29, _("29")
+    THIRTY_DAYS = 30, _("30")
+    THIRTY_ONE_DAYS = 31, _("31")
+
+
+class HoursTimeFrameChoices(models.IntegerChoices):
+    ZERO_TO_FIVE_HOURS = 5, _("0-5")
+    FIVE_TO_TEN_HOURS = 10, _("5-10")
+    TEN_TO_FIFTEEN_HOURS = 15, _("10-15")
+    FIFTEEN_TO_TWENTY_HOURS = 20, _("15-20")
+    TWENTY_TO_TWENTY_FIVE_HOURS = 25, _("20-25")
+    TWENTY_FIVE_TO_THIRTY_HOURS = 30, _("25-30")
+
+
 class OperationActivity(models.Model):
     # NOTE: `timeframe` and `time_value` together represent the time span for an activity.
     # Make sure to keep them in sync.
-    class TimeFrame(models.IntegerChoices):
-        YEARS = 10, _("Years")
-        MONTHS = 20, _("Months")
-        DAYS = 30, _("Days")
-        HOURS = 40, _("Hours")
-
-    class YearsTimeFrameChoices(models.IntegerChoices):
-        ONE_YEAR = 1, _("1")
-        TWO_YEARS = 2, _("2")
-        THREE_YEARS = 3, _("3")
-        FOUR_YEARS = 4, _("4")
-        FIVE_YEARS = 5, _("5")
-
-    class MonthsTimeFrameChoices(models.IntegerChoices):
-        ONE_MONTH = 1, _("1")
-        TWO_MONTHS = 2, _("2")
-        THREE_MONTHS = 3, _("3")
-        FOUR_MONTHS = 4, _("4")
-        FIVE_MONTHS = 5, _("5")
-        SIX_MONTHS = 6, _("6")
-        SEVEN_MONTHS = 7, _("7")
-        EIGHT_MONTHS = 8, _("8")
-        NINE_MONTHS = 9, _("9")
-        TEN_MONTHS = 10, _("10")
-        ELEVEN_MONTHS = 11, _("11")
-        TWELVE_MONTHS = 12, _("12")
-
-    class DaysTimeFrameChoices(models.IntegerChoices):
-        ONE_DAY = 1, _("1")
-        TWO_DAYS = 2, _("2")
-        THREE_DAYS = 3, _("3")
-        FOUR_DAYS = 4, _("4")
-        FIVE_DAYS = 5, _("5")
-        SIX_DAYS = 6, _("6")
-        SEVEN_DAYS = 7, _("7")
-        EIGHT_DAYS = 8, _("8")
-        NINE_DAYS = 9, _("9")
-        TEN_DAYS = 10, _("10")
-        ELEVEN_DAYS = 11, _("11")
-        TWELVE_DAYS = 12, _("12")
-        THIRTEEN_DAYS = 13, _("13")
-        FOURTEEN_DAYS = 14, _("14")
-        FIFTEEN_DAYS = 15, _("15")
-        SIXTEEN_DAYS = 16, _("16")
-        SEVENTEEN_DAYS = 17, _("17")
-        EIGHTEEN_DAYS = 18, _("18")
-        NINETEEN_DAYS = 19, _("19")
-        TWENTY_DAYS = 20, _("20")
-        TWENTY_ONE_DAYS = 21, _("21")
-        TWENTY_TWO_DAYS = 22, _("22")
-        TWENTY_THREE_DAYS = 23, _("23")
-        TWENTY_FOUR_DAYS = 24, _("24")
-        TWENTY_FIVE_DAYS = 25, _("25")
-        TWENTY_SIX_DAYS = 26, _("26")
-        TWENTY_SEVEN_DAYS = 27, _("27")
-        TWENTY_EIGHT_DAYS = 28, _("28")
-        TWENTY_NINE_DAYS = 29, _("29")
-        THIRTY_DAYS = 30, _("30")
-        THIRTY_ONE_DAYS = 31, _("31")
-
-    class HoursTimeFrameChoices(models.IntegerChoices):
-        ZERO_TO_FIVE_HOURS = 5, _("0-5")
-        FIVE_TO_TEN_HOURS = 10, _("5-10")
-        TEN_TO_FIFTEEN_HOURS = 15, _("10-15")
-        FIFTEEN_TO_TWENTY_HOURS = 20, _("15-20")
-        TWENTY_TO_TWENTY_FIVE_HOURS = 25, _("20-25")
-        TWENTY_FIVE_TO_THIRTY_HOURS = 30, _("25-30")
-
     activity = models.CharField(max_length=255, verbose_name=_("Activity"))
     timeframe = models.IntegerField(choices=TimeFrame.choices, verbose_name=_("Timeframe"))
-    # TODO(susilnem): Use enums for time_value?
     time_value = ArrayField(
         base_field=models.IntegerField(),
         verbose_name=_("Activity time span"),
@@ -950,16 +954,26 @@ class SimplifiedEAP(EAPBaseModel, CommonEAPFields):
         blank=True,
     )
 
+    # NOTE: seap_lead_timeframe_unit and seap_lead_time are atomic
+    seap_lead_timeframe_unit = models.IntegerField(
+        choices=TimeFrame.choices,
+        verbose_name=_("sEAP Lead Timeframe Unit"),
+    )
     seap_lead_time = models.IntegerField(
-        verbose_name=_("sEAP Lead Time (Hours)"),
-        null=True,
-        blank=True,
+        verbose_name=_("sEAP Lead Time"),
+    )
+
+    # NOTE: operational_timeframe_unit and operational_time are atomic
+    # operational_timeframe is set default to Months
+    operational_timeframe_unit = models.IntegerField(
+        choices=TimeFrame.choices,
+        default=TimeFrame.MONTHS,
+        verbose_name=_("Operational Timeframe Unit"),
     )
     operational_timeframe = models.IntegerField(
-        verbose_name=_("Operational Timeframe (Months)"),
-        null=True,
-        blank=True,
+        verbose_name=_("Operational Time"),
     )
+
     trigger_threshold_justification = models.TextField(
         verbose_name=_("Trigger Threshold Justification"),
         help_text=_("Explain how the trigger were set and provide information"),
@@ -1054,9 +1068,13 @@ def generate_snapshot(self):
                     "modified_by_id": self.modified_by_id,
                     "updated_checklist_file": None,
                 },
-                exclude_clone_m2m_fields=[
+                exclude_clone_m2m_fields={
                     "admin2",
-                ],
+                    "cover_image",
+                    "hazard_impact_images",
+                    "risk_selected_protocols_images",
+                    "selected_early_actions_images",
+                },
             )
 
             # Setting Parent as locked
@@ -1438,9 +1456,27 @@ def generate_snapshot(self):
                     "modified_by_id": self.modified_by_id,
                     "updated_checklist_file": None,
                 },
-                exclude_clone_m2m_fields=[
+                exclude_clone_m2m_fields={
                     "admin2",
-                ],
+                    "cover_image",
+                    # Files
+                    "hazard_selection_images",
+                    "theory_of_change_table_file",
+                    "exposed_element_and_vulnerability_factor_images",
+                    "prioritized_impact_images",
+                    "risk_analysis_relevant_files",
+                    "forecast_selection_images",
+                    "definition_and_justification_impact_level_images",
+                    "identification_of_the_intervention_area_images",
+                    "trigger_model_relevant_files",
+                    "early_action_selection_process_images",
+                    "evidence_base_relevant_files",
+                    "early_action_implementation_images",
+                    "trigger_activation_system_images",
+                    "activation_process_relevant_files",
+                    "meal_relevant_files",
+                    "capacity_relevant_files",
+                },
             )
 
             # Setting Parent as locked

eap/permissions.py

@@ -31,28 +31,24 @@ def has_permission(self, request, view) -> bool:
 
         user = request.user
         national_society_id = request.data.get("national_society")
-        return has_country_permission(user=user, national_society_id=national_society_id)
+        return user.is_superuser or has_country_permission(user=user, national_society_id=national_society_id)
 
 
 class EAPBasePermission(BasePermission):
     message = "You don't have permission to create/update EAP"
 
-    def has_permission(self, request, view) -> bool:
+    def has_object_permission(self, request, view, obj) -> bool:
         if request.method not in ["PUT", "PATCH", "POST"]:
             return True
 
         user = request.user
-        eap_registration = EAPRegistration.objects.filter(id=request.data.get("eap_registration")).first()
-
-        if not eap_registration:
-            return False
+        eap_reg_id = request.data.get("eap_registration", None) or obj.eap_registration_id
+        eap_registration = EAPRegistration.objects.filter(id=eap_reg_id).first()
 
+        assert eap_registration is not None, "EAP Registration does not exist"
         national_society_id = eap_registration.national_society_id
 
-        return has_country_permission(
-            user=user,
-            national_society_id=national_society_id,
-        )
+        return user.is_superuser or has_country_permission(user=user, national_society_id=national_society_id)
 
 
 class EAPValidatedBudgetPermission(BasePermission):