Self hosted FLOSS fitness/workout, nutrition and weight tracker
Properly handle unexisting or malformed IDs
Roland Geider3c82b0ec71e4
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex f22fcd19c..0e16891e9 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -326,10 +326,7 @@ class ExerciseImageViewSet(ModelViewSet):"""Return a list of the image's thumbnails"""- try:- image = ExerciseImage.objects.get(pk=pk)- except ExerciseImage.DoesNotExist:- return Response([])+ image = self.get_object()thumbnails = {}for alias in aliases.all():diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.pyindex 346776eac..6aa432d61 100644--- a/wger/exercises/tests/test_exercise_images.py+++ b/wger/exercises/tests/test_exercise_images.py@@ -15,6 +15,7 @@# Djangofrom django.core.files import Filefrom django.test import SimpleTestCase+from django.urls import reverse# wgerfrom wger.core.tests import api_base_test@@ -205,6 +206,20 @@ class ExerciseImageFromJsonSimpleTests(SimpleTestCase):self.assertFalse(img.is_main)+class ExerciseImageThumbnailsApiTestCase(WgerTestCase):+ """+ Tests the thumbnails action of the exercise image API endpoint+ """++ def test_thumbnails_non_numeric_pk(self):+ """A non-numeric pk yields a 404 instead of raising a 500"""+ response = self.client.get(+ reverse('exerciseimage-thumbnails', kwargs={'pk': 'not-a-number'})+ )++ self.assertEqual(response.status_code, 404)++# TODO: add POST and DELETE testsclass ExerciseImagesApiTestCase(ActstreamUpdateMixin,diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.pyindex 4275a4cfa..f239b4b9a 100644--- a/wger/nutrition/api/views.py+++ b/wger/nutrition/api/views.py@@ -385,6 +385,4 @@ class LogItemViewSet(WgerOwnerObjectModelViewSet):"""Return an overview of the nutritional plan's values"""- return Response(- LogItem.objects.get(pk=pk, plan__user=self.request.user).get_nutritional_values()- )+ return Response(self.get_object().get_nutritional_values())diff --git a/wger/nutrition/tests/test_nutritional_calculations.py b/wger/nutrition/tests/test_nutritional_calculations.pyindex 4db8fc4c1..b20fdb7d4 100644--- a/wger/nutrition/tests/test_nutritional_calculations.py+++ b/wger/nutrition/tests/test_nutritional_calculations.py@@ -17,6 +17,9 @@import loggingfrom decimal import Decimal+# Django+from django.urls import reverse+# wgerfrom wger.core.tests.base_testcase import WgerTestCasefrom wger.nutrition import models@@ -231,3 +234,18 @@ class NutritionalValuesCalculationsTestCase(WgerTestCase):self.assertAlmostEqual(values['per_kg']['carbohydrates'], Decimal(4.96), 2)self.assertAlmostEqual(values['per_kg']['fat'], Decimal(1.51), 2)self.assertAlmostEqual(values['per_kg']['protein'], Decimal(4.33), 2)+++class NutritionalValuesApiTestCase(WgerTestCase):+ """+ Tests the nutritional_values action of the nutrition diary API endpoint+ """++ def test_nutritional_values_non_numeric_pk(self):+ """A non-numeric pk yields a 404 instead of raising a 500"""+ self.user_login('test')+ response = self.client.get(+ reverse('nutritiondiary-nutritional-values', kwargs={'pk': 'not-a-number'})+ )++ self.assertEqual(response.status_code, 404)