get smart query removed

This commit is contained in:
2024-11-13 14:03:47 +03:00
parent 129e8015f3
commit 052d1f7b9c
17 changed files with 19 additions and 31 deletions

View File

@@ -46,15 +46,15 @@ class DecisionBookListEventMethods(MethodToEvent):
status_code=status.HTTP_404_NOT_FOUND,
detail=f"No building is match with given Employee UUID {token_dict.selected_company.employee_uu_id}",
)
BuildDecisionBook.filter_attr = list_options
records = BuildDecisionBook.filter_all(
BuildDecisionBook.build_id.in_([build.id for build in build_id_list]),
*BuildDecisionBook.get_smart_query(list_options.query),
*BuildDecisionBook.valid_record_args(BuildDecisionBook),
).data
elif isinstance(token_dict, OccupantTokenObject):
BuildDecisionBook.filter_attr = list_options
records = BuildDecisionBook.filter_all(
BuildDecisionBook.build_id == token_dict.selected_occupant.build_id,
*BuildDecisionBook.get_smart_query(list_options.query),
*BuildDecisionBook.valid_record_args(BuildDecisionBook),
).data
return AlchemyJsonResponse(

View File

@@ -27,6 +27,7 @@ from api_validations.validations_request import (
InsertBuildDecisionBookItems,
ListDecisionBook,
)
from service_app_test.test_application.evyos.datas.company_employee_data import list_options
class DecisionBookDecisionBookItemsListEventMethods(MethodToEvent):
@@ -103,8 +104,9 @@ class DecisionBookDecisionBookItemsListEventMethods(MethodToEvent):
# BuildDecisionBookItems.pre_query = BuildDecisionBookItems.select_action(
# occupant_id=token_dict.occupant_list["occupant_id"]
# )
# BuildDecisionBookItems.filter_attr = list_options
# records = BuildDecisionBookItems.filter_active(
# *BuildDecisionBookItems.get_smart_query(list_options.query)
# *BuildDecisionBookItems.valid_record_args(BuildDecisionBookItems)
# )
# return return_json_response_from_alchemy(response=records, pagination=list_options)
return