From 333cf1d68b881934f0083f95028c71fb8ec09286 Mon Sep 17 00:00:00 2001
From: MrWaradana <muhammadridhowaradana@gmail.com>
Date: Tue, 4 Mar 2025 13:00:58 +0700
Subject: [PATCH] refactor: equipment master join equipment tree

---
 .../__pycache__/schema.cpython-311.pyc        | Bin 10736 -> 10736 bytes
 .../__pycache__/model.cpython-311.pyc         | Bin 2405 -> 2606 bytes
 .../__pycache__/schema.cpython-311.pyc        | Bin 2828 -> 3307 bytes
 src/equipment_master/model.py                 |  11 +++++++----
 src/equipment_master/schema.py                |  14 ++++++++++----
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/equipment/__pycache__/schema.cpython-311.pyc b/src/equipment/__pycache__/schema.cpython-311.pyc
index 8e257be96cee90194a9d2b951a1b855e66540058..e9461c1c50e6e6f3b759f2a026b25331c1b03182 100644
GIT binary patch
delta 20
acmewm{2`coIWI340}y<jcx)s0Q%wL)e+P2_

delta 20
acmewm{2`coIWI340}xml9N5VHR1*M3{svJ1

diff --git a/src/equipment_master/__pycache__/model.cpython-311.pyc b/src/equipment_master/__pycache__/model.cpython-311.pyc
index 7f2575cfe93a6c67c7d39755936a86d41b91676d..1f317bfc16501cdb1de00c11e8fd6e9ce72319f3 100644
GIT binary patch
delta 450
zcmaDVv`&O?IWI340}y0RI+o7Qv5_x}k@3LhO2+w&YD^5Nf++$id?|t{Oet(@gqE=~
zFsue*2#69%5e{b16qzi?e7*h_uWMmxW<hRhUP(w%YHF2BVqQwT28x(oW{QHXtwLIU
zQEFy-9zxDHvA86)NG}zpKfVNLKzwG3rluxKkv!0@TigXjnYoEYm09_jdAB&qGE>X*
z^KvS0v6mL7=42L^_-Tqx{=s}i;1(aM8I$+01Twa6=3|Xz)cwH0Af_}S<_3rO4PNmZ
zB2hO4MQ;d*e&A*kWBbSeB)))%20suiGMQY+mc?460JM7YD>hjH6(FNX6-20k2#v|&
z?6PuNAf_>hFaZ&!AVL8~SWFILcVPodC`_Ki-YXB5K~?>W!zMRBr8FniuE=(>2gi0D
ebw;)i44A}(lo>uBLE>K!k|C3|In7u=<^uqW{C%GQ

delta 272
zcmZ1{@>Ga#IWI340}yCgC#KJ4-^iE6$hcs0CF6WXwiJP222H`qcFfnA{WL`;PhmMS
zIfFHjF>doN)>uZi29E}hBK^rO>{&LqcwGxiGYfK4^GZUBQd4gU<`&1N!bIXrfI@CX
z5<n~bG&zeDfOL@}h)@C%Dw7|u%gU*Nn0g>WA4C{{2qPF_I$4^-g$*oWG&z-{R~{^b
xs`?j)O>TZlX-=wLk>zAT&h0w#jBFnmFo_8%GkiXR#J?aU{U(3mG-Cmo4*-GEL?ZwI

diff --git a/src/equipment_master/__pycache__/schema.cpython-311.pyc b/src/equipment_master/__pycache__/schema.cpython-311.pyc
index bdbe183051d38a3c870e7cca2225ff014c8fa2b8..18e3728d77274d61f2ba3de1c77fa38593fe1c72 100644
GIT binary patch
delta 837
zcmZXSO=}ZD7{_P!J-gXW($q8wB_{0#n#8s$zF-<l6-7kor9DU~l)w(9kS6UU^{72~
z@E~d(1igBQ2YV^`3hKdwBp@ikFCbo0?8%eQvq{l5vopVaUjEO({@JIoUkT@(ZJPwv
z+{;hvWp&SqOF_Cf_56|9lnHqcr@vMliQFMx@G<dh7ChApNrXwB)1)u~XD|`=Cqgjc
z3{6D*UKn~2W}Uii#2Z;6QZCvWr?(^;XqDv@rD3tF%$UmH?%!MD8Lh2)bcy7&u6=uZ
zXJc!VRU6BkvBhO>gRE;**aKEstJZiJ(wxbo@ZzJ0GYA8bL1=)kyislN7^W!aW8%Pw
zrqUQ9aIAhGu>0R5KIpD^BTv|E<q~Y3fId%)ure=xDB}qiQ-ohnVdh7!h^R9(FBa6h
z5;Mesnx(S%rWRC_>C6(kHe0q(*k4TX0woB+V%3v8d0%NtU^ATlTCs8Jgx*9wb6Ds^
z)xxSLfn!0Q73<nW$YIC6tu??n@kA?u&mXn3?i5IUTl|mbc}xq4F~m8<w2<}lp)7`o
zG@SZRaZ|r;jb_>k?v9daJ=7<ubrD4>A}jWdxOo9XL_vHpuILyo=Ayz1tS<PT&HB<~
z5szc!JC}s$k5SsJc{>$0&#yv?zgztkuqRVWzl*nl&v}Vn?vY`<xOa%vqkk<^+%OA8
ll5}4u+wQeaqWCpYY?D||GiaelhS5$=A7c4v&=VbV?k@t}pB4ZB

delta 543
zcmZXRKS)AR6vpp;>U+=o{%NmXJ}FVr{Fhk`QfjmW5kX5s5H7-dHMHqmQ)3WvmWE~>
zf+!ptqov89DJYs+S`4DOd!9m62hNX=?>qP21NYrNvGlH{F~aLsYwUOYZ9O6kNIQG#
zsvRF87rckHs|&;x9JNEa%X{P+0$C@Hc1#@g--(cy={z%B<<D(lC$vp+;ocHm6DaE)
z`eKxZ;oLt5HQo(zDi-H2G!YXhVh9@%=Xf&VS~lTQv}hde#0_{6Z9{e?*M}p+f{>J^
z49Zd=pzwsjo>W?3Ke_97f;B$sYOemvW#~ErUr%W!;7dwER<5oZO_STrafG*#gvvt5
zh!jFZq!BZSNkj&bg|0krBv2xvyj#!kCa?5L!6a3R7zDf&>MX)$Q6kcC#L5z?t=t&g
zu)31>ro0?7%Cx!2C4NWifOFuZl)l1_au1tozABPv>MYt%EkD?mN4wG|*1#{(!hrlo
PKU(}i`*W1Rm0JA<(uZG)

diff --git a/src/equipment_master/model.py b/src/equipment_master/model.py
index d396928..f9d64ba 100644
--- a/src/equipment_master/model.py
+++ b/src/equipment_master/model.py
@@ -44,10 +44,13 @@ class EquipmentMaster(Base, DefaultMixin):
         "EquipmentMaster", backref=backref("parent", remote_side=[id]), lazy="selectin"
     )
 
-    # equipment_tree = relationship(
-    #     "EquipmentTree",
-    #     back_populates="equipment_master"
-    # )
+    equipment_tree = relationship(
+        "EquipmentTree",
+        lazy="selectin",
+        primaryjoin="and_(EquipmentTree.id == foreign(EquipmentMaster.equipment_tree_id))",
+        viewonly=True,
+        uselist=False,
+    )
 
 
 class EquipmentTree(Base, DefaultMixin):
diff --git a/src/equipment_master/schema.py b/src/equipment_master/schema.py
index 2adce2a..ed7baf1 100644
--- a/src/equipment_master/schema.py
+++ b/src/equipment_master/schema.py
@@ -1,4 +1,3 @@
-
 from datetime import datetime
 from typing import ForwardRef, List, Optional
 from uuid import UUID
@@ -18,20 +17,27 @@ class EquipmentMasterCreate(EquipmentMasterBase):
     pass
 
 
+class EquipmentTree(DefaultBase):
+    level_no: Optional[int] = Field(None, nullable=True)
+    name: Optional[str] = Field(None, nullable=True)
+
+
 class EquipmentMasterUpdate(EquipmentMasterBase):
     pass
 
-EquipmentMasterReadRef = ForwardRef('EquipmentMasterRead')
+
+EquipmentMasterReadRef = ForwardRef("EquipmentMasterRead")
+
 
 class EquipmentMasterRead(EquipmentMasterBase):
     id: UUID
     equipment_tree_id: Optional[UUID] = Field(None, nullable=True)
+    equipment_tree: EquipmentTree
     category_id: Optional[UUID] = Field(None, nullable=True)
     system_tag: Optional[str] = Field(None, nullable=True)
     assetnum: 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):