Merge pull request #1382 from gtech-mulearn/dev

[fix] remve exceptions
gtech-mulearn · Oct 19, 2023 · fb7352e · fb7352e
2 parents 2c0d9c8 + a3043c8
commit fb7352e
Show file tree

Hide file tree

Showing 10 changed files with 1,111 additions and 638 deletions.
diff --git a/api/dashboard/location/location_views.py b/api/dashboard/location/location_views.py
diff --git a/api/dashboard/organisation/organisation_views.py b/api/dashboard/organisation/organisation_views.py
@@ -38,6 +38,7 @@ def post(self, request):
                 "user_id": user_id
             }
         )
+
         if serializer.is_valid():
             serializer.save()
 
@@ -80,6 +81,7 @@ def put(self, request, org_code):
                 "user_id": user_id
             }
         )
+
         if serializer.is_valid():
             serializer.save()
 
@@ -430,15 +432,10 @@ def post(self, request):
 
     @role_required([RoleType.ADMIN.value])
     def put(self, request, department_id):
-        try:
-            department = Department.objects.get(
-                id=department_id
-            )
 
-        except Exception as e:
-            return CustomResponse(
-                general_message=str(e)
-            ).get_failure_response()
+        department = Department.objects.get(
+            id=department_id
+        )
 
         serializer = DepartmentSerializer(
             department,
@@ -461,15 +458,9 @@ def put(self, request, department_id):
     @role_required([RoleType.ADMIN.value])
     def delete(self, request, department_id):
 
-        try:
-            department = Department.objects.get(
-                id=department_id
-            )
-
-        except Exception as e:
-            return CustomResponse(
-                general_message=str(e)
-            ).get_failure_response()
+        department = Department.objects.get(
+            id=department_id
+        )
 
         department.delete()
         return CustomResponse(