orm get dict and id columns mappers updated

This commit is contained in:
2024-11-09 12:47:58 +03:00
parent df5927e5ac
commit e7a9b8c313
15 changed files with 233 additions and 129 deletions

View File

@@ -23,11 +23,11 @@ class AccountBooks(CrudCollection):
country: Mapped[str] = mapped_column(String, nullable=False)
branch_type: Mapped[str] = mapped_column(SmallInteger, server_default="0")
company_id: Mapped[Identity] = mapped_column(
company_id: Mapped[int] = mapped_column(
ForeignKey("companies.id"), nullable=False
)
company_uu_id: Mapped[UUID] = mapped_column(String, nullable=False)
branch_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
branch_id: Mapped[int] = mapped_column(ForeignKey("companies.id"))
branch_uu_id: Mapped[UUID] = mapped_column(String, comment="Branch UU ID")
# company: Mapped["Companies"] = relationship(
@@ -68,7 +68,7 @@ class AccountCodes(CrudCollection):
)
is_receive_or_debit: Mapped[bool] = mapped_column(Boolean)
product_id: Mapped[Identity] = mapped_column(Integer, server_default="0")
product_id: Mapped[int] = mapped_column(Integer, server_default="0")
nvi_id: Mapped[str] = mapped_column(String(48), server_default="")
status_id: Mapped[int] = mapped_column(SmallInteger, server_default="0")
account_code_seperator: Mapped[str] = mapped_column(String(1), server_default=".")
@@ -76,15 +76,15 @@ class AccountCodes(CrudCollection):
system_id: Mapped[int] = mapped_column(SmallInteger, server_default="0")
locked: Mapped[bool] = mapped_column(SmallInteger, server_default="0")
company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
company_id: Mapped[int] = mapped_column(ForeignKey("companies.id"))
company_uu_id: Mapped[UUID] = mapped_column(
String, nullable=False, comment="Company UU ID"
)
customer_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
customer_id: Mapped[int] = mapped_column(ForeignKey("companies.id"))
customer_uu_id: Mapped[UUID] = mapped_column(
String, nullable=False, comment="Customer UU ID"
)
person_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
person_id: Mapped[int] = mapped_column(ForeignKey("people.id"))
person_uu_id: Mapped[UUID] = mapped_column(
String, nullable=False, comment="Person UU ID"
)
@@ -123,7 +123,7 @@ class AccountCodeParser(CrudCollection):
account_code_5: Mapped[str] = mapped_column(String, server_default="")
account_code_6: Mapped[str] = mapped_column(String, server_default="")
account_code_id: Mapped[Identity] = mapped_column(
account_code_id: Mapped[int] = mapped_column(
ForeignKey("account_codes.id"), nullable=False
)
account_code_uu_id: Mapped[UUID] = mapped_column(
@@ -201,19 +201,19 @@ class AccountMaster(CrudCollection):
data_center_id: Mapped[str] = mapped_column(String, server_default="")
data_center_rec_num: Mapped[int] = mapped_column(Integer, server_default="0")
account_header_id: Mapped[Identity] = mapped_column(
account_header_id: Mapped[int] = mapped_column(
ForeignKey("account_books.id"), nullable=False
)
account_header_uu_id: Mapped[UUID] = mapped_column(
String, nullable=False, comment="Account Header UU ID"
)
project_item_id: Mapped[Identity] = mapped_column(
project_item_id: Mapped[int] = mapped_column(
ForeignKey("build_decision_book_projects.id")
)
project_item_uu_id: Mapped[UUID] = mapped_column(
String, comment="Project Item UU ID"
)
department_id: Mapped[Identity] = mapped_column(ForeignKey("departments.id"))
department_id: Mapped[int] = mapped_column(ForeignKey("departments.id"))
department_uu_id: Mapped[UUID] = mapped_column(String, comment="Department UU ID")
# account_header: Mapped["AccountBooks"] = relationship(
@@ -292,29 +292,29 @@ class AccountDetail(CrudCollection):
data_center_rec_num: Mapped[str] = mapped_column(Integer, server_default="0")
status_id: Mapped[int] = mapped_column(SmallInteger, server_default="0")
plug_type_id: Mapped[Identity] = mapped_column(
plug_type_id: Mapped[int] = mapped_column(
ForeignKey("api_enum_dropdown.id"), nullable=True
)
plug_type_uu_id = mapped_column(String, nullable=False, comment="Plug Type UU ID")
account_header_id: Mapped[Identity] = mapped_column(
account_header_id: Mapped[int] = mapped_column(
ForeignKey("account_books.id"), nullable=False
)
account_header_uu_id: Mapped[UUID] = mapped_column(
String, nullable=False, comment="Account Header UU ID"
)
account_code_id: Mapped[Identity] = mapped_column(
account_code_id: Mapped[int] = mapped_column(
ForeignKey("account_codes.id"), nullable=False
)
account_code_uu_id: Mapped[UUID] = mapped_column(
String, nullable=False, comment="Account Code UU ID"
)
account_master_id: Mapped[Identity] = mapped_column(
account_master_id: Mapped[int] = mapped_column(
ForeignKey("account_master.id"), nullable=False
)
account_master_uu_id: Mapped[UUID] = mapped_column(
String, nullable=False, comment="Account Master UU ID"
)
project_id: Mapped[Identity] = mapped_column(
project_id: Mapped[int] = mapped_column(
ForeignKey("build_decision_book_projects.id")
)
project_uu_id: Mapped[UUID] = mapped_column(String, comment="Project UU ID")
@@ -444,43 +444,43 @@ class AccountRecords(CrudCollection):
approved_record: Mapped[bool] = mapped_column(Boolean, server_default="0")
import_file_name = mapped_column(String, nullable=True, comment="XLS Key")
receive_debit: Mapped[Identity] = mapped_column(ForeignKey("api_enum_dropdown.id"))
receive_debit: Mapped[int] = mapped_column(ForeignKey("api_enum_dropdown.id"))
receive_debit_uu_id = mapped_column(String, nullable=True, comment="Debit UU ID")
budget_type: Mapped[Identity] = mapped_column(
budget_type: Mapped[int] = mapped_column(
ForeignKey("api_enum_dropdown.id"), nullable=True
)
budget_type_uu_id = mapped_column(
String, nullable=True, comment="Budget Type UU ID"
)
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="Company UU ID")
send_company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
send_company_id: Mapped[int] = mapped_column(ForeignKey("companies.id"))
send_company_uu_id = mapped_column(
String, nullable=True, comment="Send Company UU ID"
)
customer_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
customer_id: Mapped[int] = mapped_column(ForeignKey("people.id"))
customer_uu_id = mapped_column(String, nullable=True, comment="Customer UU ID")
send_person_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
send_person_id: Mapped[int] = mapped_column(ForeignKey("people.id"))
send_person_uu_id = mapped_column(
String, nullable=True, comment="Send Person UU ID"
)
approving_accounting_person: Mapped[Identity] = mapped_column(
approving_accounting_person: Mapped[int] = mapped_column(
ForeignKey("people.id")
)
approving_accounting_person_uu_id = mapped_column(
String, nullable=True, comment="Approving Accounting Person UU ID"
)
# build_id: Mapped[Identity] = mapped_column(ForeignKey("build.id"), nullable=True)
build_parts_id: Mapped[Identity] = mapped_column(ForeignKey("build_parts.id"))
build_parts_uu_id = mapped_column(
# build_id: Mapped[int] = mapped_column(ForeignKey("build.id"), nullable=True)
build_parts_id: Mapped[int] = mapped_column(ForeignKey("build_parts.id"))
build_parts_uu_id: Mapped[UUID] = mapped_column(
String, nullable=True, comment="Build Parts UU ID"
)
build_decision_book_id: Mapped[Identity] = mapped_column(
build_decision_book_id: Mapped[int] = mapped_column(
ForeignKey("build_decision_book.id")
)
build_decision_book_uu_id = mapped_column(
build_decision_book_uu_id: Mapped[UUID] = mapped_column(
String, nullable=True, comment="Build Decision Book UU ID"
)
@@ -537,7 +537,7 @@ class AccountRecords(CrudCollection):
"comment": "Bank Records that are related to building and financial transactions"
},
)
#
# def payment_budget_record_close(self):
# from database_sql_models import (
# DecisionBookProjectPaymentsMaster,

View File

@@ -25,7 +25,7 @@ class BuildIbans(CrudCollection):
bank_code: Mapped[str] = mapped_column(String(24), server_default="TR0000000000000")
xcomment: Mapped[str] = mapped_column(String(64), server_default="????")
build_id: Mapped[Identity] = mapped_column(
build_id: Mapped[int] = mapped_column(
ForeignKey("build.id"), nullable=False, comment="Building ID"
)
build_uu_id: Mapped[str] = mapped_column(
@@ -67,21 +67,21 @@ class BuildIbanDescription(CrudCollection):
String, nullable=False, comment="Search Word", index=True
)
decision_book_project_id: Mapped[Identity] = mapped_column(
decision_book_project_id: Mapped[int] = mapped_column(
ForeignKey("build_decision_book_projects.id")
)
decision_book_project_uu_id: Mapped[str] = mapped_column(
String, nullable=False, comment="Decision Book Project UUID"
)
customer_id: Mapped[Identity] = mapped_column(ForeignKey("people.id"))
customer_id: Mapped[int] = mapped_column(ForeignKey("people.id"))
customer_uu_id: Mapped[str] = mapped_column(
String, nullable=False, comment="Customer UUID"
)
company_id: Mapped[Identity] = mapped_column(ForeignKey("companies.id"))
company_id: Mapped[int] = mapped_column(ForeignKey("companies.id"))
company_uu_id: Mapped[str] = mapped_column(
String, nullable=False, comment="Company UUID"
)
build_parts_id: Mapped[Identity] = mapped_column(ForeignKey("build_parts.id"))
build_parts_id: Mapped[int] = mapped_column(ForeignKey("build_parts.id"))
build_parts_uu_id: Mapped[str] = mapped_column(
String, nullable=False, comment="Build Parts UUID"
)