Address PR feedback see HEA-651

Author: girumb

apps/baseline/models.py

@@ -72,16 +72,16 @@ def get_search_filter(self, search_term):
         return (
             Q(code__iexact=search_term)
             | Q(alternate_code__iexact=search_term)
-            | Q(name_en__iexact=search_term)
-            | Q(name_pt__iexact=search_term)
-            | Q(name_es__iexact=search_term)
-            | Q(name_fr__iexact=search_term)
-            | Q(name_ar__iexact=search_term)
-            | Q(description_en__iexact=search_term)
-            | Q(description_pt__iexact=search_term)
-            | Q(description_es__iexact=search_term)
-            | Q(description_fr__iexact=search_term)
-            | Q(description_ar__iexact=search_term)
+            | Q(name_en__icontains=search_term)
+            | Q(name_pt__icontains=search_term)
+            | Q(name_es__icontains=search_term)
+            | Q(name_fr__icontains=search_term)
+            | Q(name_ar__icontains=search_term)
+            | Q(description_en__icontains=search_term)
+            | Q(description_pt__icontains=search_term)
+            | Q(description_es__icontains=search_term)
+            | Q(description_fr__icontains=search_term)
+            | Q(description_ar__icontains=search_term)
         )
 
 

apps/baseline/tests/test_viewsets.py

@@ -589,7 +589,7 @@ def test_filter_by_wealth_characteristic(self):
         self.assertEqual(len(response.json()), 1)
 
 
-class LivelihoodBaselineFacetedSearchTestCase(APITestCase):
+class LivelihoodBaselineFacetedSearchViewTestCase(APITestCase):
     def setUp(self):
         self.category1 = LivelihoodCategoryFactory()
         self.baseline1 = LivelihoodZoneBaselineFactory(main_livelihood_category=self.category1)

apps/baseline/viewsets.py

@@ -5,7 +5,7 @@
 from django.utils.translation import override
 from django_filters import rest_framework as filters
 from django_filters.filters import CharFilter
-from rest_framework.permissions import AllowAny, DjangoModelPermissionsOrAnonReadOnly
+from rest_framework.permissions import AllowAny
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
 from rest_framework.views import APIView
@@ -225,7 +225,7 @@ def filter_by_wealth_characteristic(self, queryset, name, value):
         """
         field_lookups = [
             *[(field, "icontains") for field in translation_fields("wealth_characteristic__name")],
-            ("wealth_characteristic__code", "istartswith"),
+            ("wealth_characteristic__code", "iexact"),
             *[(field, "icontains") for field in translation_fields("wealth_characteristic__description")],
             ("wealth_characteristic__aliases", "icontains"),
         ]
@@ -1860,23 +1860,20 @@ def get_calculations_on_aggregates(self):
 ]
 
 
-class LivelihoodBaselineFacetedSearch(APIView):
+class LivelihoodBaselineFacetedSearchView(APIView):
     """
     Performs a faceted search to find Livelihood Zone Baselines using a specified search term.
 
     The search applies to multiple related models, filtering results based on the configured
     criteria for each model. For each matching result, it calculates the number of unique
-    livelihodd zones associated with the filter and includes relevant metadata in the response.
+    livelihood zones associated with the filter and includes relevant metadata in the response.
     """
 
     renderer_classes = [JSONRenderer]
-    permission_classes = [DjangoModelPermissionsOrAnonReadOnly]
+    permission_classes = []
 
     def get_permissions(self):
-        # Bypass the queryset check for permission classes
-        if DjangoModelPermissionsOrAnonReadOnly in self.permission_classes:
-            return [AllowAny()]
-        return super().get_permissions()
+        return [AllowAny()]
 
     def get(self, request, format=None):
         """

apps/common/models.py

@@ -499,30 +499,17 @@ def get_search_filter(self, search_term):
         return (
             Q(iso3166a2__iexact=search_term)
             | Q(iso3166a3__iexact=search_term)
-            | Q(name__iexact=search_term)
-            | Q(iso_en_name__iexact=search_term)
-            | Q(iso_en_proper__iexact=search_term)
-            | Q(iso_en_ro_name__iexact=search_term)
-            | Q(iso_en_ro_proper__iexact=search_term)
-            | Q(iso_fr_name__iexact=search_term)
-            | Q(iso_fr_proper__iexact=search_term)
-            | Q(iso_es_name__iexact=search_term)
+            | Q(name__icontains=search_term)
+            | Q(iso_en_name__icontains=search_term)
+            | Q(iso_en_proper__icontains=search_term)
+            | Q(iso_en_ro_name__icontains=search_term)
+            | Q(iso_en_ro_proper__icontains=search_term)
+            | Q(iso_fr_name__icontains=search_term)
+            | Q(iso_fr_proper__icontains=search_term)
+            | Q(iso_es_name__icontains=search_term)
         )
 
 
-class CountryManager(models.Manager):
-    """
-    Custom manager for Country model using CountryQuerySet.
-    """
-
-    def get_queryset(self):
-        qs = CountryQuerySet(self.model, using=self._db)
-        return qs
-
-    def search(self, search_term):
-        return self.get_queryset().search(search_term)
-
-
 class Country(models.Model):
     """
     A Country (or dependent territory or special area of geographical interest) included in ISO 3166.
@@ -579,7 +566,7 @@ class Country(models.Model):
         verbose_name=_("ISO Spanish name"),
         help_text=_("The name in Spanish of the Country approved by the ISO 3166 Maintenance Agency"),
     )
-    objects = CountryManager()
+    objects = IdentifierManager.from_queryset(CountryQuerySet)()
 
     def __str__(self):
         return self.iso_en_ro_name if self.iso_en_ro_name else ""
@@ -588,6 +575,9 @@ class Meta:
         verbose_name = _("Country")
         verbose_name_plural = _("Countries")
 
+    class ExtraMeta:
+        identifier = ["iso_en_ro_name"]
+
 
 class Currency(models.Model):
     """

apps/metadata/models.py

@@ -29,16 +29,16 @@ class ReferenceDataQuerySet(SearchQueryMixin, models.QuerySet):
     def get_search_filter(self, search_term):
         return (
             Q(code__iexact=search_term)
-            | Q(name_en__iexact=search_term)
-            | Q(name_pt__iexact=search_term)
-            | Q(name_es__iexact=search_term)
-            | Q(name_fr__iexact=search_term)
-            | Q(name_ar__iexact=search_term)
-            | Q(description_en__iexact=search_term)
-            | Q(description_pt__iexact=search_term)
-            | Q(description_es__iexact=search_term)
-            | Q(description_fr__iexact=search_term)
-            | Q(description_ar__iexact=search_term)
+            | Q(name_en__icontains=search_term)
+            | Q(name_pt__icontains=search_term)
+            | Q(name_es__icontains=search_term)
+            | Q(name_fr__icontains=search_term)
+            | Q(name_ar__icontains=search_term)
+            | Q(description_en__icontains=search_term)
+            | Q(description_pt__icontains=search_term)
+            | Q(description_es__icontains=search_term)
+            | Q(description_fr__icontains=search_term)
+            | Q(description_ar__icontains=search_term)
             | Q(aliases__contains=[search_term.lower()])
         )
 

hea/urls.py

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