From 92818a581aad3c00ccd33871e4b79b01dd62ebb0 Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Fri, 19 Dec 2025 13:52:48 +0700 Subject: [PATCH] feat: Add `min_eac_disposal_cost` to the equipment chart response schema and service. --- src/database/__pycache__/core.cpython-311.pyc | Bin 8628 -> 8688 bytes .../__pycache__/router.cpython-311.pyc | Bin 11604 -> 11643 bytes .../__pycache__/schema.cpython-311.pyc | Bin 13820 -> 13937 bytes .../__pycache__/service.cpython-311.pyc | Bin 24229 -> 27739 bytes src/equipment/router.py | 6 ++++-- src/equipment/schema.py | 2 +- src/equipment/service.py | 9 +++++++-- .../__pycache__/service.cpython-311.pyc | Bin 14396 -> 14396 bytes .../equipment/__pycache__/run.cpython-311.pyc | Bin 3336 -> 3147 bytes 9 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/database/__pycache__/core.cpython-311.pyc b/src/database/__pycache__/core.cpython-311.pyc index 30be8c6d5a95ea2cda17f0eb4fd9de5340fc6895..565023f2bd6a085aa58ac1cf060bbbe61e97166e 100644 GIT binary patch delta 1504 zcmZuw&2Jk;6yI5Y#;z0BPW%yn#2;}S=gW?pQgD-~)Kw}9N7i-C>V;gQK`2P5LZWhkM!lE=5~>jV1p(!d?tudmoH&FN5+K2Q8>i5ewdc1p@ArFe z-o7{UW&R-VxaV-#1bDvNJy-r~%i$-pTge|bywyk{LIhcmot0=cR)|&Og*XvJfre>J zJ}J9)+)aZZ+=p@a6#8{8{=ZxTI4kX^AzMNaM%!SvgEk$$d`hSv1NK$a6xrUlvl)mLmFz zhiGm|T~|t_no_6N>QzaRmMG)54d0MHK4Uy<8i1Y0`EBFed=zFWk;UMpoha2R6s+Gs;uDG?Fi)V$0dP~;x4Sl{_UwsWV}d35sOb@ja*H`j5_f^S+T$OZnbC7VowEhTCl z#bRArsL*0jvp^oJRYhgv=z~eV2_C)HUUHtFwhohIOR}a(_!)F0nnA6z&qeketTb{> z#U4fAqxgf4GvpHgr6Wm_ywf(E%cERmn1^O4%j#n#8Z5=KT!cW^UHMhDUaOv$R65qS z&2ZI5Vbe#pyhzURkV7Uf@OK@#foIXvR#wZ3T9=d(Ww?cAmR44%BC|`dNLg5x|Kzv` zRT}EdklEJjoe2W@-0FH5pGDrpUV<09jPNQ#2H^?-rphI!8(deNF|y3Joo{qtt!7gv zScd=Y48Qm?YUdE}*0ECv*a*$K!fGp&)z=TBV>q^efF)xXL~lA9!5Ko1FQ42t>%>UQ z?E0E`^+RFDL!nYtE!PyLfNrg|?|xqll+o`h!dnOxfTOd-Z+HSG28IT|xZ=z*%?r3CPk`3 zO8<3EV+4dP{=9z*TD9T-kdR643B zmB!$nE|!;=7rlM__fXimjMKLf@T#&Qo(RW#^k&?^HCCEo4OyCB3CG9qSTWq|SpWX8 zPF8F3YK2a-ZD8@DsBS~+K{!KP`@+!flmFI_eXo&p&w*$o;R6BSH-jMd?2+z6iw_o0 Mb6kqf8L7%Q6y8~T9cLW}H$RSDJKObtja$cY3!x1zP^&5hrKws3$O0DEI|&Q^>#SWU z2pXy8LaCq{DMSKh;P3JdgeDH@>;*4U(f*Q$Jo*Ymri<7A-}IAPQ8W5#6Wn+MMV*1mQZY{!@zC zw&)#gaj>~*jLw1;-p$Fb1hKFNu?gEAzq36l2&JSxMahb&Pj{T9)Ij!wyq8YXSqPq_ zDSnfL_y;8Qh$tKv^qG#J2f89ufi=Zuh6doPPY!as9-MHFs07o`NG%<*f^ z<)jKyT4WLUSYwq&wMr|k2GjJjECwnQ8&X-EE0RB)2KfLgy#Q;%&z^}l3%5Lpo6ZDF z@>9|;MCEt8@+8imcI_ht{)Q_=lDzBM9-qe`9Ez&0L9Wk74w54OZ6u!p7NNK`s%fqA z*(%jEYXn+o*XkzAVGLG(79tAn-Q*$uq&q{By^ed1DED9>u^eWLT@%@Tu(QZZCbFtx zw?B+7kQ01VPC*0nawd2b-9?6dSPnxscRbs&N{;b$nL_5j@Y740_9k#St#Y&bI^EMf;pMERj)5GMiPS)hAzM_kyP-ArCt< z#o+7^-sXC+0JHrlxK79-KNO1QpFrCwghc?$z0$7QOtLm?VJeuD*-Q-E;a5Th@-F{2 zWKP+g5IcX`$u6Ml8b2N03kTqpa9FwoiVgl=_=wG0`XK)`{5v_%zneWgX~`z5WGjvO zim}T47&ycCD2i_t#U=t?N|xqJN^IJm$g8+Vh8c3lvix-=mc=8;u*_{k{L_7Z|9Bi> w?|>C=j`@$+`$@@>UO;`E?DuVnGEue!fIl39=<6tbMF8agnfUvWWhegYzra2_00000 diff --git a/src/equipment/__pycache__/router.cpython-311.pyc b/src/equipment/__pycache__/router.cpython-311.pyc index 9e291407b3621d2749ebb281798e66fe5823662d..859b57ee0ad6032bc2a10bcbc52ef11b99286eae 100644 GIT binary patch delta 455 zcmcZ-^*f4hIWI340}zyab;)E^+Q{c2!^I2aHUshJOOr23NKUSlkr(G=V5nuTWvOMY zWvgYc<*4PX<*MbbVV$hVBy<=^ya2)m zhOZKnYvt7CMY&knZg9xo;1IjPA#{U7^acn24GxhT91=G;gl}-jPCg*#rFlci{DUwT zAJ<0)An^r6d=O(0)cYXG%ft4O0Z4oS5g!cVS&_?S@@E+tjx{XHfC^S~OqP_5X5^S$Dw{v~x2!fJ_hfZBbJk*R zpiz@ERkdu$=BLk550wO+$FbL{>5a;1x`^W$!zJQ1i3_O#=<##X^P8Lw` zV=Dw&QB*WJMZuJ{9LPMdd7eTgBU>3rv~aSll09R|<-bjkOBM zJimFL(m6)P>dCz-iEPynxi2cptaU)<>&-H%JxrD$@7!W3$S*D_0$Fj3xuCS92&A_N zq^KwXM3{pJQy}q+!zMRBr8Fniu4v-shwAn$CUT5y3p_tC0I3VE;Sf4G4NN15kIW2A V-i%imy*@Aj)qQZ<9HOJn2mmh=c2EES diff --git a/src/equipment/__pycache__/schema.cpython-311.pyc b/src/equipment/__pycache__/schema.cpython-311.pyc index a5e2cd8a3f7b3b1f704ab19ad2054ee4f6243c1d..e62b7cd903ac9a3f86ee2051c2983fa5b61096e4 100644 GIT binary patch delta 564 zcmey9{V|7kIWI340}xFA=#u$-Bku5zyQdm-0Q#seLEn{Y2SPjGw z5G9<-oysE#<1(bOr107Rc_}Qx44QnCt<|PV-V)8t%!^M=OpZ^PexV-S%IBT|5jVhP5{LF(@&TPvvXUSJ6YB8bZD$?tU~H>YWo zFmdq}rRFAP=4IxkPkyYGBUJ^`j%H*zNUVHwrgk~wIv% zkO48dd@{dot!6Dq2Mbsmh|mQQXol8+#A+sQ)wN`-+5BEtn2ECjBvJ_^CNI#koa|yy z##Rp!so#9Spox*O9%!)F{qAIC-A2EMwc|J;s5IQJjonj2{@VlM}o@f@QuS%Zu?c+J9icBqqdu O1c`ouOHEEUoeBWb(26Di delta 428 zcmeyE^Cz2kIWI340}vSAv(B8jk@tfNqs8WbD&~xADJ;PZn!J;9)uu9O3Qv|+Pn_JS zF3a?ZVe$g?cWf6}oPcQaE{!QnoV=;Y`FZ)dnaPtQv~w6MCkyHcvy}l&EGpZ4PrIB^ zUs+>;=?ak@EEkk*FDlz!QMPUHonSG;d5Y}?77)4!CV`A1Be15)JB++0pVKwwt^sjb zAYwdv5^U8VX7yw(Jxj*w$p3CXsCU)bo+qhvq+|-%M@kcaiK0q27A=fBXCP|Y{G974QCz^E9 z>3e%1NHCG($*)WgckkZ5_xA1E-FI)_E}s7y`S&bw{Jq_772taCy`hM4;!}>A6qN+w z8R57f3o?lc0sTz^1j>e}K@|g{Y77`vDIgK#iBXeU5-3s40kdieSX67ks+I;yRa?NO z+5>jg5pZxhW7MgZ1v_h>6RC2r|TBW9{18!b0M{CsDKrP2D(K@w0 zP_H%w8hF_nZB&~AO&l+cHmjb12XLEgkG8050&4(w$j<0mwKdSHwguYM_CPzAEsJ)j zoq@0_!-fJi1=p5ZJ(RS9D`a^#y#qK%!lNF6d!Jbd%a0=;pMF=w`sTq%l^eeCS5f!Lhm=bBu+j(Z+{aszR(50As&SKiAS!BuZ)NwFzKbJe9c=O5!Kz+js*2RN9y8 zfC(po{{Yvln=C5zMf`_=Ka%1C0dC@Ife(Ses7&OCpCw%ClrknilJEUWRc1MO$rL!q zWpHFx@{IC_LCc|g@IseT#=v1@jvM6DAb5lehLzTFqbx)DC@(9#JPze!ygZ@Q%Zkzl zeVhc^aZZCSK%EGbPsrq`;63wSIG1ByQ8OQ$N=D+bP*k%VJ3pn!Ly>S&6aBICUbALm zF3EdXGbWXDNzE7zB@{2wYzZZ*gp-k2G#-+n>^ypS#2*b$D(d-RO5+qo{E73i@KGg^ z0L@T#?2jcCIvxruT!K9yeVK@?*3?{~xx?`&s*BTL2rC5>Y_q9{#Z0%YtzaQV(8Nxb zY%%$Gk$tM9g0#&)U$TXe_WAFde@$F%$Y=)u7K;fbNxRvPtaa{nK+(iVEJ-(T9@XWT zt8|KVu_sI0q}@P2!v3N3*Tly@Yx{BMvLcCg1COGBW(Ae9G9H?aCTR~+x3bUMH-L&C z*xRK0fDmIQ$76M9UZ?~<5~~NUqr)S^gU37^XO+#TEWM!w=!s3MY`S@E%0D*b>Euil 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 delta 5692 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 HFT(!;%Wts! diff --git a/src/equipment/router.py b/src/equipment/router.py index 2905947..e8ec625 100644 --- a/src/equipment/router.py +++ b/src/equipment/router.py @@ -165,7 +165,8 @@ async def get_equipment(db_session: DbSession, collector_db_session: CollectorDb min_seq, min_eac_year, last_actual_year, - maximo_data + maximo_data, + min_eac_disposal_cost ) = await get_master_by_assetnum(db_session=db_session, collector_db_session=collector_db_session, assetnum=assetnum) # raise Exception(equipment[0]) if not chart_data: @@ -183,7 +184,8 @@ async def get_equipment(db_session: DbSession, collector_db_session: CollectorDb min_seq=min_seq, min_eac_year=min_eac_year, last_actual_year=last_actual_year, - maximo_data=maximo_data + maximo_data=maximo_data, + min_eac_disposal_cost=min_eac_disposal_cost ), message="Data retrieved successfully", ) diff --git a/src/equipment/schema.py b/src/equipment/schema.py index 7450552..f4b2516 100644 --- a/src/equipment/schema.py +++ b/src/equipment/schema.py @@ -106,7 +106,7 @@ class EquipmentRead(DefaultBase): min_eac_year: Optional[float] = Field(None, nullable=True) last_actual_year: Optional[int] = Field(None, nullable=True) maximo_data: Optional[List[dict]] = Field(None, nullable=True) - + min_eac_disposal_cost: Optional[float] = Field(None, nullable=True, le=MAX_PRICE) class EquipmentTop10(EquipmentBase): id: UUID diff --git a/src/equipment/service.py b/src/equipment/service.py index 6fdb325..4f0d6f7 100644 --- a/src/equipment/service.py +++ b/src/equipment/service.py @@ -293,7 +293,11 @@ async def get_master_by_assetnum( maximo_record = await _fetch_maximo_records( session=collector_db_session, assetnum=assetnum ) - + min_eac_disposal_cost = next( + (record.eac_disposal_cost for record in records if record.tahun == min_eac_year), + None, + ) + print(min_eac_disposal_cost) return ( equipment_master_record, equipment_record, @@ -302,7 +306,8 @@ async def get_master_by_assetnum( min_seq, min_eac_year, last_actual_year, - maximo_record + maximo_record, + min_eac_disposal_cost, ) # return result.scalars().all() diff --git a/src/masterdata/__pycache__/service.cpython-311.pyc b/src/masterdata/__pycache__/service.cpython-311.pyc index 2024b4cb0ed1e54995a06289a27953132cc94ed6..47aea57482897f2b943194d3d6e7dbf7e46da032 100644 GIT binary patch delta 20 acmdl}u&01~IWI340}zzDI&I`Ov;Y7>rUg&{ delta 20 acmdl}u&01~IWI340}!O1x8BHYXaN93PX)sO diff --git a/src/modules/equipment/__pycache__/run.cpython-311.pyc b/src/modules/equipment/__pycache__/run.cpython-311.pyc index c4aabcff3e9edd51da10a9aba439cf42a13fa916..0d30746bc1d102e30d3ad1985c7a4bb2c198fe44 100644 GIT binary patch delta 1188 zcmah|O-vI(6rSmJyR+Rb&`N;<+LfOgh0+=nkrbd9p6Q;mmOCv`%hC zWb(b2T6#~yB$%M?f+WQ2u(sB&*)@KOOGSf{MCRzjK(G9($j zo1k!s(%GX|sIk@(A<)=faJHzYGu3=kkwkewl}BSjLY3meqo_PAiNdHNB%=u-F(k+1 zlGq^h224$kJr+75ZGtiuYeV^}M0R+$ z;kmxWcW3x+gYVwvJ?YLI4fw$CUk<=~aRe2Yg;o=9&o7U!j2i_ZB3me&L16=h=TP|t z#F13)vRU7}FYVajJQ?oP%keEPkl_M30NJYTiqkXq@-yA}o%7;#bib@_wei)H<))P; zqo9t+7OKyndIQzZAs@cMerpVq9v99;AlQJ;$VF;{^GCweMwmAB%aNwGFxU(`+iR%J z7Js{+`r@bCYw%O&w8Q+~Ssyl>CD_Y#6jhVsA9Q78R2&EL+x?6RfL%a4e z2tq-^n8F7U3i@O82PLhS9#rh9mlf{m!1o>{@WmjS)zkAI)a-9(=Qs1+&-{MBVSYG= z3#GS`WCN@f4mF2=&PeYd{6)XQ8}$&VXUYNL&9%)|0krA_B$h2700k0j#?v8fE6UVM% z2>aImT|jYvrh5wb2YH5&j&u-b$CTi8Ua{O2%m_3eaiv3HA9Fs=0kAuUgs@K|vSY&s zC`CrVakiSUC{|sV0E$f)S)Zj_hLr3HUXdm(39NcdSvr8SJ@9{H)4()OU_5g(e#5s< zq6FSqP#vd}X-%gIfsWh2F~`+-en8WDw34t|(iaP9_d1jy3HnOnrQ6fJT1W|Zk&aMb zEZiFnsboV!M}Dh-GiBx}mnPl6ihFn^^}Vk>Xn4Z0>?g3oEQCBK~K1;>irIT9I- z7`X62qwUz~tbN@zRr<2~RkvZUWwwkxN$fGOhd#k_#cJLLMIMQcMh)yb&^9Q(x$^1Y zOyz8)VfQgx#*InbXy8VZ;#ul=(6oO>oD~gw1G8o9O=7Qsy^Q_4HNdhS&pQr2*!(5vi`(x) z3od~T7b^1nUa;V`wbY