Self hosted FLOSS fitness/workout, nutrition and weight tracker
Bump openfoodfacts version
Roland Geider03f78c8e8e72
diff --git a/requirements.txt b/requirements.txtindex cdb2f1519..ea4b350e7 100644--- a/requirements.txt+++ b/requirements.txt@@ -27,7 +27,7 @@ easy-thumbnails==2.8.5fontawesomefree~=6.4.2icalendar==5.0.10invoke==2.2.0-openfoodfacts==0.1.3+openfoodfacts==0.1.10pillow==10.0.1reportlab==4.0.5requests==2.31.0diff --git a/wger/nutrition/models/ingredient.py b/wger/nutrition/models/ingredient.pyindex f98d71fcc..1bdd9636b 100644--- a/wger/nutrition/models/ingredient.py+++ b/wger/nutrition/models/ingredient.py@@ -41,7 +41,7 @@ from django.utils.text import slugifyfrom django.utils.translation import gettext_lazy as _# Third Party-import openfoodfacts+from openfoodfacts import API# wgerfrom wger.core.models import Language@@ -464,9 +464,10 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):logger.info(f'Searching for ingredient {code} in OFF')try:- result = openfoodfacts.products.get_product(code)- except JSONDecodeError:- logger.info('Got JSONDecodeError from OFF')+ api = API()+ result = api.product.get(code)+ except JSONDecodeError as e:+ logger.info(f'Got JSONDecodeError from OFF: {e}')return Noneif result['status'] != OFF_SEARCH_PRODUCT_FOUND:return Nonediff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.pyindex 5b087f990..e0d0c4899 100644--- a/wger/nutrition/tests/test_ingredient.py+++ b/wger/nutrition/tests/test_ingredient.py@@ -493,12 +493,12 @@ class IngredientModelTestCase(WgerTestCase):'status_verbose': 'product not found'}- @patch('openfoodfacts.products.get_product')- def test_fetch_from_off_success(self, mock_get_product):+ @patch('openfoodfacts.api.ProductResource.get')+ def test_fetch_from_off_success(self, mock_api):"""Tests creating an ingredient from OFF"""- mock_get_product.return_value = self.off_response+ mock_api.return_value = self.off_responseingredient = Ingredient.fetch_ingredient_from_off('1234')@@ -514,8 +514,8 @@ class IngredientModelTestCase(WgerTestCase):self.assertEqual(ingredient.brand, 'The bar company')self.assertEqual(ingredient.license_author, 'open food facts, MrX')- @patch('openfoodfacts.products.get_product')- def test_fetch_from_off_success_long_name(self, mock_get_product):+ @patch('openfoodfacts.api.ProductResource.get')+ def test_fetch_from_off_success_long_name(self, mock_api):"""Tests creating an ingredient from OFF - name gets truncated"""@@ -524,39 +524,39 @@ class IngredientModelTestCase(WgerTestCase):small-to-medium breed, it is the smallest of the six original and distinct spitzbreeds of dog native to Japan.[1] Its name literally translates to "brushwood dog",as it is used to flush game."""- mock_get_product.return_value = self.off_response+ mock_api.return_value = self.off_responseingredient = Ingredient.fetch_ingredient_from_off('1234')self.assertEqual(len(ingredient.name), 200)- @patch('openfoodfacts.products.get_product')- def test_fetch_from_off_key_missing_1(self, mock_get_product):+ @patch('openfoodfacts.api.ProductResource.get')+ def test_fetch_from_off_key_missing_1(self, mock_api):"""Tests creating an ingredient from OFF - missing key in nutriments"""del self.off_response['product']['nutriments']['energy-kcal_100g']- mock_get_product.return_value = self.off_response+ mock_api.return_value = self.off_responseingredient = Ingredient.fetch_ingredient_from_off('1234')self.assertIsNone(ingredient)- @patch('openfoodfacts.products.get_product')- def test_fetch_from_off_key_missing_2(self, mock_get_product):+ @patch('openfoodfacts.api.ProductResource.get')+ def test_fetch_from_off_key_missing_2(self, mock_api):"""Tests creating an ingredient from OFF - missing name"""del self.off_response['product']['product_name']- mock_get_product.return_value = self.off_response+ mock_api.return_value = self.off_responseingredient = Ingredient.fetch_ingredient_from_off('1234')self.assertIsNone(ingredient)- @patch('openfoodfacts.products.get_product')- def test_fetch_from_off_no_results(self, mock_get_product):+ @patch('openfoodfacts.api.ProductResource.get')+ def test_fetch_from_off_no_results(self, mock_api):"""Tests creating an ingredient from OFF"""- mock_get_product.return_value = self.off_response_no_results+ mock_api.return_value = self.off_response_no_resultsingredient = Ingredient.fetch_ingredient_from_off('1234')self.assertIsNone(ingredient)