feat(eap): add new endpoint for revise and update eap workflow

Author: susilnem

eap/factories.py

@@ -138,7 +138,6 @@ class Meta:
 
     approach = fuzzy.FuzzyChoice(EnablingApproach.Approach)
     budget_per_approach = fuzzy.FuzzyInteger(1000, 1000000)
-    ap_code = fuzzy.FuzzyInteger(100, 999)
 
     @factory.post_generation
     def readiness_activities(self, create, extracted, **kwargs):
@@ -175,7 +174,6 @@ class Meta:
     sector = fuzzy.FuzzyChoice(PlannedOperation.Sector)
     people_targeted = fuzzy.FuzzyInteger(100, 100000)
     budget_per_sector = fuzzy.FuzzyInteger(1000, 1000000)
-    ap_code = fuzzy.FuzzyInteger(100, 999)
 
     @factory.post_generation
     def readiness_activities(self, create, extracted, **kwargs):

eap/migrations/0008_remove_enablingapproach_ap_code_and_more.py

@@ -0,0 +1,37 @@
+# Generated by Django 4.2.28 on 2026-04-03 09:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0228_merge_20260123_0806'),
+        ('eap', '0007_remove_eapregistration_activated_at_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='enablingapproach',
+            name='ap_code',
+        ),
+        migrations.RemoveField(
+            model_name='plannedoperation',
+            name='ap_code',
+        ),
+        migrations.AddField(
+            model_name='fulleap',
+            name='partners',
+            field=models.ManyToManyField(blank=True, help_text='Select any partner NS involved in the EAP development.', related_name='+', to='api.country', verbose_name='Partners'),
+        ),
+        migrations.AddField(
+            model_name='simplifiedeap',
+            name='partners',
+            field=models.ManyToManyField(blank=True, help_text='Select any partner NS involved in the EAP development.', related_name='+', to='api.country', verbose_name='Partners'),
+        ),
+        migrations.AlterField(
+            model_name='plannedoperation',
+            name='sector',
+            field=models.IntegerField(choices=[(101, 'Shelter, Settlement and Housing'), (102, 'Livelihoods'), (103, 'Protection, Gender and Inclusion'), (104, 'Health and Care'), (105, 'Risk Reduction, Climate Adaptation and Recovery'), (106, 'Multipurpose Cash'), (107, 'Water, Sanitation And Hygiene'), (109, 'Education'), (110, 'Migration'), (111, 'Environment Sustainability'), (112, 'Community Engagement And Accountability')], verbose_name='sector'),
+        ),
+    ]

eap/models.py

@@ -386,27 +386,24 @@ class Sector(models.IntegerChoices):
         RISK_REDUCTION_CLIMATE_ADAPTATION_AND_RECOVERY = 105, _("Risk Reduction, Climate Adaptation and Recovery")
         MULTIPURPOSE_CASH = 106, _("Multipurpose Cash")
         WATER_SANITATION_AND_HYGIENE = 107, _("Water, Sanitation And Hygiene")
-        WASH = 108, _("WASH")
         EDUCATION = 109, _("Education")
         MIGRATION = 110, _("Migration")
         ENVIRONMENT_SUSTAINABILITY = 111, _("Environment Sustainability")
         COMMUNITY_ENGAGEMENT_AND_ACCOUNTABILITY = 112, _("Community Engagement And Accountability")
 
-    # NOTE: AP Codes are read only in EAP forms and passed through ENUMS for now.
-    # They are not stored in the database but are derived from the sector field. Make sure to keep them in sync.
-    class APCode(models.TextChoices):
-        SHELTER_SETTLEMENT_AND_HOUSING = "AP101, AP103, AP104", _("AP101, AP103, AP104")
-        LIVELIHOODS = "AP007", _("AP007")
-        PROTECTION_GENDER_AND_INCLUSION = "AP114, AP116, AP117", _("AP114, AP116, AP117")
-        HEALTH_AND_CARE = "AP107, AP108, AP109", _("AP107, AP108, AP109")
-        RISK_REDUCTION_CLIMATE_ADAPTATION_AND_RECOVERY = "AP101, AP103, AP104, AP105, AP106", _("AP101, AP103, AP104, AP105, AP106")
-        MULTIPURPOSE_CASH = "AP081", _("AP081")
-        WATER_SANITATION_AND_HYGIENE = "AP110, AP111", _("AP110, AP111")
-        WASH = "AP110, AP111", _("AP110, AP111")
-        EDUCATION = "AP115", _("AP115")
-        MIGRATION = "AP112, AP113", _("AP112, AP113")
-        ENVIRONMENT_SUSTAINABILITY = "AP102", _("AP102")
-        COMMUNITY_ENGAGEMENT_AND_ACCOUNTABILITY = "AP129", _("AP129")
+    # NOTE: Use integer values directly in APCode rather than referencing `Sector` directly
+    class APCode(models.IntegerChoices):
+        SHELTER_SETTLEMENT_AND_HOUSING = 101, _("AP101, AP103, AP104")
+        LIVELIHOODS = 102, _("AP007")
+        PROTECTION_GENDER_AND_INCLUSION = 103, _("AP114, AP116, AP117")
+        HEALTH_AND_CARE = 104, _("AP107, AP108, AP109")
+        RISK_REDUCTION_CLIMATE_ADAPTATION_AND_RECOVERY = 105, _("AP101, AP103, AP104, AP105, AP106")
+        MULTIPURPOSE_CASH = 106, _("AP081")
+        WATER_SANITATION_AND_HYGIENE = 107, _("AP110, AP111")
+        EDUCATION = 109, _("AP115")
+        MIGRATION = 110, _("AP112, AP113")
+        ENVIRONMENT_SUSTAINABILITY = 111, _("AP102")
+        COMMUNITY_ENGAGEMENT_AND_ACCOUNTABILITY = 112, _("AP129")
 
     sector = models.IntegerField(choices=Sector.choices, verbose_name=_("sector"))
     people_targeted = models.IntegerField(verbose_name=_("People Targeted"))
@@ -456,14 +453,15 @@ class Approach(models.IntegerChoices):
 
     # NOTE: AP Codes are read only in EAP forms and passed through ENUMS for now.
     # They are not stored in the database but are derived from the Approach field. Make sure to keep them in sync.
-    class APCode(models.TextChoices):
-        SECRETARIAT_SERVICES = "AP122", _("AP122")
-        NATIONAL_SOCIETY_STRENGTHENING = "AP124, AP125, AP126", _("AP124, AP125, AP126")
-        PARTNERSHIP_AND_COORDINATION = "AP049, AP118, AP119, AP120, AP121, AP127, AP128", _("AP049, AP118, AP119, AP120, AP121, AP127, AP128")
+    class APCode(models.IntegerChoices):
+        SECRETARIAT_SERVICES = 10, _("AP122")
+        NATIONAL_SOCIETY_STRENGTHENING = 20, _("AP124, AP125, AP126")
+        PARTNERSHIP_AND_COORDINATION = 30, _(
+            "AP049, AP118, AP119, AP120, AP121, AP127, AP128"
+        )
 
     approach = models.IntegerField(choices=Approach.choices, verbose_name=_("Approach"))
     budget_per_approach = models.IntegerField(verbose_name=_("Budget per approach (CHF)"))
-    ap_code = models.IntegerField(verbose_name=_("AP Code"))
     previous_id = models.PositiveIntegerField(verbose_name=_("Previous ID"), null=True, blank=True)
 
     indicators = models.ManyToManyField(
@@ -821,6 +819,14 @@ class CommonEAPFields(models.Model):
         related_name="+",
     )
 
+    partners = models.ManyToManyField(
+        Country,
+        verbose_name=_("Partners"),
+        help_text=_("Select any partner NS involved in the EAP development."),
+        related_name="+",
+        blank=True,
+    )
+
     people_targeted = models.IntegerField(
         verbose_name=_("People Targeted."),
         blank=True,
@@ -1285,6 +1291,7 @@ def generate_snapshot(self):
                 },
                 exclude_clone_m2m_fields={
                     "admin2",
+                    "partners",
                     "cover_image",
                     "hazard_impact_images",
                     "risk_selected_protocols_images",
@@ -1831,6 +1838,7 @@ def generate_snapshot(self):
                 },
                 exclude_clone_m2m_fields={
                     "admin2",
+                    "partners",
                     "cover_image",
                     # Files
                     "hazard_selection_images",

eap/serializers.py

@@ -497,6 +497,7 @@ def get_fields(self):
         fields["budget_file"] = serializers.PrimaryKeyRelatedField(
             queryset=EAPFile.objects.all(), required=False, allow_null=True
         )
+        fields["partners_details"] = MiniCountrySerializer(source="partners", many=True, read_only=True)
         fields["budget_file_details"] = EAPFileSerializer(source="budget_file", read_only=True)
         fields["updated_checklist_file_details"] = EAPFileSerializer(source="updated_checklist_file", read_only=True)
         return fields
@@ -821,8 +822,8 @@ def validate(self, data: dict[str, typing.Any]) -> dict[str, typing.Any]:
             EAPRegistration.Status.NS_ADDRESSING_COMMENTS,
         ]:
             raise serializers.ValidationError(
-                gettext("Cannot update while EAP Application is in %s."),
-                EAPRegistration.Status(eap_registration.get_status_enum).label,
+                gettext("Cannot update while EAP Application is in %s.")
+                % EAPRegistration.Status(eap_registration.get_status_enum).label
             )
 
         # NOTE: Cannot update locked Full EAP
@@ -950,27 +951,26 @@ def _validate_status(self, validated_data: dict[str, typing.Any]) -> dict[str, t
                     % EAPRegistration.Status(new_status).label
                 )
 
-            # latest EAP
             if self.instance.get_eap_type_enum == EAPType.SIMPLIFIED_EAP:
-                snapshot_instance = self.instance.latest_simplified_eap.generate_snapshot()
-                self.instance.latest_simplified_eap = snapshot_instance
-                snapshot_instance.review_checklist_file = review_checklist_file
-                snapshot_instance.save(update_fields=["review_checklist_file"])
-                self.instance.save(update_fields=["latest_simplified_eap"])
+                self.instance.latest_simplified_eap.review_checklist_file = review_checklist_file
+                self.instance.latest_simplified_eap.save(update_fields=["review_checklist_file"])
             else:
-                snapshot_instance = self.instance.latest_full_eap.generate_snapshot()
-                self.instance.latest_full_eap = snapshot_instance
-                snapshot_instance.review_checklist_file = review_checklist_file
-                snapshot_instance.save(update_fields=["review_checklist_file"])
-                self.instance.save(update_fields=["latest_full_eap"])
+                self.instance.latest_full_eap.review_checklist_file = review_checklist_file
+                self.instance.latest_full_eap.save(update_fields=["review_checklist_file"])
 
             # NOTE: Clearing validated budget file, if changes to NS Addressing Comments.
             if (current_status, new_status) == (
                 EAPRegistration.Status.TECHNICALLY_VALIDATED,
                 EAPRegistration.Status.NS_ADDRESSING_COMMENTS,
             ):
                 self.instance.validated_budget_file = None
-                self.instance.save(update_fields=["validated_budget_file"])
+                self.instance.technically_validated_at = None
+                self.instance.save(
+                    update_fields=[
+                        "validated_budget_file",
+                        "technically_validated_at",
+                    ]
+                )
 
         elif (current_status, new_status) == (
             EAPRegistration.Status.UNDER_REVIEW,
@@ -1130,31 +1130,30 @@ def update(self, instance: EAPRegistration, validated_data: dict[str, typing.Any
         ]:
             """
             NOTE:
-                At the transition (UNDER_REVIEW -> NS_ADDRESSING_COMMENTS), the EAP snapshot
-                is generated inside `_validate_status()` BEFORE we reach this `update()` method.
-
+                At the transition (UNDER_REVIEW -> NS_ADDRESSING_COMMENTS),
+                after revise of eap, new snapshot will be created with incremented version.
                 That snapshot operation:
                 - Locks the reviewed EAP (previous version)
                 - Creates a new snapshot (incremented version)
                 - Updates latest_simplified_eap or latest_full_eap to the new version
 
                 Email logic based on eap_count:
-                - If eap_count == 2 (i.e., first snapshot already exists and this is the first IFRC feedback cycle)
+                - If eap_count == 1 (i.e., first eap has been created), indicating the first feedback cycle:
                     - Send the first feedback email
-                - Else (eap_count > 2), indicating subsequent feedback cycles:
+                - Else (eap_count > 1), indicating subsequent feedback cycles:
                     - Send the resubmitted feedback email
 
                 Therefore:
-                - version == 2 always corresponds to the first IFRC feedback cycle
-                - Any later versions (>= 3) correspond to resubmitted cycles
-                - Also when the IFRC resubmits after technical validation, it will be version >= 3
+                - version == 1 always corresponds to the first IFRC feedback cycle
+                - Any later versions (>1) correspond to resubmitted cycles
+                - Also when the IFRC resubmits after technical validation, it will be version > 2
 
                Deadline update rules:
                 - First IFRC feedback cycle: deadline is set to 90 days from the current date.
                 - Subsequent feedback or resubmission cycles: deadline is set to 30 days from the current date.
             """
 
-            if eap_count == 2:
+            if eap_count == 1:
                 updated_instance.deadline = timezone.now().date() + timedelta(days=90)
                 updated_instance.save(
                     update_fields=[
@@ -1163,7 +1162,7 @@ def update(self, instance: EAPRegistration, validated_data: dict[str, typing.Any
                 )
                 transaction.on_commit(lambda: send_feedback_email.delay(eap_registration_id))
 
-            elif eap_count > 2:
+            elif eap_count > 1:
                 updated_instance.deadline = timezone.now().date() + timedelta(days=30)
                 updated_instance.save(
                     update_fields=[

eap/tasks.py

@@ -217,8 +217,7 @@ def send_new_eap_submission_email(eap_registration_id: int):
             eap_registration_id=instance.id,
             version=latest_eap.version,
         )
-    partner_contacts = latest_eap.partner_contacts
-    partner_ns_emails = list(partner_contacts.values_list("email", flat=True))
+    partner_ns_emails = list(latest_eap.partner_contacts.values_list("email", flat=True))
 
     regional_coordinator_emails: list[str] = get_coordinator_emails_by_region(instance.country.region)
 
@@ -265,8 +264,7 @@ def send_feedback_email(eap_registration_id: int):
 
     ifrc_delegation_focal_point_email = latest_eap.ifrc_delegation_focal_point_email
 
-    partner_contacts = latest_eap.partner_contacts
-    partner_ns_emails = list(partner_contacts.values_list("email", flat=True))
+    partner_ns_emails = list(latest_eap.partner_contacts.values_list("email", flat=True))
 
     regional_coordinator_emails: list[str] = get_coordinator_emails_by_region(instance.country.region)
 
@@ -314,16 +312,13 @@ def send_eap_resubmission_email(eap_registration_id: int):
     else:
         latest_eap = instance.latest_full_eap
 
-    latest_version = latest_eap.version
-
     if not latest_eap.diff_file:
         generate_export_diff_pdf(
             eap_registration_id=instance.id,
             version=latest_eap.version,
         )
 
-    partner_contacts = latest_eap.partner_contacts
-    partner_ns_emails = list(partner_contacts.values_list("email", flat=True))
+    partner_ns_emails = list(latest_eap.partner_contacts.values_list("email", flat=True))
 
     regional_coordinator_emails: list[str] = get_coordinator_emails_by_region(instance.country.region)
 
@@ -345,7 +340,7 @@ def send_eap_resubmission_email(eap_registration_id: int):
     email_context = get_eap_email_context(instance)
     email_subject = (
         f"[DREF {instance.get_eap_type_display()} FOR REVIEW] "
-        f"{instance.country} {instance.disaster_type} version {latest_version} TO THE IFRC-DREF"
+        f"{instance.country} {instance.disaster_type} version {latest_eap.version} TO THE IFRC-DREF"
     )
     email_body = render_to_string("email/eap/re-submission.html", email_context)
     email_type = "Feedback to the National Society"
@@ -369,26 +364,10 @@ def send_feedback_email_for_resubmitted_eap(eap_registration_id: int):
 
     if instance.get_eap_type_enum == EAPType.SIMPLIFIED_EAP:
         latest_eap = instance.latest_simplified_eap
-        eap_model = SimplifiedEAP
     else:
         latest_eap = instance.latest_full_eap
-        eap_model = FullEAP
-
-    latest_version = latest_eap.version
 
-    partner_contacts = latest_eap.partner_contacts
-    partner_ns_emails = list(partner_contacts.values_list("email", flat=True))
-
-    previous_eap = (
-        eap_model.objects.filter(
-            eap_registration=instance,
-            version__lt=latest_version,
-        )
-        .order_by("-version")
-        .first()
-    )
-
-    previous_version = previous_eap.version if previous_eap else None
+    partner_ns_emails = list(latest_eap.partner_contacts.values_list("email", flat=True))
 
     regional_coordinator_emails: list[str] = get_coordinator_emails_by_region(instance.country.region)
 
@@ -409,7 +388,7 @@ def send_feedback_email_for_resubmitted_eap(eap_registration_id: int):
     email_context = get_eap_email_context(instance)
     email_subject = (
         f"[DREF {instance.get_eap_type_display()} FEEDBACK] "
-        f"{instance.country} {instance.disaster_type} version {previous_version} TO {instance.national_society}"
+        f"{instance.country} {instance.disaster_type} version {latest_eap.version} TO {instance.national_society}"
     )
     email_body = render_to_string("email/eap/feedback_to_revised_eap.html", email_context)
     email_type = "Feedback to the National Society"
@@ -491,8 +470,7 @@ def send_pending_pfa_email(eap_registration_id: int):
             eap_registration_id=instance.id,
         )
 
-    partner_contacts = latest_eap.partner_contacts
-    partner_ns_emails = list(partner_contacts.values_list("email", flat=True))
+    partner_ns_emails = list(latest_eap.partner_contacts.values_list("email", flat=True))
 
     regional_coordinator_emails: list[str] = get_coordinator_emails_by_region(instance.country.region)