django-ninja-aio-crud 0.10.0__py3-none-any.whl → 0.10.2__py3-none-any.whl

{django_ninja_aio_crud-0.10.0.dist-info → django_ninja_aio_crud-0.10.2.dist-info}/METADATA

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

{django_ninja_aio_crud-0.10.0.dist-info → django_ninja_aio_crud-0.10.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ninja_aio/__init__.py,sha256=c74pynHsTwHF_-RI5P-DJphEOG7jfzZyVasd5Xddw3M,120
+ninja_aio/__init__.py,sha256=kXlRrvKYNdU9gmbossk8GM22iSY4k_go-OeZVJlQyn4,120
 ninja_aio/api.py,sha256=Fe6l3YCy7MW5TY4-Lbl80CFuK2NT2Y7tHfmqPk6Mqak,1735
 ninja_aio/auth.py,sha256=c_ILAySswjbSIqnE9Y0G5n1qreXzAtSAaWfrhyer-i8,1283
 ninja_aio/exceptions.py,sha256=gPnZX1Do2GXudbU8wDYkwhO70Qj0ZNrIJJ2UXRs9vYk,2241
@@ -7,8 +7,8 @@ ninja_aio/parsers.py,sha256=e_4lGCPV7zs-HTqtdJTc8yQD2KPAn9njbL8nF_Mmgkc,153
 ninja_aio/renders.py,sha256=0eYklRKd59aV4cZDom5vLZyA99Ob17OwkpMybsRXvyg,1970
 ninja_aio/schemas.py,sha256=Fzu2ko3kUxkOnrjG5QYdmOXZd2gcpYGjVuocCW44NfQ,473
 ninja_aio/types.py,sha256=TJSGlA7bt4g9fvPhJ7gzH5tKbLagPmZUzfgttEOp4xs,468
-ninja_aio/views.py,sha256=qPRMMWddazQo2sEZAFzb-GxwExUQDRmfPYYv4qMoU80,20906
-django_ninja_aio_crud-0.10.0.dist-info/licenses/LICENSE,sha256=yrDAYcm0gRp_Qyzo3GQa4BjYjWRkAhGC8QRva__RYq0,1073
-django_ninja_aio_crud-0.10.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-django_ninja_aio_crud-0.10.0.dist-info/METADATA,sha256=Jzl1pwyne8LHRlWHfuSDhix2EdbX17NYZziFbua4J8I,14139
-django_ninja_aio_crud-0.10.0.dist-info/RECORD,,
+ninja_aio/views.py,sha256=Mb38z0QS9Iwe-qB9wuuxcfCOJymRI9SppbHOfns6yHg,20944
+django_ninja_aio_crud-0.10.2.dist-info/licenses/LICENSE,sha256=yrDAYcm0gRp_Qyzo3GQa4BjYjWRkAhGC8QRva__RYq0,1073
+django_ninja_aio_crud-0.10.2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+django_ninja_aio_crud-0.10.2.dist-info/METADATA,sha256=NkJRoyTgKiXOQfJyKu91NJqdNF3JOJxHHZQ6QC-ykeU,14139
+django_ninja_aio_crud-0.10.2.dist-info/RECORD,,

ninja_aio/__init__.py

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

ninja_aio/views.py

@@ -402,15 +402,14 @@ class APIViewSet:
                 @self.router.get(
                     f"{self.path_retrieve}{rel_path}",
                     response={
-                        200: List[
-                            model.generate_related_s(),
-                        ],
-                        self.error_codes : GenericMessageSchema,
+                        200: List[model.generate_related_s(),],
+                        self.error_codes: GenericMessageSchema,
                     },
                     auth=self.m2m_auth,
                     summary=f"Get {rel_util.model._meta.verbose_name_plural.capitalize()}",
                     description=f"Get all related {rel_util.model._meta.verbose_name_plural.capitalize()}",
                 )
+                @paginate(self.pagination_class)
                 async def get_related(request: HttpRequest, pk: Path[self.path_schema]):  # type: ignore
                     obj = await self.model_util.get_object(request, self._get_pk(pk))
                     related_manager = getattr(obj, related_name)
@@ -422,15 +421,19 @@ class APIViewSet:
                         async for rel_obj in related_qs
                     ]
                     return related_objs
+
                 get_related.__name__ = f"get_{self.model_util.model_name}_{rel_path}"
-                
+
                 if self.m2m_add or self.m2m_remove:
-                    if self.m2m_add and self.m2m_remove:
-                        schema_in = M2MSchemaIn
-                    elif self.m2m_add:
-                        schema_in = M2MAddSchemaIn
-                    else:  # self.m2m_remove must be True
-                        schema_in = M2MRemoveSchemaIn
+                    summary = f"{'Add or Remove' if self.m2m_add and self.m2m_remove else 'Add' if self.m2m_add else 'Remove'} {rel_util.model._meta.verbose_name_plural.capitalize()}"
+                    description = f"{'Add or remove' if self.m2m_add and self.m2m_remove else 'Add' if self.m2m_add else 'Remove'} {rel_util.model._meta.verbose_name_plural.capitalize()}"
+                    schema_in = (
+                        M2MSchemaIn
+                        if self.m2m_add and self.m2m_remove
+                        else M2MAddSchemaIn
+                        if self.m2m_add
+                        else M2MRemoveSchemaIn
+                    )
 
                     @self.router.post(
                         f"{self.path_retrieve}{rel_path}/",
@@ -439,10 +442,10 @@ class APIViewSet:
                             self.error_codes: GenericMessageSchema,
                         },
                         auth=self.m2m_auth,
-                        summary=f"Add or Remove {rel_util.model._meta.verbose_name_plural.capitalize()}",
-                        description=f"Add or remove {rel_util.model._meta.verbose_name_plural.capitalize()}"
+                        summary=summary,
+                        description=description,
                     )
-                    async def add_and_remove_related(
+                    async def manage_related(
                         request: HttpRequest,
                         pk: Path[self.path_schema],  # type: ignore
                         data: schema_in,  # type: ignore
@@ -451,14 +454,9 @@ class APIViewSet:
                             request, self._get_pk(pk)
                         )
                         related_manager: QuerySet = getattr(obj, related_name)
-                        (
-                            add_errors,
-                            add_details,
-                            add_objs,
-                            remove_errors,
-                            remove_details,
-                            remove_objs,
-                        ) = [], [], [], [], [], []
+                        add_errors, add_details, add_objs = [], [], []
+                        remove_errors, remove_details, remove_objs = [], [], []
+
                         if self.m2m_add and hasattr(data, "add"):
                             (
                                 add_errors,
@@ -479,6 +477,7 @@ class APIViewSet:
                                 related_manager,
                                 remove=True,
                             )
+
                         await asyncio.gather(
                             related_manager.aadd(*add_objs),
                             related_manager.aremove(*remove_objs),
@@ -496,8 +495,10 @@ class APIViewSet:
                                 "details": errors,
                             },
                         }
-                    add_and_remove_related.__name__ = f"add_and_remove_{self.model_util.model_name}_{rel_path}"
-                
+
+                    manage_related.__name__ = (
+                        f"manage_{self.model_util.model_name}_{rel_path}"
+                    )
 
     def _add_views(self):
         if "all" in self.disable:
@@ -518,4 +519,4 @@ class APIViewSet:
         return self.router
 
     def add_views_to_route(self):
-        return self.api.add_router(f"{self.api_route_path}", self._add_views())
+        return self.api.add_router(f"{self.api_route_path}", self._add_views())