django-pfx 1.4.dev130__tar.gz → 1.4.dev134__tar.gz

{django_pfx-1.4.dev130 → django_pfx-1.4.dev134}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev130
+Version: 1.4.dev134
 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.dev130 → django_pfx-1.4.dev134}/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.dev130 → django_pfx-1.4.dev134}/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-14 11:50+0200\n"
+"POT-Creation-Date: 2025-05-21 12:41+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -272,7 +272,7 @@ msgstr "Un nouveau code d'authentification a été envoyé par e-mail."
 msgid "Invalid value for {filter} filter"
 msgstr "Valeur invalide pour le filtre {filter}"
 
-#: views/media_rest_view_mixin.py:95 views/media_rest_view_mixin.py:143
+#: views/media_rest_view_mixin.py:37 views/media_rest_view_mixin.py:123
 msgid "Unexpected storage error"
 msgstr "Erreur de stockage inattendue"
 

{django_pfx-1.4.dev130 → django_pfx-1.4.dev134}/pfx/pfxcore/views/__init__.py

@@ -8,7 +8,11 @@ from .authentication_views import (
 from .fields import VF, FieldType, ViewField, ViewModelField
 from .filters_views import Filter, FilterGroup, ModelFilter
 from .locale_views import LocaleRestView
-from .media_rest_view_mixin import MediaPermsRestViewMixin, MediaRestViewMixin
+from .media_rest_view_mixin import (
+    MediaPermsRestViewMixin,
+    MediaRestViewMixin,
+    get_media_field_response,
+)
 from .ordered_rest_view_mixin import OrderedRestViewMixin
 from .rest_views import (
     BaseRestView,

{django_pfx-1.4.dev130 → django_pfx-1.4.dev134}/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.dev130 → django_pfx-1.4.dev134}/pfx/pfxcore/views/media_rest_view_mixin.py

@@ -18,18 +18,47 @@ from .rest_views import ModelMixin
 logger = logging.getLogger(__name__)
 
 
+def get_medial_field(model, field):
+    try:
+        model_field = model._meta.get_field(field)
+        if not isinstance(model_field, MediaField):
+            raise NotFoundError  # pragma: no cover
+    except FieldDoesNotExist:  # pragma: no cover
+        raise NotFoundError
+    return model_field
+
+
+def get_media_field_response(obj, field, request):
+    mediaField = get_medial_field(obj, field)
+    try:
+        url = mediaField.get_url(request, obj)
+    except StorageException as e:  # pragma: no cover
+        logger.exception(e)
+        raise APIError(_("Unexpected storage error", status=500))
+
+    if mediaField.storage.direct:
+        attr = getattr(obj, field)
+        filename = attr.get('name')
+        if settings.STORAGE_LOCAL_X_ACCEL_REDIRECT:
+            response = HttpResponse()
+            response["Content-Disposition"] = (
+                f"attachment; filename={filename}")
+            response['X-Accel-Redirect'] = (
+                f"/filestore/{attr.get('key')}")
+            return response
+        response = FileResponse(
+            open(url, 'rb'),
+            as_attachment=True, filename=attr.get('name'))
+        return response
+
+    if get_bool(request.GET, 'redirect'):
+        return redirect(url)
+    return JsonResponse(dict(url=url))
+
+
 class MediaRestViewMixin(ModelMixin):
     """Extension mixin to manage media fields."""
 
-    def _get_model_field(self, field):
-        try:
-            model_field = self.model._meta.get_field(field)
-            if not isinstance(model_field, MediaField):
-                raise NotFoundError  # pragma: no cover
-        except FieldDoesNotExist:  # pragma: no cover
-            raise NotFoundError
-        return model_field
-
     @rest_api(
         "/<int:pk>/<str:field>/upload-url/<str:filename>", method="get",
         priority_doc=-8)
@@ -84,12 +113,11 @@ class MediaRestViewMixin(ModelMixin):
                                                 type: string
         """
         obj = self.get_object(pk=pk)
-        mediaField = self._get_model_field(field)
+        mediaField = get_medial_field(self.model, field)
         if mediaField.storage.direct:
             raise APIError("Unavailable for direct storage")
         try:
-            res = self._get_model_field(field).get_upload_url(
-                self.request, obj, filename)
+            res = mediaField.get_upload_url(self.request, obj, filename)
         except StorageException as e:  # pragma: no cover
             logger.exception(e)
             raise APIError(_("Unexpected storage error", status=500))
@@ -135,30 +163,7 @@ class MediaRestViewMixin(ModelMixin):
                         if `redirect` is `true`.
         """
         obj = self.get_object(pk=pk)
-        mediaField = self._get_model_field(field)
-        try:
-            url = mediaField.get_url(self.request, obj)
-        except StorageException as e:  # pragma: no cover
-            logger.exception(e)
-            raise APIError(_("Unexpected storage error", status=500))
-
-        if mediaField.storage.direct:
-            filename = getattr(obj, field).get('name')
-            if settings.STORAGE_LOCAL_X_ACCEL_REDIRECT:
-                response = HttpResponse()
-                response["Content-Disposition"] = (
-                    f"attachment; filename={filename}")
-                response['X-Accel-Redirect'] = (
-                    f"/filestore/{getattr(obj, field).get('key')}")
-                return response
-            response = FileResponse(
-                open(mediaField.get_url(self.request, obj), 'rb'),
-                as_attachment=True, filename=getattr(obj, field).get('name'))
-            return response
-
-        if get_bool(self.request.GET, 'redirect'):
-            return redirect(url)
-        return JsonResponse(dict(url=url))
+        return get_media_field_response(obj, field, self.request)
 
 
 class MediaPermsRestViewMixin(MediaRestViewMixin):

{django_pfx-1.4.dev130 → django_pfx-1.4.dev134}/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.dev134/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)