django-ninja-aio-crud 0.7.3__py3-none-any.whl → 0.7.4__py3-none-any.whl

{django_ninja_aio_crud-0.7.3.dist-info → django_ninja_aio_crud-0.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-ninja-aio-crud
-Version: 0.7.3
+Version: 0.7.4
 Summary: Django Ninja AIO CRUD - Rest Framework
 Author: Giuseppe Casillo
 Requires-Python: >=3.10

{django_ninja_aio_crud-0.7.3.dist-info → django_ninja_aio_crud-0.7.4.dist-info}/RECORD

@@ -1,14 +1,14 @@
-ninja_aio/__init__.py,sha256=lfBEFyqJlXlBY3tBnJ8_d3b1qVmx8aNY-C4-QNxTCH8,119
+ninja_aio/__init__.py,sha256=mOBOfTz2rTIcK2p5GfONfds9MeHL41sf2sHhoR1WYag,119
 ninja_aio/api.py,sha256=Fe6l3YCy7MW5TY4-Lbl80CFuK2NT2Y7tHfmqPk6Mqak,1735
 ninja_aio/auth.py,sha256=fKboioU4sezPukKJukIwiboxml_KV7irhCH3vGYt5pU,1008
 ninja_aio/exceptions.py,sha256=gPnZX1Do2GXudbU8wDYkwhO70Qj0ZNrIJJ2UXRs9vYk,2241
-ninja_aio/models.py,sha256=JioOl0veqx_pqT7lYtZaLsR9HHCtgq0LRppd6_Yr_os,17146
+ninja_aio/models.py,sha256=-Zh3UFmV3iIUIbMN93uN7v-VInoWp215Y_RXK3izuQI,17115
 ninja_aio/parsers.py,sha256=e_4lGCPV7zs-HTqtdJTc8yQD2KPAn9njbL8nF_Mmgkc,153
 ninja_aio/renders.py,sha256=mHeKNJtmDhZmgFpS9B6SPn5uZFcyVXrsoMhr149LeW8,1555
 ninja_aio/schemas.py,sha256=EgRkfhnzZqwGvdBmqlZixMtMcoD1ZxV_qzJ3fmaAy20,113
 ninja_aio/types.py,sha256=TJSGlA7bt4g9fvPhJ7gzH5tKbLagPmZUzfgttEOp4xs,468
 ninja_aio/views.py,sha256=qROag0OsMeVUXcnUYKV7ZmWj4E0F-QH52PI2-56zVRs,9263
-django_ninja_aio_crud-0.7.3.dist-info/licenses/LICENSE,sha256=yrDAYcm0gRp_Qyzo3GQa4BjYjWRkAhGC8QRva__RYq0,1073
-django_ninja_aio_crud-0.7.3.dist-info/WHEEL,sha256=_2ozNFCLWc93bK4WKHCO-eDUENDlo-dgc9cU3qokYO4,82
-django_ninja_aio_crud-0.7.3.dist-info/METADATA,sha256=m55Q0O1Eb9kzXkfpDzMncLsc3LPd-Wu8wqr4GlWet18,13759
-django_ninja_aio_crud-0.7.3.dist-info/RECORD,,
+django_ninja_aio_crud-0.7.4.dist-info/licenses/LICENSE,sha256=yrDAYcm0gRp_Qyzo3GQa4BjYjWRkAhGC8QRva__RYq0,1073
+django_ninja_aio_crud-0.7.4.dist-info/WHEEL,sha256=_2ozNFCLWc93bK4WKHCO-eDUENDlo-dgc9cU3qokYO4,82
+django_ninja_aio_crud-0.7.4.dist-info/METADATA,sha256=ZjawRtUD5hMHi_u0klFeVtu8BXXzqgRph-5TELJ1_OQ,13759
+django_ninja_aio_crud-0.7.4.dist-info/RECORD,,

ninja_aio/__init__.py

@@ -1,6 +1,6 @@
 """Django Ninja AIO CRUD - Rest Framework"""
 
-__version__ = "0.7.3"
+__version__ = "0.7.4"
 
 from .api import NinjaAIO
 

ninja_aio/models.py

@@ -348,9 +348,9 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
     @classmethod
     def get_related_schema_data(cls):
         fields = cls.get_fields("read")
-        custom_f = [f[0] for f in cls.get_custom_fields("read")]
-        related_fields = []
-        for f in fields + custom_f:
+        custom_f = {name: (value, default) for name, value, default  in cls.get_custom_fields("read")}
+        _related_fields = []
+        for f in fields + list(custom_f.keys()):
             field_obj = getattr(cls, f)
             if not isinstance(
                 field_obj,
@@ -362,18 +362,14 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
                     ForwardOneToOneDescriptor,
                 ),
             ):
-                related_fields.append(f)
+                _related_fields.append(f)
 
-        if not related_fields:
+        if not _related_fields:
             return None, None
 
-        custom_related_fields = []
-        for f in related_fields:
-            for custom in cls.get_custom_fields("read"):
-                if f == custom[0]:
-                    custom_related_fields.append(custom)
-                    related_fields.remove(f)
-
+        
+        custom_related_fields = [(f, *custom_f[f]) for f in _related_fields if f in custom_f]
+        related_fields = [f for f in _related_fields if f not in custom_f]
         return related_fields, custom_related_fields
 
     @classmethod