Update LivelihoodZoneBaselineFacetedSearchView to include livelihood_zone_baselines not just the counts see HEA-947

Author: girumb

apps/baseline/tests/test_viewsets.py

@@ -762,6 +762,15 @@ def test_search_with_product(self):
         self.assertEqual(search_data["products"][0]["count"], 2)  # 2 zones have this product
         # confirm the product value is correct
         self.assertEqual(search_data["products"][0]["value"], self.product1.cpc)
+        # confirm livelihood_zone_baselines are present with correct data
+        baselines = search_data["products"][0]["livelihood_zone_baselines"]
+        self.assertEqual(len(baselines), 2)
+        baseline_ids = {b["id"] for b in baselines}
+        self.assertEqual(baseline_ids, {self.baseline1.id, self.baseline3.id})
+        for b in baselines:
+            self.assertIn("name", b)
+            self.assertIn("livelihood_zone__code", b)
+            self.assertIn("reference_year_end_date", b)
         # Apply the filters to the baseline
         baseline_url = reverse("livelihoodzonebaseline-list")
         response = self.client.get(
@@ -806,6 +815,14 @@ def test_search_with_wealth_characterstics(self):
         self.assertEqual(len(data["items"]), 2)
         self.assertEqual(data["items"][0]["count"], 1)  # 1 zone for this characteristic
         self.assertEqual(data["items"][1]["count"], 1)  # 1 zone for this characteristic
+        # confirm livelihood_zone_baselines are present on each item
+        for item in data["items"]:
+            self.assertIn("livelihood_zone_baselines", item)
+            self.assertEqual(len(item["livelihood_zone_baselines"]), 1)
+            self.assertIn("id", item["livelihood_zone_baselines"][0])
+            self.assertIn("name", item["livelihood_zone_baselines"][0])
+            self.assertIn("livelihood_zone__code", item["livelihood_zone_baselines"][0])
+            self.assertIn("reference_year_end_date", item["livelihood_zone_baselines"][0])
         # Search by the second characteristic
         response = self.client.get(
             self.url,
@@ -872,6 +889,13 @@ def test_search_with_livelihood_strategy_type(self):
         self.assertEqual(milk_results[0]["filter"], "strategy_type")
         self.assertEqual(milk_results[0]["value_label"], "Milk Production")
         self.assertEqual(milk_results[0]["count"], 1)
+        # confirm livelihood_zone_baselines on strategy type result
+        baselines = milk_results[0]["livelihood_zone_baselines"]
+        self.assertEqual(len(baselines), 1)
+        self.assertEqual(baselines[0]["id"], self.baseline1.id)
+        self.assertIn("name", baselines[0])
+        self.assertIn("livelihood_zone__code", baselines[0])
+        self.assertIn("reference_year_end_date", baselines[0])
 
         # Test that search "lait" with language=fr returns MilkProduction via French translation
         response = self.client.get(self.url, {"search": "lait", "language": "fr"})

apps/baseline/viewsets.py

@@ -2097,6 +2097,18 @@ class LivelihoodZoneBaselineFacetedSearchView(APIView):
     renderer_classes = [JSONRenderer]
     permission_classes = [AllowAny]
 
+    def _get_baselines(self, baselines_qs):
+        # returs a list of baseline dicts with id, name, livelihood_zone__code, reference_year_end_date.
+        return [
+            {
+                "id": baseline.id,
+                "name": baseline.name,
+                "livelihood_zone__code": baseline.livelihood_zone.code,
+                "reference_year_end_date": baseline.reference_year_end_date,
+            }
+            for baseline in baselines_qs.select_related("livelihood_zone")
+        ]
+
     def _search_products(self, search_term):
         # Search products using icontains for broader matching than the default iexact search.
         q_object = Q()
@@ -2132,44 +2144,42 @@ def get(self, request, format=None):
                 with override(language):
                     for search_result in search_per_model:
                         if model_name == "ClassifiedProduct":
-                            unique_zones = (
-                                LivelihoodStrategy.objects.filter(product=search_result)
-                                .values("livelihood_zone_baseline")
-                                .distinct()
-                                .count()
-                            )
+                            baselines_qs = LivelihoodZoneBaseline.objects.filter(
+                                id__in=LivelihoodStrategy.objects.filter(product=search_result).values(
+                                    "livelihood_zone_baseline"
+                                )
+                            ).distinct()
                             value_label, value = search_result.description, search_result.pk
                         elif model_name == "LivelihoodCategory":
-                            unique_zones = LivelihoodZoneBaseline.objects.filter(
+                            baselines_qs = LivelihoodZoneBaseline.objects.filter(
                                 main_livelihood_category=search_result
-                            ).count()
+                            )
                             value_label, value = search_result.description, search_result.pk
                         elif model_name == "LivelihoodZone":
-                            unique_zones = LivelihoodZoneBaseline.objects.filter(livelihood_zone=search_result).count()
+                            baselines_qs = LivelihoodZoneBaseline.objects.filter(livelihood_zone=search_result)
                             value_label, value = search_result.name, search_result.pk
                         elif model_name == "WealthCharacteristic":
-                            unique_zones = (
-                                WealthGroupCharacteristicValue.objects.filter(wealth_characteristic=search_result)
-                                .values("wealth_group__livelihood_zone_baseline")
-                                .distinct()
-                                .count()
-                            )
+                            baselines_qs = LivelihoodZoneBaseline.objects.filter(
+                                id__in=WealthGroupCharacteristicValue.objects.filter(
+                                    wealth_characteristic=search_result
+                                ).values("wealth_group__livelihood_zone_baseline")
+                            ).distinct()
                             value_label, value = search_result.description, search_result.pk
                         elif model_name == "Country":
-                            unique_zones = (
-                                LivelihoodZoneBaseline.objects.filter(livelihood_zone__country=search_result)
-                                .distinct()
-                                .count()
-                            )
+                            baselines_qs = LivelihoodZoneBaseline.objects.filter(
+                                livelihood_zone__country=search_result
+                            ).distinct()
                             value_label, value = search_result.iso_en_name, search_result.pk
-                        if unique_zones > 0:
+                        baselines = self._get_baselines(baselines_qs)
+                        if baselines:
                             results[filter_category].append(
                                 {
                                     "filter": filter_key,
                                     "filter_label": filter_label,
                                     "value_label": value_label,
                                     "value": value,
-                                    "count": unique_zones,
+                                    "count": len(baselines),
+                                    "livelihood_zone_baselines": baselines,
                                 }
                             )
 
@@ -2189,20 +2199,21 @@ def get(self, request, format=None):
                         or search_lower in english_labels[strategy_type.value]
                         or search_lower in translated_label.lower()
                     ):
-                        unique_zones = (
-                            LivelihoodStrategy.objects.filter(strategy_type=strategy_type.value)
-                            .values("livelihood_zone_baseline")
-                            .distinct()
-                            .count()
-                        )
-                        if unique_zones > 0:
+                        baselines_qs = LivelihoodZoneBaseline.objects.filter(
+                            id__in=LivelihoodStrategy.objects.filter(strategy_type=strategy_type.value).values(
+                                "livelihood_zone_baseline"
+                            )
+                        ).distinct()
+                        baselines = self._get_baselines(baselines_qs)
+                        if baselines:
                             results["livelihood_strategy_types"].append(
                                 {
                                     "filter": "strategy_type",
                                     "filter_label": "Livelihood Strategy Type",
                                     "value_label": translated_label,
                                     "value": strategy_type.value,
-                                    "count": unique_zones,
+                                    "count": len(baselines),
+                                    "livelihood_zone_baselines": baselines,
                                 }
                             )