test application updated@build living space

This commit is contained in:
2024-11-15 19:23:08 +03:00
parent d2cc195ccf
commit 7e1b26f3c4
44 changed files with 261 additions and 321 deletions

View File

@@ -42,9 +42,7 @@ class CompanyListEventMethods(MethodToEvent):
Companies.id == token_dict.selected_occupant.responsible_company_id
).query
Companies.filter_attr = list_options
records = Companies.filter_all(
*Companies.valid_record_args(Companies)
)
records = Companies.filter_all()
return AlchemyJsonResponse(
completed=True,
message="Building Living Spaces are listed successfully",
@@ -97,7 +95,6 @@ class CompanyUpdateEventMethods(MethodToEvent):
)
find_one_company = Companies.filter_one(
Companies.uu_id == company_uu_id,
Companies.valid_record_args(Companies),
).data
if not find_one_company:
return JSONResponse(
@@ -133,7 +130,6 @@ class CompanyPatchEventMethods(MethodToEvent):
):
find_one_company = Companies.filter_one(
Companies.uu_id==company_uu_id,
*Companies.valid_record_args(Companies)
).data
access_authorized_company = Companies.select_action(
duty_id_list=[

View File

@@ -32,7 +32,6 @@ class DepartmentListEventMethods(MethodToEvent):
Departments.filter_attr = list_options
records = Departments.filter_all(
Departments.company_id == token_dict.selected_company.company_id,
*Departments.valid_record_args(Departments)
)
return AlchemyJsonResponse(
completed=True,

View File

@@ -67,7 +67,6 @@ class DutiesGetByUUIDEventMethods(MethodToEvent):
records = Duties.filter_all(
Duties.duties_id == duty.id,
Duties.company_id == token_dict.selected_company.company_id,
*Duties.valid_record_args(Duties)
)
if not records.data:
return JSONResponse(

View File

@@ -31,12 +31,10 @@ class EmployeeListEventMethods(MethodToEvent):
):
employees_staff = Staff.filter_all(
Staff.duties_id.in_(token_dict.duty_id_list),
*Staff.valid_record_args(Staff),
).data
Employees.filter_attr = list_options
records = Employees.filter_all(
Employees.staff_id.in_([staff.id for staff in employees_staff]),
*Employees.valid_record_args(Employees),
)
return AlchemyJsonResponse(
completed=True,
@@ -60,11 +58,9 @@ class EmployeeCreateEventMethods(MethodToEvent):
):
person = People.filter_one(
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.valid_record_args(Staff),
).data
if not staff:
return JSONResponse(
@@ -108,7 +104,6 @@ class EmployeeUpdateEventMethods(MethodToEvent):
):
find_one_employee = Employees.filter_one(
Employees.uu_id == employee_uu_id,
*Employees.valid_record_args(Employees),
).data
access_authorized_employee = Employees.select_action(
employee_id=getattr(token_dict, "employee_id", 5),
@@ -199,10 +194,9 @@ class Employee2PeopleEmployEventMethods(MethodToEvent):
):
selected_staff = Staff.filter_one(
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
).data
if not selected_staff:
raise HTTPException(
@@ -217,7 +211,6 @@ class Employee2PeopleEmployEventMethods(MethodToEvent):
find_one_employee = Employees.filter_all(
Employees.staff_id == selected_staff.id,
*Employees.valid_record_args(Employees),
).data
staff_name_upper = str(selected_staff.staff_name).upper()
@@ -265,7 +258,6 @@ class Employee2PeopleFireEventMethods(MethodToEvent):
):
selected_people = People.filter_one(
People.uu_id == data.people_uu_id,
*People.valid_record_args(People),
).data
if not selected_people:
raise HTTPException(
@@ -275,7 +267,6 @@ class Employee2PeopleFireEventMethods(MethodToEvent):
find_one_employee: Employees = Employees.filter_one(
Employees.people_id == selected_people.id,
*Employees.valid_record_args(Employees),
).data
if not find_one_employee:
return JSONResponse(

View File

@@ -25,9 +25,7 @@ class StaffListEventMethods(MethodToEvent):
@classmethod
def staff_list(cls, list_options: ListOptions, token_dict: EmployeeTokenObject):
Staff.filter_attr = list_options
records = Staff.filter_all(
*Staff.valid_record_args(Staff)
)
records = Staff.filter_all()
return AlchemyJsonResponse(
completed=True,
message="Staff are listed successfully",
@@ -46,7 +44,6 @@ class StaffCreateEventMethods(MethodToEvent):
data_dict = data.excluded_dump()
duties = Duties.filter_one(
Duties.uu_id == data.duties_uu_id,
*Duties.valid_record_args(Duties),
).data
if not duties:
raise HTTPException(
@@ -77,10 +74,10 @@ class StaffGetByUUIDEventMethods(MethodToEvent):
def staff_get_by_uu_id(cls, data: SelectStaff, token_dict: EmployeeTokenObject):
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,
).data
selected_staffs = Staff.filter_all(
Staff.duties_id == duties_id.id, *Staff.valid_record_args(Staff)
Staff.duties_id == duties_id.id
)
return JSONResponse(
content={