django-pfx 1.4.dev132__tar.gz → 1.4.dev136__tar.gz

{django_pfx-1.4.dev132 → django_pfx-1.4.dev136}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev132
+Version: 1.4.dev136
 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.dev132 → django_pfx-1.4.dev136}/django_pfx.egg-info/SOURCES.txt

@@ -146,6 +146,7 @@ tests/tests/test_body_mixin.py
 tests/tests/test_cache.py
 tests/tests/test_client.py
 tests/tests/test_fields_choices.py
+tests/tests/test_fields_date.py
 tests/tests/test_fields_decimal.py
 tests/tests/test_fields_minutes_duration.py
 tests/tests/test_fields_nh3.py

{django_pfx-1.4.dev132 → django_pfx-1.4.dev136}/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-05-21 12:41+0200\n"
+"POT-Creation-Date: 2025-06-04 16:47+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -302,7 +302,7 @@ msgstr "{model} {obj} créé."
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1169
+#: views/rest_views.py:1174
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."

{django_pfx-1.4.dev132 → django_pfx-1.4.dev136}/pfx/pfxcore/views/fields.py

@@ -366,14 +366,9 @@ class ViewModelField(ViewField):
             value = (value['value']
                      if isinstance(value, dict) and 'value' in value
                      else value)
-        elif self.field_type == FieldType.DateField:
+        elif self.field_type in (FieldType.DateField, FieldType.DateTimeField):
             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)
+                value = value and field.to_python(value) or None
             except ValidationError as e:
                 raise ValidationError({field.name: e})
         elif self.field_type == FieldType.IntegerField:

{django_pfx-1.4.dev132 → django_pfx-1.4.dev136}/pfx/pfxcore/views/rest_views.py

@@ -855,10 +855,15 @@ class ListRestViewMixin(ModelResponseMixin):
         elif settings.PFX_MAX_LIST_RESULT_SIZE:
             qs = qs[:settings.PFX_MAX_LIST_RESULT_SIZE]
         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))
+            mode = self.request.GET.get('mode', 'list')
+            match mode:
+                case 'list':
+                    res['items'] = list(self.get_list_result(qs))
+                case 'select':
+                    res['items'] = list(self.get_short_list_result(qs))
+                case _:
+                    m = f'get_{mode}_result'
+                    res['items'] = list(getattr(self, m)(qs))
         meta.update(self._get_list_extra_meta(res))
         if meta:
             res['meta'] = meta

{django_pfx-1.4.dev132 → django_pfx-1.4.dev136}/tests/tests/__init__.py

@@ -7,6 +7,7 @@ from .test_body_mixin import TestBodyMixin
 from .test_cache import TestCache
 from .test_client import TestApiClient
 from .test_fields_choices import TestFieldsChoices
+from .test_fields_date import TestFieldsDate
 from .test_fields_decimal import TestFieldsDecimal
 from .test_fields_minutes_duration import TestFieldsMinutesDuration
 from .test_fields_nh3 import TestFieldsNh3

django_pfx-1.4.dev136/tests/tests/test_fields_date.py

@@ -0,0 +1,60 @@
+from datetime import date
+
+from django.db import connection, models
+from django.test import TestCase
+from django.test.utils import override_settings
+from django.urls import include, path
+
+from pfx.pfxcore import register_views
+from pfx.pfxcore.decorator import rest_view
+from pfx.pfxcore.models import JSONReprMixin
+from pfx.pfxcore.test import APIClient, TestAssertMixin
+from pfx.pfxcore.views import RestView
+from tests.views import FakeViewMixin
+
+
+class TestDateModel(JSONReprMixin, models.Model):
+    date_at = models.DateField(blank=True, null=True)
+
+    class Meta:
+        verbose_name = "TestModel"
+        verbose_name_plural = "TestModels"
+        ordering = ['pk']
+
+
+@rest_view("/test")
+class TestDateRestView(FakeViewMixin, RestView):
+    default_public = True
+    model = TestDateModel
+
+
+urlpatterns = [
+    path('api/', include(register_views(TestDateRestView))),
+    path('api/', include('pfx.pfxcore.urls'))
+]
+
+
+@override_settings(ROOT_URLCONF=__name__)
+class TestFieldsDate(TestAssertMixin, TestCase):
+
+    def setUp(self):
+        self.client = APIClient(default_locale='en')
+
+    @classmethod
+    def setUpTestData(cls):
+        with connection.schema_editor() as schema_editor:
+            schema_editor.create_model(TestDateModel)
+
+    def test_update_null(self):
+        c1 = TestDateModel.objects.create(date_at=date(2025, 5, 3))
+
+        response = self.client.put(f'/api/test/{c1.pk}', dict(date_at=None))
+        self.assertRC(response, 200)
+        self.assertJE(response, 'date_at', None)
+
+    def test_update_empty_string(self):
+        c1 = TestDateModel.objects.create(date_at=date(2025, 5, 3))
+
+        response = self.client.put(f'/api/test/{c1.pk}', dict(date_at=""))
+        self.assertRC(response, 200)
+        self.assertJE(response, 'date_at', None)