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

alchemy functions updated

Browse Source
This commit is contained in:
berkay
2024-11-10 12:14:10 +03:00
parent 1f75e49a07
commit e01a2c8afb
24 changed files with 543 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
databases/sql_models/building/build.py
View File

@@ -341,15 +341,16 @@ class Build(CrudCollection, SelectActionWithEmployee):
@classmethod
def update_action(cls, data: UpdateBuild, build_uu_id: str, token):
from databases import Addresses
data_dict = data.excluded_dump()
if data.official_address_uu_id:
official_address = Addresses.filter_one(
Addresses.uu_id==data.address_uu_id
Addresses.uu_id == data.address_uu_id
).data
data_dict["address_id"] = official_address.id if official_address else None
del data_dict["address_uu_id"]
if build_to_update := cls.filter_one(
cls.uu_id==build_uu_id, cls.person_id==token.id
cls.uu_id == build_uu_id, cls.person_id == token.id
).data:
return build_to_update.update(**data_dict)
@@ -491,7 +492,7 @@ class BuildParts(CrudCollection):
)
if build_types := BuildTypes.filter_one(
BuildTypes.uu_id==data.build_part_type_uu_id
BuildTypes.uu_id == data.build_part_type_uu_id
).data:
part_direction = ApiEnumDropdown.get_by_uuid(
uuid=str(data.part_direction_uu_id)

33
databases/sql_models/building/decision_book.py
View File

@@ -406,9 +406,9 @@ class BuildDecisionBookPerson(CrudCollection):
**book_dict
):
decision_book = BuildDecisionBook.filter_one(
BuildDecisionBook.id==self.build_decision_book_id,
BuildDecisionBook.active==True,
BuildDecisionBook.is_confirmed==True
BuildDecisionBook.id == self.build_decision_book_id,
BuildDecisionBook.active == True,
BuildDecisionBook.is_confirmed == True,
).data
person_occupants.update(
expiry_starts=decision_book.expiry_starts,
@@ -417,8 +417,7 @@ class BuildDecisionBookPerson(CrudCollection):
if build_living_space_id:
related_service = Services.filter_by_one(
related_responsibility=str(occupant_type.occupant_code),
active=True,
is_confirmed=True,
*Services.valid_record_dict
)
if not related_service:
raise HTTPException(
@@ -427,9 +426,9 @@ class BuildDecisionBookPerson(CrudCollection):
)
decision_build = Build.filter_one(
Build.id==decision_book.build_id,
Build.active==True,
Build.is_confirmed==True
Build.id == decision_book.build_id,
Build.active == True,
Build.is_confirmed == True,
).data
management_room = decision_build.management_room
if not management_room:
@@ -439,16 +438,14 @@ class BuildDecisionBookPerson(CrudCollection):
)
living_space = BuildLivingSpace.filter_one(
BuildLivingSpace.id==build_living_space_id,
BuildLivingSpace.active==True,
BuildLivingSpace.is_confirmed==True
BuildLivingSpace.id == build_living_space_id,
BuildLivingSpace.active == True,
BuildLivingSpace.is_confirmed == True,
).data
expiry_ends = str(
system_arrow.get(decision_book.meeting_date).shift(hours=23)
)
expiry_starts = str(
system_arrow.get(decision_book.meeting_date)
)
expiry_starts = str(system_arrow.get(decision_book.meeting_date))
related_living_space = BuildLivingSpace.find_or_create(
build_parts_id=management_room.id,
build_parts_uu_id=str(management_room.uu_id),
@@ -481,10 +478,10 @@ class BuildDecisionBookPerson(CrudCollection):
def check_occupant_type(self, occupant_type):
book_person_occupant_type = BuildDecisionBookPersonOccupants.filter_one(
BuildDecisionBookPersonOccupants.build_decision_book_person_id==self.id,
BuildDecisionBookPersonOccupants.occupant_type_id==occupant_type.id,
BuildDecisionBookPersonOccupants.active==True,
BuildDecisionBookPersonOccupants.is_confirmed==True,
BuildDecisionBookPersonOccupants.build_decision_book_person_id == self.id,
BuildDecisionBookPersonOccupants.occupant_type_id == occupant_type.id,
BuildDecisionBookPersonOccupants.active == True,
BuildDecisionBookPersonOccupants.is_confirmed == True,
).data
if not book_person_occupant_type:
raise HTTPException(