Self hosted FLOSS fitness/workout, nutrition and weight tracker
Answer an invalid workout log with a 400
Roland Geider64f1d4f43ae9
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 46c343a26..f448e6544 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -604,6 +604,15 @@ class WorkoutLogSerializer(serializers.ModelSerializer):'rest_target',)+ def save(self, **kwargs):+ """+ Answer the model validation in WorkoutLog.save() with a 400+ """+ try:+ return super().save(**kwargs)+ except DjangoValidationError as e:+ raise serializers.ValidationError(e.messages)+class LogDisplaySerializer(serializers.Serializer):"""diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex e999c3856..74a96d20d 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -16,8 +16,12 @@import datetimeimport logging+# Django+from django.urls import reverse+# wgerfrom wger.core.tests import api_base_test+from wger.core.tests.base_testcase import WgerTestCasefrom wger.manager.models import WorkoutLog@@ -43,3 +47,52 @@ class WorkoutLogApiTestCase(api_base_test.ApiBaseResourceTestCase):'weight': 2,'date': datetime.date.today(),}+++class WorkoutLogValidationApiTestCase(WgerTestCase):+ """+ Tests that the model validation of a log answers with a 400+ """++ pk = 'aaaaaaaa-aaaa-aaaa-aaaa-000000000005'++ def setUp(self):+ super().setUp()+ self.user_login('test')++ def test_patch_weight_onto_log_without_weight_unit(self):+ WorkoutLog.objects.filter(pk=self.pk).update(weight=None, weight_unit=None)++ response = self.client.patch(+ reverse('workoutlog-detail', kwargs={'pk': self.pk}),+ data={'weight': 82.5},+ content_type='application/json',+ )++ self.assertEqual(response.status_code, 400)+ self.assertIsNone(WorkoutLog.objects.get(pk=self.pk).weight)++ def test_patch_keeps_values_of_the_stored_log(self):+ response = self.client.patch(+ reverse('workoutlog-detail', kwargs={'pk': self.pk}),+ data={'weight': 82.5},+ content_type='application/json',+ )++ self.assertEqual(response.status_code, 200, response.content)++ def test_create_with_weight_but_without_weight_unit(self):+ response = self.client.post(+ reverse('workoutlog-list'),+ data={+ 'exercise': 1,+ 'routine': 3,+ 'repetitions': 3,+ 'weight': 20,+ 'weight_unit': None,+ 'date': datetime.date.today().isoformat(),+ },+ content_type='application/json',+ )++ self.assertEqual(response.status_code, 400)