Merge pull request #1 from freemindcore/feat/serizalize_qs_m2m

Feat/serizalize qs m2m

Author: freemindcore

easy/domain/orm.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Tuple, Type
+from typing import Any, Dict, List, Tuple, Type
 
 from django.db import models
 from django.db.models.query import QuerySet
@@ -14,8 +14,13 @@
 class CrudModel(object):
     def __init__(self, model: Type[models.Model]):
         self.model = model
+        self.m2m_fields = [
+            f
+            for f in self.model._meta.get_fields(include_hidden=True)
+            if isinstance(f, models.ManyToManyField)
+        ]
 
-    def __get_fields(self, payload: dict) -> Tuple[dict, dict]:
+    def __get_fields(self, payload: Dict) -> Tuple[Dict, Dict]:
         m2m_fields = {}
         local_fields = {}
         for field in payload.keys():
@@ -27,12 +32,12 @@ def __get_fields(self, payload: dict) -> Tuple[dict, dict]:
         return local_fields, m2m_fields
 
     # Define BASE CRUD
-    def _crud_add_obj(self, **payload: dict) -> Any:
+    def _crud_add_obj(self, **payload: Dict) -> Any:
         local_fields, m2m_fields = self.__get_fields(payload)
         obj = self.model.objects.create(**local_fields)
         if m2m_fields:
             for field, value in m2m_fields.items():
-                if value and isinstance(value, list):
+                if value and isinstance(value, List):
                     m2m_f = getattr(obj, field)
                     m2m_f.set(value)
         return obj
@@ -47,7 +52,7 @@ def _crud_del_obj(self, id: int) -> "BaseApiResponse":
                 {"Detail": "Not found."}, message="Not found."
             )  # pragma: no cover
 
-    def _crud_update_obj(self, id: int, payload: dict) -> "BaseApiResponse":
+    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(
@@ -64,7 +69,17 @@ def _crud_update_obj(self, id: int, payload: dict) -> "BaseApiResponse":
         return BaseApiResponse({"id": obj.id, "created": created})
 
     def _crud_get_obj(self, id: int) -> Any:
-        return get_object_or_none(self.model, id=id)
+        if self.m2m_fields:
+            qs = self.model.objects.filter(id=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)
+        if qs:
+            return qs.first()
+        return BaseApiResponse()
 
     def _crud_get_objs_all(self, maximum: int = None, **filters: Any) -> Any:
         """

easy/domain/serializers.py

@@ -46,7 +46,6 @@ def serialize_model_instance(
     """Serializes Django model instance to dictionary"""
     out = {}
     for field in obj._meta.get_fields():
-        # TODO: Add OneToOne relationship??
         if is_one_relationship(field):
             out.update(serialize_foreign_key(obj, field, referrers + (obj,)))
 

tests/demo_app/controllers.py

@@ -68,10 +68,13 @@ async def get_objs_list_with_filter_exclude(self, request):
 
     @http_get(
         "/qs",
-        response=List[EventSchema],
     )
     async def list_events(self):
-        return await sync_to_async(list)(self.model.objects.all())
+        qs = await sync_to_async(self.model.objects.all)()
+        await sync_to_async(list)(qs)
+        if qs:
+            return qs
+        return BaseApiResponse()
 
 
 @api_controller("unittest")

tests/demo_app/models.py

@@ -35,6 +35,10 @@ class Event(TestBaseModel):
 
     owner = models.ManyToManyField(to=Client, related_name="events", null=True)
 
+    lead_owner = models.ManyToManyField(to=Client, related_name="lead_owner", null=True)
+
+    boss_owner = models.ManyToManyField(to=Client, related_name="boss_owner", null=True)
+
     type = models.ForeignKey(Type, on_delete=models.CASCADE, null=True)
 
     def __str__(self):

tests/demo_app/test_async_other_apis.py

@@ -99,3 +99,21 @@ async def test_qs_list(self, transactional_db, easy_api_client):
             == data[4]["title"]
             == "AsyncAPIEvent_create_qs_list_88"
         )
+
+    async def test_qs_(self, transactional_db, easy_api_client):
+        client = easy_api_client(EasyCrudAPIController)
+
+        for i in range(4):
+            type = await sync_to_async(Type.objects.create)(name=f"Test-Type-{i}")
+            object_data = await EventService.prepare_create_event_data(dummy_data)
+            object_data.update(title=f"{object_data['title']}_qs_{i}", type=type.id)
+            await client.put("/", json=object_data)
+
+        response = await client.get(
+            "/qs",
+        )
+        assert response.status_code == 200
+
+        data = response.json().get("data")
+
+        assert data[0]["title"] == "AsyncAPIEvent_create_qs_0"