django-ninja-aio-crud 0.6.4__tar.gz → 0.7.0__tar.gz

{django_ninja_aio_crud-0.6.4 → django_ninja_aio_crud-0.7.0}/PKG-INFO

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

{django_ninja_aio_crud-0.6.4 → django_ninja_aio_crud-0.7.0}/ninja_aio/__init__.py

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

{django_ninja_aio_crud-0.6.4 → django_ninja_aio_crud-0.7.0}/ninja_aio/models.py

@@ -11,6 +11,8 @@ from django.db.models.fields.related_descriptors import (
     ReverseManyToOneDescriptor,
     ReverseOneToOneDescriptor,
     ManyToManyDescriptor,
+    ForwardManyToOneDescriptor,
+    ForwardOneToOneDescriptor,
 )
 
 from .exceptions import SerializeError
@@ -99,7 +101,7 @@ class ModelUtil:
             if isinstance(self.model, ModelSerializerMeta):
                 if self.model.is_custom(k):
                     continue
-                if self.model.is_optional(k) and k is None:
+                if self.model.is_optional(k) and v is None:
                     continue
             field_obj = getattr(self.model, k).field
             if isinstance(field_obj, models.BinaryField):
@@ -332,6 +334,41 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
         """
         pass
 
+    @classmethod
+    def get_forward_relation_schema(cls, obj: type["ModelSerializer"], field: str):
+        cls_f = []
+        for rel_f in obj.ReadSerializer.fields:
+            rel_f_obj = getattr(obj, rel_f)
+            if isinstance(
+                rel_f_obj,
+                (
+                    ManyToManyDescriptor,
+                    ReverseManyToOneDescriptor,
+                    ReverseOneToOneDescriptor,
+                ),
+            ):
+                if isinstance(rel_f_obj, ManyToManyDescriptor):
+                    rel_obj: ModelSerializer = rel_f_obj.field.related_model
+                    if rel_f_obj.reverse:
+                        rel_obj = rel_f_obj.field.model
+                elif isinstance(rel_f_obj, ReverseManyToOneDescriptor):
+                    rel_obj = rel_f_obj.field.model
+                else:  # ReverseOneToOneDescriptor
+                    rel_obj = rel_f_obj.related.related_model
+                if not rel_obj == cls:
+                    continue
+                cls_f.append(rel_f)
+                obj.ReadSerializer.fields.remove(rel_f)
+        rel_schema = obj.generate_read_s(depth=0)
+        rel_data = (
+            field,
+            rel_schema | None,
+            None,
+        )
+        if len(cls_f) > 0:
+            obj.ReadSerializer.fields.append(*cls_f)
+        return rel_data
+
     @classmethod
     def get_reverse_relation_schema(
         cls, obj: type["ModelSerializer"], rel_type: type[REL_TYPES], field: str
@@ -372,6 +409,7 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
     def get_schema_out_data(cls):
         fields = []
         reverse_rels = []
+        rels = []
         for f in cls.get_fields("read"):
             field_obj = getattr(cls, f)
             if isinstance(
@@ -394,15 +432,26 @@ class ModelSerializer(models.Model, metaclass=ModelSerializerMeta):
                     rel_obj = field_obj.related.related_model
                     rel_type = "one"
 
+                if not rel_obj.get_fields("read") or not rel_obj.get_custom_fields("read"):
+                    continue
                 rel_data = cls.get_reverse_relation_schema(rel_obj, rel_type, f)
                 reverse_rels.append(rel_data)
                 continue
+            if isinstance(
+                field_obj, (ForwardOneToOneDescriptor, ForwardManyToOneDescriptor)
+            ):
+                rel_obj = field_obj.field.related_model
+                if not rel_obj.get_fields("read") or not rel_obj.get_custom_fields("read"):
+                    continue
+                rel_data = cls.get_forward_relation_schema(rel_obj, f)
+                rels.append(rel_data)
+                continue
             fields.append(f)
         return (
             fields,
             reverse_rels,
             cls.get_excluded_fields("read"),
-            cls.get_custom_fields("read"),
+            cls.get_custom_fields("read") + rels,
         )
 
     @classmethod