Address additional PR feedback see HEA-651

Author: girumb

apps/baseline/tests/test_viewsets.py

@@ -589,7 +589,7 @@ def test_filter_by_wealth_characteristic(self):
         self.assertEqual(len(response.json()), 1)
 
 
-class LivelihoodBaselineFacetedSearchViewTestCase(APITestCase):
+class LivelihoodZoneBaselineFacetedSearchViewTestCase(APITestCase):
     def setUp(self):
         self.category1 = LivelihoodCategoryFactory()
         self.baseline1 = LivelihoodZoneBaselineFactory(main_livelihood_category=self.category1)
@@ -618,17 +618,38 @@ def setUp(self):
             wealth_group__livelihood_zone_baseline=self.baseline2, wealth_characteristic=self.characteristic2
         )
         self.characteristic3 = WealthCharacteristicFactory()
-        self.strategy = LivelihoodStrategyFactory(product=self.product1)
+        self.strategy = LivelihoodStrategyFactory(product=self.product1, livelihood_zone_baseline=self.baseline3)
         self.baseline = LivelihoodZoneBaselineFactory(main_livelihood_category=self.category1)
-        self.url = reverse("livelihood-baseline-faceted-search")
+        self.url = reverse("livelihood-zone-baseline-faceted-search")
 
     def test_search_with_product(self):
         # Test when search matches entries
         response = self.client.get(self.url, {"search": self.product1.description_en, "language": "en"})
         self.assertEqual(response.status_code, 200)
-        data = response.data
-        self.assertEqual(len(data["products"]), 1)
-        self.assertEqual(data["products"][0]["count"], 2)  # 2 zones have this proudct
+        search_data = response.data
+        self.assertEqual(len(search_data["products"]), 1)
+        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)
+        # Apply the filters to the baseline
+        baseline_url = reverse("livelihoodzonebaseline-list")
+        response = self.client.get(
+            baseline_url, {search_data["products"][0]["filter"]: search_data["products"][0]["value"]}
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(json.loads(response.content)), 2)
+        data = json.loads(response.content)
+        self.assertTrue(any(d["name"] == self.baseline1.name for d in data))
+        self.assertTrue(any(d["name"] == self.baseline3.name for d in data))
+        self.assertFalse(any(d["name"] == self.baseline2.name for d in data))
+
+        response = self.client.get(baseline_url, {search_data["items"][0]["filter"]: search_data["items"][0]["value"]})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(json.loads(response.content)), 1)
+        data = json.loads(response.content)
+        self.assertTrue(any(d["name"] == self.baseline1.name for d in data))
+        self.assertFalse(any(d["name"] == self.baseline2.name for d in data))
+        self.assertFalse(any(d["name"] == self.baseline3.name for d in data))
         # Search by the second product
         response = self.client.get(
             self.url,
@@ -637,8 +658,8 @@ def test_search_with_product(self):
             },
         )
         self.assertEqual(response.status_code, 200)
-        data = response.data
-        self.assertEqual(len(data["products"]), 0)
+        search_data = response.data
+        self.assertEqual(len(search_data["products"]), 0)
 
     def test_search_with_wealth_characterstics(self):
         # Test when search matches entries

apps/baseline/viewsets.py

@@ -1,4 +1,5 @@
 from django.apps import apps
+from django.conf import settings
 from django.db import models
 from django.db.models import F, OuterRef, Q, Subquery
 from django.db.models.functions import Coalesce, NullIf
@@ -1860,7 +1861,7 @@ def get_calculations_on_aggregates(self):
 ]
 
 
-class LivelihoodBaselineFacetedSearchView(APIView):
+class LivelihoodZoneBaselineFacetedSearchView(APIView):
     """
     Performs a faceted search to find Livelihood Zone Baselines using a specified search term.
 
@@ -1870,17 +1871,14 @@ class LivelihoodBaselineFacetedSearchView(APIView):
     """
 
     renderer_classes = [JSONRenderer]
-    permission_classes = []
-
-    def get_permissions(self):
-        return [AllowAny()]
+    permission_classes = [AllowAny]
 
     def get(self, request, format=None):
         """
         Return a faceted set of matching filters
         """
         results = {}
-        search_term = request.query_params.get("search", "")
+        search_term = request.query_params.get(settings.REST_FRAMEWORK["SEARCH_PARAM"], "")
         language = request.query_params.get("language", "en")
 
         if search_term:

hea/settings/base.py

@@ -150,6 +150,7 @@
     "TEST_REQUEST_DEFAULT_FORMAT": "json",
     "EXCEPTION_HANDLER": "apps.common.exception_handlers.drf_exception_handler",
     "STRICT_JSON": True,
+    "SEARCH_PARAM": "search",
 }
 
 ROOT_URLCONF = "hea.urls"

hea/urls.py

@@ -24,7 +24,7 @@
     HazardViewSet,
     HuntingViewSet,
     LivelihoodActivityViewSet,
-    LivelihoodBaselineFacetedSearchView,
+    LivelihoodZoneBaselineFacetedSearchView,
     LivelihoodProductCategoryViewSet,
     LivelihoodStrategyViewSet,
     LivelihoodZoneBaselineReportViewSet,
@@ -133,9 +133,9 @@
 ]
 urlpatterns += [
     path(
-        "api/livelihoodbaselinefacetedsearch/",
-        LivelihoodBaselineFacetedSearchView.as_view(),
-        name="livelihood-baseline-faceted-search",
+        "api/livelihoodzonebaselinefacetedsearch/",
+        LivelihoodZoneBaselineFacetedSearchView.as_view(),
+        name="livelihood-zone-baseline-faceted-search",
     ),
 ]