From b467452fedd46cbe8eb89423634cb998ca9c5c72 Mon Sep 17 00:00:00 2001
From: MrWaradana <muhammadridhowaradana@gmail.com>
Date: Mon, 17 Nov 2025 13:15:30 +0700
Subject: [PATCH] feat: add collector db connection and maximo route for each
 equipment

---
 src/__pycache__/config.cpython-311.pyc        | Bin 3434 -> 4148 bytes
 src/__pycache__/main.cpython-311.pyc          | Bin 4858 -> 5301 bytes
 src/database/__pycache__/core.cpython-311.pyc | Bin 7427 -> 8628 bytes
 src/database/core.py                          |  50 ++++++++++--------
 .../__pycache__/model.cpython-311.pyc         | Bin 5113 -> 5325 bytes
 .../__pycache__/router.cpython-311.pyc        | Bin 7450 -> 11472 bytes
 .../__pycache__/schema.cpython-311.pyc        | Bin 11067 -> 11518 bytes
 .../__pycache__/service.cpython-311.pyc       | Bin 14452 -> 17065 bytes
 src/equipment/router.py                       |  13 ++++-
 src/equipment/service.py                      |  47 ++++++++++++++++
 src/main.py                                   |   5 +-
 src/modules/equipment/Eac.py                  |   4 +-
 .../equipment/__pycache__/Eac.cpython-311.pyc | Bin 15130 -> 15130 bytes
 .../equipment/__pycache__/run.cpython-311.pyc | Bin 2793 -> 2817 bytes
 14 files changed, 94 insertions(+), 25 deletions(-)

diff --git a/src/__pycache__/config.cpython-311.pyc b/src/__pycache__/config.cpython-311.pyc
index 1c86c540a64a326586a062264b829acaa488a744..953269a3a35863538a009578c449dde0b95eb310 100644
GIT binary patch
delta 895
zcmaDQwMBt%IWI340}wp<BbFJ<J&{j>DTjHZMif&$6GN(Kidu^L8op&r3=FG*7y_cy
z!7>`Dk|~;NgqJY`<$xF}rvaAJO3}v9r3seN!6Kstlwrw|hnWH738rc-o4l7%rd}JY
zNjF6b!#JH3rBuz?3@OT~+CWkzRUORM0FtVyI<pz(az*K;=tb#)_3Nh?VCdHe%NV8@
zVaOPyFa|Sd8ova(XY&!JYpnIRgq;0-d|aJF{Da~>{DVXM9DQA@gfmJ?3as??4K0oI
z49zU`4D~F`Zt)=$2KWbsWLk(aFx-+v2s#J3y14p<cslyThX%U_-Qp<7FD^+hN-e%6
zi&as8V{mY|uz!#XvdJLpC(q)jW;EO^#u>+0Ut|e%X^|C>xFr>j)fli{a@gg-R)B1f
ziVqC+4{>!tQU;SNvI7~;i!eJh$nzFQh^Mb>l)s;WYmq(30S+L74@B^T2mv7Ri^C>2
zKczG$)vhQ4$YliL;swl`*K(CJ)qh}P5R;h@c0tDAf|dUT(SVDh0aru=E-(n)5EP#v
zc0od8Mez=o3xbXp1s$&lIyUg#kX4=$c0tAdgwzGukc+Y*S7bvjFi71{R9_%=LBst*
zVDtsWn2U-rR}^C|Fv#7I)tC`FCwhhO3gHX7-WN4}u4wvPl=ZzL>kHBYvY;Ml!v;Mh
z^FOdK2u3np&~W;|0AfJM3$F1f+@um@E|6Wp=mu2^m+)i?M-gh^eZVc*zyb8Hh|~nL
R3sO24%t9{+PqyGS0svG4^B@2K

delta 175
zcmdm@@JfnrIWI340}vd{<;i@=F_BM#X$sRujVLC&6tyUICWche6!jF1HGIpM7#LOq
zF$6?ufMqmOv@m2eQy7C8G_^O+V7|pVnT4yGQEPJpR~)0|EshXRU)LyqKi48lpdm$8
rAc7A>@Ph~eAn}XCCO1E&G$+-r$PdV61mfatOq+Xo%9$p=<97o9P!T6x

diff --git a/src/__pycache__/main.cpython-311.pyc b/src/__pycache__/main.cpython-311.pyc
index bd90e128cab4928df6d253e78726ce200c47edd5..5a613dff8cc061dae2dea91cc2bdb792a78218ce 100644
GIT binary patch
delta 1300
zcmb7EO=uHA6rS1bW;fepYinzoHi~T;+f_+h`{Pe)ZKBm`{Xr~(5nR&U5mS@hFuTPf
z^#}3bK~R~C-g>HndeETYwTR#?m560Q5HE^?)SLDo&LoDmpa<X1yxsS`_vZaEyA*k*
z`tSSwGNANywkiGTjz0)bK50J%$Fe(<J0UQD(UjShjU{6cZ~(!H0cOew?Vg1IJfyo!
z$w8{`o~6RW3IrfPdr&M5lS5SJLqnthgUxZ&gW?m3ijme+`9g8h#RW(+SI@_1_K{kC
zEg9yTtYIXf{lSV6KnIL4OM;##qhSL+YMbR~OuEaI9HF?l(qolxg!vkqR$H9qjP~nQ
z$%809bEp(I%r}ysT%9nw0@*AarqU6n&m;aTggiMe1bl8lw=x-|I~LaRr-e}nqvXD4
z2=<ZBo)*|cWU+($$dO+0jpBGKNdn;1k>_H2i@<?tVRh4{!Gu_`(`52XRKp&#Aq<>#
z6%>FrfTc^~v}k~9oB=M0mql_&3PWEh`CFbEa$8awR~|G`8ZkRyW~EULJVIuq;Qu=+
z<crh*{iS$oz4c?B6F}vTs?hb?x|Ks`Crw>dT;6stuA)J4lrkzJ2iG#Og|R+{3AU4R
zkjok4xRuGi<!+L5-q0xtZ)dPqPh~QiiKZO9r7SyBnq!?urYqXWw$qmB)-JnNAPFNo
zXPGu~A+javxbY9+Uh>-8ERRrVkZzlhZ{AK`7P`qsxwYecsOxR_$lI~;LP(zv>BW#<
zkb(=5{z9aGKC+`2*>OX>=`TvHBq3kyTu>TrW{XP4J0<!?iOwrsMWw4C{eAsd<Oz}0
zt^eagzRK&Ptmqf<&V&l)I^aGD%&BrB#?STeiGF^rUtr%cp5ia1xIA1(`l=r{vc6$<
z&G3F!Ax{}Co)*4T-6V`s=_CpI_IlX$Q;+7yeQjKzJOahWdK69RDCf|&+Bi(^DjU}9
zp>{YznaihgIXpmKDO;{=W#BFb)@WMFG%Y$z=A&t)iI+z#XVZp}K^IaOVb*ZWg1buE
z)H9O?(y%q@AdI&$4NC_1Qnn-wWG!Pdg9dSqitI0A-=ifg@({ugp!#a*$>(YoVCZlG
n{Bz~c)NX>|dRYG;un6dDnSJL0*I0ysMUKJr&ek2PV&Q)S%$z)S

delta 1020
zcmZuwO-vI(6rS1bcKeI`|H^NnPzh@JF`@jG0*W9S;bbpO=?tXU?l!aANK{0P2d`#s
z#sjBn1P`Y1;1Qw+Z^U>od-CGNQ%y867!%*LX@tbLeXsBP=Dq#i%<jGk9QAmgd%Z3M
zwx9MS(GzbIUVhzs18-wQ5NS@0rbE#XMiQcUV@#9@qvJV@&@On%q7$$l%mLUfQwSqE
zNkd5-oq{zFogyvdG-)Mmd+j*|>cC4D4bveS-k2`q*ibQ3A=2<pga@6qyiKZ;!#gv@
zd_ii`XQ_kEHI+LMy-0lHfI!GaX9?cx&PgBvUb5&V;ML<DCwhBCFY%wOSd&QaBU^MH
zX1H9`?UNh$AE{bdIK~8&ML<`?dVWLxhTW27r`mc_qn0<nsVrhVz~9-!c$h0{Cm!Uz
zYM=B2^XuwI{=m`cQ?xoCGONpDBGiqTW6OTmPS8V%pe_47JAd!+VHXGlrGSqgIvR`M
zJpbve!|vi-?XH?_Wd#MKs{w2|jf9?|YgsK3@K~~8GG>FjvjGSIsmZDY>=a>GaEf8Z
zO=?MG)pE{lCTPY?>YAk_Qo2Dcg;8h;sO*9$btdAeR7|6rCOcEY=4Q;)Z&J<jsRlI+
z(dmGejIKd5riOTg9VKH!{I{#cH3!TjxKYnL+~;If>E+ArF8<7Y+kWWq|9ZU63vRy*
zDSzr|9S|~ar_po>?T_Nf2-*+1A|Cm`CP!5HKvhKUk%2!L@z1pIubx+pVo(+qVFrRB
zLjZjcf9Y*j<^iqn58fI3AY_51e04>)RBcrlEOC~W_inH*zEs&(IRPcC8-gXrGZ{9<
z?^O10_X~1Vkf&m?xTfiFc(7|D7Au}`=}2AaBq1q!E6ykr`(;Acsz_>yRF=>f)3YXJ
zEGSmQ98A3KM~?BdPO>RF$<hGDcV%#xz93_azaaPh;+5~I`i$#`4$*&p`KB5__Eq89
d7YzjjfB(XF8A*+wa6>^7bRS=>y=D`_e*xV(@QMHc

diff --git a/src/database/__pycache__/core.cpython-311.pyc b/src/database/__pycache__/core.cpython-311.pyc
index 0ed6dde33acef6d87d1811a4c530ab5555041ba3..30be8c6d5a95ea2cda17f0eb4fd9de5340fc6895 100644
GIT binary patch
delta 1899
zcmaJ>ZERCj7{2G;wrlD7LD%nX-DMx`O4$e75Md74$~FnGAtOO6VRpM`TeWM)xg9d2
zVF^q02S0!laVjy8khuwof%?xF!!LgrlM<)a`$zqwn3z~2`a|Q#`?gyLM7{T(=brOE
z&w1bT@t$*b_xn-HI~L0(0iL6Ox)UE?u=vD2@j~+#y6O5@{e{13&oqbv4bXbUu57;H
zSds+cI+W5AYXr_n8)z-C@ZP9e(gP1=jc+RQjsM996(=PVqT*W6#X@U!H`JS{i`GKl
zDjGVoM8GAK(la6Y)~iA+T$VNek7}zZ3<`>8K~TI)BKU$*dSVd>VWyEAz6X29wo$L*
zUl5i+cKyk9wGe9obM=~e!`iCUEC{hSaMfPyu)%CsYH5cOpzaBsQU|l@RLmnnSk8V&
ze1wP>C7)TdM28O^?2jHDKEhqnCEW^P0sfxUt#1M^?ffUHnomicPcs>sVUcZtpH?}Z
zPA2JiCe22bG1dSk6<0@QjmX+3X=d~RMHtMTsImae3wg8ST+gbxDW_{<L2l4}MP&Ys
zu7fo4D*ZOn!}sc|Nsu4c|6$#Zop7&Zd7d?LYUm<S{-&V==uZv)P&?8X`Pourost;O
zyl9Kgs+sh3UtFcFXz1nEiij=<GJdtnogJxglfVvWg^4Dq8MY#_N1>&W(<*L@471>`
z7<ZEW{3Bxs0)20c`1(*TG8~R3B@}f-88OMEpC2?)63pH*MMd&B|IMtBC-^g!yMsGX
zzbT<6Qfeli8mA2XXomRA3{5F)KRT^o+xZ8TgD`i=(oPO#yDUuvg2t>L?mUFNo*jT6
zJAyER(1vgvV0}D>gfa@#*cj4~t)5KsleQBkobyn)lC|-?EpT8Mdk!JsSz{dtJph_<
zhNWjH%gmKxp>q~Tz*S=Cq`15+f;EI)yw|>HC=!wE*Y*_>ULjhAN>w$HPTijhW=w@O
zJDY}{r}$0Bow{HAP`y~!A>1UrZNjbEUYm5=CPDRfTTP!?%Kl*AMVj|T)2R$Sosp;G
zsrV#iawaX)lse0(oSC9>Il=f|$Cfjma&t7U&ZWl7L8oxc354emo(H&pfUXB~b$zHO
zL3S3Up8(v2cV76_AlQO;tf5tFXnwFDR_FtHtLs%u>E)VZS<g}+&O(Y2c`d#4$@B}9
zu_$_4&n>94e*UF1LO7RPt=+haVM!Ai)%5C2GLb3eg~%QOLer<>)3B`fcWy-w2<Lgy
z)dOkwuImyZ-MrUR-*F7N!wB5~nsH(_nM4n47MhSS=#%XND0}3ud3wlO{4<a0ERKW}
zU59mS4yE%v=54Moo@#e-rIK+~9UYq+&BVu&wCEX^X^~&^?kVO&xQpNQ{zy*o&wU4`
zm<Kq`KvR>66xHk-TU4^JNenTAfOieUTS7DK8yhL*k>-f5-!f%eDFt6fHD(jTePXSA
z$luU{M~mTL9?II^jgL*ImDwcS!(Im#ZwvMB?A!iM;_k@_|MKx~s~cozC|4EC>o(_2
z*1XwPsL(mZp9O$>2sy#dNlkOuE>wpWx8-%tyxEg?`SUhs-da^K8>&GIa1S9TcnWsD
zwZ?zg0OxvfvLL|kVK4|5_xa?N!7GEy16PNy4d>jQtCd~zro1b#_|o#R<zu-W{dZah
zR$B&gbpxxe!JObI==h16r-+wduJH%F64_A@%1|lz>J|-e7%v-hf(wMJHKptCA9=^n
AD*ylh

delta 1254
zcmZ8gOK%%h6rMYN+jZjFdHR)!?Kl}bc8wbXa+?U(=>yVMf>a^|ig7wOslhMZv1!AC
z78*9Rs#G1R>I$(yhPH-{Ss_)T{~(nrl+F?fBqSC{AQrHIa~!9Fj(tDtp6@&79)IV~
zw}opt_m^(BQ^MzA^+5T<TkdiBJ9ca4hjUDlB_8IJnnyd>@wQEpbRXB=vlc<l&Lcd8
zEPgt^wgq`yeLkuUake3A!`tSy7$4>#)cbf0K4XC^Q?hhY(nhu=ZL}?87Os9)991qJ
z?~Jt>#&PxI(|k-D-<I0Ay}uun)@C&SwzQ^VPU0CRsRj6~7UUxvW-Wvrq%_xxq=tW?
zT(#SjeQbmoqbskT&Yv!vI)3Jj;!^%x{#btHICM<6%_<WiIAJ~#jG~;D?nbyO?Yg`-
z79P6-JLbUe5~M6o*aX<DSr&nubvBeHp|>aeX>juM*cYisgPF&JnH_sZ#Ne9s?}1rT
zkcEnJRYc&1ZH~>sLtAz_hA~w(9K~X@v|i!GqG7vGue7Q)T_h=ojCcn#{B}Rf!t?ed
zi*-x(LoA%3L}r-urnoDM!?-ipWu5#~6x4s?c!A~MXU8;)!GJTFTOheCs1L(b*7T=J
z3fPKet%!v_@D^HnvtB(`(s{Zcn+M&=@z5vEf{YbIZjBY-V|Ol|rA%j8FW2;Dsdj-2
zI>NA)8Vz34#1d{)o0x?k-6zqd#6X5EcHbPBV%X0|gAbyoh_{Fn_#@5`oFzyQypBMv
zLdoO9)Rrg0R^g84Z3lUERy`mR@Q)|F{0eDbCZHQEQUos|81{y!H@IkS?Nz68;w=KQ
zOi&RKA&Boo0xllBW9<>~uGM>&sc5WC=el05*Lo8`M^S9JHhHtykBd!=Y{IVZ5!2z`
z&_wsr=rB|IQ?XR)m$(p%DEY6^;w9*eCD~=z9ZMgf^Hh@|3vO8SMy1@`^Gp`c(NUIK
zsfrEk&l5vJ-G>(B#}{xUSH^EMHV-3#NcJ`2mI>w&4Esi_QlSdsJ=~(1R8!0$Jgo@t
z1{T;&_$r_e^*Uj_`l?yfN%}q<3eKSUtHGdU3j^0-E4bLRNKM0o;IFI#_d?5Q!^&%$
z<r)|3ltk}~;aFN<*>i5sV4WE9N~mx?98J+J5mfS-ar|XJTCHoX3SSi0k)?aDpYMJh
xKFmDn9qE5x_;Vr(N0lk&g-;bfv%~kwsQjB1{!mt#A1+P?nF60oCe8G}{sqSJAAtY>

diff --git a/src/database/core.py b/src/database/core.py
index 9c6361b..b029e0e 100644
--- a/src/database/core.py
+++ b/src/database/core.py
@@ -15,7 +15,7 @@ from typing import AsyncGenerator
 from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
 from sqlalchemy.orm import DeclarativeBase, sessionmaker
 
-from src.config import SQLALCHEMY_DATABASE_URI
+from src.config import SQLALCHEMY_DATABASE_URI, COLLECTOR_URI
 
 engine = create_async_engine(
     SQLALCHEMY_DATABASE_URI,
@@ -23,6 +23,12 @@ engine = create_async_engine(
     future=True
 )
 
+collector_engine = create_async_engine(
+    COLLECTOR_URI,
+    echo=False,
+    future=True
+)
+
 async_session = sessionmaker(
     engine,
     class_=AsyncSession,
@@ -31,13 +37,22 @@ async_session = sessionmaker(
     autoflush=False,
 )
 
+collector_async_session = sessionmaker(
+    collector_engine,
+    class_=AsyncSession,
+    expire_on_commit=False,
+    autocommit=False,
+    autoflush=False,
+)
 
 def get_db(request: Request):
     return request.state.db
 
+def get_collector_db(request: Request):
+    return request.state.collector_db
 
 DbSession = Annotated[AsyncSession, Depends(get_db)]
-
+CollectorDbSession = Annotated[AsyncSession, Depends(get_collector_db)]
 
 class CustomBase:
     __repr_attrs__ = []
@@ -113,6 +128,18 @@ async def get_session():
     finally:
         await session.close()
 
+@contextmanager
+async def get_collector_session():
+    """Context manager to ensure the collector session is closed after use."""
+    session = collector_async_session()
+    try:
+        yield session
+        await session.commit()
+    except:
+        await session.rollback()
+        raise
+    finally:
+        await session.close()
 
 def resolve_table_name(name):
     """Resolves table names to their mapped names."""
@@ -122,20 +149,6 @@ def resolve_table_name(name):
 
 raise_attribute_error = object()
 
-
-# def resolve_attr(obj, attr, default=None):
-#     """Attempts to access attr via dotted notation, returns none if attr does not exist."""
-#     try:
-#         return functools.reduce(getattr, attr.split("."), obj)
-#     except AttributeError:
-#         return default
-
-
-# def get_model_name_by_tablename(table_fullname: str) -> str:
-#     """Returns the model name of a given table."""
-#     return get_class_by_tablename(table_fullname=table_fullname).__name__
-
-
 def get_class_by_tablename(table_fullname: str) -> Any:
     """Return class reference mapped to table."""
 
@@ -149,8 +162,3 @@ def get_class_by_tablename(table_fullname: str) -> Any:
     mapped_class = _find_class(mapped_name)
 
     return mapped_class
-
-
-# def get_table_name_by_class_instance(class_instance: Base) -> str:
-#     """Returns the name of the table for a given class instance."""
-#     return class_instance._sa_instance_state.mapper.mapped_table.name
diff --git a/src/equipment/__pycache__/model.cpython-311.pyc b/src/equipment/__pycache__/model.cpython-311.pyc
index bf48a1730cbf6daeb71f28e4c6bec614849d3e8d..476bc8f06debaf17ab67f74696f43641e8c57ceb 100644
GIT binary patch
delta 267
zcmeyVepZujIWI340|<N)%UmX~kx!DHF=n#{J1@)RgY1%w24K<<Od3r#<vz}6Jozv8
zM>FxF#PaxpqSTbk<dV#?)cDN2lGLKI#GG3)XcD=JK#9!6ocQGY;*!a4c`O9@K`Qby
z;954T@cv<B?AffyZ@{Q2r!pgLLFk6i3v$*M<*cvBSzln0zM-tSz-)!;4%G|F4i}Xj
zt|&WPU{RPHAfP?@AAj)XT>@cDj7gIPh1XhJG3tC^z$6x^tl-&@`w=Ab1&ef%9?<gu
DyyRI}

delta 145
zcmX@B`BR;5IWI340}w3TC7Ah@e<PnHJ0ss_4R&6Z$<5ry84V_T^L%8KoZQbVI=Pcq
zar188-;9iYo44~DFisW})SCQAP;~NM0j<q_f?-UI@spnlueCO3)cL@GNi0xV!LuRv
OBS_{87U?2Apc?>~{3^`=

diff --git a/src/equipment/__pycache__/router.cpython-311.pyc b/src/equipment/__pycache__/router.cpython-311.pyc
index 0b126e17445740eb797a11368d756cfa40de9c28..02dad94cd044579d0a4b78b001bbef85ffdfba71 100644
GIT binary patch
literal 11472
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

delta 2366
zcmcgtOK%%h6rQm?e#Wo7Y{zfM&%7T^t0pKZNqLlpG;JzThDC6FZ`x2#V(!>TbU})g
zRRyKd-4*dtrJ#sNMJhs(V95^%hy|J*yGktR4uOQ=oEbZ@6R8m!CZ13Co_o%BzH@x8
zv;X>oNza#Vw^M+p?U8@=Ue}f<Xj-&v<p<B1iKT2;9I``k%1%)rW+IhcN}JrKxMjEE
zkv)o6_9{Nvr}$+*oD0NSZdW?w4y9A>RJ!D?Poh_Jv#lIeVscE0%W-{gFDI0woYdEj
za!ToydzG}D*7weGM#;)qQ7{SAvJI-fLTUOV=V<QpJb&NRu^|u_%~E%$aU|@vZJWRs
zUgLpi8*y)oV1u{G=4rL9n247qiI2vJpPFdlkdd^*zVC3qVkaG&lA*}cpp^R?k}e9Q
z6C{b$cNlWGIw}v7Lh7!~qa_YB@pb=azQ8fQ!3N)1fdqli^9)U)P2otxhZ@nB1k$6c
zX==zbn6RZ`nqIMx$T3C34bC}%L{CtJJTck_Jn>^ZBfv9?!vLMfVep=yCqca=Nqco&
zc9J^AHwJv;$OpBeF8>L9po=7^|A5m;dXI6Q0?r=fd_f>-;A}gAGo#m<J;pOZJWE0$
z$FE7V{A=l<=;T+eyF6zbGmDyoS8Vg*0{`CjgD(Sf$#MvJge<>rpNMqfG6_(SnC_58
zgW<)0wad~7>{I-lL*?E87c=}}U?$U#{w5YcSB%{;8L>mKR`Hf45^R{;f@9JIY|ilM
z;G#InKMH;zj`K+9bgUj9hC@A`ooWfJgbLCbu*~vLLm2pbXny7_`i>$D18D6xXmy#s
zU0bavbgjBvWt6f>I9PyJbpt$szdOQHs~|b<oM)r_cFz}9y}l`)43CHE3VOiPsNQT;
zFvXQ{L>%UK!v$#?4zKdP@RAkt-gfct94TIi{Oo9yJH!8p<O4e<&81e0)tb6oS|?Pq
z5?U>;mia(5A`bBj(Mfk7X3;ZRSv!B?Ov%_ZhQAX9yODPW4KE^K57|oyFC$z)cm+VU
z10?E?(FAu(6WBaByvhHLehV%8Cicjsm-{NlPw};QT<quf;=#+^XlVYzbr0+tn*z`r
z2VGSq*y{<6biNX!#VS2)J6i&W_xK<2TjJ>BQX(KGpGTTmggJnM#VGCy8tOtmPR2L%
zRybHEm^G=wR@bV`iY_*UiwKK&<g8T)<Ri=1-!-Nr2-bqNsbQ_s8Rk)u$>>sDwZYP)
zT6zs!KIGG>pFp<1*D7}Dow^2A&8(<5>ILwDbn^Tl7})>-<n6%q5utcxTLuVO3?XJ%
zfe^R|Tj_4;4cP7Q-SlVrFcnVo%bAgJNr8bWGyMO`TmYI?E#0I_k+q@4jetYKya+x7
zKmRckcC_OX<?!D!`3<d8Wu+l#Rq=XJr9&!Z@2r+6i=a~!K=Zepm)03&F|_;8UaVDb
z9>l~kCV^*8Jk#Z=dVQLet=FoQX=WHY%?#g}W>%|=jR-P?;5BD>W%WzQ@aE{_s97rO
z;DvLdnJcv_!`3tG1#7*~f7zddWVJG#X1Cx}gjc<9;c{+{@8#awaEYd;!v7CFf_O>X
f7Z%d+9{Kzt<n~)X{LlQJn14Lmch_XWAB=wi<?-2X

diff --git a/src/equipment/__pycache__/schema.cpython-311.pyc b/src/equipment/__pycache__/schema.cpython-311.pyc
index e3c69e94478b128316ded077962b3108d11e0988..7191162c48a85f99bf9f4a745c00c6808e9e599b 100644
GIT binary patch
delta 980
zcma)(PfXKb7{>Xw^3SZWv9X1f$tII+C{)KpO*omESS1EwDwE+XTb1g@NY~+?gMZ?U
zT{N!;4<0a@z=?p3iP0z?O}w<q!RX0&@d$>K2et2)AZF9V9)91`=jr!8U%tLL^&{Cd
z&$8QU%;)Vlx4hzAZdz=#_#3oWjk6ZWu}(<ZI$(fxK-u=0t~b~dxN2Y6PZnwzb^)?1
z=iDRJO13tfL?5X>y9>^-9nQT~{%-0=tNb4HeSKAa?|?ZmOGauUJop_(zef=-r>7Mu
zD`!-BMoP<5s-(<_xsUA?L0&WiS<Iy~g`x^;jsx~){Gu@Vdy5uoxkp+YVzDTx>5L+)
zaz@O_>Q#8|93(NQcdgrp&2nV~kwBb;4OhStsDtLZs3x?Q$x%MGP+Cg7j_bT&@WLuD
z=nQv%bWVDZ))`X^1|xik9b7v6EcnKy50B}wlo3m<#!@=tp9?SSd(7*MsZ$1%g7<C#
zp0wW8W<6&uaL5zXzP5!3lsOjKIWIio9I)aILxF4HNAWB{#7;yPVr&ybD3S;onm!oB
zqrK#Ak^LgtwTMo{1R{e7ASxz~qlZX9$@kQ1Dmo~>-De$|#7su)KwL!7k(W^A5P8HD
zqJWr2R5VEFA;z`kz(Zm+C9TMHekbws7+x@OJfYZ7yAfN(c6_D9|LTmmpf}KWY-`K^
zp0(nb3N|6~TDa>vAqvcguJn}9Wi}(lkE&v$iXP%742JuO3b(@(-qUE(zeO*Y-T`e;
i;b+)Ku7NM|F4|3wkhPk>^A5L8lZ`*~Gg_eAOMU@LPVDml

delta 690
zcmewtxjT$+IWI340}vd{<;k2Rxsh)jCsQ2z=6#%9Op|SR1t&-I$WNZbD?GWI=OLJ`
z<qZVUoA2}9W&#VG7Vu<CVGL%_)SmoE@Z#iGLgt%|geNmjz9HhxXfRnt^y6erF<GX5
z*2(;AMw_d|x)~=2NO(*>AgMNaueir%P02W>&8wx=8M%UiZYTl~9+U6L$T9{`{w3qU
z7&3Xki~?U#C`e8fM1(UiOuon{zPUlRk<mOBB*F?JltDxsh=>OfiXcJ-M1VD^fmo3+
zB4DzG{8nZl7i<u_f-G}r3P>&$L@0rXG!OwcG9ARq01=rWA`3)hgNPgufo4M@NDM@P
ztSX+o`Ga~c<K$;5`piHvuwDA9zZhMTK&p~~gkMMz4~Q)WA`mVR0CB-Cz-76n$mEYo
z#@+}m#5x+yy?G#;Kt$%|*XnhQjCqr@G%L6ZL82^RsmX6OCAbPeOb}5snP1C{v0$>B
zR+0rcvVd^`4OXzv!N!4AquTR}!zMRBr8FniuBdGC1FcKOYK$I?9~iKc6Qn<aWxgQG
N2Qg0O*U<vv_W%+4o*MuF

diff --git a/src/equipment/__pycache__/service.cpython-311.pyc b/src/equipment/__pycache__/service.cpython-311.pyc
index 0fa27dcb4c0a9a26bbdc32d2a36f8fb9fb2512a6..bea24cfca055914763a6bbd0d8524f0bafe379e9 100644
GIT binary patch
delta 4947
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
RJL}1#3-1qKVl^b<{tx&7wTb`$

delta 2601
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

diff --git a/src/equipment/router.py b/src/equipment/router.py
index 6d5f9a1..213cf94 100644
--- a/src/equipment/router.py
+++ b/src/equipment/router.py
@@ -23,12 +23,13 @@ from src.equipment.service import (
     delete,
     generate_all_transaction,
     get_top_10_economic_life,
+    get_maximo_by_assetnum
 )
 from src.modules.equipment.Prediksi import main as prediksi_main
 from src.modules.equipment.Eac import Eac
 
 from src.database.service import CommonParameters, search_filter_sort_paginate
-from src.database.core import DbSession
+from src.database.core import DbSession, CollectorDbSession
 from src.auth.service import CurrentUser, Token
 from src.models import StandardResponse
 
@@ -55,6 +56,16 @@ async def get_equipments(
         message="Data retrieved successfully",
     )
 
+@router.get("/maximo/{assetnum}", response_model=StandardResponse[List[dict]])
+async def get_maximo_record_by_assetnum(db_session: CollectorDbSession, assetnum: str):
+    record = await get_maximo_by_assetnum(db_session=db_session, assetnum=assetnum)
+    if not record:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Maximo record not found")
+    return StandardResponse(
+        data=record,
+        message="Maximo record retrieved successfully",
+    )
+
 @router.get("/simulate/{assetnum}")
 async def simulate_equipment(db_session: DbSession, assetnum: str):
     """Stream progress events while running the simulation (prediksi + EAC).
diff --git a/src/equipment/service.py b/src/equipment/service.py
index 6daddf0..4ac3eef 100644
--- a/src/equipment/service.py
+++ b/src/equipment/service.py
@@ -17,6 +17,7 @@ import httpx
 from src.modules.equipment.run import main
 import datetime
 import math
+from sqlalchemy import text
 
 
 async def get_master_by_assetnum(
@@ -120,6 +121,52 @@ async def get_master_by_assetnum(
     )
     # return result.scalars().all()
 
+async def get_maximo_by_assetnum(*, db_session: DbSession, assetnum: str) -> Optional[MasterBase]:
+    """Returns a document based on the given document id."""
+    # default worktype; change if you need a different filtering
+    # worktype = "CM"
+
+    # where_worktype = (
+    #     "AND a.worktype in ('CM', 'PROACTIVE', 'WA')"
+    #     if worktype == "CM"
+    #     else "AND a.worktype = :worktype"
+    # )
+    # where_wojp8 = "AND a.wojp8 != 'S1'" if worktype == "CM" else ""
+
+    # sql = f"""
+    # SELECT
+    #     DATE_PART('year', a.reportdate) AS tahun,
+    #     COUNT(a.wonum) AS raw_{worktype.lower()}_interval,
+    #     SUM(a.actmatcost) AS raw_{worktype.lower()}_material_cost,
+    #     ROUND(SUM(EXTRACT(EPOCH FROM (a.actfinish - a.actstart)) / 3600), 2) AS raw_{worktype.lower()}_labor_time,
+    #     CASE WHEN COUNT(b.laborcode) = 0 THEN 3 ELSE COUNT(b.laborcode) END AS raw_{worktype.lower()}_labor_human
+    # FROM public.wo_maximo AS a
+    # LEFT JOIN public.wo_maximo_labtrans AS b ON b.wonum = a.wonum
+    # WHERE a.asset_unit = '3'
+    # {where_worktype}
+    # AND a.asset_assetnum = :assetnum
+    # AND a.wonum NOT LIKE 'T%'
+    # {where_wojp8}
+    # GROUP BY DATE_PART('year', a.reportdate);
+    # """
+
+    sql = f"""
+    SELECT
+    *
+    FROM public.wo_maximo AS a
+    WHERE a.asset_unit = '3'
+    AND a.asset_assetnum = '{assetnum}'
+    AND a.wonum NOT LIKE 'T%'
+    """
+
+    query = text(sql)
+    # Pass parameters to execute to avoid bindparam/name mismatches
+    result = await db_session.execute(query)
+    record = result.mappings().all()
+    if record:
+        return record
+    return None
+
 async def get_by_assetnum(*, db_session: DbSession, assetnum: str) -> Optional[Equipment]:
     """Returns a document based on the given document id."""
     print("assetnum service:", assetnum)
diff --git a/src/main.py b/src/main.py
index 94d37c2..ca47123 100644
--- a/src/main.py
+++ b/src/main.py
@@ -29,7 +29,7 @@ from src.enums import ResponseStatus
 from src.logging import configure_logging
 from src.rate_limiter import limiter
 from src.api import api_router
-from src.database.core import engine, async_session
+from src.database.core import engine, async_session, collector_async_session
 from src.exceptions import handle_exception
 
 
@@ -70,11 +70,14 @@ async def db_session_middleware(request: Request, call_next):
     try:
         session = async_scoped_session(async_session, scopefunc=get_request_id)
         request.state.db = session()
+        collector_session = async_scoped_session(collector_async_session, scopefunc=get_request_id)
+        request.state.collector_db = collector_session()
         response = await call_next(request)
     except Exception as e:
         raise e from None
     finally:
         await request.state.db.close()
+        await request.state.collector_db.close()
 
     _request_id_ctx_var.reset(ctx_token)
     return response
diff --git a/src/modules/equipment/Eac.py b/src/modules/equipment/Eac.py
index 01e63d7..f615b7e 100644
--- a/src/modules/equipment/Eac.py
+++ b/src/modules/equipment/Eac.py
@@ -159,8 +159,8 @@ class Eac:
                 # Total NPV pada titik proyeksi ini = NPV aktual terakhir + biaya proyeksi yang didiskontokan
                 final_value = float(last_npv) + float(discounted_proj)
 
-                # Gunakan seq penuh (jumlah periode dari akuisisi) untuk menghitung pembayaran tahunan tingkat
-                # pemeliharaan. Menggunakan hanya selisih dari seq aktual terakhir
+                # Gunakan seq penuh (jumlah periode dari akuisisi) untuk menghitung pembayaran tahunan pemeliharaan.
+                #  Menggunakan hanya selisih dari seq aktual terakhir
                 # (sisa_periode) mengamortisasi seluruh nilai sekarang selama
                 # sejumlah periode yang sangat kecil untuk proyeksi pertama dan menghasilkan lonjakan.
                 # Menggunakan row["seq"] menjaga periode amortisasi konsisten dengan perhitungan lain
diff --git a/src/modules/equipment/__pycache__/Eac.cpython-311.pyc b/src/modules/equipment/__pycache__/Eac.cpython-311.pyc
index 2830049413318000680a4cdf7130203d3dd59f3b..baa1835347296c1ca9e67eab86c17ef4f101e468 100644
GIT binary patch
delta 22
ccmbPLHmi(xIWI340}%MHl*+W;$jfUD07;AmwEzGB

delta 22
ccmbPLHmi(xIWI340}w1fCzR>5k(bvR08O_BF#rGn

diff --git a/src/modules/equipment/__pycache__/run.cpython-311.pyc b/src/modules/equipment/__pycache__/run.cpython-311.pyc
index 4cfcbd2e2c8ec566bb4d134e00fe83f982ff31e1..7c85b9b35acdf52dbe15c3a72782d45f066e04f0 100644
GIT binary patch
delta 103
zcmaDU+9<}moR^o20SE-Yh-IGK$lJllm@s)7<5Qkyh7^Ws<}ilo%xx^2tC<{G7>y_I
yW$P4@ke^sNrE-Ei0&ezU-_9s%<E+SVSdq&`l=-l>yo&(y5dl^g(ajQ^7a0K$RUKFW

delta 78
zcmZn^dnwAhoR^o20SG+$1TznB<n3T&44FKQ@#*GvCPx-V^~opMI@yFICrVC{+?>L`
iol(@xS(@RnG?xoM^I=ta7cS-_T&ynqn+-TGG6Dc#vK2u9