Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add image to ingredient search response

olijzengadee1168492ec
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.py
index 7eb0b3693..3be9efbe9 100644
--- a/wger/nutrition/api/views.py
+++ b/wger/nutrition/api/views.py
@@ -22,6 +22,8 @@ import datetime
from django.shortcuts import get_object_or_404
# Third Party
+from easy_thumbnails.alias import aliases
+from easy_thumbnails.files import get_thumbnailer
from rest_framework import viewsets
from rest_framework.decorators import (
action,
@@ -167,11 +169,22 @@ def search(request):
)
for ingredient in ingredients:
+ if hasattr(ingredient, 'image'):
+ image_obj = ingredient.image
+ image = image_obj.image.url
+ t = get_thumbnailer(image_obj.image)
+ thumbnail = t.get_thumbnail(aliases.get('micro_cropped')).url
+ else:
+ image = None
+ thumbnail = None
+
ingredient_json = {
'value': ingredient.name,
'data': {
'id': ingredient.id,
'name': ingredient.name,
+ 'image': image,
+ 'image_thumbnail': thumbnail
}
}
results.append(ingredient_json)
diff --git a/wger/nutrition/models/ingredient.py b/wger/nutrition/models/ingredient.py
index fedaedcfa..d8251156a 100644
--- a/wger/nutrition/models/ingredient.py
+++ b/wger/nutrition/models/ingredient.py
@@ -446,18 +446,13 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
if self.source_name == Source.OPEN_FOOD_FACTS.value:
return f'https://world.openfoodfacts.org/product/{self.code}/'
- def get_image(self, request: HttpRequest):
+ def fetch_image(self):
"""
- Returns the ingredient image
+ Fetches the ingredient image from Open Food Facts servers if it is not available locally
- If it is not available locally, it is fetched from Open Food Facts servers
+ Returns the image if it was fetched
"""
- try:
- return self.image
- except Ingredient.image.RelatedObjectDoesNotExist:
- pass
-
- if not request.user.is_authenticated:
+ if hasattr(self, 'image'):
return
if self.source_name != Source.OPEN_FOOD_FACTS.value:
@@ -507,3 +502,17 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
'size': len(downloaded_image.content)
}
return Image.from_json(self, downloaded_image, image_data, headers, generate_uuid=True)
+
+ def get_image(self, request: HttpRequest):
+ """
+ Returns the ingredient image
+
+ If it is not available locally, it is fetched from Open Food Facts servers
+ """
+ if hasattr(self, 'image'):
+ return self.image
+
+ if not request.user.is_authenticated:
+ return
+
+ return self.fetch_image()
diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.py
index 22c71f9d6..3f8700db2 100644
--- a/wger/nutrition/tests/test_ingredient.py
+++ b/wger/nutrition/tests/test_ingredient.py
@@ -246,7 +246,16 @@ class IngredientSearchTestCase(WgerTestCase):
result = json.loads(response.content.decode('utf8'))
self.assertEqual(len(result['suggestions']), 2)
self.assertEqual(result['suggestions'][0]['value'], 'Ingredient, test, 2, organic, raw')
+ self.assertEqual(result['suggestions'][0]['data']['id'], 2)
+ suggestion_0_name = 'Ingredient, test, 2, organic, raw'
+ self.assertEqual(result['suggestions'][0]['data']['name'], suggestion_0_name)
+ self.assertEqual(result['suggestions'][0]['data']['image'], None)
+ self.assertEqual(result['suggestions'][0]['data']['image_thumbnail'], None)
self.assertEqual(result['suggestions'][1]['value'], 'Test ingredient 1')
+ self.assertEqual(result['suggestions'][1]['data']['id'], 1)
+ self.assertEqual(result['suggestions'][1]['data']['name'], 'Test ingredient 1')
+ self.assertEqual(result['suggestions'][1]['data']['image'], None)
+ self.assertEqual(result['suggestions'][1]['data']['image_thumbnail'], None)
# Search for an ingredient pending review (0 hits, "Pending ingredient")
response = self.client.get(reverse('ingredient-search'), {'term': 'Pending'}, **kwargs)