Self hosted FLOSS fitness/workout, nutrition and weight tracker
Also expose the thumbnails over the ingredient info endpoint
Roland Geiderf40c72ec0a72
diff --git a/wger/nutrition/api/serializers.py b/wger/nutrition/api/serializers.pyindex 167f9430b..33719e236 100644--- a/wger/nutrition/api/serializers.py+++ b/wger/nutrition/api/serializers.py@@ -13,7 +13,10 @@# You should have received a copy of the GNU Affero General Public License# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.+# Django+from django.conf import settings# Third Party+from easy_thumbnails.files import get_thumbnailerfrom rest_framework import serializers# wger@@ -149,6 +152,7 @@ class IngredientInfoSerializer(serializers.ModelSerializer):weight_units = IngredientWeightUnitInfoSerializer(source='ingredientweightunit_set', many=True)image = IngredientImageSerializer(read_only=True)+ thumbnails = serializers.SerializerMethodField()class Meta:model = Ingredient@@ -174,15 +178,31 @@ class IngredientInfoSerializer(serializers.ModelSerializer):'sodium','weight_units','language',- 'image','license','license_title','license_object_url','license_author','license_author_url','license_derivative_source_url',+ 'image',+ 'thumbnails',]+ def get_thumbnails(self, obj: Ingredient):+ if not hasattr(obj, 'image'):+ return None++ request = self.context.get('request')+ aliases = ['small', 'small_cropped', 'medium', 'medium_cropped', 'large', 'large_cropped']+ result = {}++ thumbnailer = get_thumbnailer(obj.image.image)+ for alias in aliases:+ opts = settings.THUMBNAIL_ALIASES[''][alias]+ thumb = thumbnailer.get_thumbnail(opts)+ result[alias] = request.build_absolute_uri(thumb.url)+ return result+class MealItemSerializer(serializers.ModelSerializer):"""diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.pyindex f50e0a710..f2a77ec7c 100644--- a/wger/nutrition/tests/test_ingredient.py+++ b/wger/nutrition/tests/test_ingredient.py@@ -249,7 +249,7 @@ class IngredientSearchTestCase(WgerTestCase):"""response = self.client.get(- reverse('api-ingredient-list'),+ reverse('api-ingredientinfo-list'),{'name__search': 'test', 'language__code': 'en'},)self.assertEqual(response.status_code, 200)@@ -261,13 +261,17 @@ class IngredientSearchTestCase(WgerTestCase):self.assertEqual(ingredient_1['id'], 2)self.assertEqual(ingredient_1['name'], 'Ingredient, test, 2, organic, raw')self.assertEqual(ingredient_1['uuid'], '44dc5966-73a2-4df7-8b15-f6d37a8990d9')- self.assertEqual(ingredient_1['language'], 2)+ self.assertEqual(ingredient_1['language']['id'], 2)+ self.assertEqual(ingredient_1['image'], None)+ self.assertEqual(ingredient_1['thumbnails'], None)ingredient_2 = result['results'][1]self.assertEqual(ingredient_2['id'], 1)self.assertEqual(ingredient_2['name'], 'Test ingredient 1')self.assertEqual(ingredient_2['uuid'], '7908c204-907f-4b1e-ad4e-f482e9769ade')- self.assertEqual(ingredient_2['language'], 2)+ self.assertEqual(ingredient_2['language']['id'], 2)+ self.assertEqual(ingredient_2['image'], None)+ self.assertEqual(ingredient_2['thumbnails'], None)def search_ingredient_de(self):"""@@ -275,7 +279,7 @@ class IngredientSearchTestCase(WgerTestCase):"""response = self.client.get(- reverse('api-ingredient-list'),+ reverse('api-ingredientinfo-list'),{'name__search': 'test', 'language__code': 'de'},)self.assertEqual(response.status_code, 200)@@ -287,7 +291,9 @@ class IngredientSearchTestCase(WgerTestCase):self.assertEqual(ingredient_1['id'], 6)self.assertEqual(ingredient_1['name'], 'Testzutat 123')self.assertEqual(ingredient_1['uuid'], 'dfc5c622-027b-4f17-8141-dadd1ce7e3f1')- self.assertEqual(ingredient_1['language'], 1)+ self.assertEqual(ingredient_1['language']['id'], 1)+ self.assertEqual(ingredient_1['image'], None)+ self.assertEqual(ingredient_1['thumbnails'], None)def test_search_ingredient_anonymous(self):"""