evyos-center-server/wag-managment-api-service-version-2
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test application updated@build living space

Browse Source
This commit is contained in:
berkay
2024-11-15 19:23:08 +03:00
parent d2cc195ccf
commit 7e1b26f3c4
44 changed files with 261 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api_events/events/decision_book/decision_book_decision_book.py
View File

@@ -49,13 +49,11 @@ class DecisionBookListEventMethods(MethodToEvent):
BuildDecisionBook.filter_attr = list_options
records = BuildDecisionBook.filter_all(
BuildDecisionBook.build_id.in_([build.id for build in build_id_list]),
*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.valid_record_args(BuildDecisionBook),
).data
return AlchemyJsonResponse(
completed=True,
@@ -84,7 +82,6 @@ class DecisionBookCreateEventMethods(MethodToEvent):
)
build = Build.filter_one(
Build.uu_id == data.build_uu_id,
*Build.valid_record_args(Build),
).data
if not build:
raise HTTPException(
@@ -101,7 +98,6 @@ class DecisionBookCreateEventMethods(MethodToEvent):
)
company = Companies.filter_one(
Companies.uu_id == data.resp_company_uu_id,
*Companies.valid_record_args(Companies),
).data
if not company:
raise HTTPException(
@@ -143,11 +139,9 @@ class DecisionBookCreateEventMethods(MethodToEvent):
occupant_build = Build.filter_one(
Build.id == token_dict.selected_occupant.build_id,
*Build.valid_record_args(Build),
).data
occupant_company = Companies.filter_one(
Companies.id == token_dict.selected_occupant.responsible_company_id,
*Companies.valid_record_args(Companies),
).data
data_dict["build_id"] = occupant_build.id
data_dict["build_uu_id"] = str(occupant_build.uu_id)

8
api_events/events/decision_book/decision_book_decision_book_items.py
View File

@@ -44,7 +44,6 @@ class DecisionBookDecisionBookItemsListEventMethods(MethodToEvent):
):
decision_book = BuildDecisionBook.filter_one(
BuildDecisionBook.uu_id == data.build_decision_book_uu_id,
*BuildDecisionBook.valid_record_args(BuildDecisionBook),
).data
if not decision_book:
raise HTTPException(
@@ -105,7 +104,6 @@ class DecisionBookDecisionBookItemsListEventMethods(MethodToEvent):
# )
# BuildDecisionBookItems.filter_attr = list_options
# records = BuildDecisionBookItems.filter_all(
# *BuildDecisionBookItems.valid_record_args(BuildDecisionBookItems)
# )
# return return_json_response_from_alchemy(response=records, pagination=list_options)
return
@@ -178,7 +176,6 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
build_parts_list = BuildParts.filter_all(
BuildParts.human_livable == True,
BuildParts.build_id == build_id,
*BuildParts.valid_record_args(BuildParts)
)
book_payment_dict = dict(
payment_plan_time_periods=str(data_info_type.key),
@@ -236,7 +233,6 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
management_room = BuildParts.filter_one(
BuildParts.build_id == build_id,
BuildParts.part_no == 0,
*BuildParts.valid_record_args(BuildParts),
).data
occupant_man = OccupantTypes.filter_by_one(
occupant_code="MT-VPR", occupant_category_type="MT"
@@ -244,7 +240,6 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
manager_living_space = BuildLivingSpace.filter_one(
BuildLivingSpace.build_parts_id == management_room.id,
BuildLivingSpace.occupant_type == occupant_man.id,
*BuildLivingSpace.valid_record_args(BuildLivingSpace),
).data
if not manager_living_space.data:
raise HTTPException(
@@ -325,11 +320,9 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
decision_book_person = BuildDecisionBookPerson.filter_one(
BuildDecisionBookPerson.token == data.token,
*BuildDecisionBookPerson.valid_record_args(BuildDecisionBookPerson),
).data
decision_book = BuildDecisionBook.filter_one(
BuildDecisionBook.id == decision_book_person.build_decision_book_id,
*BuildDecisionBook.valid_record_args(BuildDecisionBook),
).data
BuildDecisionBookItems.check_meeting_is_valid_to_start_add_attendance(
decision_book=decision_book,
@@ -337,7 +330,6 @@ class DecisionBookDecisionBookItemsCreateEventMethods(MethodToEvent):
)
book_items = BuildDecisionBookItems.filter_all(
BuildDecisionBookItems.build_decision_book_id == decision_book.id,
*BuildDecisionBookItems.valid_record_args(BuildDecisionBookItems)
)
data_dict["item_order"] = int(book_items.count) + 1

4
api_events/events/decision_book/decision_book_decision_book_items_debits.py
View File

@@ -36,12 +36,10 @@ class DecisionBookDecisionBookItemsDebitsListEventMethods(MethodToEvent):
):
BuildDecisionBookItems.pre_query = BuildDecisionBookItems.filter_all(
BuildDecisionBookItems.decision_book_id == decision_book_id,
*BuildDecisionBookItems.valid_record_args(BuildDecisionBookItems)
).query
BuildDecisionBookItems.filter_attr = None
records = BuildDecisionBookItems.filter_all(
BuildDecisionBookItems.decision_book_id == decision_book_id,
*BuildDecisionBookItems.valid_record_args(BuildDecisionBookItems)
)
return AlchemyJsonResponse(
completed=True,
@@ -93,12 +91,10 @@ class DecisionBookDecisionBookItemsDebitsCreateEventMethods(MethodToEvent):
decision_book_items_debits["deleted_by"] = None
BuildDecisionBookItems.pre_query = BuildDecisionBookItems.filter_all(
BuildDecisionBookItems.decision_book_id == decision_book_id,
*BuildDecisionBookItems.valid_record_args(BuildDecisionBookItems)
).query
BuildDecisionBookItems.filter_attr = None
records = BuildDecisionBookItems.filter_all(
BuildDecisionBookItems.decision_book_id == decision_book_id,
*BuildDecisionBookItems.valid_record_args(BuildDecisionBookItems)
)
return AlchemyJsonResponse(
completed=True,

2
api_events/events/decision_book/decision_book_decision_book_person.py
View File

@@ -63,7 +63,6 @@ class DecisionBookPersonAddEventMethods(MethodToEvent):
elif isinstance(token_dict, OccupantTokenObject):
decision_book = BuildDecisionBook.filter_one(
BuildDecisionBook.uu_id == data.build_decision_book_uu_id,
*BuildDecisionBook.valid_record_args(BuildDecisionBook),
).data
if not decision_book:
raise HTTPException(
@@ -281,7 +280,6 @@ class DecisionBookPersonAssignOccupantEventMethods(MethodToEvent):
build_parts_of_token = BuildParts.filter_all(
BuildParts.build_id == token_dict.selected_occupant.build_id,
*BuildParts.valid_record_args(BuildParts),
).data
selected_living_space = BuildLivingSpace.filter_one(
BuildLivingSpace.uu_id == data.build_living_space_uu_id,

8
api_events/events/decision_book/decision_book_invitations.py
View File

@@ -137,7 +137,6 @@ class BuildDecisionBookInvitationsCreateEventMethods(MethodToEvent):
# Get all the parts of the building that is occupant in token
build_parts = BuildParts.filter_all(
BuildParts.build_id == occupant_building.id,
*BuildParts.valid_record_args(BuildParts),
)
# Get all build living spaces that is found in building with distinct person id
@@ -188,7 +187,6 @@ class BuildDecisionBookInvitationsCreateEventMethods(MethodToEvent):
BuildDecisionBookPerson.invite_id == book_invitation.id,
BuildDecisionBookPerson.build_living_space_id
== build_living_spaces_user.id,
*BuildDecisionBookPerson.valid_record_args(BuildDecisionBookPerson),
).data:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
@@ -219,7 +217,6 @@ class BuildDecisionBookInvitationsCreateEventMethods(MethodToEvent):
manager_living_spaces = BuildLivingSpace.filter_all(
BuildLivingSpace.person_id == token_dict.person_id,
*BuildLivingSpace.valid_record_args(BuildLivingSpace),
)
manager_people = BuildDecisionBookPerson.filter_all(
BuildDecisionBookPerson.invite_id == book_invitation.id,
@@ -229,14 +226,11 @@ class BuildDecisionBookInvitationsCreateEventMethods(MethodToEvent):
for manager_living_space in manager_living_spaces.data
]
),
*BuildLivingSpace.valid_record_args(BuildLivingSpace),
)
manager_people_occupants = BuildDecisionBookPersonOccupants.filter_all(
BuildDecisionBookPersonOccupants.build_decision_book_person_id
== manager_people.get(1).id,
*BuildDecisionBookPersonOccupants.valid_record_args(
BuildDecisionBookPersonOccupants
),
)
manager_people_occupants.query.delete()
manager_people.query.delete()