Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Possibility to remove trailing zeros on DecimalFields representation #6514

Merged
merged 5 commits into from
Nov 16, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/api-guide/fields.md
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ Corresponds to `django.db.models.fields.DecimalField`.
- `min_value` Validate that the number provided is no less than this value.
- `localize` Set to `True` to enable localization of input and output based on the current locale. This will also force `coerce_to_string` to `True`. Defaults to `False`. Note that data formatting is enabled if you have set `USE_L10N=True` in your settings file.
- `rounding` Sets the rounding mode used when quantising to the configured precision. Valid values are [`decimal` module rounding modes][python-decimal-rounding-modes]. Defaults to `None`.
- `normalize` Will normalize the decimal value. This will strip all trailing zeroes and change the value's precision to the minimum required precision to be able to represent the value without loosing data. Defaults to `False`.
Krolken marked this conversation as resolved.
Show resolved Hide resolved

#### Example usage

Expand Down
8 changes: 7 additions & 1 deletion rest_framework/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -1014,10 +1014,11 @@ class DecimalField(Field):
MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs.

def __init__(self, max_digits, decimal_places, coerce_to_string=None, max_value=None, min_value=None,
localize=False, rounding=None, **kwargs):
localize=False, rounding=None, normalize=False, **kwargs):
self.max_digits = max_digits
self.decimal_places = decimal_places
self.localize = localize
self.normalize = normalize
if coerce_to_string is not None:
self.coerce_to_string = coerce_to_string
if self.localize:
Expand Down Expand Up @@ -1125,6 +1126,11 @@ def to_representation(self, value):

quantized = self.quantize(value)

# TODO: Should maybe name the value to something not bound to
# quantized. Ex: out_value
Krolken marked this conversation as resolved.
Show resolved Hide resolved
if self.normalize:
quantized = quantized.normalize()

if not coerce_to_string:
return quantized
if self.localize:
Expand Down
21 changes: 21 additions & 0 deletions tests/test_fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,27 @@ def test_part_precision_string_quantized_value_for_decimal(self):
assert value == expected_digit_tuple


class TestNormalizedValueDecimalField(TestCase):
"""
Test that we get the expected behavior of on DecimalField when normalize=True
"""

def test_normalize_output(self):
field = serializers.DecimalField(max_digits=4, decimal_places=3, normalize=True)
output = field.to_representation(Decimal('1.000'))
assert output == '1'

def test_non_normalize_output(self):
field = serializers.DecimalField(max_digits=4, decimal_places=3, normalize=False)
output = field.to_representation(Decimal('1.000'))
assert output == '1.000'

def test_normalize_coeherce_to_string(self):
field = serializers.DecimalField(max_digits=4, decimal_places=3, normalize=True, coerce_to_string=False)
output = field.to_representation(Decimal('1.000'))
assert output == Decimal('1')


class TestNoDecimalPlaces(FieldValues):
valid_inputs = {
'0.12345': Decimal('0.12345'),
Expand Down