evyos-center-server/production-evyos-systems-and-services-3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

payment re-arragend tru raw sql

Browse Source
This commit is contained in:
Berkay
2025-07-13 19:42:22 +03:00
parent 9edc6cb6a0
commit 2fe8375be2
12 changed files with 607 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ServicesApi/Schemas/building/build.py
View File

@@ -148,7 +148,7 @@ class Build(CrudCollection):
site_uu_id: Mapped[str] = mapped_column(String, comment="Site UUID", nullable=True)
address_id: Mapped[int] = mapped_column(ForeignKey("addresses.id"), nullable=False)
address_uu_id: Mapped[str] = mapped_column(String, comment="Address UUID", nullable=False)
build_types_id: Mapped[int] = mapped_column(ForeignKey("build_types.id"), nullable=False, comment="Building Type")
build_types_id: Mapped[int] = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=False, comment="Building Type")
build_types_uu_id: Mapped[str] = mapped_column(String, comment="Building Type UUID")
parts: Mapped[List["BuildParts"]] = relationship("BuildParts", back_populates="buildings", foreign_keys="BuildParts.build_id")
@@ -238,8 +238,8 @@ class Build(CrudCollection):
building_types = None
for part in self.parts:
building_types = {}
build_type = BuildTypes.query.filter(
BuildTypes.id == part.build_part_type_id
build_type = ApiEnumDropdown.query.filter(
ApiEnumDropdown.id == part.part_type_id
).first()
if not build_type:
raise HTTPException(
@@ -316,7 +316,7 @@ class BuildParts(CrudCollection):
String, nullable=True, comment="Part Direction UUID"
)
part_type_id: Mapped[int] = mapped_column(
ForeignKey("build_types.id"), nullable=False, comment="Building Part Type"
ForeignKey("api_enum_dropdown.id"), nullable=False, comment="Building Part Type"
)
part_type_uu_id: Mapped[str] = mapped_column(
String, nullable=False, comment="Building Part Type UUID"
@@ -332,9 +332,9 @@ class BuildParts(CrudCollection):
)
def part_name(self, db):
BuildTypes.set_session(db)
if build_type := BuildTypes.query.filter(
BuildTypes.id == self.part_type_id
ApiEnumDropdown.set_session(db)
if build_type := ApiEnumDropdown.query.filter(
ApiEnumDropdown.id == self.part_type_id
).first():
return f"{str(build_type.type_name).upper()} : {str(self.part_no).upper()}"
return f"Undefined:{str(build_type.type_name).upper()}"
@@ -488,7 +488,7 @@ class BuildArea(CrudCollection):
build_id: Mapped[int] = mapped_column(ForeignKey("build.id"))
build_uu_id: Mapped[str] = mapped_column(String, comment="Building UUID")
part_type_id: Mapped[int] = mapped_column(
ForeignKey("build_types.id"), nullable=True, comment="Building Part Type"
ForeignKey("api_enum_dropdown.id"), nullable=True, comment="Building Part Type"
)
part_type_uu_id: Mapped[str] = mapped_column(
String, nullable=True, comment="Building Part Type UUID"