feat(eap): Remove required fields and add feedbacks

- changes on enums
- add sourceinformation for meal and ns capacity

Author: susilnem

assets

@@ -82,7 +82,7 @@ class Meta:
     readiness_budget = fuzzy.FuzzyInteger(1000, 1000000)
     pre_positioning_budget = fuzzy.FuzzyInteger(1000, 1000000)
     early_action_budget = fuzzy.FuzzyInteger(1000, 1000000)
-    people_targeted = fuzzy.FuzzyInteger(100, 100000)
+    people_targeted = fuzzy.FuzzyInteger(2001, 100000)
     seap_lead_timeframe_unit = fuzzy.FuzzyInteger(TimeFrame.MONTHS)
     seap_lead_time = fuzzy.FuzzyInteger(1, 12)
     operational_timeframe = fuzzy.FuzzyInteger(1, 12)
@@ -222,7 +222,7 @@ class Meta:
     readiness_budget = fuzzy.FuzzyInteger(1000, 1000000)
     pre_positioning_budget = fuzzy.FuzzyInteger(1000, 1000000)
     early_action_budget = fuzzy.FuzzyInteger(1000, 1000000)
-    people_targeted = fuzzy.FuzzyInteger(100, 100000)
+    people_targeted = fuzzy.FuzzyInteger(10001, 10000000)
     national_society_contact_name = fuzzy.FuzzyText(length=10, prefix="NS-")
     national_society_contact_email = factory.LazyAttribute(lambda obj: f"{obj.national_society_contact_name.lower()}@example.com")
     ifrc_delegation_focal_point_name = fuzzy.FuzzyText(length=10, prefix="IFRC-")

eap/factories.py

@@ -0,0 +1,82 @@
+# Generated by Django 4.2.28 on 2026-02-27 09:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("eap", "0005_merge_20260213_0909"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="fulleap",
+            name="meal_source_of_information",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="meal_source_of_information",
+                to="eap.sourceinformation",
+                verbose_name="meal source of information",
+            ),
+        ),
+        migrations.AddField(
+            model_name="fulleap",
+            name="ns_capacity_source_of_information",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="ns_capacity_source_of_information",
+                to="eap.sourceinformation",
+                verbose_name="ns_capacity source of information",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="fulleap",
+            name="is_worked_with_government",
+            field=models.BooleanField(
+                blank=True,
+                default=False,
+                null=True,
+                verbose_name="Has Worked with government or other relevant actors.",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="fulleap",
+            name="people_targeted",
+            field=models.IntegerField(
+                blank=True, null=True, verbose_name="People Targeted."
+            ),
+        ),
+        migrations.AlterField(
+            model_name="plannedoperation",
+            name="ap_code",
+            field=models.IntegerField(verbose_name="AP Code"),
+        ),
+        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"),
+                    (108, "WASH"),
+                    (109, "Education"),
+                    (110, "Migration"),
+                    (111, "Environment Sustainability"),
+                    (112, "Community Engagement And Accountability"),
+                ],
+                verbose_name="sector",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="simplifiedeap",
+            name="people_targeted",
+            field=models.IntegerField(
+                blank=True, null=True, verbose_name="People Targeted."
+            ),
+        ),
+    ]

eap/migrations/0006_fulleap_meal_source_of_information_and_more.py

@@ -379,25 +379,23 @@ def __str__(self):
 
 class PlannedOperation(models.Model):
     class Sector(models.IntegerChoices):
-        SHELTER = 101, _("Shelter")
-        SETTLEMENT_AND_HOUSING = 102, _("Settlement and Housing")
-        LIVELIHOODS = 103, _("Livelihoods")
-        PROTECTION_GENDER_AND_INCLUSION = 104, _("Protection, Gender and Inclusion")
-        HEALTH_AND_CARE = 105, _("Health and Care")
-        RISK_REDUCTION = 106, _("Risk Reduction")
-        CLIMATE_ADAPTATION_AND_RECOVERY = 107, _("Climate Adaptation and Recovery")
-        MULTIPURPOSE_CASH = 108, _("Multipurpose Cash")
-        WATER_SANITATION_AND_HYGIENE = 109, _("Water, Sanitation And Hygiene")
-        WASH = 110, _("WASH")
-        EDUCATION = 111, _("Education")
-        MIGRATION = 112, _("Migration")
-        ENVIRONMENT_SUSTAINABILITY = 113, _("Environment Sustainability")
-        COMMUNITY_ENGAGEMENT_AND_ACCOUNTABILITY = 114, _("Community Engagement And Accountability")
+        SHELTER_SETTLEMENT_AND_HOUSING = 101, _("Shelter, Settlement and Housing")
+        LIVELIHOODS = 102, _("Livelihoods")
+        PROTECTION_GENDER_AND_INCLUSION = 103, _("Protection, Gender and Inclusion")
+        HEALTH_AND_CARE = 104, _("Health and Care")
+        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")
 
     sector = models.IntegerField(choices=Sector.choices, verbose_name=_("sector"))
     people_targeted = models.IntegerField(verbose_name=_("People Targeted"))
     budget_per_sector = models.IntegerField(verbose_name=_("Budget per sector (CHF)"))
-    ap_code = models.IntegerField(verbose_name=_("AP Code"), null=True, blank=True)
+    ap_code = models.IntegerField(verbose_name=_("AP Code"))
     previous_id = models.PositiveIntegerField(verbose_name=_("Previous ID"), null=True, blank=True)
 
     indicators = models.ManyToManyField(
@@ -812,6 +810,8 @@ class CommonEAPFields(models.Model):
 
     people_targeted = models.IntegerField(
         verbose_name=_("People Targeted."),
+        blank=True,
+        null=True,
     )
 
     # Contacts
@@ -1343,6 +1343,8 @@ class FullEAP(EAPBaseModel, CommonEAPFields):
     is_worked_with_government = models.BooleanField(
         verbose_name=_("Has Worked with government or other relevant actors."),
         default=False,
+        null=True,
+        blank=True,
     )
 
     worked_with_government_description = models.TextField(
@@ -1447,6 +1449,7 @@ class FullEAP(EAPBaseModel, CommonEAPFields):
     )
 
     # NOTE: In days
+    # TODO(susilnem): add unit for lead time
     lead_time = models.IntegerField(
         verbose_name=_("Lead Time"),
         null=True,
@@ -1675,6 +1678,13 @@ class FullEAP(EAPBaseModel, CommonEAPFields):
         related_name="full_eap_meal_files",
     )
 
+    meal_source_of_information = models.ManyToManyField(
+        SourceInformation,
+        verbose_name=_("meal source of information"),
+        related_name="meal_source_of_information",
+        blank=True,
+    )
+
     # NATIONAL SOCIETY CAPACITY
     operational_administrative_capacity = models.TextField(
         verbose_name=_("National Society Operational, thematic and administrative capacity"),
@@ -1701,6 +1711,13 @@ class FullEAP(EAPBaseModel, CommonEAPFields):
         related_name="ns_capacity_relevant_files",
     )
 
+    ns_capacity_source_of_information = models.ManyToManyField(
+        SourceInformation,
+        verbose_name=_("ns_capacity source of information"),
+        related_name="ns_capacity_source_of_information",
+        blank=True,
+    )
+
     # FINANCE AND LOGISTICS
 
     budget_description = models.TextField(

eap/models.py

@@ -495,7 +495,9 @@ def get_fields(self):
         fields["cover_image_file"] = EAPFileUpdateSerializer(source="cover_image", required=False, allow_null=True)
         fields["planned_operations"] = PlannedOperationSerializer(many=True, required=False)
         fields["enabling_approaches"] = EnablingApproachSerializer(many=True, required=False)
-        fields["budget_file"] = serializers.PrimaryKeyRelatedField(queryset=EAPFile.objects.all(), required=False)
+        fields["budget_file"] = serializers.PrimaryKeyRelatedField(
+            queryset=EAPFile.objects.all(), required=False, allow_null=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
@@ -556,6 +558,7 @@ class SimplifiedEAPSerializer(
     seap_lead_timeframe_unit_display = serializers.CharField(source="get_seap_lead_timeframe_unit_display", read_only=True)
     operational_timeframe_unit_display = serializers.CharField(source="get_operational_timeframe_unit_display", read_only=True)
 
+    people_targeted = serializers.IntegerField(min_value=2000, required=False, allow_null=True)
     # IMAGES
 
     # NOTE: When adding new image fields, include their names in IMAGE_FIELDS below
@@ -580,9 +583,11 @@ def _validate_timeframe(self, data: dict[str, typing.Any]) -> None:
         seap_unit = data.get("seap_lead_timeframe_unit")
         seap_value = data.get("seap_lead_time")
 
-        if (seap_unit is None) != (seap_value is None):
+        if seap_value is not None and seap_unit is None:
             raise serializers.ValidationError(
-                {"seap_lead_timeframe_unit": gettext("seap lead timeframe and unit must both be provided.")}
+                {
+                    "seap_lead_timeframe_unit": gettext("seap lead timeframe and unit must both be provided."),
+                }
             )
 
         if seap_unit is not None and seap_value is not None:
@@ -604,10 +609,11 @@ def _validate_timeframe(self, data: dict[str, typing.Any]) -> None:
         op_unit = data.get("operational_timeframe_unit")
         op_value = data.get("operational_timeframe")
 
-        # Require both if one is provided
-        if (op_unit is None) != (op_value is None):
+        if op_value is not None and op_unit is None:
             raise serializers.ValidationError(
-                {"operational_timeframe_unit": gettext("operational timeframe and unit must both be provided.")}
+                {
+                    "operational_timeframe_unit": gettext("operational timeframe and unit must both be provided."),
+                }
             )
 
         if op_unit is not None and op_value is not None:
@@ -679,12 +685,16 @@ class FullEAPSerializer(
     early_actions = EAPActionSerializer(many=True, required=True)
     prioritized_impacts = ImpactSerializer(many=True, required=True)
 
+    people_targeted = serializers.IntegerField(min_value=10000, required=False, allow_null=True)
+
     # SOURCE OF INFORMATIONS
     risk_analysis_source_of_information = EAPSourceInformationSerializer(many=True, required=False, allow_null=True)
     trigger_statement_source_of_information = EAPSourceInformationSerializer(many=True, required=False, allow_null=True)
     trigger_model_source_of_information = EAPSourceInformationSerializer(many=True, required=False, allow_null=True)
     evidence_base_source_of_information = EAPSourceInformationSerializer(many=True, required=False, allow_null=True)
     activation_process_source_of_information = EAPSourceInformationSerializer(many=True, required=False, allow_null=True)
+    meal_source_of_information = EAPSourceInformationSerializer(many=True, required=False, allow_null=True)
+    ns_capacity_source_of_information = EAPSourceInformationSerializer(many=True, required=False, allow_null=True)
 
     # IMAGES
     hazard_selection_images = EAPFileUpdateSerializer(
@@ -737,8 +747,8 @@ class FullEAPSerializer(
     forecast_table_file_details = EAPFileSerializer(source="forecast_table_file", read_only=True)
     forecast_table_file = serializers.PrimaryKeyRelatedField(
         queryset=EAPFile.objects.all(),
-        required=True,
-        allow_null=False,
+        required=False,
+        allow_null=True,
     )
 
     theory_of_change_table_file_details = EAPFileSerializer(source="theory_of_change_table_file", read_only=True)

eap/serializers.py

@@ -605,7 +605,7 @@ def test_create_simplified_eap(self):
             "next_step_towards_full_eap": "Plan to expand.",
             "planned_operations": [
                 {
-                    "sector": PlannedOperation.Sector.SETTLEMENT_AND_HOUSING,
+                    "sector": PlannedOperation.Sector.SHELTER_SETTLEMENT_AND_HOUSING,
                     "ap_code": 111,
                     "people_targeted": 10000,
                     "budget_per_sector": 100000,
@@ -829,7 +829,7 @@ def test_update_simplified_eap(self):
 
         # PLANNED OPERATION with activities
         planned_operation = PlannedOperationFactory.create(
-            sector=PlannedOperation.Sector.SHELTER,
+            sector=PlannedOperation.Sector.SHELTER_SETTLEMENT_AND_HOUSING,
             ap_code=456,
             people_targeted=5000,
             budget_per_sector=50000,
@@ -942,7 +942,7 @@ def test_update_simplified_eap(self):
             "planned_operations": [
                 {
                     "id": planned_operation.id,
-                    "sector": PlannedOperation.Sector.SHELTER,
+                    "sector": PlannedOperation.Sector.SHELTER_SETTLEMENT_AND_HOUSING,
                     "ap_code": 456,
                     "people_targeted": 8000,
                     "budget_per_sector": 80000,
@@ -1268,7 +1268,7 @@ def test_status_transition(self):
         )
 
         planned_operation = PlannedOperationFactory.create(
-            sector=PlannedOperation.Sector.SHELTER,
+            sector=PlannedOperation.Sector.SHELTER_SETTLEMENT_AND_HOUSING,
             ap_code=456,
             people_targeted=5000,
             budget_per_sector=50000,
@@ -1806,7 +1806,7 @@ def test_status_transitions_trigger_email(
         )
 
         planned_operation = PlannedOperationFactory.create(
-            sector=PlannedOperation.Sector.SHELTER,
+            sector=PlannedOperation.Sector.SHELTER_SETTLEMENT_AND_HOUSING,
             ap_code=456,
             people_targeted=5000,
             budget_per_sector=50000,
@@ -2431,7 +2431,7 @@ def test_create_full_eap(self):
             "readiness_budget": 3000,
             "pre_positioning_budget": 4000,
             "early_action_budget": 3000,
-            "people_targeted": 5000,
+            "people_targeted": 10000,
             "key_actors": [
                 {
                     "national_society": self.national_society.id,
@@ -2474,7 +2474,7 @@ def test_create_full_eap(self):
             "eap_endorsement": "EAP endorsement text",
             "planned_operations": [
                 {
-                    "sector": PlannedOperation.Sector.SETTLEMENT_AND_HOUSING,
+                    "sector": PlannedOperation.Sector.SHELTER_SETTLEMENT_AND_HOUSING,
                     "ap_code": 111,
                     "people_targeted": 10000,
                     "budget_per_sector": 100000,
@@ -2689,7 +2689,7 @@ def test_snapshot_full_eap(self):
         )
 
         planned_operation = PlannedOperationFactory.create(
-            sector=PlannedOperation.Sector.SHELTER,
+            sector=PlannedOperation.Sector.SHELTER_SETTLEMENT_AND_HOUSING,
             ap_code=456,
             people_targeted=5000,
             budget_per_sector=50000,