fix(dref): Replace affected minor field with affected number for girls and boys under 18

Author: susilnem

dref/migrations/0078_remove_dref_estimated_number_of_affected_minors_and_more.py

@@ -0,0 +1,55 @@
+# Generated by Django 4.2.19 on 2025-04-25 11:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("dref", "0077_dref_child_safeguarding_risk_level_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="dref",
+            name="estimated_number_of_affected_minors",
+        ),
+        migrations.RemoveField(
+            model_name="dreffinalreport",
+            name="estimated_number_of_affected_minors",
+        ),
+        migrations.RemoveField(
+            model_name="drefoperationalupdate",
+            name="estimated_number_of_affected_minors",
+        ),
+        migrations.AddField(
+            model_name="dref",
+            name="estimated_number_of_affected_boys_under_18",
+            field=models.IntegerField(blank=True, null=True, verbose_name="estimated number of affected boys under 18"),
+        ),
+        migrations.AddField(
+            model_name="dref",
+            name="estimated_number_of_affected_girls_under_18",
+            field=models.IntegerField(blank=True, null=True, verbose_name="estimated number of affected girls under 18"),
+        ),
+        migrations.AddField(
+            model_name="dreffinalreport",
+            name="estimated_number_of_affected_boys_under_18",
+            field=models.IntegerField(blank=True, null=True, verbose_name="estimated number of affected boys under 18"),
+        ),
+        migrations.AddField(
+            model_name="dreffinalreport",
+            name="estimated_number_of_affected_girls_under_18",
+            field=models.IntegerField(blank=True, null=True, verbose_name="estimated number of affected girls under 18"),
+        ),
+        migrations.AddField(
+            model_name="drefoperationalupdate",
+            name="estimated_number_of_affected_boys_under_18",
+            field=models.IntegerField(blank=True, null=True, verbose_name="estimated number of affected boys under 18"),
+        ),
+        migrations.AddField(
+            model_name="drefoperationalupdate",
+            name="estimated_number_of_affected_girls_under_18",
+            field=models.IntegerField(blank=True, null=True, verbose_name="estimated number of affected girls under 18"),
+        ),
+    ]

dref/models.py

@@ -313,8 +313,11 @@ class Status(models.IntegerChoices):
     estimated_number_of_affected_female = models.IntegerField(
         verbose_name=_("estimated number of affected female"), blank=True, null=True
     )
-    estimated_number_of_affected_minors = models.IntegerField(
-        verbose_name=_("estimated number of affected minors"), blank=True, null=True
+    estimated_number_of_affected_girls_under_18 = models.IntegerField(
+        verbose_name=_("estimated number of affected girls under 18"), blank=True, null=True
+    )
+    estimated_number_of_affected_boys_under_18 = models.IntegerField(
+        verbose_name=_("estimated number of affected boys under 18"), blank=True, null=True
     )
     amount_requested = models.IntegerField(verbose_name=_("amount requested"), blank=True, null=True)
     people_in_need = models.IntegerField(verbose_name=_("people in need"), blank=True, null=True)
@@ -832,8 +835,11 @@ class DrefOperationalUpdate(models.Model):
     estimated_number_of_affected_female = models.IntegerField(
         verbose_name=_("estimated number of affected female"), blank=True, null=True
     )
-    estimated_number_of_affected_minors = models.IntegerField(
-        verbose_name=_("estimated number of affected minors"), blank=True, null=True
+    estimated_number_of_affected_girls_under_18 = models.IntegerField(
+        verbose_name=_("estimated number of affected girls under 18"), blank=True, null=True
+    )
+    estimated_number_of_affected_boys_under_18 = models.IntegerField(
+        verbose_name=_("estimated number of affected boys under 18"), blank=True, null=True
     )
     dref_allocated_so_far = models.IntegerField(verbose_name=_("Dref allocated so far"), null=True, blank=True)
     additional_allocation = models.IntegerField(verbose_name=_("Additional allocation"), null=True, blank=True)
@@ -1267,8 +1273,11 @@ class DrefFinalReport(models.Model):
     estimated_number_of_affected_female = models.IntegerField(
         verbose_name=_("estimated number of affected female"), blank=True, null=True
     )
-    estimated_number_of_affected_minors = models.IntegerField(
-        verbose_name=_("estimated number of affected minors"), blank=True, null=True
+    estimated_number_of_affected_girls_under_18 = models.IntegerField(
+        verbose_name=_("estimated number of affected girls under 18"), blank=True, null=True
+    )
+    estimated_number_of_affected_boys_under_18 = models.IntegerField(
+        verbose_name=_("estimated number of affected boys under 18"), blank=True, null=True
     )
     total_dref_allocation = models.IntegerField(verbose_name=_("Total dref allocation"), null=True, blank=True)
     date_of_publication = models.DateField(verbose_name=_("Date of publication"), blank=True, null=True)

dref/serializers.py

@@ -757,7 +757,8 @@ def create(self, validated_data):
             validated_data["number_of_people_affected"] = dref.num_affected
             validated_data["estimated_number_of_affected_male"] = dref.estimated_number_of_affected_male
             validated_data["estimated_number_of_affected_female"] = dref.estimated_number_of_affected_female
-            validated_data["estimated_number_of_affected_minors"] = dref.estimated_number_of_affected_minors
+            validated_data["estimated_number_of_affected_girls_under_18"] = dref.estimated_number_of_affected_girls_under_18
+            validated_data["estimated_number_of_affected_boys_under_18"] = dref.estimated_number_of_affected_boys_under_18
             validated_data["emergency_appeal_planned"] = dref.emergency_appeal_planned
             validated_data["appeal_code"] = dref.appeal_code
             validated_data["glide_code"] = dref.glide_code
@@ -1115,7 +1116,8 @@ def create(self, validated_data):
             validated_data["number_of_people_affected"] = dref_operational_update.number_of_people_affected
             validated_data["estimated_number_of_affected_male"] = dref_operational_update.estimated_number_of_affected_male
             validated_data["estimated_number_of_affected_female"] = dref_operational_update.estimated_number_of_affected_female
-            validated_data["estimated_number_of_affected_minors"] = dref_operational_update.estimated_number_of_affected_minors
+            validated_data["estimated_number_of_affected_girls_under_18"] = dref.estimated_number_of_affected_girls_under_18
+            validated_data["estimated_number_of_affected_boys_under_18"] = dref.estimated_number_of_affected_boys_under_18
             validated_data["total_dref_allocation"] = dref_operational_update.total_dref_allocation
             validated_data["total_operation_timeframe"] = dref_operational_update.total_operation_timeframe
             validated_data["operation_start_date"] = dref_operational_update.dref.date_of_approval
@@ -1241,7 +1243,8 @@ def create(self, validated_data):
             validated_data["number_of_people_affected"] = dref.num_affected
             validated_data["estimated_number_of_affected_male"] = dref.estimated_number_of_affected_male
             validated_data["estimated_number_of_affected_female"] = dref.estimated_number_of_affected_female
-            validated_data["estimated_number_of_affected_minors"] = dref.estimated_number_of_affected_minors
+            validated_data["estimated_number_of_affected_girls_under_18"] = dref.estimated_number_of_affected_girls_under_18
+            validated_data["estimated_number_of_affected_boys_under_18"] = dref.estimated_number_of_affected_boys_under_18
             validated_data["total_operation_timeframe"] = dref.operation_timeframe
             validated_data["operation_start_date"] = dref.date_of_approval
             validated_data["appeal_code"] = dref.appeal_code

dref/test_views.py

@@ -231,7 +231,8 @@ def test_event_date_in_dref(self):
             "num_affected": 23,
             "estimated_number_of_affected_male": 12,
             "estimated_number_of_affected_female": 12,
-            "estimated_number_of_affected_minors": 12,
+            "estimated_number_of_affected_girls_under_18": 12,
+            "estimated_number_of_affected_boys_under_18": 12,
             "amount_requested": 127771111,
             "emergency_appeal_planned": False,
             "event_date": "2021-08-01",