Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

feat: allow range lookups on nutriscore ingredient filter

kiranannadatha8374b8e8aafe3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bfdcfbc8..59215ad7e 100644
--- a/CHANGELOG.md
+++ b/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).
diff --git a/wger/nutrition/api/filtersets.py b/wger/nutrition/api/filtersets.py
index 0c8d18438..461909ac7 100644
--- a/wger/nutrition/api/filtersets.py
+++ b/wger/nutrition/api/filtersets.py
@@ -120,7 +120,7 @@ class IngredientFilterSet(filters.FilterSet):
'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'],
diff --git a/wger/nutrition/tests/test_search_api.py b/wger/nutrition/tests/test_search_api.py
index aa1beb5fa..105354c45 100644
--- a/wger/nutrition/tests/test_search_api.py
+++ b/wger/nutrition/tests/test_search_api.py
@@ -96,3 +96,57 @@ class SearchIngredientApiTestCase(BaseTestCase, ApiBaseTestCase):
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)