django-pfx 1.4.dev158__tar.gz → 1.4.dev162__tar.gz

{django_pfx-1.4.dev158 → django_pfx-1.4.dev162}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev158
+Version: 1.4.dev162
 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.dev158 → django_pfx-1.4.dev162}/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-10-22 12:44+0200\n"
+"POT-Creation-Date: 2025-10-22 16:49+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:1257
+#: views/rest_views.py:1261
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."

{django_pfx-1.4.dev158 → django_pfx-1.4.dev162}/pfx/pfxcore/models/ordered_model_mixin.py

@@ -41,11 +41,13 @@ class OrderedModelMixin(models.Model):
 
     @property
     def _order_max(self):
-        return self._order_qs.aggregate(Max('seq'))['seq__max']
+        return self._order_qs.exclude(
+            pk=self.pk).aggregate(Max('seq'))['seq__max']
 
     @property
     def _order_min(self):
-        return self._order_qs.aggregate(Min('seq'))['seq__min']
+        return self._order_qs.exclude(
+            pk=self.pk).aggregate(Min('seq'))['seq__min']
 
     @property
     def _order_default(self):

{django_pfx-1.4.dev158 → django_pfx-1.4.dev162}/pfx/pfxcore/storage/local_storage.py

@@ -24,7 +24,11 @@ class LocalStorage:
         relative_path = Path(*key_list[:-1])
         dirname = Path(settings.STORAGE_LOCAL_ROOT, relative_path)
         dirname.mkdir(parents=True, exist_ok=True)
-        ext = ''.join(filename.partition('.')[-2:])
+        suffixes = Path(filename).suffixes
+        if suffixes[-1] in ['gz', 'bz2'] and len(suffixes) > 1:
+            ext = ''.join(suffixes[-2:])
+        else:
+            ext = suffixes[-1]
         hashname = f'{hashlib.sha1(file).hexdigest()}{ext}'
         final_key = str(Path(relative_path, hashname))
         with open(Path(dirname, hashname), 'wb') as f:

{django_pfx-1.4.dev158 → django_pfx-1.4.dev162}/pfx/pfxcore/views/rest_views.py

@@ -7,9 +7,9 @@ from django.conf import settings
 from django.core.cache import cache
 from django.core.exceptions import FieldError, ValidationError
 from django.db import IntegrityError, connection, transaction
-from django.db.models import ForeignKey, ManyToOneRel, Model, Q, Window
+from django.db.models import F, ForeignKey, ManyToOneRel, Model, Q, Window
 from django.db.models.fields import AutoFieldMixin
-from django.db.models.functions import Lag, Lead
+from django.db.models.functions import Lag, Lead, RowNumber
 from django.urls import path
 from django.utils.translation import gettext_lazy as _
 from django.views import View
@@ -953,22 +953,26 @@ class ListRestViewMixin(ModelResponseMixin):
         order = qs.query.order_by
         qs_window = qs.annotate(
             prev_id=Window(Lag('id'), order_by=order),
-            next_id=Window(Lead('id'), order_by=order))
+            next_id=Window(Lead('id'), order_by=order),
+            index=Window(RowNumber(), order_by=order)).values(
+                'prev_id', 'next_id', 'index', obj_id=F('id'))
+        compiler = qs_window.query.get_compiler(connection=connection)
+        inner_sql, params = compiler.as_sql()
         sql = f"""
-            WITH annotated AS (
-                {qs_window.values('id', 'prev_id', 'next_id').query}
-            )
-            SELECT prev_id, next_id
+            WITH annotated AS ({inner_sql})
+            SELECT prev_id, next_id, index
             FROM annotated
-            WHERE id = %s;
+            WHERE obj_id = %s;
         """
 
         with connection.cursor() as cursor:
-            cursor.execute(sql, [obj.pk])
-            prev_id, next_id = cursor.fetchone() or (None, None)
+            cursor.execute(sql, list(params) + [obj.pk])
+            prev_id, next_id, index = cursor.fetchone() or (None, None)
             return {
-                'previous_pk': prev_id,
-                'next_pk': next_id}
+                'previous_pk': prev_id or qs.last().pk,
+                'next_pk': next_id or qs.first().pk,
+                'index': index,
+                'count': qs.count()}
 
     @classmethod
     def generate_schemas(cls):

{django_pfx-1.4.dev158 → django_pfx-1.4.dev162}/tests/tests/basic_api_test.py

@@ -636,20 +636,26 @@ class BasicAPITest(TestAssertMixin, TestCase):
         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.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)
 
         response = self.client.get(
             f'/api/authors/{self.author2.pk}?navigation=1&order=last_name')
         self.assertRC(response, 200)
         self.assertJE(response, 'meta.previous_pk', self.author3.pk)
         self.assertJE(response, 'meta.next_pk', self.author4.pk)
+        self.assertJE(response, 'meta.index', 2)
+        self.assertJE(response, 'meta.count', 4)
 
         response = self.client.get(
             f'/api/authors/{self.author2.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', 3)
+        self.assertJE(response, 'meta.count', 4)
 
     def test_get_date_format(self):
         response = self.client.get(f'/api/books/{self.author1_book1.pk}')