django-pfx 1.4.dev146__tar.gz → 1.4.dev150__tar.gz

{django_pfx-1.4.dev146 → django_pfx-1.4.dev150}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev146
+Version: 1.4.dev150
 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.dev146 → django_pfx-1.4.dev150}/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-09-11 10:12+0200\n"
+"POT-Creation-Date: 2025-09-16 10:41+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:220
+#: views/rest_views.py:220 views/rest_views.py:381
 #, 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:344
+#: views/rest_views.py:345
 #, python-brace-format
 msgid "{model} {obj} created."
 msgstr "{model} {obj} créé."
 
-#: views/rest_views.py:345
+#: views/rest_views.py:346
 #, python-brace-format
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1213
+#: views/rest_views.py:1224
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."

{django_pfx-1.4.dev146 → django_pfx-1.4.dev150}/pfx/pfxcore/views/fields.py

@@ -93,9 +93,20 @@ class FieldType:
         return cls.APIDOC_FIELD_BINDING.get(field_type)
 
 
+def get_db_type(field):
+    if isinstance(field, models.ManyToManyRel):
+        return "ManyToManyField"
+    elif isinstance(field, models.ManyToOneRel):
+        return "OneToManyField"
+    elif isinstance(field, models.OneToOneRel):
+        return "OneToOneField"
+    return field.__class__.__name__
+
+
 class ViewField:
     def __init__(
-            self, name, verbose_name=None, alias=None, field_type=None,
+            self, name, verbose_name=None, alias=None,
+            field_type=None, db_type=None,
             readonly=False, readonly_create=False, readonly_update=False,
             choices=None, json_repr=None, media_field_api=None,
             related_model=None, related_model_api=None, related_fields=None,
@@ -106,6 +117,7 @@ class ViewField:
         self.readonly_update = readonly or readonly_update
         self.verbose_name = verbose_name or name
         self.field_type = field_type
+        self.db_type = db_type
         self.choices = dict(choices or [])
         self.json_repr = json_repr
         self.media_field_api = media_field_api
@@ -123,7 +135,8 @@ class ViewField:
         return self.readonly_create if created else self.readonly_update
 
     def meta(self):
-        res = dict(type=self.field_type, name=self.verbose_name)
+        res = dict(
+            type=self.field_type, db_type=self.db_type, name=self.verbose_name)
         if self.choices:
             res['choices'] = [
                 dict(label=str(v), value=k) for k, v in self.choices.items()]
@@ -206,12 +219,15 @@ class ViewField:
             verbose_name = getattr(
                 prop.fget, 'short_description', prop.fget.__name__)
             field_type = getattr(prop.fget, 'field_type', None)
+            db_type = getattr(prop.fget, 'db_type', None)
         else:
             verbose_name = (
                 hasattr(prop, 'name') and prop.name or str(prop))
             field_type = None
+            db_type = None
         setifnone(kwargs, 'verbose_name', verbose_name)
         setifnone(kwargs, 'field_type', field_type)
+        setifnone(kwargs, 'db_type', db_type)
         return ViewField(name, **kwargs)
 
     @classmethod
@@ -219,6 +235,8 @@ class ViewField:
         setifnone(kwargs, 'verbose_name', cls._get_model_verbose_name(field))
         setifnone(
             kwargs, 'field_type', FieldType.from_model_field(field.__class__))
+        setifnone(
+            kwargs, 'db_type', get_db_type(field))
         return ViewModelField(
             name, model_field=field, **kwargs)
 
@@ -427,7 +445,8 @@ class VF:
             readonly=False, readonly_create=False, readonly_update=False,
             choices=None, select_related=None, prefetch_related=None,
             json_repr=None, related_model=None, related_model_api=None,
-            field=None, related_fields=None, media_field_api=None):
+            field=None, related_fields=None, media_field_api=None,
+            db_type=None):
         self.kwargs = dict(
             name=name, verbose_name=verbose_name, field_type=field_type,
             alias=alias,
@@ -436,7 +455,8 @@ class VF:
             select_related=select_related, prefetch_related=prefetch_related,
             json_repr=json_repr, related_model=related_model,
             related_model_api=related_model_api, field=field,
-            related_fields=related_fields, media_field_api=media_field_api)
+            related_fields=related_fields, media_field_api=media_field_api,
+            db_type=db_type)
 
     def to_field(self, model):
         return ViewField.from_name(model, **self.kwargs)

{django_pfx-1.4.dev146 → django_pfx-1.4.dev150}/pfx/pfxcore/views/rest_views.py

@@ -7,7 +7,7 @@ from django.conf import settings
 from django.core.cache import cache
 from django.core.exceptions import FieldError, ValidationError
 from django.db import IntegrityError, transaction
-from django.db.models import ForeignKey, Model, Q
+from django.db.models import ForeignKey, ManyToOneRel, Model, Q
 from django.db.models.fields import AutoFieldMixin
 from django.urls import path
 from django.utils.translation import gettext_lazy as _
@@ -314,6 +314,7 @@ class ModelResponseMixin(ModelMixin):
                 save_field = getattr(o, '_save_related', False)
                 if save_field:
                     try:
+                        setattr(o, save_field, obj)
                         o.full_clean(exclude={save_field})
                     except ValidationError as e:
                         for mk, ms in e.error_dict.items():
@@ -370,6 +371,16 @@ class ModelResponseMixin(ModelMixin):
             if rel_data:
                 for k, v in rel_data.items():
                     if isinstance(v, ModelList):
+                        if isinstance(obj._meta.get_field(k), ManyToOneRel):
+                            for cur in getattr(obj, k).all():
+                                if cur not in v:
+                                    try:
+                                        cur.delete()
+                                    except IntegrityError:
+                                        raise APIError(f(_(
+                                            "{obj} cannot be deleted because "
+                                            "it is referenced by other "
+                                            "objects."), obj=str(cur)))
                         for o in v:
                             save_field = getattr(o, '_save_related', False)
                             if save_field:

{django_pfx-1.4.dev146 → django_pfx-1.4.dev150}/tests/tests/test_fields_one2many.py

@@ -176,3 +176,22 @@ class TestFieldsOne2Many(TestAssertMixin, TestCase):
         self.assertJE(response, 'name', ["This field cannot be blank."])
         self.assertJE(
             response, 'rels::0::name', ["This field cannot be null."])
+
+    def test_put_delete(self):
+        o = TestOne2ManyModel.objects.create(name="Test")
+        r1 = TestOne2ManyRelModel.objects.create(rel=o, name="R1", descr="D1")
+        r2 = TestOne2ManyRelModel.objects.create(rel=o, name="R2", descr="D2")
+        TestOne2ManyRelModel.objects.create(rel=o, name="R3", descr="D3")
+
+        vals = self.client.get(f'/api/test/{o.pk}').json()
+        del vals['rels'][2]
+
+        response = self.client.put(f'/api/test/{o.pk}', vals)
+        self.assertRC(response, 200)
+        self.assertSize(response, 'rels', 2)
+        self.assertJE(response, 'rels.@0.pk', r1.pk)
+        self.assertJE(response, 'rels.@0.name', "R1")
+        self.assertJE(response, 'rels.@0.descr', "D1")
+        self.assertJE(response, 'rels.@1.pk', r2.pk)
+        self.assertJE(response, 'rels.@1.name', "R2")
+        self.assertJE(response, 'rels.@1.descr', "D2")