Merge pull request #281 from American-Institutes-for-Research/HEA-1069/broken_wealthgroup_api

Hea 1069/broken wealthgroup api

Author: rhunwicks

apps/baseline/autocomplete.py

@@ -1,7 +1,13 @@
 from dal import autocomplete
 from django.contrib.auth.mixins import LoginRequiredMixin
 
-from .models import Community, LivelihoodStrategy, LivelihoodZoneBaseline, WealthGroup
+from .models import (
+    Community,
+    LivelihoodStrategy,
+    LivelihoodZone,
+    LivelihoodZoneBaseline,
+    WealthGroup,
+)
 
 
 class WealthGroupAutocomplete(LoginRequiredMixin, autocomplete.Select2QuerySetView):
@@ -38,6 +44,20 @@ def get_queryset(self):
         return qs
 
 
+class LivelihoodZoneAutocomplete(LoginRequiredMixin, autocomplete.Select2QuerySetView):
+    # autocomplete endpoint for LivelihoodZone FK fields
+
+    def get_queryset(self):
+        qs = LivelihoodZone.objects.select_related("country")
+        if self.q:
+            qs = (
+                LivelihoodZone.objects.filter(code__icontains=self.q)
+                | LivelihoodZone.objects.filter(name_en__icontains=self.q)
+                | LivelihoodZone.objects.filter(alternate_code__icontains=self.q)
+            )
+        return qs
+
+
 class LivelihoodZoneBaselineAutocomplete(LoginRequiredMixin, autocomplete.Select2QuerySetView):
     # autocomplete endpoint for LivelihoodZoneBaseline FK fields
 

apps/baseline/models.py

@@ -870,6 +870,9 @@ def _get_livelihoods_protection_threshold_as_percentage_kcals(self):
         )
 
         df = pd.DataFrame.from_records(livelihood_protection_qs)
+        if not df.empty:
+            for col in ["expenditure", "percentage_allocation_to_basket", "household_size", "percentage_kcals"]:
+                df[col] = pd.to_numeric(df[col], errors="coerce")
         if df.empty:
             livelihoods_protection_expenditure = 0
             livelihoods_protection_percentage_kcals = 0
@@ -922,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
@@ -932,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

apps/baseline/viewsets.py

@@ -328,7 +328,7 @@ class LivelihoodProductCategoryFilterSet(filters.FilterSet):
     )
     livelihood_zone = django_filters.ModelChoiceFilter(
         field_name="baseline_livelihood_activity__livelihood_zone_baseline__livelihood_zone",
-        queryset=LivelihoodZone.objects.select_related("livelihood_zone"),
+        queryset=LivelihoodZone.objects.select_related("country"),
         widget=autocomplete.ModelSelect2(url="livelihoodzone-autocomplete"),
         label="Livelihood Zone",
     )
@@ -447,7 +447,7 @@ class WealthGroupFilterSet(filters.FilterSet):
     )
     livelihood_zone = django_filters.ModelChoiceFilter(
         field_name="livelihood_zone_baseline__livelihood_zone",
-        queryset=LivelihoodZone.objects.select_related("livelihood_zone"),
+        queryset=LivelihoodZone.objects.select_related("country"),
         widget=autocomplete.ModelSelect2(url="livelihoodzone-autocomplete"),
         label="Livelihood Zone",
     )

hea/urls.py

@@ -12,6 +12,7 @@
 from baseline.autocomplete import (
     CommunityAutocomplete,
     LivelihoodStrategyAutocomplete,
+    LivelihoodZoneAutocomplete,
     LivelihoodZoneBaselineAutocomplete,
     WealthGroupAutocomplete,
 )
@@ -146,6 +147,7 @@
     ########## LOCALE INDEPENDENT PATHS go here. ##########
     path("autocomplete/wealthgroup/", WealthGroupAutocomplete.as_view(), name="wealthgroup-autocomplete"),
     path("autocomplete/community/", CommunityAutocomplete.as_view(), name="community-autocomplete"),
+    path("autocomplete/livelihoodzone/", LivelihoodZoneAutocomplete.as_view(), name="livelihoodzone-autocomplete"),
     path(
         "autocomplete/livelihoodzonebaseline/",
         LivelihoodZoneBaselineAutocomplete.as_view(),