migrator functions updated
This commit is contained in:
@@ -50,6 +50,7 @@ def save_access_token_to_redis(
|
||||
Employees,
|
||||
Staff,
|
||||
)
|
||||
|
||||
if not found_user:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
@@ -82,8 +83,9 @@ def save_access_token_to_redis(
|
||||
)
|
||||
occupants_selection_dict = {}
|
||||
for living_space in living_spaces:
|
||||
build_parts_selection = BuildParts.filter_active(
|
||||
BuildParts.id == living_space.build_parts_id
|
||||
build_parts_selection = BuildParts.filter_all(
|
||||
BuildParts.id == living_space.build_parts_id,
|
||||
*BuildParts.valid_record_args(BuildParts),
|
||||
)
|
||||
if not build_parts_selection.data:
|
||||
raise HTTPException(
|
||||
@@ -129,29 +131,30 @@ def save_access_token_to_redis(
|
||||
available_occupants=new_occupants_selection_dict,
|
||||
)
|
||||
|
||||
list_employee = Employees.filter_active(Employees.people_id == found_user.person_id)
|
||||
list_employee = Employees.filter_all(
|
||||
Employees.people_id == found_user.person_id,
|
||||
*Employees.valid_record_args(Employees),
|
||||
).data
|
||||
companies_uu_id_list, companies_id_list = [], []
|
||||
duty_uu_id_list, duty_id_list = [], []
|
||||
for employee in list_employee.data:
|
||||
for employee in list_employee:
|
||||
staff = Staff.filter_one(
|
||||
Staff.id==employee.staff_id,
|
||||
*Staff.valid_record_args(Staff)
|
||||
Staff.id == employee.staff_id, *Staff.valid_record_args(Staff)
|
||||
).data
|
||||
if duties := Duties.filter_one(
|
||||
Duties.id == staff.duties_id,
|
||||
*Duties.valid_record_args(Duties)
|
||||
Duties.id == staff.duties_id, *Duties.valid_record_args(Duties)
|
||||
).data:
|
||||
if duty_found := Duty.filter_by_one(id=duties.duties_id).data:
|
||||
duty_uu_id_list.append(str(duty_found.uu_id))
|
||||
duty_id_list.append(duty_found.id)
|
||||
|
||||
department = Departments.filter_one(
|
||||
Departments.id==duties.department_id,
|
||||
Departments.id == duties.department_id,
|
||||
*Departments.valid_record_args(Departments),
|
||||
)
|
||||
).data
|
||||
if company := Companies.filter_one(
|
||||
Companies.id==department.company_id,
|
||||
*Companies.valid_record_args(Companies),
|
||||
Companies.id == department.company_id,
|
||||
*Companies.valid_record_args(Companies),
|
||||
).data:
|
||||
companies_uu_id_list.append(str(company.uu_id))
|
||||
companies_id_list.append(company.id)
|
||||
|
||||
Reference in New Issue
Block a user