django-pfx 1.7.2.dev2__tar.gz → 1.7.2.dev6__tar.gz

{django_pfx-1.7.2.dev2 → django_pfx-1.7.2.dev6}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.2.dev2
+Version: 1.7.2.dev6
 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.7.2.dev2 → django_pfx-1.7.2.dev6}/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: 2026-03-12 12:43+0100\n"
+"POT-Creation-Date: 2026-04-02 16:13+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -286,23 +286,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:225 views/rest_views.py:390
+#: views/rest_views.py:228 views/rest_views.py:393
 #, 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:354
+#: views/rest_views.py:357
 #, python-brace-format
 msgid "{model} {obj} created."
 msgstr "{model} {obj} créé."
 
-#: views/rest_views.py:355
+#: views/rest_views.py:358
 #, python-brace-format
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1286
+#: views/rest_views.py:1289
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."

{django_pfx-1.7.2.dev2 → django_pfx-1.7.2.dev6}/pfx/pfxcore/models/ordered_model_mixin.py

@@ -25,10 +25,12 @@ class OrderedModelMixin(models.Model):
         super().clean_fields(exclude=exclude)
 
     def save(self, *args, **kwargs):
+        created = bool(self.pk)
         if not self.seq:
             self.seq = self._order_default
         super().save(*args, **kwargs)
-        if self.__previous_ordered_by_values != self._ordered_by_values:
+        if (not created and
+                self.__previous_ordered_by_values != self._ordered_by_values):
             if self.ordered_default == 'first':
                 self.top()
             else:

{django_pfx-1.7.2.dev2 → django_pfx-1.7.2.dev6}/pfx/pfxcore/views/fields.py

@@ -205,7 +205,8 @@ class ViewField:
             return self.json_repr(value)
 
         if self.field_type == FieldType.MediaField:
-            if value:
+            key = (value or {}).get('key')
+            if key:
                 if self.media_field_api:
                     api_url = self.media_field_api
                 elif view:

{django_pfx-1.7.2.dev2 → django_pfx-1.7.2.dev6}/pfx/pfxcore/views/rest_views.py

@@ -95,8 +95,12 @@ class ModelMixin():
         """
         qs = self.apply_user_filter(
             from_queryset or self.model._default_manager.all())
+        select_related = (
+            self.get_fields_select_related() | set(select_related or []))
         if select_related:
             qs = qs.select_related(*select_related)
+        prefetch_related = (
+            self.get_fields_prefetch_related() | set(prefetch_related or []))
         if prefetch_related:
             qs = qs.prefetch_related(*prefetch_related)
         return qs
@@ -107,9 +111,7 @@ class ModelMixin():
         :param \\**kwargs: Keyword arguments
         :returns: A view model instance
         """
-        return get_object(self.get_queryset(
-            select_related=self.get_fields_select_related(),
-            prefetch_related=self.get_fields_prefetch_related()), **kwargs)
+        return get_object(self.get_queryset(), **kwargs)
 
     def get_related_queryset(
             self, related_model, select_related=None, prefetch_related=None):
@@ -146,7 +148,8 @@ class ModelMixin():
         :returns: The queryset
         :rtype: :class:`django.db.models.QuerySet`
         """
-        return self.get_queryset(select_related, prefetch_related)
+        return self.get_queryset(
+            select_related=select_related, prefetch_related=prefetch_related)
 
     @classmethod
     def _process_fields(cls, fields):

{django_pfx-1.7.2.dev2 → django_pfx-1.7.2.dev6}/tests/tests/basic_api_test.py

@@ -708,6 +708,21 @@ class BasicAPITest(TestAssertMixin, TestCase):
         response = self.client.get('/api/authors/slug/not-existent')
         self.assertRC(response, 404)
 
+    def test_get_null_key_media_file(self):
+        response = self.client.get(f'/api/books/{self.author1_book1.pk}')
+        self.assertRC(response, 200)
+        self.assertJE(response, 'cover', None)
+        self.assertJE(response, 'local_file', None)
+
+        self.author1_book1.cover = dict(key=None)
+        self.author1_book1.local_file = dict(key=None)
+        self.author1_book1.save()
+
+        response = self.client.get(f'/api/books/{self.author1_book1.pk}')
+        self.assertRC(response, 200)
+        self.assertJE(response, 'cover', None)
+        self.assertJE(response, 'local_file', None)
+
     def test_create(self):
         response = self.client.post(
             '/api/authors', dict(

{django_pfx-1.7.2.dev2 → django_pfx-1.7.2.dev6}/tests/tests/test_ordered_rest_view_mixin.py

@@ -316,6 +316,15 @@ class TestOrderedRestViewMixin(TestAssertMixin, TestCase):
             order(OrderedModel),
             [self.o3.pk, self.o1.pk, self.o2.pk])
 
+        response = self.client.post(
+            '/api/ordered?move=top', {'name': "Test"})
+        self.assertRC(response, 200)
+        o4_pk = self.get_val(response, 'pk')
+
+        self.assertEqual(
+            order(OrderedModel),
+            [o4_pk, self.o3.pk, self.o1.pk, self.o2.pk])
+
     def test_top_by_name(self):
         response = self.client.put(
             f'/api/ordered-by-name/{self.obn3.pk}?move=top', {})
@@ -370,6 +379,15 @@ class TestOrderedRestViewMixin(TestAssertMixin, TestCase):
             order(OrderedModel),
             [self.o2.pk, self.o3.pk, self.o1.pk])
 
+        response = self.client.post(
+            '/api/ordered?move=bottom', {'name': "Test"})
+        self.assertRC(response, 200)
+        o4_pk = self.get_val(response, 'pk')
+
+        self.assertEqual(
+            order(OrderedModel),
+            [self.o2.pk, self.o3.pk, self.o1.pk, o4_pk])
+
     def test_bottom_by_name(self):
         response = self.client.put(
             f'/api/ordered-by-name/{self.obn2.pk}?move=bottom', {})