Merge pull request #2305 from kiranannadatha8/feature/2295-nutriscore-range-filters

feat(nutrition): allow range lookups on nutriscore ingredient filter

Author: rolandgeider

CHANGELOG.md

@@ -1,2 +1,5 @@
 # Changelog for the next release
 
+* The ingredient API filter now supports range lookups on `nutriscore`
+  (`gt`, `gte`, `lt`, `lte`) in addition to `exact` and `in`, enabling queries
+  like "better than C" (#2295).

wger/nutrition/api/filtersets.py

@@ -120,7 +120,7 @@ class Meta:
             'sodium': ['exact'],
             'is_vegan': ['exact'],
             'is_vegetarian': ['exact'],
-            'nutriscore': ['exact', 'in'],
+            'nutriscore': ['exact', 'in', 'gt', 'gte', 'lt', 'lte'],
             'created': ['exact', 'gt', 'lt'],
             'last_update': ['exact', 'gt', 'lt'],
             'last_imported': ['exact', 'gt', 'lt'],

wger/nutrition/tests/test_search_api.py

@@ -96,3 +96,57 @@ def test_search_all_languages(self):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data['count'], 7)
+
+    def test_filter_nutriscore_exact(self):
+        """
+        Exact match on nutriscore returns only ingredients with that grade
+        """
+        response = self.client.get(self.url + '?nutriscore=a')
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['count'], 3)
+
+    def test_filter_nutriscore_in(self):
+        """
+        `in` lookup accepts a comma-separated list of grades
+        """
+        response = self.client.get(self.url + '?nutriscore__in=a,b')
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['count'], 7)
+
+    def test_filter_nutriscore_lt(self):
+        """
+        `lt` lookup returns ingredients with a better grade (e.g. better than C → A, B)
+        """
+        response = self.client.get(self.url + '?nutriscore__lt=c')
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['count'], 7)
+
+    def test_filter_nutriscore_lte(self):
+        """
+        `lte` lookup is inclusive (e.g. C or better → A, B, C)
+        """
+        response = self.client.get(self.url + '?nutriscore__lte=c')
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['count'], 10)
+
+    def test_filter_nutriscore_gt(self):
+        """
+        `gt` lookup returns ingredients with a worse grade (e.g. worse than C → D, E)
+        """
+        response = self.client.get(self.url + '?nutriscore__gt=c')
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['count'], 3)
+
+    def test_filter_nutriscore_gte(self):
+        """
+        `gte` lookup is inclusive (e.g. C or worse → C, D, E)
+        """
+        response = self.client.get(self.url + '?nutriscore__gte=c')
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['count'], 6)