refactor: CrudAPI _crud_del_obj

Author: freemindcore

easy/controller/meta.py

@@ -48,7 +48,10 @@ async def del_obj(self, request: HttpRequest, id: int) -> Any:
         DELETE /{id}
         Delete a single Object
         """
-        return await self.service.del_obj(id)
+        if await self.service.del_obj(id):
+            return BaseApiResponse("Deleted.", errno=204)
+        else:
+            return BaseApiResponse("Not Found.", errno=404)
 
     @paginate
     async def get_objs(
@@ -153,7 +156,7 @@ async def add_obj(  # type: ignore
                 if obj_id:
                     return BaseApiResponse({"id": obj_id}, errno=201)
                 else:
-                    return BaseApiResponse("Update failed", errno=204)
+                    return BaseApiResponse("Add failed", errno=204)  # pragma: no cover
 
             async def patch_obj(  # type: ignore
                 self, request: HttpRequest, id: int, data: DataSchema

easy/domain/orm.py

@@ -6,7 +6,6 @@
 from ninja_extra.shortcuts import get_object_or_none
 
 from easy.exception import BaseAPIException
-from easy.response import BaseApiResponse
 
 logger = logging.getLogger(__name__)
 
@@ -37,37 +36,35 @@ def _separate_payload(self, payload: Dict) -> Tuple[Dict, Dict]:
         return local_fields, m2m_fields
 
     @staticmethod
-    def _crud_set_m2m_obj(obj: models.Model, m2m_fields: Dict) -> bool:
+    def _crud_set_m2m_obj(obj: models.Model, m2m_fields: Dict) -> None:
         if obj and m2m_fields:
             for _field, _value in m2m_fields.items():
                 if _value and isinstance(_value, List):
                     m2m_f = getattr(obj, _field)
                     m2m_f.set(_value)
-        return True
 
     # Define BASE CRUD
     @transaction.atomic()
     def _crud_add_obj(self, **payload: Dict) -> Any:
         local_f_payload, m2m_f_payload = self._separate_payload(payload)
 
-        # Create obj with local_fields payload
-        obj = self.model.objects.create(**local_f_payload)
-
-        # Save obj with m2m_fields payload
-        set_m2m_status = self._crud_set_m2m_obj(obj, m2m_f_payload)
-
-        if obj and set_m2m_status:
+        try:
+            # Create obj with local_fields payload
+            obj = self.model.objects.create(**local_f_payload)
+            # Save obj with m2m_fields payload
+            self._crud_set_m2m_obj(obj, m2m_f_payload)
+        except Exception as e:  # pragma: no cover
+            raise BaseAPIException(f"Create Error - {e}")
+        if obj:
             return obj.id
-        else:
-            return None
 
-    def _crud_del_obj(self, pk: int) -> "BaseApiResponse":
+    def _crud_del_obj(self, pk: int) -> bool:
         obj = get_object_or_none(self.model, pk=pk)
         if obj:
             self.model.objects.filter(pk=pk).delete()
-            return BaseApiResponse("Deleted.", errno=204)
+            return True
         else:
-            return BaseApiResponse("Not Found.", errno=404)
+            return False
 
     @transaction.atomic()
     def _crud_update_obj(self, pk: int, payload: Dict) -> bool:
@@ -76,11 +73,10 @@ def _crud_update_obj(self, pk: int, payload: Dict) -> bool:
             return False
         try:
             obj, _ = self.model.objects.update_or_create(pk=pk, defaults=local_fields)
+            self._crud_set_m2m_obj(obj, m2m_fields)
         except Exception as e:  # pragma: no cover
             raise BaseAPIException(f"Update Error - {e}")
-
-        set_m2m_status = self._crud_set_m2m_obj(obj, m2m_fields)
-        return bool(set_m2m_status and obj)
+        return bool(obj)
 
     def _crud_get_obj(self, pk: int) -> Any:
         if self.m2m_fields_list: