migrator functions updated

api_events/events/company/company_company.py

@@ -60,27 +60,19 @@ class CompanyCreateEventMethods(MethodToEvent):
     }
 
     @classmethod
-    def company_create(cls, data: InsertCompany, token_dict):
+    def company_create(
+            cls, data: InsertCompany, token_dict: typing.Union[EmployeeTokenObject, OccupantTokenObject]
+    ):
         created_company = Companies.create_action(
-            data=data, token=token_dict.companies_list
+            data=data, token=token_dict
         )
-        created_company.related_company = token_dict.get("company_uu_id")
-        created_company.flush()
+        created_company.related_company = token_dict.selected_company.company_uu_id
         created_company.save()
         return JSONResponse(
             content={
                 "completed": True,
                 "message": "Create Company record",
-                "data": created_company.get_dict(),
-                "password_token": {
-                    "password_token": created_company.password_token,
-                    "password_expires_day": str(created_company.password_expires_day),
-                    "password_expiry_begins": str(
-                        created_company.password_expiry_begins
-                    ),
-                    "hash_password": created_company.hash_password,
-                    "related_company": created_company.related_company,
-                },
+                "data": created_company.get_dict()
             },
             status_code=status.HTTP_200_OK,
         )

api_events/events/company/company_employee.py

@@ -58,11 +58,11 @@ class EmployeeCreateEventMethods(MethodToEvent):
         token_dict: Union[EmployeeTokenObject, OccupantTokenObject],
     ):
         person = People.filter_one(
-            People.uu_id==data.people_uu_id,
+            People.uu_id == data.people_uu_id,
             *People.valid_record_args(People),
         ).data
         staff = Staff.filter_one(
-            Staff.uu_id==data.staff_uu_id,
+            Staff.uu_id == data.staff_uu_id,
             *Staff.valid_record_args(Staff),
         ).data
         if not staff:
@@ -101,7 +101,7 @@ class EmployeeUpdateEventMethods(MethodToEvent):
     @classmethod
     def employee_update(cls, employee_uu_id: str, data: PatchRecord, token_dict):
         find_one_employee = Employees.filter_one(
-            Employees.uu_id==employee_uu_id,
+            Employees.uu_id == employee_uu_id,
             *Employees.valid_record_args(Employees),
         ).data
         access_authorized_employee = Employees.select_action(
@@ -188,12 +188,11 @@ class Employee2PeopleEmployEventMethods(MethodToEvent):
     @classmethod
     def company_employee_employ(cls, data: BindEmployees2People, token_dict):
         selected_staff = Staff.filter_one(
-            Staff.uu_id==data.staff_uu_id,
+            Staff.uu_id == data.staff_uu_id,
             *Staff.valid_record_args(Staff),
         ).data
         selected_people = People.filter_one(
-            People.uu_id==data.people_uu_id,
-            *People.valid_record_args
+            People.uu_id == data.people_uu_id, *People.valid_record_args
         ).data
         if not selected_staff:
             raise HTTPException(
@@ -251,7 +250,7 @@ class Employee2PeopleFireEventMethods(MethodToEvent):
     @classmethod
     def company_employee_fire(cls, data: BindEmployees2People, token_dict):
         selected_people = People.filter_one(
-            People.uu_id==data.people_uu_id,
+            People.uu_id == data.people_uu_id,
             *People.valid_record_args(People),
         ).data
         if not selected_people:
@@ -261,7 +260,7 @@ class Employee2PeopleFireEventMethods(MethodToEvent):
             )
 
         find_one_employee: Employees = Employees.filter_one(
-            Employees.people_id==selected_people.id,
+            Employees.people_id == selected_people.id,
             *Employees.valid_record_args(Employees),
         ).data
         if not find_one_employee:

api_events/events/company/company_staff.py

@@ -45,7 +45,7 @@ class StaffCreateEventMethods(MethodToEvent):
     def staff_create(cls, data: InsertStaff, token_dict: EmployeeTokenObject):
         data_dict = data.excluded_dump()
         duties = Duties.filter_one(
-            Duties.uu_id==data.duties_uu_id,
+            Duties.uu_id == data.duties_uu_id,
             *Duties.valid_record_args(Duties),
         ).data
         if not duties:
@@ -77,12 +77,10 @@ class StaffGetByUUIDEventMethods(MethodToEvent):
     def staff_get_by_uu_id(cls, data: SelectStaff, token_dict):
         if data.duties_uu_id:
             duties_id = Duties.filter_one(
-                Duties.uu_id==data.duties_uu_id,
-                *Duties.valid_record_args(Duties)
+                Duties.uu_id == data.duties_uu_id, *Duties.valid_record_args(Duties)
             ).data
             selected_staffs = Staff.filter_all(
-                Staff.duties_id == duties_id.id,
-                *Staff.valid_record_args(Staff)
+                Staff.duties_id == duties_id.id, *Staff.valid_record_args(Staff)
             )
             return JSONResponse(
                 content={