Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Just for completeness, check the validity of the Nutriscore

Roland Geider3febe996a128
diff --git a/wger/nutrition/dataclasses.py b/wger/nutrition/dataclasses.py
index dbb7329d1..8bf5e92be 100644
--- a/wger/nutrition/dataclasses.py
+++ b/wger/nutrition/dataclasses.py
@@ -100,6 +100,9 @@ class IngredientData:
if self.carbohydrates + self.protein + self.fat > 100:
raise ValueError('Total of carbohydrates, protein and fat is greater than 100!')
+ if self.nutriscore is not None and self.nutriscore not in ('a', 'b', 'c', 'd', 'e'):
+ raise ValueError(f'Invalid nutriscore value: {self.nutriscore}')
+
def dict(self):
data = asdict(self)
data.pop('serving_size_gram', None)
diff --git a/wger/nutrition/tests/test_dataclass.py b/wger/nutrition/tests/test_dataclass.py
index 17cab8ab4..701e6e334 100644
--- a/wger/nutrition/tests/test_dataclass.py
+++ b/wger/nutrition/tests/test_dataclass.py
@@ -78,3 +78,18 @@ class IngredientDataclassTestCase(SimpleTestCase):
self.ingredient_data.carbohydrates = 20
self.ingredient_data.carbohydrates_sugar = 30
self.assertRaises(ValueError, self.ingredient_data.sanity_checks)
+
+ def test_validation_nutriscore_valid(self):
+ """
+ Test that valid nutriscore values are accepted
+ """
+ for score in ('a', 'b', 'c', 'd', 'e', None):
+ self.ingredient_data.nutriscore = score
+ self.assertEqual(self.ingredient_data.sanity_checks(), None)
+
+ def test_validation_nutriscore_invalid(self):
+ """
+ Test that invalid nutriscore values are rejected
+ """
+ self.ingredient_data.nutriscore = 'z'
+ self.assertRaises(ValueError, self.ingredient_data.sanity_checks)