orm get dict and id columns mappers updated

2024-11-09 12:47:58 +03:00
parent df5927e5ac
commit e7a9b8c313
15 changed files with 233 additions and 129 deletions
--- a/databases/sql_models/building/build.py
+++ b/databases/sql_models/building/build.py
@@ -150,10 +150,10 @@ class Part2Employee(CrudCollection):
    __include__fields__ = []

    build_id: Mapped[int] = mapped_column(Integer, comment="Building ID")
-    part_id: Mapped[Identity] = mapped_column(
+    part_id: Mapped[int] = mapped_column(
        ForeignKey("build_parts.id"), nullable=False, comment="Part ID"
    )
-    employee_id: Mapped[Identity] = mapped_column(
+    employee_id: Mapped[int] = mapped_column(
        ForeignKey("employees.id"), nullable=False, comment="Employee ID"
    )

@@ -173,13 +173,13 @@ class RelationshipEmployee2Build(CrudCollection):
    __tablename__ = "relationship_employee2build"
    __exclude__fields__ = []

-    company_id: Mapped[Identity] = mapped_column(
+    company_id: Mapped[int] = mapped_column(
        ForeignKey("companies.id"), nullable=False
    )  # 1, 2, 3
-    employee_id: Mapped[Identity] = mapped_column(
+    employee_id: Mapped[int] = mapped_column(
        ForeignKey("employees.id"), nullable=False
    )  # employee -> (n)person Evyos LTD
-    member_id: Mapped[Identity] = mapped_column(
+    member_id: Mapped[int] = mapped_column(
        ForeignKey("build.id"), nullable=False
    )  # 2, 3, 4

@@ -255,9 +255,9 @@ class Build(CrudCollection, SelectActionWithEmployee):
        Integer, nullable=True, comment="Management Room ID"
    )

-    site_id: Mapped[Identity] = mapped_column(ForeignKey("build_sites.id"))
+    site_id: Mapped[int] = mapped_column(ForeignKey("build_sites.id"))
    site_uu_id: Mapped[str] = mapped_column(String, comment="Site UUID")
-    address_id: Mapped[Identity] = mapped_column(ForeignKey("addresses.id"))
+    address_id: Mapped[int] = mapped_column(ForeignKey("addresses.id"))
    address_uu_id: Mapped[str] = mapped_column(String, comment="Address UUID")
    build_types_id = mapped_column(
        ForeignKey("build_types.id"), nullable=False, comment="Building Type"
@@ -452,7 +452,7 @@ class BuildParts(CrudCollection):
    build_uu_id: Mapped[str] = mapped_column(
        String, nullable=False, comment="Building UUID"
    )
-    part_direction_id: Mapped[Identity] = mapped_column(
+    part_direction_id: Mapped[int] = mapped_column(
        ForeignKey("api_enum_dropdown.id"), nullable=True
    )
    part_direction_uu_id = mapped_column(
@@ -672,7 +672,7 @@ class BuildArea(CrudCollection):
    width = mapped_column(Integer, server_default="0")
    size = mapped_column(Integer, server_default="0")

-    build_id: Mapped[Identity] = mapped_column(ForeignKey("build.id"))
+    build_id: Mapped[int] = mapped_column(ForeignKey("build.id"))
    build_uu_id = mapped_column(String, comment="Building UUID")
    part_type_id = mapped_column(
        ForeignKey("build_types.id"), nullable=True, comment="Building Part Type"
@@ -702,7 +702,7 @@ class BuildSites(CrudCollection):
    site_name = mapped_column(String(24), nullable=False)
    site_no = mapped_column(String(8), nullable=False)

-    address_id: Mapped[Identity] = mapped_column(ForeignKey("addresses.id"))
+    address_id: Mapped[int] = mapped_column(ForeignKey("addresses.id"))
    address_uu_id = mapped_column(String, comment="Address UUID")

    # addresses: Mapped["Address"] = relationship(
@@ -729,9 +729,9 @@ class BuildCompaniesProviding(CrudCollection):
        ForeignKey("build.id"), nullable=False, comment="Building ID"
    )
    build_uu_id = mapped_column(String, nullable=True, comment="Providing UUID")
-    company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
+    company_id: Mapped[int] = mapped_column(ForeignKey("companies.id"))
    company_uu_id = mapped_column(String, nullable=True, comment="Providing UUID")
-    provide_id: Mapped[Identity] = mapped_column(
+    provide_id: Mapped[int] = mapped_column(
        ForeignKey("api_enum_dropdown.id"), nullable=True
    )
    provide_uu_id = mapped_column(String, nullable=True, comment="Providing UUID")
@@ -760,9 +760,9 @@ class BuildPersonProviding(CrudCollection):
        ForeignKey("build.id"), nullable=False, comment="Building ID"
    )
    build_uu_id = mapped_column(String, nullable=True, comment="Providing UUID")
-    people_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
+    people_id: Mapped[int] = mapped_column(ForeignKey("people.id"))
    people_uu_id = mapped_column(String, nullable=True, comment="People UUID")
-    provide_id: Mapped[Identity] = mapped_column(
+    provide_id: Mapped[int] = mapped_column(
        ForeignKey("api_enum_dropdown.id"), nullable=True
    )
    provide_uu_id = mapped_column(String, nullable=True, comment="Providing UUID")
@@ -836,9 +836,9 @@ class BuildPersonProviding(CrudCollection):
 # life_people: Mapped["People"] = relationship(
 #     "People", back_populates="life_living_spaces", foreign_keys=[life_person_id]
 # )
-# company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
-# response_company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
-# person_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
+# company_id: Mapped[int] = mapped_column(ForeignKey("companies.id"))
+# response_company_id: Mapped[int] = mapped_column(ForeignKey("companies.id"))
+# person_id: Mapped[int] = mapped_column(ForeignKey("people.id"))

 # companies: Mapped["Companies"] = relationship(
 #     "Companies", back_populates="buildings", foreign_keys=[company_id]
--- a/databases/sql_models/building/decision_book.py
+++ b/databases/sql_models/building/decision_book.py
@@ -69,15 +69,15 @@ class BuildDecisionBook(CrudCollection):
        TIMESTAMP, nullable=True, comment="Meeting Completed Date"
    )

-    build_id: Mapped[Identity] = mapped_column(ForeignKey("build.id"), nullable=False)
+    build_id: Mapped[int] = mapped_column(ForeignKey("build.id"), nullable=False)
    build_uu_id: Mapped[str] = mapped_column(
        String, nullable=True, comment="Build UUID"
    )
-    resp_company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
+    resp_company_id: Mapped[int] = mapped_column(ForeignKey("companies.id"))
    resp_company_uu_id: Mapped[str] = mapped_column(
        String, nullable=True, comment="Company UUID"
    )
-    contact_id: Mapped[Identity] = mapped_column(
+    contact_id: Mapped[int] = mapped_column(
        ForeignKey("contracts.id"), nullable=True, comment="Contract id"
    )
    contact_uu_id: Mapped[str] = mapped_column(
@@ -231,7 +231,7 @@ class BuildDecisionBookInvitations(CrudCollection):
    build_uu_id: Mapped[str] = mapped_column(
        String, nullable=True, comment="Build UUID"
    )
-    decision_book_id: Mapped[Identity] = mapped_column(
+    decision_book_id: Mapped[int] = mapped_column(
        ForeignKey("build_decision_book.id"), nullable=False
    )
    decision_book_uu_id: Mapped[str] = mapped_column(
@@ -367,7 +367,7 @@ class BuildDecisionBookPerson(CrudCollection):
    build_living_space_uu_id = mapped_column(
        String, nullable=True, comment="Living Space UUID"
    )
-    person_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"), nullable=False)
+    person_id: Mapped[int] = mapped_column(ForeignKey("people.id"), nullable=False)
    # person_uu_id: Mapped[str] = mapped_column(String, nullable=False, comment="Person UUID")

    __table_args__ = (
@@ -508,7 +508,7 @@ class BuildDecisionBookPersonOccupants(CrudCollection):
        String, nullable=True, comment="Invite UUID"
    )

-    occupant_type_id: Mapped[Identity] = mapped_column(
+    occupant_type_id: Mapped[int] = mapped_column(
        ForeignKey("occupant_types.id"), nullable=False
    )
    occupant_type_uu_id: Mapped[str] = mapped_column(
@@ -549,7 +549,7 @@ class BuildDecisionBookItems(CrudCollection):
        Boolean, server_default="0", comment="Are payment Records Created"
    )

-    info_type_id: Mapped[Identity] = mapped_column(
+    info_type_id: Mapped[int] = mapped_column(
        ForeignKey("api_enum_dropdown.id"), nullable=True
    )
    info_type_uu_id: Mapped[str] = mapped_column(
@@ -766,7 +766,7 @@ class BuildDecisionBookItemsUnapproved(CrudCollection):
    decision_book_item_uu_id = mapped_column(
        String, nullable=True, comment="Decision Book Item"
    )
-    person_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"), nullable=False)
+    person_id: Mapped[int] = mapped_column(ForeignKey("people.id"), nullable=False)
    person_uu_id: Mapped[str] = mapped_column(
        String, nullable=True, comment="Person UUID"
    )
@@ -804,7 +804,7 @@ class BuildDecisionBookPayments(CrudCollection):
    )
    currency: Mapped[str] = mapped_column(String(8), server_default="TRY")

-    payment_types_id: Mapped[Identity] = mapped_column(
+    payment_types_id: Mapped[int] = mapped_column(
        ForeignKey("api_enum_dropdown.id"), nullable=True
    )
    payment_types_uu_id: Mapped[str] = mapped_column(
@@ -832,24 +832,24 @@ class BuildDecisionBookPayments(CrudCollection):
        String, nullable=True, comment="Decision Book Project UUID"
    )

-    build_parts_id: Mapped[Identity] = mapped_column(
+    build_parts_id: Mapped[int] = mapped_column(
        ForeignKey("build_parts.id"), nullable=False
    )
    build_parts_uu_id: Mapped[str] = mapped_column(
        String, nullable=True, comment="Build Part UUID"
    )

-    budget_records_id: Mapped[Identity] = mapped_column(
+    budget_records_id: Mapped[int] = mapped_column(
        ForeignKey("account_records.id")
    )
    budget_records_uu_id: Mapped[str] = mapped_column(
        String, nullable=True, comment="Budget UUID"
    )
-    accounting_id: Mapped[Identity] = mapped_column(ForeignKey("account_detail.id"))
+    accounting_id: Mapped[int] = mapped_column(ForeignKey("account_detail.id"))
    accounting_uu_id: Mapped[str] = mapped_column(
        String, nullable=True, comment="Accounting UUID"
    )
-    # receive_debit_id: Mapped[Identity] = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
+    # receive_debit_id: Mapped[int] = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
    # receive_debit_uu_id: Mapped[str] = mapped_column(String, nullable=True, comment="Debit UUID")

    # accounting: Mapped["AccountDetail"] = relationship(
@@ -932,17 +932,17 @@ class BuildDecisionBookLegal(CrudCollection):
    build_db_item_uu_id = mapped_column(
        String, nullable=True, comment="Decision Book Item UUID"
    )
-    resp_attorney_id: Mapped[Identity] = mapped_column(
+    resp_attorney_id: Mapped[int] = mapped_column(
        ForeignKey("people.id"), nullable=False
    )
    resp_attorney_uu_id = mapped_column(String, nullable=True, comment="Attorney UUID")
-    resp_attorney_company_id: Mapped[Identity] = mapped_column(
+    resp_attorney_company_id: Mapped[int] = mapped_column(
        ForeignKey("companies.id")
    )
    resp_attorney_company_uu_id = mapped_column(
        String, nullable=True, comment="Company UUID"
    )
-    mediator_lawyer_person_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
+    mediator_lawyer_person_id: Mapped[int] = mapped_column(ForeignKey("people.id"))
    mediator_lawyer_person_uu_id = mapped_column(
        String, nullable=True, comment="Mediator Lawyer UUID"
    )
@@ -1014,7 +1014,7 @@ class BuildDecisionBookProjects(CrudCollection):
    project_response_living_space_uu_id = mapped_column(
        String, nullable=True, comment="Project Response Person UUID"
    )
-    resp_company_id: Mapped[Identity] = mapped_column(
+    resp_company_id: Mapped[int] = mapped_column(
        ForeignKey("companies.id"), nullable=True
    )
    resp_company_uu_id = mapped_column(String, nullable=True, comment="Company UUID")
@@ -1119,7 +1119,7 @@ class BuildDecisionBookProjectPerson(CrudCollection):
    build_decision_book_project_uu_id = mapped_column(
        String, nullable=True, comment="Decision Book Project UUID"
    )
-    living_space_id: Mapped[Identity] = mapped_column(
+    living_space_id: Mapped[int] = mapped_column(
        ForeignKey("build_living_space.id"), nullable=False
    )
    living_space_uu_id = mapped_column(
@@ -1155,7 +1155,7 @@ class BuildDecisionBookProjectPerson(CrudCollection):
 #         Numeric(20, 2), nullable=False, comment="Default Payment Amount"
 #     )
 #
-#     dues_types_id: Mapped[Identity] = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
+#     dues_types_id: Mapped[int] = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
 #     dues_types_uu_id = mapped_column(String, nullable=True, comment="Dues Type UUID")
 #     build_decision_book_item_debits_id = mapped_column(
 #         ForeignKey("build_decision_book_item_debits.id"), nullable=False
@@ -1163,7 +1163,7 @@ class BuildDecisionBookProjectPerson(CrudCollection):
 #     build_decision_book_item_debits_uu_id = mapped_column(
 #         String, nullable=True, comment="Decision Book Item Debit UUID"
 #     )
-#     build_parts_id: Mapped[Identity] = mapped_column(ForeignKey("build_parts.id"), nullable=False)
+#     build_parts_id: Mapped[int] = mapped_column(ForeignKey("build_parts.id"), nullable=False)
 #     build_parts_uu_id = mapped_column(String, nullable=True, comment="Build Part UUID")
 #
 #     # decision_books_item_debits: Mapped["BuildDecisionBookItemDebits"] = relationship(
@@ -1292,7 +1292,7 @@ class BuildDecisionBookProjectPerson(CrudCollection):
 #     __exclude__fields__ = []
 #     __enum_list__ = [("dues_types", "BuildDuesTypes", "D")]
 #
-#     dues_types_id: Mapped[Identity] = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
+#     dues_types_id: Mapped[int] = mapped_column(ForeignKey("api_enum_dropdown.id"), nullable=True)
 #     dues_types_uu_id = mapped_column(String, nullable=True, comment="Dues Type UUID")
 #     # dues_values = mapped_column(
 #     #     MutableDict.as_mutable(JSONB()),
@@ -1431,7 +1431,7 @@ class BuildDecisionBookProjectPerson(CrudCollection):
 #     process_date_w: Mapped[int] = mapped_column(SmallInteger)
 #     period_time = mapped_column(String(12), server_default="")
 #
-#     build_decision_book_id: Mapped[Identity] = mapped_column(ForeignKey("build_decision_book.id"))
+#     build_decision_book_id: Mapped[int] = mapped_column(ForeignKey("build_decision_book.id"))
 #     accounting_id = mapped_column(ForeignKey("account_detail.id"))
 #
 #     __table_args__ = (