refactor: CrudAPI _crud_get_obj

Author: freemindcore

easy/controller/meta.py

@@ -11,6 +11,7 @@
 from ninja_extra.pagination import paginate
 
 from easy.domain.orm import CrudModel
+from easy.response import BaseApiResponse
 from easy.services import BaseService
 from easy.utils import copy_func
 
@@ -32,7 +33,15 @@ async def get_obj(self, request: HttpRequest, id: int) -> Any:
         GET /{id}
         Retrieve a single Object
         """
-        return await self.service.get_obj(id)
+        try:
+            qs = await self.service.get_obj(id)
+        except Exception as e:  # pragma: no cover
+            logger.error(f"Get Error - {e}", exc_info=True)
+            return BaseApiResponse(str(e), message="Get Failed", errno=500)
+        if qs:
+            return qs
+        else:
+            return BaseApiResponse(message="Not Found", errno=404)
 
     async def del_obj(self, request: HttpRequest, id: int) -> Any:
         """

easy/domain/orm.py

@@ -83,22 +83,16 @@ def _crud_update_obj(self, pk: int, payload: Dict) -> "BaseApiResponse":
         return BaseApiResponse({"pk": pk}, message="Updated.")
 
     def _crud_get_obj(self, pk: int) -> Any:
-        try:
-            if self.m2m_fields_list:
-                qs = self.model.objects.filter(pk=pk).prefetch_related(
-                    self.m2m_fields_list[0].name
-                )
-                for f in self.m2m_fields_list[1:]:
-                    qs = qs.prefetch_related(f.name)
-            else:
-                qs = self.model.objects.filter(pk=pk)
-        except Exception as e:  # pragma: no cover
-            logger.error(f"Get Error - {e}", exc_info=True)
-            return BaseApiResponse(str(e), message="Get Failed", errno=500)
+        if self.m2m_fields_list:
+            qs = self.model.objects.filter(pk=pk).prefetch_related(
+                self.m2m_fields_list[0].name
+            )
+            for f in self.m2m_fields_list[1:]:
+                qs = qs.prefetch_related(f.name)
+        else:
+            qs = self.model.objects.filter(pk=pk)
         if qs:
             return qs.first()
-        else:
-            return BaseApiResponse(message="Not Found", errno=404)
 
     def _crud_get_objs_all(self, maximum: int = None, **filters: Any) -> Any:
         """