Merge pull request #2 from freemindcore/feat/serizalize_qs_m2m

fix: change id -> pk in filter

Author: freemindcore

easy/controller/meta.py

@@ -27,19 +27,19 @@ def __init__(self, service=None):  # type: ignore
         super().__init__(model=self.model)
 
     # Define Controller APIs for auto generation
-    async def get_obj(self, request: HttpRequest, id: int) -> Any:
+    async def get_obj(self, request: HttpRequest, pk: int) -> Any:
         """
         GET /{id}
         Retrieve a single Object
         """
-        return await self.service.get_obj(id)
+        return await self.service.get_obj(pk)
 
-    async def del_obj(self, request: HttpRequest, id: int) -> Any:
+    async def del_obj(self, request: HttpRequest, pk: int) -> Any:
         """
         DELETE /{id}
         Delete a single Object
         """
-        return await self.service.del_obj(id)
+        return await self.service.del_obj(pk)
 
     @paginate
     async def get_objs(
@@ -143,13 +143,13 @@ async def add_obj(  # type: ignore
                 return await self.service.add_obj(**data.dict())
 
             async def patch_obj(  # type: ignore
-                self, request: HttpRequest, id: int, data: DataSchema
+                self, request: HttpRequest, pk: int, data: DataSchema
             ) -> Any:
                 """
                 PATCH /?id={id}
                 Update a single field for a Object
                 """
-                return await self.service.patch_obj(id=id, payload=data.dict())
+                return await self.service.patch_obj(pk=pk, payload=data.dict())
 
             DataSchema.__name__ = (
                 f"{opts_model.__name__}__AutoSchema({str(uuid.uuid4())[:4]})"

easy/domain/orm.py

@@ -43,9 +43,9 @@ def _crud_add_obj(self, **payload: Dict) -> Any:
         return obj
 
     def _crud_del_obj(self, id: int) -> "BaseApiResponse":
-        obj = get_object_or_none(self.model, id=id)
+        obj = get_object_or_none(self.model, pk=id)
         if obj:
-            self.model.objects.filter(id=id).delete()
+            self.model.objects.filter(pk=id).delete()
             return BaseApiResponse({"Detail": "Deleted."})
         else:
             return BaseApiResponse(
@@ -56,7 +56,7 @@ def _crud_update_obj(self, id: int, payload: Dict) -> "BaseApiResponse":
         local_fields, m2m_fields = self.__get_fields(payload)
         try:
             obj, created = self.model.objects.update_or_create(
-                id=id, defaults=local_fields
+                pk=id, defaults=local_fields
             )
         except Exception as e:  # pragma: no cover
             logger.error(f"Crud_update Error - {e}", exc_info=True)
@@ -70,13 +70,13 @@ def _crud_update_obj(self, id: int, payload: Dict) -> "BaseApiResponse":
 
     def _crud_get_obj(self, id: int) -> Any:
         if self.m2m_fields:
-            qs = self.model.objects.filter(id=id).prefetch_related(
+            qs = self.model.objects.filter(pk=id).prefetch_related(
                 self.m2m_fields[0].name
             )
             for f in self.m2m_fields[1:]:
                 qs = qs.prefetch_related(f.name)
         else:
-            qs = self.model.objects.filter(id=id)
+            qs = self.model.objects.filter(pk=id)
         if qs:
             return qs.first()
         return BaseApiResponse()

easy/services/crud.py

@@ -14,17 +14,17 @@ def __init__(self, model: Type[models.Model]):
         super().__init__(model)
         self.model = model
 
-    async def get_obj(self, id: int) -> Any:
-        return await sync_to_async(self._crud_get_obj)(id)
+    async def get_obj(self, pk: int) -> Any:
+        return await sync_to_async(self._crud_get_obj)(pk)
 
     async def get_objs(self, maximum: int = None, **filters: Any) -> Any:
         return await sync_to_async(self._crud_get_objs_all)(maximum, **filters)
 
-    async def patch_obj(self, id: int, payload: Any) -> Any:
-        return await sync_to_async(self._crud_update_obj)(id, payload)
+    async def patch_obj(self, pk: int, payload: Any) -> Any:
+        return await sync_to_async(self._crud_update_obj)(pk, payload)
 
-    async def del_obj(self, id: int) -> Any:
-        return await sync_to_async(self._crud_del_obj)(id)
+    async def del_obj(self, pk: int) -> Any:
+        return await sync_to_async(self._crud_del_obj)(pk)
 
     async def add_obj(self, **payload: Any) -> Any:
         return await sync_to_async(self._crud_add_obj)(**payload)

tests/demo_app/test_async_api_permissions.py

@@ -109,12 +109,12 @@ async def test_perm_auto_apis_delete(self, transactional_db, easy_api_client):
         object_data.update(title=f"{object_data['title']}_get")
         event = await sync_to_async(Event.objects.create)(**object_data)
         response = await client.get(
-            f"/?id={event.id}",
+            f"/?pk={event.id}",
         )
         assert response.status_code == 200
 
         response = await client.delete(
-            f"/?id={event.id}",
+            f"/?pk={event.id}",
         )
         assert response.status_code == 200
         assert response.json().get("data") == {
@@ -124,11 +124,11 @@ async def test_perm_auto_apis_delete(self, transactional_db, easy_api_client):
         # Super users
         client = easy_api_client(AutoGenCrudAPIController, is_superuser=True)
         await client.delete(
-            f"/?id={event.id}",
+            f"/?pk={event.id}",
         )
 
         response = await client.get(
-            f"/?id={event.id}",
+            f"/?pk={event.id}",
         )
         assert response.status_code == 200
         assert response.json().get("data") == {}
@@ -140,7 +140,7 @@ async def test_perm_auto_apis_patch(self, transactional_db, easy_api_client):
         event = await sync_to_async(Event.objects.create)(**object_data)
 
         response = await client.get(
-            f"/?id={event.id}",
+            f"/?pk={event.id}",
         )
         assert response.status_code == 200
         assert response.json().get("data") == {
@@ -150,7 +150,7 @@ async def test_perm_auto_apis_patch(self, transactional_db, easy_api_client):
         # Staff users
         client = easy_api_client(AutoGenCrudAPIController, is_staff=True)
         response = await client.get(
-            f"/?id={event.id}",
+            f"/?pk={event.id}",
         )
         assert response.json().get("data")["title"] == f"{object_data['title']}"
 
@@ -172,7 +172,7 @@ async def test_perm_auto_apis_patch(self, transactional_db, easy_api_client):
 
         client = easy_api_client(AdminSitePermissionAPIController)
         response = await client.patch(
-            f"/?id={event.id}", json=new_data, content_type="application/json"
+            f"/?pk={event.id}", json=new_data, content_type="application/json"
         )
 
         assert response.status_code == 200
@@ -183,13 +183,13 @@ async def test_perm_auto_apis_patch(self, transactional_db, easy_api_client):
         # Super users
         client = easy_api_client(AutoGenCrudAPIController, is_superuser=True)
         response = await client.patch(
-            f"/?id={event.id}", json=new_data, content_type="application/json"
+            f"/?pk={event.id}", json=new_data, content_type="application/json"
         )
         assert response.json().get("data")["id"] == event.id
         assert response.json().get("data")["created"] is False
 
         response = await client.get(
-            f"/?id={event.id}",
+            f"/?pk={event.id}",
         )
         assert response.status_code == 200
         assert response.json().get("data")["title"] == "AsyncAPIEvent_patch"

tests/demo_app/test_async_auto_crud_apis.py

@@ -84,7 +84,7 @@ async def test_crud_default_get_delete(self, transactional_db, easy_api_client):
         event = await sync_to_async(Event.objects.create)(**object_data)
 
         response = await client.get(
-            f"/?id={event.id}",
+            f"/?pk={event.id}",
         )
         assert response.status_code == 200
 
@@ -95,11 +95,11 @@ async def test_crud_default_get_delete(self, transactional_db, easy_api_client):
         assert event_schema["end_date"] == data["end_date"]
 
         await client.delete(
-            f"/?id={event.id}",
+            f"/?pk={event.id}",
         )
 
         response = await client.get(
-            f"/?id={event.id}",
+            f"/?pk={event.id}",
         )
         assert response.status_code == 200
         assert response.json().get("data") == {}
@@ -118,6 +118,7 @@ async def test_crud_default_create(self, transactional_db, easy_api_client):
         object_data = dummy_data.copy()
         object_data.update(title=f"{object_data['title']}_create")
         object_data.update(owner=[client_c.id, client_d.id])
+        object_data.update(lead_owner=[client_d.id])
 
         response = await client.put(
             "/", json=object_data, content_type="application/json"
@@ -127,10 +128,11 @@ async def test_crud_default_create(self, transactional_db, easy_api_client):
         event_id = response.json().get("data")["id"]
 
         response = await client.get(
-            f"/?id={event_id}",
+            f"/?pk={event_id}",
         )
         assert response.status_code == 200
         assert response.json().get("data")["title"] == "AsyncAdminAPIEvent_create"
+        print(f"====================>>>>>>>>>{response.json().get('data')}")
 
     async def test_crud_default_patch(self, transactional_db, easy_api_client):
         client = easy_api_client(AutoGenCrudAPIController)
@@ -139,7 +141,7 @@ async def test_crud_default_patch(self, transactional_db, easy_api_client):
         event = await sync_to_async(Event.objects.create)(**object_data)
 
         response = await client.get(
-            f"/?id={event.id}",
+            f"/?pk={event.id}",
         )
         assert response.status_code == 200
         assert response.json().get("data")["title"] == f"{object_data['title']}"
@@ -161,15 +163,15 @@ async def test_crud_default_patch(self, transactional_db, easy_api_client):
         )
 
         response = await client.patch(
-            f"/?id={event.id}", json=new_data, content_type="application/json"
+            f"/?pk={event.id}", json=new_data, content_type="application/json"
         )
 
         assert response.status_code == 200
         assert response.json().get("data")["id"] == event.id
         assert response.json().get("data")["created"] is False
 
         response = await client.get(
-            f"/?id={event.id}",
+            f"/?pk={event.id}",
         )
         assert response.status_code == 200
         assert response.json().get("data")["title"] == "AsyncAdminAPIEvent_patch"

tests/demo_app/test_async_other_apis.py

@@ -33,7 +33,7 @@ async def test_crud_apis(self, transactional_db, easy_api_client):
         event_id = response.json().get("data")["id"]
 
         response = await client.get(
-            f"/?id={event_id}",
+            f"/?pk={event_id}",
         )
         assert response.status_code == 200
         assert response.json().get("data")["title"] == "AsyncAPIEvent_create"