Minor fixes for stored LivelihoodZoneBaseline._annual_kcals_cost - see HEA-1072

Author: rhunwicks

apps/baseline/models.py

@@ -348,7 +348,7 @@ class Language(models.TextChoices):
         verbose_name=_("Currency"),
         help_text=_("Default currency for income or expenditure from Livelihood Activities within this Baseline."),
     )
-    # Derived country field - always set by calculate_fields()
+    # Derived field - always set by calculate_fields()
     _annual_kcals_cost = models.FloatField(
         blank=True,
         null=True,
@@ -459,6 +459,11 @@ def save(self, *args, **kwargs):
             exclude=[field.name for field in self._meta.fields if isinstance(field, models.ForeignKey)],
             validate_unique=False,
         )
+
+        # Make sure that _annual_kcals_cost is included in the update_fields if the update_fields argument is provided.
+        update_fields = kwargs.get("update_fields")
+        if update_fields is not None:
+            kwargs["update_fields"] = set(update_fields) | {"_annual_kcals_cost"}
         super().save(*args, **kwargs)
 
     def natural_key(self):

apps/baseline/signals.py

@@ -75,7 +75,7 @@ def refresh_baseline_after_livelihood_activity_change(sender, instance, **kwargs
     """
     Refresh the LivelihoodZoneBaseline when a FoodPurchase BaselineLivelihoodActivity is changed.
 
-    This forces the recalculation of the annual_kcals_cost for the Baseline. The calculation depends on Baseline\
+    This forces the recalculation of the annual_kcals_cost for the Baseline. The calculation depends on Baseline
     FoodPurchase activities so we only need to trigger the refresh for Activities that meet those criteria.
 
     Django doesn't fire signals for subclasses of a model, so we need to listen to LivelihoodActivity and

apps/baseline/tests/test_models.py

@@ -108,7 +108,7 @@ def test_baseline_livelihood_activity_change_resaves_baseline_on_commit(self):
         self.baseline.refresh_from_db()
         self.assertAlmostEqual(self.baseline.annual_kcals_cost, self.get_expected_annual_kcals_cost())
 
-    def test_livelihood_activity_superclass_resaves_baseline_on_commit(self):
+    def test_baseline_livelihood_activity_superclass_resaves_baseline_on_commit(self):
         with self.captureOnCommitCallbacks(execute=True):
             activity = BaselineLivelihoodActivity.objects.get(pk=self.main_staple_activity.pk)
             activity.price = 4
@@ -119,7 +119,7 @@ def test_livelihood_activity_superclass_resaves_baseline_on_commit(self):
         self.main_staple_activity.refresh_from_db()
         self.assertAlmostEqual(self.baseline.annual_kcals_cost, self.get_expected_annual_kcals_cost())
 
-    def test_baseline_livelihood_activity_superclass_resaves_baseline_on_commit(self):
+    def test_livelihood_activity_superclass_resaves_baseline_on_commit(self):
         with self.captureOnCommitCallbacks(execute=True):
             activity = LivelihoodActivity.objects.get(pk=self.main_staple_activity.pk)
             activity.price = 5