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

{django_pfx-1.7.dev6 → django_pfx-1.7.2.dev2}/.gitlab-ci.yml

@@ -27,7 +27,7 @@ stages:
 
 quality check:
   variables:
-    DJANGO_VERSION: 'django==4.2.*'  # LTS
+    DJANGO_VERSION: 'django==5.2.*'  # LTS
   script:
     - apt-get update
     - apt-get install -y gettext
@@ -110,7 +110,7 @@ package:
     - job: quality check
     - job: test
   rules:
-    - if: $CI_COMMIT_TAG =~ /^\d+\.\d+$/
+    - if: $CI_COMMIT_TAG =~ /^\d+\.\d+(\.\d+)?$/
       when: on_success
     - if: $CI_COMMIT_BRANCH == "master"
       when: on_success

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

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

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

@@ -67,6 +67,7 @@ pfx/pfxcore/middleware/profiling.py
 pfx/pfxcore/migrations/0001_initial.py
 pfx/pfxcore/migrations/0002_pfxpermissionsuser.py
 pfx/pfxcore/migrations/0003_delete_pfxpermissionsuser.py
+pfx/pfxcore/migrations/0004_alter_loginban_failed_counter_and_more.py
 pfx/pfxcore/migrations/__init__.py
 pfx/pfxcore/migrations/operations/__init__.py
 pfx/pfxcore/migrations/operations/permissions.py

{django_pfx-1.7.dev6 → django_pfx-1.7.2.dev2}/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-10 15:48+0100\n"
+"POT-Creation-Date: 2026-03-12 12:43+0100\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -67,23 +67,23 @@ msgstr ""
 msgid "users"
 msgstr ""
 
-#: models/login_ban.py:45
+#: models/login_ban.py:54
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
-#: models/login_ban.py:46
+#: models/login_ban.py:55
 msgid "Failed counter"
 msgstr "Compteur d’échec"
 
-#: models/login_ban.py:47
+#: models/login_ban.py:56
 msgid "Last failed"
 msgstr "Dernier échec"
 
-#: models/login_ban.py:52
+#: models/login_ban.py:61
 msgid "Login ban"
 msgstr "Login banni"
 
-#: models/login_ban.py:53
+#: models/login_ban.py:62
 msgid "Login bans"
 msgstr "Login bannis"
 
@@ -302,7 +302,7 @@ msgstr "{model} {obj} créé."
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1282
+#: views/rest_views.py:1286
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."

django_pfx-1.7.2.dev2/pfx/pfxcore/migrations/0004_alter_loginban_failed_counter_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.25 on 2026-03-11 09:19
+# flake8: noqa
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pfxcore', '0003_delete_pfxpermissionsuser'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='loginban',
+            name='failed_counter',
+            field=models.IntegerField(default=0, verbose_name='Failed counter'),
+        ),
+        migrations.AlterField(
+            model_name='loginban',
+            name='last_failed',
+            field=models.DateTimeField(verbose_name='Last failed'),
+        ),
+    ]

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

@@ -1,7 +1,8 @@
 from datetime import timedelta
 
-from django.db import models
-from django.utils import timezone
+from django.db import IntegrityError, models
+from django.db.models import F
+from django.utils import timezone as tz
 from django.utils.translation import gettext_lazy as _
 
 from pfx.pfxcore.settings import settings
@@ -21,19 +22,27 @@ class LoginBanQuerySet(models.QuerySet):
                     ban.failed_counter //
                     settings.PFX_LOGIN_BAN_FAILED_NUMBER - 1))
             ban_time = ban.last_failed + timedelta(seconds=seconds)
-            now = timezone.now()
+            now = tz.now()
             if now < ban_time:
                 return ban_time - now
         return False
 
+    def _increment(self, username, last_failed):
+        return self.filter(username=username).update(
+            failed_counter=F("failed_counter") + 1,
+            last_failed=last_failed)
+
     def ban(self, username):
         if not username:
             return
-        try:
-            ban = self.get(username=username)
-            ban.save()
-        except LoginBan.DoesNotExist:
-            LoginBan.objects.create(username=username)
+        now = tz.now()
+        updated = self._increment(username, now)
+        if not updated:
+            try:
+                self.create(
+                    username=username, failed_counter=1, last_failed=now)
+            except IntegrityError:
+                self._increment(username, now)
 
     def unban(self, username):
         if not username:
@@ -43,8 +52,8 @@ class LoginBanQuerySet(models.QuerySet):
 
 class LoginBan(models.Model):
     username = models.CharField(_("Username"), max_length=150, unique=True)
-    failed_counter = models.IntegerField(_("Failed counter"))
-    last_failed = models.DateTimeField(_("Last failed"), auto_now=True)
+    failed_counter = models.IntegerField(_("Failed counter"), default=0)
+    last_failed = models.DateTimeField(_("Last failed"))
 
     objects = LoginBanQuerySet.as_manager()
 
@@ -54,7 +63,3 @@ class LoginBan(models.Model):
 
     def __str__(self):
         return self.username
-
-    def save(self, *args, **kwargs):
-        self.failed_counter = (self.failed_counter or 0) + 1
-        return super().save(*args, **kwargs)

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

@@ -570,10 +570,14 @@ class ModelBodyMixin(BodyMixin, ModelMixin):
                                 # Force a copy if the existing related
                                 # object is linked to another parent.
                                 rel_obj.pk = None
-                            for rk, rf in field.related_fields.items():
+                            for rk, rb in rv.items():
+                                if rk not in field.related_fields:
+                                    continue
+                                rf = field.related_fields[rk]
                                 rmk, rmv = rf.to_model_value(
-                                    rv.get(rk), self.get_related_queryset)
-                                setattr(rel_obj, rmk, rmv)
+                                    rb, self.get_related_queryset)
+                                if can_write(rmk, field.related_fields):
+                                    setattr(rel_obj, rmk, rmv)
                             setattr(rel_obj, '_save_related', fk_name)
                     res_rel[mk] = mv
                 else:

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

@@ -40,7 +40,7 @@ class TestOne2ManyModel(JSONReprMixin, models.Model):
 
 class TestOne2ManyRelModel(JSONReprMixin, models.Model):
     name = models.CharField(max_length=30)
-    descr = models.TextField()
+    descr = models.TextField(default="Default description")
     rel = models.ForeignKey(
         TestOne2ManyModel, related_name='rels', on_delete=models.CASCADE)
 
@@ -115,9 +115,9 @@ class TestFieldsOne2Many(TestAssertMixin, TestCase):
         self.assertRC(response, 200)
         self.assertSize(response, 'rels', 2)
         self.assertJE(response, 'rels.@0.name', "R1")
-        self.assertJE(response, 'rels.@0.descr', "D1")
+        self.assertJE(response, 'rels.@0.descr', "Default description")
         self.assertJE(response, 'rels.@1.name', "R2")
-        self.assertJE(response, 'rels.@1.descr', "D2")
+        self.assertJE(response, 'rels.@1.descr', "Default description")
 
     def test_post_field_errors(self):
         response = self.client.post('/api/test', dict(
@@ -128,7 +128,7 @@ class TestFieldsOne2Many(TestAssertMixin, TestCase):
             set(response.json().keys()), {'name', 'rels::1::name'})
         self.assertJE(response, 'name', ["This field cannot be blank."])
         self.assertJE(
-            response, 'rels::1::name', ["This field cannot be null."])
+            response, 'rels::1::name', ["This field cannot be blank."])
 
         response = self.client.post('/api/test', dict(
             rels=[dict(descr="D1")]
@@ -139,7 +139,7 @@ class TestFieldsOne2Many(TestAssertMixin, TestCase):
         self.assertJE(response, '__all__', ["You have to set minimum 2 rels."])
         self.assertJE(response, 'name', ["This field cannot be blank."])
         self.assertJE(
-            response, 'rels::0::name', ["This field cannot be null."])
+            response, 'rels::0::name', ["This field cannot be blank."])
 
     def test_put(self):
         o = TestOne2ManyModel.objects.create(name="Test")
@@ -156,7 +156,7 @@ class TestFieldsOne2Many(TestAssertMixin, TestCase):
         self.assertJE(response, 'rels.@0.name', "R1 updated")
         self.assertJE(response, 'rels.@0.descr', "D1")
         self.assertJE(response, 'rels.@1.name', "R2")
-        self.assertJE(response, 'rels.@1.descr', "D2")
+        self.assertJE(response, 'rels.@1.descr', "Default description")
 
     def test_put_field_errors(self):
         o = TestOne2ManyModel.objects.create(name="Test")