django-ninja-aio-crud 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

{django_ninja_aio_crud-1.0.3.dist-info → django_ninja_aio_crud-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-ninja-aio-crud
-Version: 1.0.3
+Version: 1.0.5
 Summary: Django Ninja AIO CRUD - Rest Framework
 Author: Giuseppe Casillo
 Requires-Python: >=3.10
@@ -23,9 +23,9 @@ Classifier: Framework :: AsyncIO
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
 Classifier: Topic :: Internet :: WWW/HTTP
 License-File: LICENSE
-Requires-Dist: django-ninja >=1.3.0
-Requires-Dist: joserfc >=1.0.0
-Requires-Dist: orjson >= 3.10.7
+Requires-Dist: django-ninja >=1.3.0, <=1.4.5
+Requires-Dist: joserfc >=1.0.0, <= 1.4.1
+Requires-Dist: orjson >= 3.10.7, <= 3.11.4
 Requires-Dist: coverage ; extra == "test"
 Project-URL: Documentation, https://django-ninja-aio.com
 Project-URL: Repository, https://github.com/caspel26/django-ninja-aio-crud

{django_ninja_aio_crud-1.0.3.dist-info → django_ninja_aio_crud-1.0.5.dist-info}/RECORD

@@ -1,9 +1,9 @@
-ninja_aio/__init__.py,sha256=wwki9IvFvW3fGlR--9braYcHTw1vHiGZWTZzMaYW4VE,119
+ninja_aio/__init__.py,sha256=_Euc356-ScYsaVY9gvZ7xLRgTfnHKXk0pv69eFhjdJg,119
 ninja_aio/api.py,sha256=Fe6l3YCy7MW5TY4-Lbl80CFuK2NT2Y7tHfmqPk6Mqak,1735
 ninja_aio/auth.py,sha256=zUwruKcz7MXuOnWp5k1CCSwEc8s2Lyqqk7Qm9kPbJ3o,5149
 ninja_aio/decorators.py,sha256=LsvHbMxmw_So8NV0ey5NRRvSbfYkOZLeLQ4Fix7rQAY,5519
 ninja_aio/exceptions.py,sha256=1-iRbrloIyi0CR6Tcrn5YR4_LloA7PPohKIBaxXJ0-8,2596
-ninja_aio/models.py,sha256=tFhMMr4avx5OtCU3-HlGOFD8cSx_t00x9aTmn3coTxw,34645
+ninja_aio/models.py,sha256=fsFYjKFZb8MDpE1g3Nte-Dot4x7ofmuxIDi8qtkWu0o,35422
 ninja_aio/parsers.py,sha256=e_4lGCPV7zs-HTqtdJTc8yQD2KPAn9njbL8nF_Mmgkc,153
 ninja_aio/renders.py,sha256=5TdSQI8e4x3Gb2tAw1AaxrbU-asVjf2chWMr8x2Tt80,1485
 ninja_aio/schemas.py,sha256=sYxhovFq6nE_Gdx_yl1ufcuHBAXxpsnBmNytyTSqFLI,2449
@@ -11,7 +11,7 @@ ninja_aio/types.py,sha256=TJSGlA7bt4g9fvPhJ7gzH5tKbLagPmZUzfgttEOp4xs,468
 ninja_aio/views.py,sha256=31pyOzABHwO1jcIVJRHXVrpMu9__FHmdX2vEhX6XrPs,15890
 ninja_aio/helpers/__init__.py,sha256=E45h2prtpCudx_bSKkIDMNK9oxrHPDJrweXWCuLxUOs,59
 ninja_aio/helpers/api.py,sha256=VW5C4hQl2flYhGPgVJ2ZkFK1tGMdNOaxVWJfZfLd7OY,17171
-django_ninja_aio_crud-1.0.3.dist-info/licenses/LICENSE,sha256=yrDAYcm0gRp_Qyzo3GQa4BjYjWRkAhGC8QRva__RYq0,1073
-django_ninja_aio_crud-1.0.3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-django_ninja_aio_crud-1.0.3.dist-info/METADATA,sha256=QUPAzuNbc0o5uH6ZSd-jxlRBdh_0U4HKf8ZoLUyusK8,8540
-django_ninja_aio_crud-1.0.3.dist-info/RECORD,,
+django_ninja_aio_crud-1.0.5.dist-info/licenses/LICENSE,sha256=yrDAYcm0gRp_Qyzo3GQa4BjYjWRkAhGC8QRva__RYq0,1073
+django_ninja_aio_crud-1.0.5.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+django_ninja_aio_crud-1.0.5.dist-info/METADATA,sha256=V6cJgV_yDqLnEtG1FKbQR0fdmGE6okwPChkwEkyfNzs,8570
+django_ninja_aio_crud-1.0.5.dist-info/RECORD,,

ninja_aio/__init__.py

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

ninja_aio/models.py

@@ -284,14 +284,14 @@ class ModelUtil:
         rel = await rel_util.get_object(request, v, with_qs_request=False)
         payload[k] = rel
 
-    def _extract_field_obj(self, field_name: str):
+    async def _extract_field_obj(self, field_name: str):
         """
         Return the underlying Django Field (if any) for a given attribute name.
         """
-        descriptor = getattr(self.model, field_name, None)
+        descriptor = await agetattr(self.model, field_name, None)
         if descriptor is None:
             return None
-        return getattr(descriptor, "field", None) or getattr(
+        return await agetattr(descriptor, "field", None) or await agetattr(
             descriptor, "related", None
         )
 
@@ -313,6 +313,21 @@ class ModelUtil:
         rel_pk = nested_dict.get(rel_util.model_pk_name)
         return await rel_util.get_object(request, rel_pk)
 
+    async def _rewrite_nested_foreign_keys(self, rel_obj, nested_dict: dict):
+        """
+        Rewrite foreign key keys inside a nested dict from <key> to <key>_id.
+        """
+        keys_to_rewrite: list[str] = []
+        new_nested = nested_dict
+        for rel_k in nested_dict.keys():
+            attr = await agetattr(rel_obj, rel_k)
+            if isinstance(attr, models.ForeignKey):
+                keys_to_rewrite.append(rel_k)
+        for old_k in keys_to_rewrite:
+            new_nested[f"{old_k}_id"] = new_nested.pop(old_k)
+        return new_nested
+
+
     async def parse_input_data(self, request: HttpRequest, data: Schema):
         """
         Transform inbound schema data to a model-ready payload.
@@ -403,10 +418,13 @@ class ModelUtil:
         payload = data.model_dump(mode="json")
 
         for k, v in payload.items():
-            field_obj = self._extract_field_obj(k)
+            field_obj = await self._extract_field_obj(k)
             if not self._should_process_nested(v, field_obj):
                 continue
-            payload[k] = await self._fetch_related_instance(request, field_obj, v)
+            rel_instance = await self._fetch_related_instance(request, field_obj, v)
+            if isinstance(field_obj, models.ForeignKey):
+                v = await self._rewrite_nested_foreign_keys(rel_instance, v)
+            payload[k] = rel_instance
         return payload
 
     async def create_s(self, request: HttpRequest, data: Schema, obj_schema: Schema):