django-pfx 1.7.2.dev4__tar.gz → 1.7.2.dev8__tar.gz

{django_pfx-1.7.2.dev4 → django_pfx-1.7.2.dev8}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.7.2.dev4
+Version: 1.7.2.dev8
 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.dev4 → django_pfx-1.7.2.dev8}/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-04-02 16:13+0200\n"
+"POT-Creation-Date: 2026-04-20 13:42+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:228 views/rest_views.py:393
+#: views/rest_views.py:228 views/rest_views.py:400
 #, 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:357
+#: views/rest_views.py:364
 #, python-brace-format
 msgid "{model} {obj} created."
 msgstr "{model} {obj} créé."
 
-#: views/rest_views.py:358
+#: views/rest_views.py:365
 #, python-brace-format
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1289
+#: views/rest_views.py:1299
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."

{django_pfx-1.7.2.dev4 → django_pfx-1.7.2.dev8}/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.dev4 → django_pfx-1.7.2.dev8}/pfx/pfxcore/models/pfx_models.py

@@ -23,6 +23,7 @@ class UniqueConstraint(models.UniqueConstraint):
 class JSONReprMixin():
     """A model mixin to manage JSON representation."""
     api = None
+    api_navigation_loop = True
     url = None
     URL_AUTO_PK = True
     apidoc = {}

{django_pfx-1.7.2.dev4 → django_pfx-1.7.2.dev8}/pfx/pfxcore/views/rest_views.py

@@ -256,6 +256,8 @@ class ModelMixin():
 
 class ModelResponseMixin(ModelMixin):
     """Extension of :class:`ModelMixin` to manage object responses."""
+    #: Define if list navigation is looping (None is model default).
+    navigation_loop = None
     #: The response schema for meta service.
     meta_schema = None
     #: The model schema.
@@ -288,6 +290,11 @@ class ModelResponseMixin(ModelMixin):
         vals.update(fields)
         return vals
 
+    def is_navigation_loop(self):
+        if self.navigation_loop is None:
+            return getattr(self.model, 'api_navigation_loop', True)
+        return self.navigation_loop
+
     def get_navigation_meta(self, obj):
         return {}
 
@@ -995,10 +1002,13 @@ class ListRestViewMixin(ModelResponseMixin):
             if not row:
                 return {}
 
-            prev_id, next_id, index = row
+            prev_pk, next_pk, index = row
+            if self.is_navigation_loop():
+                prev_pk = prev_pk or qs.last().pk
+                next_pk = next_pk or qs.first().pk
             return {
-                'previous_pk': prev_id or qs.last().pk,
-                'next_pk': next_id or qs.first().pk,
+                'previous_pk': prev_pk,
+                'next_pk': next_pk,
                 'index': index,
                 'count': qs.count()}
 

{django_pfx-1.7.2.dev4 → django_pfx-1.7.2.dev8}/tests/tests/basic_api_test.py

@@ -6,6 +6,7 @@ from django.db import connection
 from django.test import TestCase, override_settings
 
 from pfx.pfxcore.test import APIClient, MockBoto3Client, TestAssertMixin
+from tests import views
 from tests.models import Author, Book, BookType
 
 
@@ -657,6 +658,56 @@ class BasicAPITest(TestAssertMixin, TestCase):
         self.assertJE(response, 'meta.index', 3)
         self.assertJE(response, 'meta.count', 4)
 
+        # Check looping by default
+        response = self.client.get(
+            f'/api/authors/{self.author1.pk}?navigation=1&order=last_name')
+        self.assertRC(response, 200)
+        self.assertJE(response, 'meta.previous_pk', self.author4.pk)
+        self.assertJE(response, 'meta.next_pk', self.author3.pk)
+        self.assertJE(response, 'meta.index', 4)
+        self.assertJE(response, 'meta.count', 4)
+        response = self.client.get(
+            f'/api/authors/{self.author3.pk}?navigation=1&order=last_name')
+        self.assertRC(response, 200)
+        self.assertJE(response, 'meta.previous_pk', self.author1.pk)
+        self.assertJE(response, 'meta.next_pk', self.author2.pk)
+        self.assertJE(response, 'meta.index', 1)
+        self.assertJE(response, 'meta.count', 4)
+
+        # Check looping disabled by model
+        with patch.object(views.Author, "api_navigation_loop", False):
+            response = self.client.get(
+                f'/api/authors/{self.author1.pk}?navigation=1&order=last_name')
+            self.assertRC(response, 200)
+            self.assertJE(response, 'meta.previous_pk', self.author4.pk)
+            self.assertJE(response, 'meta.next_pk', None)
+            self.assertJE(response, 'meta.index', 4)
+            self.assertJE(response, 'meta.count', 4)
+            response = self.client.get(
+                f'/api/authors/{self.author3.pk}?navigation=1&order=last_name')
+            self.assertRC(response, 200)
+            self.assertJE(response, 'meta.previous_pk', None)
+            self.assertJE(response, 'meta.next_pk', self.author2.pk)
+            self.assertJE(response, 'meta.index', 1)
+            self.assertJE(response, 'meta.count', 4)
+
+        # Check looping disabled by view
+        with patch.object(views.AuthorRestView, "navigation_loop", False):
+            response = self.client.get(
+                f'/api/authors/{self.author1.pk}?navigation=1&order=last_name')
+            self.assertRC(response, 200)
+            self.assertJE(response, 'meta.previous_pk', self.author4.pk)
+            self.assertJE(response, 'meta.next_pk', None)
+            self.assertJE(response, 'meta.index', 4)
+            self.assertJE(response, 'meta.count', 4)
+            response = self.client.get(
+                f'/api/authors/{self.author3.pk}?navigation=1&order=last_name')
+            self.assertRC(response, 200)
+            self.assertJE(response, 'meta.previous_pk', None)
+            self.assertJE(response, 'meta.next_pk', self.author2.pk)
+            self.assertJE(response, 'meta.index', 1)
+            self.assertJE(response, 'meta.count', 4)
+
     def test_get_date_format(self):
         response = self.client.get(f'/api/books/{self.author1_book1.pk}')
         self.assertRC(response, 200)

{django_pfx-1.7.2.dev4 → django_pfx-1.7.2.dev8}/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', {})