Suppress Pandas deprecation warning - see HEA-1069

Author: rhunwicks

apps/baseline/models.py

@@ -925,8 +925,10 @@ def _get_livelihoods_protection_threshold_as_percentage_kcals(self):
                 # the current Wealth Group
                 for column in poor_df.columns:
                     if column != "livelihood_strategy_id":
-                        merged[f"effective_{column}"] = merged[f"{column}_wealth_group"].combine_first(
-                            merged[f"{column}_poor"]
+                        wealth_group_values = merged[f"{column}_wealth_group"]
+                        poor_values = merged[f"{column}_poor"]
+                        merged[f"effective_{column}"] = wealth_group_values.where(
+                            wealth_group_values.notna(), poor_values
                         )
 
                 # Calculate the expenditure for the Basket by applying the
@@ -935,10 +937,14 @@ def _get_livelihoods_protection_threshold_as_percentage_kcals(self):
                 # was for the Poor Wealth Group the expenditure reflects the
                 # different household sizes.
                 merged["basket_expenditure"] = (
-                    merged["effective_expenditure"]
-                    * merged["effective_percentage_allocation_to_basket"]
-                    / merged["effective_household_size"]
-                    * self.average_household_size
+                    (
+                        merged["effective_expenditure"]
+                        * merged["effective_percentage_allocation_to_basket"]
+                        / merged["effective_household_size"]
+                        * self.average_household_size
+                    )
+                    if self.average_household_size
+                    else None
                 )
 
                 # For the percentage_kcals we can apply the effective_percentage_allocation_to_basket