django-pfx 1.4.dev118__tar.gz → 1.4.dev122__tar.gz

{django_pfx-1.4.dev118 → django_pfx-1.4.dev122}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev118
+Version: 1.4.dev122
 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.dev118 → django_pfx-1.4.dev122}/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.dev118 → django_pfx-1.4.dev122}/pfx/pfxcore/models/pfx_models.py

@@ -24,6 +24,7 @@ class JSONReprMixin():
     """A model mixin to manage JSON representation."""
     api = None
     url = None
+    URL_AUTO_PK = True
     apidoc = {}
 
     def __init__(self, *args, **kw):
@@ -51,7 +52,8 @@ class JSONReprMixin():
             res['resource_api'] = f"{self.api}/{self.pk}"
         url = self.get_url()
         if url:
-            res['resource_url'] = f"{url}/{self.pk}"
+            res['resource_url'] = (
+                self.URL_AUTO_PK and f"{url}/{self.pk}" or url)
         res.update(**values)
         return res
 

{django_pfx-1.4.dev118 → django_pfx-1.4.dev122}/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.dev118 → django_pfx-1.4.dev122}/pfx/pfxcore/views/fields.py

@@ -56,6 +56,7 @@ class FieldType:
         (models.URLField, CharField),
         (models.UUIDField, CharField),
         (models.ForeignObject, ModelObject),
+        (models.OneToOneRel, ModelObject),
         (models.ForeignObjectRel, ModelObjectList),
         (models.ManyToManyField, ModelObjectList),
         (models.JSONField, JsonObject),
@@ -111,6 +112,7 @@ class ViewField:
         self.related_model_api = related_model_api
         self.select_related = select_related or []
         self.prefetch_related = prefetch_related or []
+        self.model_field = None
 
     def is_readonly(self, created=False):
         return self.readonly_create if created else self.readonly_update
@@ -136,6 +138,10 @@ class ViewField:
             obj = operator.attrgetter(path)(obj)
         else:
             name = self.name
+        if (self.model_field and
+                'reverse_related' in str(type(self.model_field)) and
+                not hasattr(obj, name)):
+            return None
         return getattr(obj, name)
 
     def _json_repr(self, value):

{django_pfx-1.4.dev118 → django_pfx-1.4.dev122}/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(''))