django-pfx 1.4.dev106__tar.gz → 1.4.dev108__tar.gz

{django_pfx-1.4.dev106 → django_pfx-1.4.dev108}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev106
+Version: 1.4.dev108
 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
@@ -37,6 +37,7 @@ Requires-Dist: dill
 Requires-Dist: nh3
 Provides-Extra: otp
 Requires-Dist: pyotp; extra == "otp"
+Dynamic: license-file
 
 # Django PFX
 

{django_pfx-1.4.dev106 → django_pfx-1.4.dev108}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev106
+Version: 1.4.dev108
 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
@@ -37,6 +37,7 @@ Requires-Dist: dill
 Requires-Dist: nh3
 Provides-Extra: otp
 Requires-Dist: pyotp; extra == "otp"
+Dynamic: license-file
 
 # Django PFX
 

{django_pfx-1.4.dev106 → django_pfx-1.4.dev108}/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-03-18 12:26+0100\n"
+"POT-Creation-Date: 2025-03-31 12:17+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -281,23 +281,23 @@ msgstr "Le paramètre object est requis pour move={move}."
 msgid "object {pk} does not exists in this move context."
 msgstr "object {pk} n'existe pas dans ce contexte de déplacement."
 
-#: views/rest_views.py:239
+#: views/rest_views.py:234
 #, python-brace-format
 msgid "{obj} cannot be deleted because it is referenced by other objects."
 msgstr ""
 "{obj} ne peut pas être supprimé car il est référencé par d’autres objets."
 
-#: views/rest_views.py:324
+#: views/rest_views.py:319
 #, python-brace-format
 msgid "{model} {obj} created."
 msgstr "{model} {obj} créé."
 
-#: views/rest_views.py:325
+#: views/rest_views.py:320
 #, python-brace-format
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1170
+#: views/rest_views.py:1165
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."

{django_pfx-1.4.dev106 → django_pfx-1.4.dev108}/pfx/pfxcore/views/fields.py

@@ -1,11 +1,10 @@
 import inspect
 import logging
 import operator
-from datetime import date
 
+from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models.constants import LOOKUP_SEP
-from django.utils.formats import date_format
 from django.utils.functional import cached_property
 
 from apispec.utils import deepupdate
@@ -144,13 +143,8 @@ class ViewField:
             return self.json_repr(value)
         return value.json_repr()
 
-    def to_json(self, obj, format_date):
+    def to_json(self, obj):
         value = self.get_value(obj)
-        if format_date and isinstance(value, date):
-            return dict(
-                value=value,
-                formatted=date_format(
-                    value, format='SHORT_DATE_FORMAT', use_l10n=True))
         if self.field_type == FieldType.MinutesDurationField:
             return pfx_fields.MinutesDurationField.to_json(value)
         if self.field_type == FieldType.ModelObject:
@@ -343,9 +337,15 @@ class ViewModelField(ViewField):
                      if isinstance(value, dict) and 'value' in value
                      else value)
         elif self.field_type == FieldType.DateField:
-            value = (value['value']
-                     if isinstance(value, dict) and 'value' in value
-                     else value)
+            try:
+                value = value and field.to_python(value)
+            except ValidationError as e:
+                raise ValidationError({field.name: e})
+        elif self.field_type == FieldType.DateTimeField:
+            try:
+                value = value and field.to_python(value)
+            except ValidationError as e:
+                raise ValidationError({field.name: e})
         elif self.field_type == FieldType.IntegerField:
             value = value if value != '' else None
         elif self.field_type == FieldType.FloatField:

{django_pfx-1.4.dev106 → django_pfx-1.4.dev108}/pfx/pfxcore/views/rest_views.py

@@ -205,11 +205,6 @@ class ModelMixin():
         """
         return self.model._meta.verbose_name
 
-    @property
-    def format_date(self):
-        """:meta private: Undocumented because it must be changed."""
-        return get_bool(self.request.GET, 'date_format')
-
     def message_response(self, message, **kwargs):
         """Build a message JSON response.
 
@@ -296,7 +291,7 @@ class ModelResponseMixin(ModelMixin):
         :rtype: :class:`JsonResponse`
         """
         return JsonResponse(self.serialize_object(o, **{
-            _f.alias: _f.to_json(o, self.format_date)
+            _f.alias: _f.to_json(o)
             for _f in self.get_fields().values()}, meta=meta))
 
     def validate(self, obj, rel_data=None, created=False, **kwargs):
@@ -759,7 +754,7 @@ class ListRestViewMixin(ModelResponseMixin):
             *self.get_list_fields_prefetch_related())
         for o in qs:
             yield self.serialize_object(o, **{
-                _f.alias: _f.to_json(o, self.format_date)
+                _f.alias: _f.to_json(o)
                 for _f in self.get_list_fields().values()})
 
     def get_short_list_result(self, qs):
@@ -1043,14 +1038,14 @@ class CreateRestViewMixin(ModelBodyMixin, ModelResponseMixin):
         return True
 
     def _post(self, *args, **kwargs):
-        obj = self.new_object()
-        data, rel_data = self.get_model_data(
-            obj, self.deserialize_body(), created=True)
-        forbidden = False
-        if not self.object_create_perm(data):
-            forbidden = True
-        self.set_values(obj, **data)
         try:
+            obj = self.new_object()
+            data, rel_data = self.get_model_data(
+                obj, self.deserialize_body(), created=True)
+            forbidden = False
+            if not self.object_create_perm(data):
+                forbidden = True
+            self.set_values(obj, **data)
             self.validate(obj, rel_data=rel_data, created=True)
             if forbidden:
                 raise ForbiddenError
@@ -1101,14 +1096,14 @@ class UpdateRestViewMixin(ModelBodyMixin, ModelResponseMixin):
         return True
 
     def _put(self, id, *args, **kwargs):
-        obj = self.get_object(pk=id)
-        data, rel_data = self.get_model_data(
-            obj, self.deserialize_body(), created=False)
-        forbidden = False
-        if not self.object_update_perm(obj, data):
-            forbidden = True
-        self.set_values(obj, **data)
         try:
+            obj = self.get_object(pk=id)
+            data, rel_data = self.get_model_data(
+                obj, self.deserialize_body(), created=False)
+            forbidden = False
+            if not self.object_update_perm(obj, data):
+                forbidden = True
+            self.set_values(obj, **data)
             self.validate(obj, rel_data=rel_data, created=False)
             if forbidden:
                 raise ForbiddenError

{django_pfx-1.4.dev106 → django_pfx-1.4.dev108}/tests/tests/basic_api_test.py

@@ -632,15 +632,6 @@ class BasicAPITest(TestAssertMixin, TestCase):
         response = self.client.get(f'/api/books/{self.author1_book1.pk}')
         self.assertRC(response, 200)
         self.assertJE(response, 'pub_date', '1937-01-01')
-        response = self.client.get(
-            f'/api/books/{self.author1_book1.pk}?date_format=0')
-        self.assertRC(response, 200)
-        self.assertJE(response, 'pub_date', '1937-01-01')
-        response = self.client.get(
-            f'/api/books/{self.author1_book1.pk}?date_format=1')
-        self.assertRC(response, 200)
-        self.assertJE(response, 'pub_date.value', '1937-01-01')
-        self.assertJE(response, 'pub_date.formatted', '01/01/1937')
 
     def test_get_detail_with_rel_object(self):
         response = self.client.get(f'/api/books/{self.author3_book1.pk}')
@@ -764,6 +755,18 @@ class BasicAPITest(TestAssertMixin, TestCase):
             response, '__all__.@0',
             'The Hobbit already exists for John Ronald Reuel Tolkien')
 
+    def test_create_invalid_date(self):
+        response = self.client.post(
+            '/api/books', dict(
+                name="The Silmarillion",
+                author=self.author1.pk,
+                pub_date="19777-09-15"))
+        self.assertRC(response, 422)
+        self.assertJE(
+            response, 'pub_date.@0',
+            '“19777-09-15” value has an invalid date format. '
+            'It must be in YYYY-MM-DD format.')
+
     def test_update(self):
         response = self.client.put(
             f'/api/authors/{self.author1.pk}',