django-ninja-aio-crud 0.6.2__py3-none-any.whl → 0.6.4__py3-none-any.whl

{django_ninja_aio_crud-0.6.2.dist-info → django_ninja_aio_crud-0.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-ninja-aio-crud
-Version: 0.6.2
+Version: 0.6.4
 Summary: Django Ninja AIO CRUD - Rest Framework
 Author: Giuseppe Casillo
 Requires-Python: >=3.10
@@ -196,7 +196,7 @@ class Foo(ModelSerializer):
   bar = models.CharField(max_length=30, default="")
   active = models.BooleanField(default=False)
 
-  @propetry
+  @property
   def full_name(self):
     return f"{self.name} example_full_name"
 
@@ -472,7 +472,7 @@ api = NinjaAIO()
 class FooAPI(APIViewSet):
   model = Foo
   api = api
-  auths = CustomJWTBearer()
+  auth = CustomJWTBearer()
 
 
 class ExampleSchemaOut(Schema):
@@ -488,10 +488,10 @@ class SumView(APIView):
   api = api
   api_router_path = "numbers-sum/"
   router_tag = "Sum"
-  auths = CustomJWTBearer()
+  auth = CustomJWTBearer()
 
   def views(self):
-    @self.router.post("/", response={200: ExampleSchemaOut}, auth=self.auths)
+    @self.router.post("/", response={200: ExampleSchemaOut}, auth=self.auth)
     async def sum(request: HttpRequest, data: ExampleSchemaIn):
         return 200, {sum: data.n1 + data.n2}
 

{django_ninja_aio_crud-0.6.2.dist-info → django_ninja_aio_crud-0.6.4.dist-info}/RECORD

@@ -1,13 +1,13 @@
-ninja_aio/__init__.py,sha256=fj_imNMQNt3s9V2z1MaTVCq27ZeyFxCD555vG2F80d8,119
+ninja_aio/__init__.py,sha256=He13CnD_ZdNDB5ItYJnH39b2l_xnkGParFmyfLD1cCc,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=58Uk24f2IQYDdnGq1vXp8HqmCwDYeSkZtbiQ9JOQEXc,15504
+ninja_aio/models.py,sha256=p8X_G2WVlygDE8UEJ7O2fajauJYu1d_pgcvFPDkHRwc,15638
 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=EHznS-6KWLwSX5hLeXbAi7qHWla09_rGeQraiLpH-aY,491
-ninja_aio/views.py,sha256=z820mKzfbvh9SZ4cALQVKMfc64kx74t8xWGWaUBzHfs,9270
-django_ninja_aio_crud-0.6.2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-django_ninja_aio_crud-0.6.2.dist-info/METADATA,sha256=QFGhtfwohjs0YQG1K6ysZpHQEYtfM0BTJaopwqaFmGQ,13740
-django_ninja_aio_crud-0.6.2.dist-info/RECORD,,
+ninja_aio/views.py,sha256=qROag0OsMeVUXcnUYKV7ZmWj4E0F-QH52PI2-56zVRs,9263
+django_ninja_aio_crud-0.6.4.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+django_ninja_aio_crud-0.6.4.dist-info/METADATA,sha256=VFT8uPTiMq7nHgAvoRqHmrs9Nh0K0BLR9Z9DF1tWw0Y,13737
+django_ninja_aio_crud-0.6.4.dist-info/RECORD,,

ninja_aio/__init__.py

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

ninja_aio/models.py

@@ -51,13 +51,14 @@ class ModelUtil:
         pk: int | str = None,
         filters: dict = None,
         getters: dict = None,
+        with_qs_request=True,
     ):
         get_q = {self.model_pk_name: pk} if pk is not None else {}
         if getters:
             get_q |= getters
 
         obj_qs = self.model.objects.select_related()
-        if isinstance(self.model, ModelSerializerMeta):
+        if isinstance(self.model, ModelSerializerMeta) and with_qs_request:
             obj_qs = await self.model.queryset_request(request)
 
         obj_qs = obj_qs.prefetch_related(*self.get_reverse_relations())
@@ -108,7 +109,9 @@ class ModelUtil:
                     raise SerializeError({k: ". ".join(exc.args)}, 400)
             if isinstance(field_obj, models.ForeignKey):
                 rel_util = ModelUtil(field_obj.related_model)
-                rel: ModelSerializer = await rel_util.get_object(request, v)
+                rel: ModelSerializer = await rel_util.get_object(
+                    request, v, with_qs_request=False
+                )
                 payload |= {k: rel}
         new_payload = {
             k: v for k, v in payload.items() if k not in (customs.keys() or optionals)
@@ -132,7 +135,7 @@ class ModelUtil:
             ):
                 rel_util = ModelUtil(field_obj.related_model)
                 rel: ModelSerializer = await rel_util.get_object(
-                    request, list(v.values())[0]
+                    request, list(v.values())[0], with_qs_request=False
                 )
                 if isinstance(field_obj, models.ForeignKey):
                     for rel_k, rel_v in v.items():

ninja_aio/views.py

@@ -18,7 +18,7 @@ class APIView:
     api: NinjaAPI
     router_tag: str
     api_route_path: str
-    auths: list | None = NOT_SET
+    auth: list | None = NOT_SET
 
     def __init__(self) -> None:
         self.router = Router(tags=[self.router_tag])
@@ -71,7 +71,7 @@ class APIViewSet:
     schema_in: Schema | None = None
     schema_out: Schema | None = None
     schema_update: Schema | None = None
-    auths: list | None = NOT_SET
+    auth: list | None = NOT_SET
     pagination_class: type[AsyncPaginationBase] = PageNumberPagination
     query_params: dict[str, tuple[type, ...]] = {}
     disable: list[type[VIEW_TYPES]] = []
@@ -137,7 +137,7 @@ class APIViewSet:
     def create_view(self):
         @self.router.post(
             self.path,
-            auth=self.auths,
+            auth=self.auth,
             response={201: self.schema_out, self.error_codes: GenericMessageSchema},
         )
         async def create(request: HttpRequest, data: self.schema_in):
@@ -149,7 +149,7 @@ class APIViewSet:
     def list_view(self):
         @self.router.get(
             self.path,
-            auth=self.auths,
+            auth=self.auth,
             response={
                 200: List[self.schema_out],
                 self.error_codes: GenericMessageSchema,
@@ -179,7 +179,7 @@ class APIViewSet:
     def retrieve_view(self):
         @self.router.get(
             self.path_retrieve,
-            auth=self.auths,
+            auth=self.auth,
             response={200: self.schema_out, self.error_codes: GenericMessageSchema},
         )
         async def retrieve(request: HttpRequest, pk: Path[self.path_schema]):
@@ -192,7 +192,7 @@ class APIViewSet:
     def update_view(self):
         @self.router.patch(
             self.path_retrieve,
-            auth=self.auths,
+            auth=self.auth,
             response={200: self.schema_out, self.error_codes: GenericMessageSchema},
         )
         async def update(
@@ -208,7 +208,7 @@ class APIViewSet:
     def delete_view(self):
         @self.router.delete(
             self.path_retrieve,
-            auth=self.auths,
+            auth=self.auth,
             response={204: None, self.error_codes: GenericMessageSchema},
         )
         async def delete(request: HttpRequest, pk: Path[self.path_schema]):