events imports are checked

api_events/events/company/company_duties.py

@@ -1,8 +1,15 @@
+from typing import Union
+
 from fastapi import status
 from fastapi.responses import JSONResponse
 
-from validations import InsertDuties, UpdateDuties, SelectDuties
-from validations.root_validates import PatchRecord, ListOptions
+from api_validations.validations_request import (
+    InsertDuties,
+    UpdateDuties,
+    SelectDuties,
+    PatchRecord,
+    ListOptions,
+)
 
 from databases import Departments, Duty, Duties
 
@@ -19,9 +26,11 @@ class DutiesListEventMethods(MethodToEvent):
     }
 
     @classmethod
-    def duties_list(cls, list_options: ListOptions, token_dict):
+    def duties_list(
+            cls, list_options: ListOptions, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
+    ):
         Duties.filter_attr = list_options
-        records = Duties.filter_active(
+        records = Duties.filter_all(
             *Duties.get_smart_query(smart_query=list_options.query),
             Duties.company_id == token_dict.selected_company.company_id
         )
@@ -40,9 +49,11 @@ class DutiesGetByUUIDEventMethods(MethodToEvent):
     }
 
     @classmethod
-    def duties_get_by_uuid(cls, data: SelectDuties, token_dict):
+    def duties_get_by_uuid(
+            cls, data: SelectDuties, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
+    ):
 
-        duty = Duty.find_one(uu_id=data.duty_uu_id)
+        duty = Duty.filter_one(Duty.uu_id==data.duty_uu_id).data
         if not duty:
             return JSONResponse(
                 content={
@@ -81,9 +92,11 @@ class DutiesCreateEventMethods(MethodToEvent):
     }
 
     @classmethod
-    def duties_create(cls, data: InsertDuties, token_dict):
-        duty = Duty.find_one(uu_id=data.duties_uu_id)
-        department = Departments.find_one(uu_id=data.department_uu_id)
+    def duties_create(
+            cls, data: InsertDuties, token_dict: Union[EmployeeTokenObject, OccupantTokenObject]
+    ):
+        duty = Duty.filter_one(Duty.uu_id==data.duties_uu_id).data
+        department = Departments.filter_one(Duty.uu_id==data.department_uu_id).data
 
         created_duties = Duties.find_or_create(
             company_id=token_dict.selected_company.company_id,
@@ -98,6 +111,7 @@ class DutiesCreateEventMethods(MethodToEvent):
             created_duties.update(users_default_duty=created_duties.id)
 
         if not created_duties:
+            Duty.save()
             return JSONResponse(
                 content={
                     "completed": False,
@@ -134,6 +148,7 @@ class DutiesUpdateEventMethods(MethodToEvent):
         if access_authorized_duties.count:
             data_dict = data.excluded_dump()
             updated_duties = find_one_duties.update(**data_dict)
+            Duties.save()
             return {
                 "completed": True,
                 "message": "Update Duties record",