Merge pull request #256 from American-Institutes-for-Research/HEA-957/Missing_mandatory_field_animals_slaughtered_new

Hea 957/missing mandatory field animals slaughtered new

Author: rhunwicks

apps/baseline/migrations/0028_alter_meatproduction_animals_slaughtered_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2.11 on 2026-02-26 07:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("baseline", "0027_alter_seasonalactivity_livelihood_zone_baseline"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="meatproduction",
+            name="animals_slaughtered",
+            field=models.PositiveSmallIntegerField(
+                blank=True, null=True, verbose_name="Number of animals slaughtered"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="meatproduction",
+            name="carcass_weight",
+            field=models.FloatField(blank=True, null=True, verbose_name="Carcass weight per animal"),
+        ),
+    ]

apps/baseline/models.py

@@ -1723,14 +1723,25 @@ class MeatProduction(LivelihoodActivity):
     """
 
     # Production calculation /validation is `input_quantity` * `item_yield`
-    animals_slaughtered = models.PositiveSmallIntegerField(verbose_name=_("Number of animals slaughtered"))
-    carcass_weight = models.FloatField(verbose_name=_("Carcass weight per animal"))
+    animals_slaughtered = models.PositiveSmallIntegerField(
+        verbose_name=_("Number of animals slaughtered"), null=True, blank=True
+    )
+    carcass_weight = models.FloatField(verbose_name=_("Carcass weight per animal"), null=True, blank=True)
+
+    def clean(self):
+        super().clean()
+        # If animals were slaughtered, carcass weight must be recorded
+        if self.animals_slaughtered and self.animals_slaughtered > 0 and self.carcass_weight is None:
+            raise ValidationError(_("Carcass weight is required when animals slaughtered"))
 
     def validate_quantity_produced(self):
-        if self.quantity_produced and self.quantity_produced != self.animals_slaughtered * self.carcass_weight:
-            raise ValidationError(
-                _("Quantity Produced for a Meat Production must be animals slaughtered multiplied by carcass weight")
-            )
+        if self.quantity_produced is not None and self.animals_slaughtered and self.carcass_weight is not None:
+            if self.quantity_produced != self.animals_slaughtered * self.carcass_weight:
+                raise ValidationError(
+                    _(
+                        "Quantity Produced for a Meat Production must be animals slaughtered multiplied by carcass weight"
+                    )
+                )
 
     class Meta:
         verbose_name = LivelihoodStrategyType.MEAT_PRODUCTION.label

pipelines/assets/livelihood_activity.py

@@ -943,6 +943,18 @@ def get_instances_from_dataframe(
                     # to the list, provided that it has at least one Livelihood Activity where there is some income,
                     # expediture or consumption. This excludes empty activities that only contain attributes for,
                     # for example, 'type_of_milk_sold_or_other_uses'.
+                    # For MeatProduction, if animals_slaughtered is null/0 or carcass_weight is null/0, then a
+                    # percentage_kcals of 0 is not meaningful (it results from the BSS formula evaluating to 0
+                    # because there are no animals or no carcass weight). Set it to None so that the activity is
+                    # treated as empty and not saved to the database.
+                    if livelihood_strategy and livelihood_strategy["strategy_type"] == "MeatProduction":
+                        for livelihood_activity in livelihood_activities_for_strategy:
+                            if (
+                                not livelihood_activity.get("animals_slaughtered")
+                                or not livelihood_activity.get("carcass_weight")
+                            ) and livelihood_activity.get("percentage_kcals") == 0:
+                                livelihood_activity["percentage_kcals"] = None
+
                     # Also ignore any livelihood activities that don't have a Wealth Category component to the Wealth Group
                     # natural key. These are from blank columns between Wealth Category groups in the BSS, which sometimes
                     # contain data where values or formulae have been copied across all the columns in a row.