refactor: equipment master join equipment tree

main
MrWaradana 10 months ago
parent c3d191182e
commit 333cf1d68b

@ -44,10 +44,13 @@ class EquipmentMaster(Base, DefaultMixin):
"EquipmentMaster", backref=backref("parent", remote_side=[id]), lazy="selectin" "EquipmentMaster", backref=backref("parent", remote_side=[id]), lazy="selectin"
) )
# equipment_tree = relationship( equipment_tree = relationship(
# "EquipmentTree", "EquipmentTree",
# back_populates="equipment_master" lazy="selectin",
# ) primaryjoin="and_(EquipmentTree.id == foreign(EquipmentMaster.equipment_tree_id))",
viewonly=True,
uselist=False,
)
class EquipmentTree(Base, DefaultMixin): class EquipmentTree(Base, DefaultMixin):

@ -1,4 +1,3 @@
from datetime import datetime from datetime import datetime
from typing import ForwardRef, List, Optional from typing import ForwardRef, List, Optional
from uuid import UUID from uuid import UUID
@ -18,20 +17,27 @@ class EquipmentMasterCreate(EquipmentMasterBase):
pass pass
class EquipmentTree(DefaultBase):
level_no: Optional[int] = Field(None, nullable=True)
name: Optional[str] = Field(None, nullable=True)
class EquipmentMasterUpdate(EquipmentMasterBase): class EquipmentMasterUpdate(EquipmentMasterBase):
pass pass
EquipmentMasterReadRef = ForwardRef('EquipmentMasterRead')
EquipmentMasterReadRef = ForwardRef("EquipmentMasterRead")
class EquipmentMasterRead(EquipmentMasterBase): class EquipmentMasterRead(EquipmentMasterBase):
id: UUID id: UUID
equipment_tree_id: Optional[UUID] = Field(None, nullable=True) equipment_tree_id: Optional[UUID] = Field(None, nullable=True)
equipment_tree: EquipmentTree
category_id: Optional[UUID] = Field(None, nullable=True) category_id: Optional[UUID] = Field(None, nullable=True)
system_tag: Optional[str] = Field(None, nullable=True) system_tag: Optional[str] = Field(None, nullable=True)
assetnum: Optional[str] = Field(None, nullable=True) assetnum: Optional[str] = Field(None, nullable=True)
location_tag: Optional[str] = Field(None, nullable=True) location_tag: Optional[str] = Field(None, nullable=True)
children: List[EquipmentMasterReadRef] # type: ignore children: List[EquipmentMasterReadRef] # type: ignore
class EquipmentMasterPaginated(Pagination): class EquipmentMasterPaginated(Pagination):

Loading…
Cancel
Save