events imports are checked

api_events/events/company/company_department.py

@@ -1,8 +1,8 @@
-from typing import Optional
+from typing import Optional, Union
 from fastapi import status
 from fastapi.responses import JSONResponse
 
-from validations import (
+from api_validations.validations_request import (
     DepartmentsPydantic,
     PatchRecord,
     ListOptions,
@@ -24,7 +24,9 @@ class DepartmentListEventMethods(MethodToEvent):
     }
 
     @classmethod
-    def department_list(cls, list_options: ListOptions, token_dict):
+    def department_list(
+            cls, list_options: ListOptions, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
+    ):
         Departments.filter_attr = list_options
         records = Departments.filter_active(
             *Departments.get_smart_query(smart_query=list_options.query),
@@ -57,22 +59,14 @@ class DepartmentCreateEventMethods(MethodToEvent):
         data_dict["company_id"] = token_dict.selected_company.company_id
         data_dict["company_uu_id"] = token_dict.selected_company.company_uu_id
         created_department = Departments.find_or_create(**data_dict)
-        if created_department.is_found:
-            return JSONResponse(
-                content={
-                    "completed": False,
-                    "message": "Company record already exits here is the record",
-                    "data": created_department.get_dict(),
-                },
-                status_code=status.HTTP_202_ACCEPTED,
-            )
+        Departments.save()
         return JSONResponse(
             content={
-                "completed": True,
-                "message": "Create Company record",
+                "completed": False,
+                "message": "Company record already exits here is the record",
                 "data": created_department.get_dict(),
             },
-            status_code=status.HTTP_200_OK,
+            status_code=status.HTTP_202_ACCEPTED,
         )
 
 
@@ -87,7 +81,7 @@ class DepartmentUpdateEventMethods(MethodToEvent):
     def department_update(
         cls, company_uu_id: str, data: DepartmentsPydantic, token_dict
     ):
-        find_one_company = Departments.find_one_or_abort(uu_id=company_uu_id)
+        find_one_company = Departments.filter_one(Departments.uu_id==company_uu_id)
         access_authorized_company = Departments.select_action(
             duty_id=getattr(token_dict, "duty_id", 5),
             filter_expr=[Departments.id == token_dict.get("")],
@@ -95,6 +89,7 @@ class DepartmentUpdateEventMethods(MethodToEvent):
         if access_authorized_company.count:
             data_dict = data.excluded_dump()
             updated_company = find_one_company.update(**data_dict)
+            Departments.save()
             return JSONResponse(
                 content={
                     "completed": True,