Merge pull request #32 from cloudblue/LITE-21432-Trim-decimal-places

LITE-21432:Trim decimal places

Author: net-free

dj_rql/filter_cls.py

@@ -1,7 +1,7 @@
 #
 #  Copyright © 2021 Ingram Micro Inc. All rights reserved.
 #
-
+import decimal
 from collections import defaultdict
 from datetime import datetime
 from uuid import uuid4
@@ -38,7 +38,6 @@
 
 from lark.exceptions import LarkError
 
-
 iterable_types = (list, tuple)
 
 
@@ -847,7 +846,7 @@ def _get_typed_value(cls, filter_name, filter_lookup, str_value, django_field,
 
             typed_value = cls._convert_value(django_field, str_value, use_repr=use_repr)
             return typed_value
-        except (ValueError, TypeError):
+        except (ValueError, TypeError, decimal.InvalidOperation):
             raise RQLFilterValueError(**cls._get_error_details(
                 filter_name, filter_lookup, str_value,
             ))
@@ -890,7 +889,10 @@ def _convert_value(cls, django_field, str_value, use_repr=False):
             return float(val)
 
         elif filter_type == FilterTypes.DECIMAL:
-            return round(float(val), django_field.decimal_places)
+            if '.' in val:
+                integer_part, fractional_part = val.split('.', 1)
+                val = integer_part + '.' + fractional_part[:django_field.decimal_places]
+            return decimal.Decimal(val)
 
         elif filter_type == FilterTypes.DATE:
             return cls._convert_date_value(val)

requirements/test.txt

@@ -6,6 +6,7 @@ pytest-django==4.4.0
 pytest-mock==3.6.1
 pytest-deadfixtures==2.2.1
 pytest-randomly==3.10.1
+pytz==2021.3
 django-fsm==2.7.1
 django-model-utils==4.1.1
 djangorestframework==3.12.4

tests/dj_rf/urls.py

@@ -2,7 +2,8 @@
 #  Copyright © 2021 Ingram Micro Inc. All rights reserved.
 #
 
-from django.conf.urls import include, re_path
+from django.conf.urls import include
+from django.urls import re_path
 
 from rest_framework.routers import SimpleRouter
 

tests/test_filter_cls/test_fields_filtering.py

@@ -81,14 +81,24 @@ def test_current_price():
     filter_name = 'current_price'
     books = [
         Book.objects.create(current_price=5.23),
-        Book.objects.create(current_price=0.0121),
+        Book.objects.create(current_price=1.5554),
+        Book.objects.create(current_price=222.5556),
+        Book.objects.create(current_price=-35.4567),
+        Book.objects.create(current_price=0.0123),
     ]
     assert filter_field(filter_name, CO.EQ, books[0].current_price) == [books[0]]
-    assert filter_field(filter_name, CO.EQ, 5.2300123) == [books[0]]
+    assert filter_field(filter_name, CO.EQ, 1.55549) == [books[1]]
+    assert filter_field(filter_name, CO.EQ, 222.55567) == [books[2]]
+    assert filter_field(filter_name, CO.EQ, -35.456789) == [books[3]]
+    assert filter_field(filter_name, CO.EQ, 0.0123456) == [books[4]]
     assert filter_field(filter_name, CO.EQ, 2) == []
-    assert filter_field(filter_name, CO.NE, books[1].current_price) == [books[0]]
-    assert filter_field(filter_name, CO.LE, books[0].current_price) == books
-    assert filter_field(filter_name, CO.GT, books[1].current_price) == [books[0]]
+    assert filter_field(filter_name, CO.GT, books[1].current_price) == [books[0], books[2]]
+    assert filter_field(filter_name, CO.NE, books[1].current_price) == [
+        books[0], books[2], books[3], books[4],
+    ]
+    assert filter_field(filter_name, CO.LE, books[0].current_price) == [
+        books[0], books[1], books[3], books[4],
+    ]
 
 
 @pytest.mark.django_db