django-pfx 1.4.dev114__tar.gz → 1.4.dev116__tar.gz

{django_pfx-1.4.dev114 → django_pfx-1.4.dev116}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev114
+Version: 1.4.dev116
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev114 → django_pfx-1.4.dev116}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev114
+Version: 1.4.dev116
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

django_pfx-1.4.dev116/pfx/pfxcore/fields/decimal_field.py

@@ -0,0 +1,33 @@
+from decimal import Decimal
+
+from django.db import models
+
+
+class DecimalField(models.DecimalField):
+    def __init__(
+            self, *args, percent=False, currency=None,
+            json_decimal_places=None, **kw):
+        super().__init__(*args, **kw)
+        self.percent = percent
+        self.currency = currency
+        self.json_quantize = Decimal(10) ** -(json_decimal_places or (
+            percent and self.decimal_places - 2 or self.decimal_places))
+
+    def to_json_meta(self, meta):
+        meta.update(
+            percent=self.percent,
+            currency=self.currency)
+        return meta
+
+    def to_json(self, value):
+        if value is None:
+            return None
+        if self.percent:
+            value *= Decimal(100)
+        return value.quantize(self.json_quantize)
+
+    def from_json(self, value):
+        if value is None:
+            return None
+        value = Decimal(value)
+        return self.percent and value / Decimal(100) or value

{django_pfx-1.4.dev114 → django_pfx-1.4.dev116}/pfx/pfxcore/views/fields.py

@@ -332,6 +332,8 @@ class ViewModelField(ViewField):
         res['required'] = not (
             getattr(self.model_field, 'null', False) or
             getattr(self.model_field, 'blank', False))
+        if hasattr(self.model_field, 'to_json_meta'):
+            res = self.model_field.to_json_meta(res)
         return res
 
     def to_model_value(self, value, get_related_queryset):
@@ -346,6 +348,8 @@ class ViewModelField(ViewField):
             value = _get_obj(value)
         elif self.field_type == FieldType.ModelObjectList:
             value = ModelList(_get_obj(v) for v in value)
+        elif hasattr(field, 'from_json'):
+            value = field.from_json(value)
         elif hasattr(field, 'choices') and field.choices:
             value = (value['value']
                      if isinstance(value, dict) and 'value' in value

{django_pfx-1.4.dev114 → django_pfx-1.4.dev116}/tests/tests/test_fields_decimal.py

@@ -17,6 +17,11 @@ from tests.views import FakeViewMixin
 class TestDecimalModel(JSONReprMixin, models.Model):
     decimal = DecimalField(
         max_digits=10, decimal_places=5, json_decimal_places=2)
+    percent = DecimalField(
+        max_digits=10, decimal_places=4, percent=True)
+    monetary = DecimalField(
+        max_digits=10, decimal_places=5, json_decimal_places=2,
+        currency="CHF")
 
     class Meta:
         verbose_name = "TestModel"
@@ -28,7 +33,7 @@ class TestDecimalModel(JSONReprMixin, models.Model):
 class DecimalModelRestView(FakeViewMixin, RestView):
     default_public = True
     model = TestDecimalModel
-    fields = ['decimal']
+    fields = ['decimal', 'percent', 'monetary']
 
 
 urlpatterns = [
@@ -48,12 +53,37 @@ class TestFieldsDecimal(TestAssertMixin, TestCase):
         with connection.schema_editor() as schema_editor:
             schema_editor.create_model(TestDecimalModel)
 
+    def test_decimal_meta(self):
+        response = self.client.get('/api/test-decimal-model/meta')
+        self.assertRC(response, 200)
+        self.assertJE(response, 'fields.decimal.percent', False)
+        self.assertJE(response, 'fields.decimal.currency', None)
+        self.assertJE(response, 'fields.percent.percent', True)
+        self.assertJE(response, 'fields.percent.currency', None)
+        self.assertJE(response, 'fields.monetary.percent', False)
+        self.assertJE(response, 'fields.monetary.currency', "CHF")
+
     def test_decimal(self):
-        t = TestDecimalModel.objects.create(decimal=3.14)
+        t = TestDecimalModel.objects.create(
+            decimal=3.14, percent=0.0810, monetary=100)
         t.save()
         t.refresh_from_db()
         self.assertEqual(t.decimal, Decimal('3.14000'))
+        self.assertEqual(t.percent, Decimal('0.0810'))
 
         response = self.client.get(f'/api/test-decimal-model/{t.pk}')
         self.assertRC(response, 200)
         self.assertJE(response, 'decimal', "3.14")
+        self.assertJE(response, 'percent', "8.10")
+
+        response = self.client.put(f'/api/test-decimal-model/{t.pk}', dict(
+            decimal="3.12121",
+            percent="7.7",
+        ))
+        self.assertRC(response, 200)
+        self.assertJE(response, 'decimal', "3.12")
+        self.assertJE(response, 'percent', "7.70")
+
+        t.refresh_from_db()
+        self.assertEqual(t.decimal, Decimal('3.12121'))
+        self.assertEqual(t.percent, Decimal('0.0770'))

django_pfx-1.4.dev114/pfx/pfxcore/fields/decimal_field.py

@@ -1,15 +0,0 @@
-from decimal import Decimal
-
-from django.db import models
-
-
-class DecimalField(models.DecimalField):
-    def __init__(self, *args, json_decimal_places=None, **kw):
-        super().__init__(*args, **kw)
-        self.json_quantize = Decimal(10) ** -(
-            json_decimal_places or self.decimal_places)
-
-    def to_json(self, value):
-        if value is None:
-            return None
-        return value.quantize(self.json_quantize)