Merge pull request #244 from American-Institutes-for-Research/HEA-787/season_purpose

Hea 787/season purpose

Author: rhunwicks

apps/common/lookups.py

@@ -348,7 +348,8 @@ def get(self, value: str, **parent_values) -> str | None:
         """
         df = pd.DataFrame({"value": [value]})
         for parent_field in self.parent_fields:
-            df[parent_field] = [parent_values[parent_field]]
+            if parent_field in parent_values:
+                df[parent_field] = [parent_values[parent_field]]
         try:
             df = self.do_lookup(df, "value", "result")
             result = df.iloc[0, -1]
@@ -372,7 +373,8 @@ def get_instance(self, value: str, **parent_values) -> Model | None:
         """
         df = pd.DataFrame({"value": [value]})
         for parent_field in self.parent_fields:
-            df[parent_field] = [parent_values[parent_field]]
+            if parent_field in parent_values:
+                df[parent_field] = [parent_values[parent_field]]
         try:
             df = self.do_lookup(df, "value", "result")
             df = self.get_instances(df, "result")

apps/metadata/admin.py

@@ -151,7 +151,7 @@ class SeasonAdmin(admin.ModelAdmin):
         "season_type",
         "purpose",
     )
-    ordering = ("order",)
+    ordering = ("country", "order")
 
 
 class MarketAdmin(ReferenceDataAdmin):

…tadata/migrations/0014_season_purpose.py …tadata/migrations/0015_season_purpose.pyapps/metadata/migrations/0014_season_purpose.py renamed to apps/metadata/migrations/0015_season_purpose.py apps/metadata/migrations/0014_season_purpose.py renamed to apps/metadata/migrations/0015_season_purpose.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("metadata", "0013_wealthcharacteristic_characteristic_group"),
+        ("metadata", "0014_characteristicgroup_and_more"),
     ]
 
     operations = [

apps/metadata/viewsets.py

@@ -238,3 +238,4 @@ class SeasonViewSet(BaseModelViewSet):
         "season_type",
         "purpose",
     )
+    ordering = ("country", "order")

pipelines/assets/livelihood_activity.py

@@ -414,6 +414,8 @@ def get_all_label_attributes(labels: pd.Series, activity_type: str, country_code
     # Add the country_id because it is required for the Season lookup
     if country_code:
         all_label_attributes["country_id"] = country_code
+        # The all_label_attributes dataframe should also contain a 'strategy_type' column, which will be used by the
+        # lookup to restrict the possible matches to Seasons with a matching `purpose` (or those with a null purpose).
         all_label_attributes = seasonnamelookup.do_lookup(all_label_attributes, "season", "season")
         all_label_attributes["season"] = all_label_attributes["season"].replace(pd.NA, None)
 
@@ -659,8 +661,16 @@ def get_instances_from_dataframe(
         livelihood_zone_baseline.reference_year_end_date.isoformat(),
     ]
 
-    # Save the identifier for Season 2 because we need it when creating MilkProduction instances
-    season2_name = SeasonNameLookup().get("Season 2", country_id=livelihood_zone_baseline.livelihood_zone.country_id)
+    # Save the identifier for Season 2 because we need it when creating MilkProduction and ButterProduction instances
+    seasonnamelookup = SeasonNameLookup()
+    dairy_season2_names = [
+        seasonnamelookup.get(
+            "Season 2", country_id=livelihood_zone_baseline.livelihood_zone.country_id, purpose="MilkProduction"
+        ),
+        seasonnamelookup.get(
+            "Season 2", country_id=livelihood_zone_baseline.livelihood_zone.country_id, purpose="ButterProduction"
+        ),
+    ]
 
     # Prepare a lookup for ClassifiedProduct, so it caches and reuses the results of .get() lookups
     classifiedproductlookup = ClassifiedProductLookup()
@@ -834,7 +844,7 @@ def get_instances_from_dataframe(
                         if (
                             livelihood_strategy["strategy_type"] in ["MilkProduction", "ButterProduction"]
                             and ("product_id" not in livelihood_strategy or not livelihood_strategy["product_id"])
-                            and livelihood_strategy["season"] == season2_name
+                            and livelihood_strategy["season"] in dairy_season2_names
                             and previous_livelihood_strategy
                             and "product_id" in previous_livelihood_strategy
                             and previous_livelihood_strategy["product_id"]
@@ -846,7 +856,7 @@ def get_instances_from_dataframe(
                         # if necessary.
                         if (
                             livelihood_strategy["strategy_type"] == "MilkProduction"
-                            and livelihood_strategy["season"] == season2_name
+                            and livelihood_strategy["season"] in dairy_season2_names
                             and previous_livelihood_activities_for_strategy
                         ):
                             # Assertion to prevent linting from complaining about possible None values
@@ -947,7 +957,14 @@ def get_instances_from_dataframe(
                                     strategy["strategy_type"] == "MilkProduction"
                                     # Season for the current LivelihoodStrategy hasn't been converted to a natural key yet,
                                     # so coerce it to a list for comparison
-                                    and strategy["season"] == [livelihood_strategy["season"]]
+                                    and strategy["season"]
+                                    == [
+                                        seasonnamelookup.get(
+                                            livelihood_strategy["season_original"],
+                                            country_id=livelihood_zone_baseline.livelihood_zone.country_id,
+                                            purpose="MilkProduction",
+                                        )
+                                    ]
                                     and strategy["additional_identifier"]
                                     == livelihood_strategy["additional_identifier"]
                                 ):