Self hosted FLOSS fitness/workout, nutrition and weight tracker
Serialize some values as integers, if possible
Roland Geider03538ce45ef7
diff --git a/wger/manager/api/fields.py b/wger/manager/api/fields.pynew file mode 100644index 000000000..ada3e332d--- /dev/null+++ b/wger/manager/api/fields.py@@ -0,0 +1,16 @@+from rest_framework import serializers+from decimal import Decimal+++class DecimalOrIntegerField(serializers.DecimalField):+ """+ Custom field to represent Decimal values as integers when they are whole numbers.+ """++ def to_representation(self, value):+ value = super().to_representation(value)+ if value is not None:+ value = Decimal(value)+ if value == value.to_integral_value():+ return str(int(value))+ return str(value)diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex fd14522de..09a7524fc 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -19,6 +19,7 @@ from rest_framework import serializers# wgerfrom wger.manager.api.consts import BASE_CONFIG_FIELDS+from wger.manager.api.fields import DecimalOrIntegerFieldfrom wger.manager.api.validators import validate_requirementsfrom wger.manager.models import (Day,@@ -348,19 +349,19 @@ class SetConfigDataSerializer(serializers.Serializer):exercise = serializers.IntegerField()sets = serializers.IntegerField()max_sets = serializers.IntegerField()- weight = serializers.DecimalField(max_digits=5, decimal_places=2)- max_weight = serializers.DecimalField(max_digits=5, decimal_places=2)+ weight = DecimalOrIntegerField(max_digits=5, decimal_places=2)+ max_weight = DecimalOrIntegerField(max_digits=5, decimal_places=2)weight_unit = serializers.IntegerField()weight_rounding = serializers.DecimalField(max_digits=4, decimal_places=2)- repetitions = serializers.DecimalField(max_digits=5, decimal_places=2)- max_repetitions = serializers.DecimalField(max_digits=5, decimal_places=2)+ repetitions = DecimalOrIntegerField(max_digits=5, decimal_places=2)+ max_repetitions = DecimalOrIntegerField(max_digits=5, decimal_places=2)repetitions_unit = serializers.IntegerField()repetitions_rounding = serializers.DecimalField(max_digits=4, decimal_places=2)- rir = serializers.DecimalField(max_digits=5, decimal_places=2)- max_rir = serializers.DecimalField(max_digits=5, decimal_places=2)- rpe = serializers.DecimalField(max_digits=5, decimal_places=2)- rest = serializers.DecimalField(max_digits=5, decimal_places=2)- max_rest = serializers.DecimalField(max_digits=5, decimal_places=2)+ rir = DecimalOrIntegerField(max_digits=2, decimal_places=1)+ max_rir = DecimalOrIntegerField(max_digits=2, decimal_places=1)+ rpe = DecimalOrIntegerField(max_digits=2, decimal_places=1)+ rest = DecimalOrIntegerField(max_digits=5, decimal_places=2)+ max_rest = DecimalOrIntegerField(max_digits=5, decimal_places=2)type = serializers.CharField()text_repr = serializers.CharField()comment = serializers.CharField()diff --git a/wger/manager/tests/test_dataclasses_helper.py b/wger/manager/tests/test_dataclasses_helper.pyindex 09d902403..c503ea909 100644--- a/wger/manager/tests/test_dataclasses_helper.py+++ b/wger/manager/tests/test_dataclasses_helper.py@@ -33,6 +33,9 @@ class RoundValueTestCase(SimpleTestCase):def test_round_value2(self):self.assertEqual(round_value(Decimal('7'), 1.25), Decimal('7.5'))+ def test_round_value3(self):+ self.assertEqual(round_value(Decimal('3.0'), 0.5), Decimal('3'))+def test_round_value_base_none(self):self.assertEqual(round_value(Decimal('1.33')), Decimal('1.33'))