encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-09-16 17:22:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: enforce decimal type in decimal field

Browse Source
This commit is contained in:
ismaeljs 2023-05-04 07:52:14 +02:00
parent e08e606c82
commit ed941287d9
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/fields.py
View File

@ -990,6 +990,11 @@ class DecimalField(Field):
self.max_value = max_value self.max_value = max_value
self.min_value = min_value self.min_value = min_value
if self.max_value is not None and isinstance(self.max_value) is not decimal.Decimal:
raise ValueError("Invalid max_value argument. It must be decimal type.")
if self.min_value is not None and isinstance(self.min_value) is not decimal.Decimal:
raise ValueError("Invalid min_value argument. It must be decimal type.")
if self.max_digits is not None and self.decimal_places is not None: if self.max_digits is not None and self.decimal_places is not None:
self.max_whole_digits = self.max_digits - self.decimal_places self.max_whole_digits = self.max_digits - self.decimal_places
else: else:

14
tests/test_fields.py
View File

@ -1203,17 +1203,17 @@ class TestMinMaxDecimalField(FieldValues):
Valid and invalid values for `DecimalField` with min and max limits. Valid and invalid values for `DecimalField` with min and max limits.
""" """
valid_inputs = { valid_inputs = {
'10.0': Decimal('10.0'), '10.1': Decimal('10.1'),
'20.0': Decimal('20.0'), '20.1': Decimal('20.1'),
} }
invalid_inputs = { invalid_inputs = {
'9.9': ['Ensure this value is greater than or equal to 10.'], '9.9': ['Ensure this value is greater than or equal to 10.1.'],
'20.1': ['Ensure this value is less than or equal to 20.'], '20.2': ['Ensure this value is less than or equal to 20.2.'],
} }
outputs = {} outputs = {}
field = serializers.DecimalField( field = serializers.DecimalField(
max_digits=3, decimal_places=1, max_digits=3, decimal_places=1,
min_value=10, max_value=20 min_value=Decimal('10.1'), max_value=Decimal('20.1')
) )
@ -1238,12 +1238,12 @@ class TestAllowEmptyStrDecimalFieldWithValidators(FieldValues):
outputs = { outputs = {
None: '', None: '',
} }
field = serializers.DecimalField(max_digits=3, decimal_places=1, allow_null=True, min_value=0, max_value=10) field = serializers.DecimalField(max_digits=3, decimal_places=1, allow_null=True, min_value=Decimal('0'), max_value=Decimal('10'))
class TestNoMaxDigitsDecimalField(FieldValues): class TestNoMaxDigitsDecimalField(FieldValues):
field = serializers.DecimalField( field = serializers.DecimalField(
max_value=100, min_value=0, max_value=Decimal('100'), min_value=Decimal('0'),
decimal_places=2, max_digits=None decimal_places=2, max_digits=None
) )
valid_inputs = { valid_inputs = {