Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use the ingredient id for the path

Roland Geider490e2733446e
diff --git a/wger/nutrition/models/image.py b/wger/nutrition/models/image.py
index e11b795f2..c76b31dce 100644
--- a/wger/nutrition/models/image.py
+++ b/wger/nutrition/models/image.py
@@ -33,7 +33,7 @@ def ingredient_image_upload_dir(instance, filename):
Returns the upload target for exercise images
"""
ext = pathlib.Path(filename).suffix
- return "ingredients/{0}/{1}{2}".format(instance.ingredient.uuid, instance.uuid, ext)
+ return "ingredients/{0}/{1}{2}".format(instance.ingredient.pk, instance.uuid, ext)
class Image(AbstractLicenseModel, models.Model, BaseImage):
diff --git a/wger/nutrition/tests/test_tasks.py b/wger/nutrition/tests/test_tasks.py
index d7a3035a0..113752647 100644
--- a/wger/nutrition/tests/test_tasks.py
+++ b/wger/nutrition/tests/test_tasks.py
@@ -76,8 +76,8 @@ class MockWgerApiResponse:
"uuid": "188324b5-587f-42d7-9abc-d2ca64c73d45",
"ingredient_id": "12345",
"ingredient_uuid": "e9baa8bd-84fc-4756-8d90-5b9739b06cf8",
- "image": "http://localhost:8000/media/ingredients/e9baa8bd-84fc-4756-8d90"
- "-5b9739b06cf8/188324b5-587f-42d7-9abc-d2ca64c73d45.jpg",
+ "image": "http://localhost:8000/media/ingredients/1/"
+ "188324b5-587f-42d7-9abc-d2ca64c73d45.jpg",
"last_update": "2023-03-15T23:20:10.969369+01:00",
"size": 20179,
"source_url": "",
@@ -190,8 +190,7 @@ class FetchIngredientImageTestCase(WgerTestCase):
headers=wger_headers(),
)
mock_request.assert_any_call(
- 'http://localhost:8000/media/ingredients/e9baa8bd-84fc-4756-8d90-5b9739b06cf8'
- '/188324b5-587f-42d7-9abc-d2ca64c73d45.jpg',
+ 'http://localhost:8000/media/ingredients/1/188324b5-587f-42d7-9abc-d2ca64c73d45.jpg',
headers=wger_headers()
)