django-pfx 1.4.dev120__tar.gz → 1.4.dev124__tar.gz

{django_pfx-1.4.dev120 → django_pfx-1.4.dev124}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev120
+Version: 1.4.dev124
 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.dev120 → django_pfx-1.4.dev124}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev120
+Version: 1.4.dev124
 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.dev120 → django_pfx-1.4.dev124}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-08 13:56+0200\n"
+"POT-Creation-Date: 2025-04-16 11:28+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -112,22 +112,27 @@ msgstr "OTP activé"
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr "%(model_name)s avec ce/cette %(field_labels)s éxiste déjà."
 
-#: shortcuts.py:50
+#: shortcuts.py:51
 #, python-brace-format
 msgid "{key} must be an integer number."
 msgstr "{key} doit être un nombre entier."
 
-#: shortcuts.py:66
+#: shortcuts.py:67
 #, python-brace-format
 msgid "{key} must be a number."
 msgstr "{key} doit être un nombre."
 
-#: shortcuts.py:82
+#: shortcuts.py:83
+#, python-brace-format
+msgid "{key} must be a decimal number."
+msgstr "{key} doit être un nombre décimal."
+
+#: shortcuts.py:99
 #, python-brace-format
 msgid "{key} must be a date."
 msgstr "{key} doit être une date."
 
-#: shortcuts.py:103
+#: shortcuts.py:120
 #, python-brace-format
 msgid "{key} must be “true”, “false”, “1”, “0” or empty."
 msgstr "{key} doit être « true », « false », « 1 », « 0 » ou vide"

{django_pfx-1.4.dev120 → django_pfx-1.4.dev124}/pfx/pfxcore/shortcuts.py

@@ -1,6 +1,7 @@
 
 import logging
 from datetime import date
+from decimal import Decimal as D
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import gettext_lazy as _
@@ -66,6 +67,22 @@ def get_float(data, key, default=None):
         raise APIError(f(_("{key} must be a number."), key=key))
 
 
+def parse_decimal(value):
+    if is_null(value):
+        return None
+    return D(value)
+
+
+def get_decimal(data, key, default=None):
+    if key not in data:
+        return default
+    try:
+        return parse_decimal(data.get(key))
+    except Exception:
+        from pfx.pfxcore.exceptions import APIError
+        raise APIError(f(_("{key} must be a decimal number."), key=key))
+
+
 def parse_date(value):
     if is_null(value):
         return None

{django_pfx-1.4.dev120 → django_pfx-1.4.dev124}/pfx/pfxcore/views/rest_views.py

@@ -838,7 +838,7 @@ class ListRestViewMixin(ModelResponseMixin):
             limit=limit,
             offset=offset)
 
-    def _get_list_extra_meta(self):
+    def _get_list_extra_meta(self, res):
         return {}
 
     def _get_list(self, *args, **kwargs):
@@ -854,14 +854,14 @@ class ListRestViewMixin(ModelResponseMixin):
             qs, meta['subset'] = self.offset_result(qs)
         elif settings.PFX_MAX_LIST_RESULT_SIZE:
             qs = qs[:settings.PFX_MAX_LIST_RESULT_SIZE]
-        meta.update(self._get_list_extra_meta())
-        if meta:
-            res['meta'] = meta
         if get_bool(self.request.GET, 'items', 'count' not in meta):
             if self.request.GET.get('mode', 'list') == 'select':
                 res['items'] = list(self.get_short_list_result(qs))
             else:
                 res['items'] = list(self.get_list_result(qs))
+        meta.update(self._get_list_extra_meta(res))
+        if meta:
+            res['meta'] = meta
         return JsonResponse(res)
 
     @rest_api(

{django_pfx-1.4.dev120 → django_pfx-1.4.dev124}/tests/tests/test_shortcuts.py

@@ -1,4 +1,5 @@
 from datetime import date
+from decimal import Decimal as D
 
 from django.test import TestCase
 
@@ -7,6 +8,7 @@ from pfx.pfxcore.shortcuts import (
     f,
     get_bool,
     get_date,
+    get_decimal,
     get_float,
     get_int,
     get_object,
@@ -157,6 +159,32 @@ class ShortcutTest(TestAssertMixin, TestCase):
         self.assertEqual(get_float(
             vals, 'does_not_exists', default=3.14159265359), 3.14159265359)
 
+    def test_get_decimal(self):
+        vals = dict(
+            none=None,
+            empty='',
+            null='null',
+            undefined='undefined',
+            zero='0',
+            integer='3',
+            negative='-7.45',
+            positive='13.57',
+            invalid='INVALID')
+        self.assertIsNone(get_decimal(vals, 'none'))
+        self.assertIsNone(get_decimal(vals, 'empty'))
+        self.assertIsNone(get_decimal(vals, 'null'))
+        self.assertIsNone(get_decimal(vals, 'undefined'))
+        self.assertEqual(get_decimal(vals, 'zero'), D('0'))
+        self.assertEqual(get_decimal(vals, 'integer'), D('3'))
+        self.assertEqual(get_decimal(vals, 'negative'), D('-7.45'))
+        self.assertEqual(get_decimal(vals, 'positive'), D('13.57'))
+        with self.assertRaises(APIError):
+            get_decimal(vals, 'invalid')
+        self.assertIs(get_decimal(vals, 'does_not_exists'), None)
+        self.assertEqual(get_decimal(
+            vals, 'does_not_exists',
+            default=D('3.14159265359')), D('3.14159265359'))
+
     def test_parse_date(self):
         self.assertIsNone(parse_date(None))
         self.assertIsNone(parse_date(''))

{django_pfx-1.4.dev120 → django_pfx-1.4.dev124}/tests/views.py

@@ -129,7 +129,7 @@ class AuthorRestView(AuthorRestViewMixin, SlugDetailRestViewMixin, RestView):
 class AuthorExtraMetaRestView(AuthorRestViewMixin, RestView):
     default_public = True
 
-    def _get_list_extra_meta(self):
+    def _get_list_extra_meta(self, res):
         return dict(test="Hello world")