test application updated@build living space
This commit is contained in:
@@ -39,9 +39,7 @@ class PeopleListEventMethods(MethodToEvent):
|
||||
],
|
||||
)
|
||||
People.filter_attr = list_options
|
||||
records = People.filter_all(
|
||||
*People.valid_record_args(People),
|
||||
)
|
||||
records = People.filter_all()
|
||||
elif isinstance(token_dict, OccupantTokenObject):
|
||||
related_users = Users.filter_all(
|
||||
Users.related_company
|
||||
@@ -49,12 +47,9 @@ class PeopleListEventMethods(MethodToEvent):
|
||||
).data
|
||||
People.pre_query = People.filter_all(
|
||||
People.id.in_([user.person_id for user in related_users]),
|
||||
*People.valid_record_args(People),
|
||||
).query
|
||||
People.filter_attr = list_options
|
||||
records = People.filter_all(
|
||||
*People.valid_record_args(People),
|
||||
)
|
||||
records = People.filter_all()
|
||||
return AlchemyJsonResponse(
|
||||
completed=True,
|
||||
message="People are listed successfully",
|
||||
@@ -68,9 +63,7 @@ class PeopleListEventMethods(MethodToEvent):
|
||||
token_dict: EmployeeTokenObject,
|
||||
):
|
||||
People.filter_attr = list_options
|
||||
records = People.filter_all(
|
||||
*People.valid_record_args(People),
|
||||
).data
|
||||
records = People.filter_all().data
|
||||
return AlchemyJsonResponse(
|
||||
completed=True,
|
||||
message="People are listed successfully",
|
||||
@@ -85,9 +78,7 @@ class PeopleListEventMethods(MethodToEvent):
|
||||
):
|
||||
if isinstance(token_dict, EmployeeTokenObject):
|
||||
People.filter_attr = list_options
|
||||
records = People.filter_all(
|
||||
*People.valid_record_args(People),
|
||||
).data
|
||||
records = People.filter_all().data
|
||||
return AlchemyJsonResponse(
|
||||
completed=True,
|
||||
message="People are listed successfully",
|
||||
@@ -142,7 +133,6 @@ class PeopleUpdateEventMethods(MethodToEvent):
|
||||
if isinstance(token_dict, EmployeeTokenObject):
|
||||
find_one_user = Users.filter_one(
|
||||
Users.uu_id == user_uu_id,
|
||||
*Users.valid_record_args(Users),
|
||||
).data
|
||||
access_authorized_company = Companies.select_action(
|
||||
duty_id_list=[
|
||||
@@ -164,7 +154,6 @@ class PeopleUpdateEventMethods(MethodToEvent):
|
||||
elif isinstance(token_dict, OccupantTokenObject):
|
||||
find_one_user = People.filter_one(
|
||||
People.uu_id == user_uu_id,
|
||||
*People.valid_record_args(People),
|
||||
).data
|
||||
access_authorized_company = Companies.select_action(
|
||||
duty_id_list=[getattr(token_dict, "duty_id")],
|
||||
|
||||
@@ -46,13 +46,12 @@ class UserListEventMethods(MethodToEvent):
|
||||
people_id_list = (
|
||||
user.person_id
|
||||
for user in Users.filter_all(
|
||||
Users.uu_id.in_(people_ids), *Users.valid_record_args(Users)
|
||||
Users.uu_id.in_(people_ids)
|
||||
).data
|
||||
)
|
||||
Users.filter_attr = list_options
|
||||
records = Users.filter_all(
|
||||
Users.person_id.in_(people_id_list),
|
||||
*Users.valid_record_args(Users),
|
||||
)
|
||||
return AlchemyJsonResponse(
|
||||
completed=True,
|
||||
@@ -60,9 +59,7 @@ class UserListEventMethods(MethodToEvent):
|
||||
result=records,
|
||||
)
|
||||
Users.filter_attr = list_options
|
||||
records = Users.filter_all(
|
||||
*Users.valid_record_args(Users),
|
||||
)
|
||||
records = Users.filter_all()
|
||||
return AlchemyJsonResponse(
|
||||
completed=True,
|
||||
message="Users are listed successfully",
|
||||
@@ -161,7 +158,6 @@ class UserPatchEventMethods(MethodToEvent):
|
||||
def user_patch(cls, data: PatchRecord, user_uu_id: str, token_dict):
|
||||
find_one_user = Users.filter_one(
|
||||
Users.uu_id == user_uu_id,
|
||||
*Users.valid_record_args(Users),
|
||||
).data
|
||||
access_authorized_company = Companies.select_action(
|
||||
duty_id_list=[getattr(token_dict, "duty_id", 5)],
|
||||
|
||||
Reference in New Issue
Block a user