From d2861e1a35c2ce5594e0176d3ed81259a4797b43 Mon Sep 17 00:00:00 2001
From: MrWaradana <muhammadridhowaradana@gmail.com>
Date: Tue, 23 Dec 2025 14:53:04 +0700
Subject: [PATCH] refactor: Streamline actual data queries by removing labor
 details, add optional asset filtering, and update EAC disposal cost
 calculation.

---
 src/modules/equipment/Eac.py                  |   3 +-
 .../equipment/__pycache__/Eac.cpython-311.pyc | Bin 15261 -> 15388 bytes
 .../insert_actual_data.cpython-311.pyc        | Bin 51652 -> 51445 bytes
 .../equipment/__pycache__/run.cpython-311.pyc | Bin 2686 -> 2998 bytes
 src/modules/equipment/insert_actual_data.py   |  36 ++++++++----------
 src/modules/equipment/run.py                  |  10 ++---
 6 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/modules/equipment/Eac.py b/src/modules/equipment/Eac.py
index 867a82c..e91a793 100644
--- a/src/modules/equipment/Eac.py
+++ b/src/modules/equipment/Eac.py
@@ -186,7 +186,8 @@ class Eac:
                 # final_value adalah PV pada titik proyeksi periods
                 pmt_mnt_cost = -float(npf.pmt(disc_rate, periods, final_value))
 
-                eac_disposal_cost_proyeksi = 0.07 * pmt_mnt_cost
+                eac_disposal_cost_proyeksi = -npf.pmt(disc_rate, row["seq"], 0, 0.05 * rc_total_cost_0) if row["seq"] > 0 else 0.0
+                
                 # menghitung PMT biaya akuisisi
                 # Rumus PMT: PMT = PV * [r(1 + r)^n] / [(1 + r)^n – 1]
                 # dimana PV = rc_total_cost_0, r = disc_rate, n = row["seq"]
diff --git a/src/modules/equipment/__pycache__/Eac.cpython-311.pyc b/src/modules/equipment/__pycache__/Eac.cpython-311.pyc
index 880816ff5640b88937036df29544b7f292e4c1e0..08b9fa69e2549a7194b95f8f4fcb114f24fa2fa8 100644
GIT binary patch
delta 372
zcmbPRKBt0jIWI340}xnxd1V?qZRA_W#Kgh1c^^|fE90fjb{vx!Cof@*oqUt?8Kd~*
z16*eruT1Xap35jPS%=4yOVY2138?j#w9Dj=M#7sX@%-grN>rWfC^T=gg_t)p&skOm
zh95tEG%$Q%O5fZsY0b>;!^kW2k-=y3MVadk*?AZ8ORi*>UZ|+NlwEltyK-&vn)D5s
z2ZRrV9+5f`cp)I<LU`K6fV7Kx=~wj9FX)2M2L=WQCTFG#0$N`MHgAzFW>gC1XE?~}
zC<&wvDFo;NsmuIaA&ktIC1rzcm@nI~hA?jSlxJpTl$`9Va)(iRvX<%_M%l^YYCjki
zCJU(FV^rGwUi}~w<KN92wLUNjXE3uGd|*H#BiJYJ)|J|PPFIAT(Q)%*lLA(YVirb!
W#t#g*sgDr3FQ`hgHg{VIF#-ViE_=rS

delta 352
zcmbPJF}Iv=IWI340}wQEcxFCu+{m|%iD?Vx=6y`{tc)u*+i^@{<VX>(5vpQkV3@4K
z^_*3rR;-3)a)G}1WPR>UtgC967w}JBs30=Az(`;+7f&gp<m3h(Pe!TDr+6eexzpbS
z?vQJJz0p2Vb@EIN`OPe1r<nO?0*(6d<3|I-2c|S;PJ_vg+HRYbr9LsSdo%J1ePr;S
zEF*iJN7rzJ&qZB_3j$hS`8FHN6*DRYsWKd7b(92BhZF)>fYc>bu3&NIOZu|GLd=(i
zScAnkpO9x}Wt5nFM&%Bp)Z~?_Zy04JPgDEBC_lMh{T`#@<~)sqOpJdv8)$!E5>97k
zHTb}QM24|XcGMG|?5oGV*;h}5ozY=)l4${}MG*_5KjQ}m+|);i+!s_O8JoGRg%|;&
Cn`s&V

diff --git a/src/modules/equipment/__pycache__/insert_actual_data.cpython-311.pyc b/src/modules/equipment/__pycache__/insert_actual_data.cpython-311.pyc
index 0c990aba1d5407c1f652593c04c6b94c31499878..1dee995c90eacecc3a27a82b9c30c6cde72989a0 100644
GIT binary patch
delta 4420
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
TK8~o|+dOgq9(f0m-&y=W?wA?}

delta 4470
zcmc&%eNa@_6~Fg=?Av|pF1xTSE+5OX%PtFn#Q*|EF>Vl*V30%%5)lL*i6n};tTmx;
zU7gyGB(@Q6G)9ZYbVg^QX&PUxZJJ4=^((gVBSAhipqNf)I?ZHAVx~<eZF=roM4mR2
zcKS!&a1X!VIp>~pIq$xE51;q2CkSggU^0mao(=k{j#WJ-2bOxWU&fxEvza)n=cDQQ
zUMX!ee#9xIZ$^(~NKTM0DFbAt<O1n#_ehyfFf>3YU2>C0a5?rVJ8_%N90xiU#%F$v
z&<o^{F^lBu>o7w$=Gw{I)n?spBysWtH3Q{k7No8>F2a%5AD=?vS0<7pdOsG(h<=l~
zNp!)})xNU5E$kA>T0<c@U~rjonmanf?V<0qtjq)Lpuw55rg>EhXgXR}Hn*+r3g@Zw
z{Hml89$L7#W{!W+;s^X>G+|maC(l)wqZ)Hu!9}i6%lhW-?>Db(X<Z#^4tK0-k4>)#
zE~<1*gs7iiS>vjJICcIxRg3DXYAWhntpRmT+iIyj$5rl{>Z+qoMYkqZE`ShsOv;@!
zOO0PyGiPEQYsS~HV%@5iPLYUW8p*X~`Cyr?vA7FsAn*Fso$FRX%9a>XqjcXTl4)Wt
zX%l69lw1=XQLBj?(;;vEftr_VE@l<?WfhMJREMb0qm1mmox3_OIs<*qz?fmeU`FxD
z&vic2dC~0bGdsuPCk%FEb-ZBSX1-`~^;ukF$rA=A(pkqcCMXTRv2x5u8jNnTB5oLO
zR^}RiE#e<5U)cjZzN!S$US#m6${A-V&*-s&vo2x$Pi4ScugAHhAaEQ{RXz>0b2vj;
zQgmD-vzHVrD`pk4`~d8&(`0Wjh^v&*U>ApPD2wOL7T93Kx~)2ky!k*06XwaTniK{j
z<<kcQPN*;-8NK8n`^t03tF`IM+=rq({yjNW-_3`93(-h;$(MMJvbJG06L%7LsDz5M
z<gZJ;ai=NtQ*nZ%HqJ~r1Msr0WzCxQPAT*bkQ`U&57hievbM2F_dbR1l1q)Vb>}EN
zPg0kCp)<gT(zRDfX<E<OKGz{r!i9wVi^f2oF>t{c7<8m7J6fH()FlEs7H1E-(J{9e
zEMSiXFvycB6(vgqa(;z98UTk233K?mDO_JN2GTc0d^kzy^VsUjbbY1xVT;gLCNAa;
zmly`{B@R=}2X#RD<9L|RZ{cA=e^M|G$Uvs8z61?Sqmc$m#3d{{h#0_w45pZ6Dc0d-
zJ~SwZ4OTWfXtgvL*+I8$Nhvc}f+;Q)8#sOlGk}L!Ofkn&EbuUG$jHOAAuCI9vb`aI
zh5};440h-q4071Vwv@8Nx%MW^jUWto1dB~(VI+>B*n}xISL6U`gGwT#eAuxo9uFxS
zo|?+wH_2<?b>O$iJKsHzk0~$89LD*|o`@dfE9Ah2r|?OV8Lh&n$P>|Q9eqooGh}Df
zlYACnPTKejqv{+g-Y4%xci=wKvGFf>pR#CEf;lag5{&e5!}uPI&wgM<=!bstMMnwQ
zGdDxvWW0%ilkDT?f^n#ek#T4j>@=2)rrSyF)@hiVK<FkS^?S3)*}b`pjL4dvB9?{e
zYkG>!5*OhmKBAL!5dk99F0k8VVLu$82Vuk>Oheah^I|=DX?GUcwJk2&5O&<OA|&gz
z{t;0UB5^Q`)PG9E6y|R^OL|#^BiA6C$Ue7vER#Hv387n7C*^a?{?rINHe!y%%kh%&
zR*r~8wuHRlj9YPJ3)xDFW|+pWf@Dn&vrG^7cr}xym)9;2qb&<0Ys5+yw;+-r$4O$h
z36jzkC&I9WJ(JRKvPDWbl(?UTiol3Hk)%6(Y=;ub{m-YvtFcH)fIFX0cTjA<WA2o&
zmwZx|5{)>***6115!FQ6G<Vo--(XMr2D^Qdoz_xH{wWtpfxkI5O!wpXBU@#IB$AEW
z9hrVPalAT-;k$0y5&Dt;Q7lc_te2C>8{0GE)3i2nczY>NJyJ;14sW7UYXyBO`FOjR
zRPQhws8<@qanLvhmy{mKR5vng!xTAFwmj{Bl-UnE;vkIJqi)6r!*u6Z$|h|PcW0gl
zh4nYx5XwTKjEG0GEu69iwnc{QArHE2r1n96o@aw+%f}Lm!0+{VJ$jODK<jb1;8qkl
zO-`4ca)#`B+ApUZa_tvjF)(6JBujR8U5kA-jLeg>FHDQVn&nhUl(VGFTgwCH)-aET
zWoejK!+aW+tzmu*%b_e9TNxzG)fn&6usjXR*RX(w6=>L04ZB;z3RM<V^F#U~jj>q6
zrfFD-hLw_8FQzBk#<!hKHjX1>=gC;1qq6SXEbw@RzqJC#^8Y^to>Xr7fu-K@f&GW#
z(~5V)tBs^?H85M=nCNS~q@i~TsqONUv6UR@?ad|oc4r9*-O%Ajyl}#L=b2ROlf{r;
zHp^l+bm>xAH{1xFSSpKTYd+A)=k|2<W4%YV!6!RI_L7YcWtpX!yE&;`HiBxF?4zpX
zs_I@jTbd1~V6XM|vtBk!_jT(arx3d-x^#3E<F`hECVR!CTVsxzq%xMotp=alYq&l5
zR&L9mzqS-5rg`cGG+zx>MT^1FVvtR>UY)w^xukec_TAbu>VDaC`}=4>u@kCOANx(V
z?8*5bul?$A|DFF;o3QXHo)ql!8LDeSL-5W+mzAb{4g;rltUa#;Qr@IWBNf$DyhTL<
z6~9x4Uh!i55&7!ijW{1P5TQ*}olX9As8}}!*JsF2TtENW9i|&!Yr=mg>}#LjJ^_EJ
zl>OpajE|8MuLq&=(j6{09EVK*z~0c?WWnKC&}2V*_+XOSQ^Va3Jv0>`QgMn@E7?A^
zyFN-e><wtrs8HKAwNcBt*;)50g*V&jOUiuc)SSP(!O^RdSc`n5{78~`FZ`8{!ScJ_
zBaKJW@mkV-q!Ndfw~tsbkc+>nwCc^znV&Il?Y^jY_vzgi^lnmjbd$b|G1N1kpe|+j
z=>1rD5}TZ#peL2UZ+2pAQ%=9JM_?Mu$z#VCM8(E(^zJ={HTm4RJPi0;zPQjXoGVRQ
zXcf*IdC;7<@}N0ypC<t6ciJ8<V)_fIYk!eg@8kPt+3FLyfdmYAAW^J$2?Oa2#Tl4l
z7fZ1R(xCyb>f@`RIWOOBTdG4>;2#zsS9Idi>FgD&ZK;pB;>8sE#HB_2m8lHHg_z<Z
zmf{i`=}MXEGd;)x`Cukqo`^mu7nfzS!-8d58atfKgJw95r<zQb;xb#435}S<rWAI>
zfvI%bnu^d!v`B15?8v<s<W<hr>_Ar?VzZCE>cv#%+Lj}94T;Om>@^dnGSSwC*lT{<
z@^bFlOiXdP*dhv}0t0x|fGHNCvu8)mwiXXJ>ZU%U9<gPrFq*IW6kv*{sy@Y)wpIgo
zT~D2^8^l(-a6OSaT~ERk+o{v_6kBTncRir`6o{=eh3nH*pBb3qnOqwp>rVWHzYn&`
zOGJNiCaF5vpF#hd41Gz32lOGjk1p$*n>$-pwKq41?jy5Kxy2e#!Vl_NO&&k>H^(xJ
d)5p*qayF}UpEluybsSC_LzCnh^6HuS{{}jwAu0d>

diff --git a/src/modules/equipment/__pycache__/run.cpython-311.pyc b/src/modules/equipment/__pycache__/run.cpython-311.pyc
index e53b8ce9b711f692d89b1c392157b2cc0d6db792..ef5c1fd1b2fdb1f17012b63118f815c1bac17ab2 100644
GIT binary patch
delta 948
zcmah`O=uHA6rP`*>`%J+p{Y$=q=^;_QcWvCrI15w7fTO<2!fY}lHI^++@{kBtzlQ|
zQ53OE!9&PF&?@LH(0i-BNAMH~-bB1uZ=Q-16A5XHzMYwUZ{FMQ``+7w*!HmgM%OhU
z?0aV3xw4`EKyhi~;8q3#_wpIQq;{%fqkx|CA(Q{c09cTzy~u++g2#0D09xQCuz)W-
z{uQ3(b5I{f9<opw&}iTHm=|H<{J%M*qZ~#b$0}R}Yxp);g(_e=pMdd*k6E}U?2f{p
zqd3o?!E1xPTMx5XFJdQpegSPE0N#n+F`DWVO<00IL#OOO4R1kFCw9lg$ijV<@{#=i
zN2(lc_s~dZaW<&lC2dYR#SA_mr5*;D(G?+H9<kI)K>Qx9B6{f8;L9SbwX?or1-(EO
zSOcCcPTf<iP*t+RHQ86)bi1m{arzMUF{l?0!S(|Z0VoSH@`oT&!@kO7z96L%(d(5V
zlhP%cbll`}*{1h%)*@S+O7ch2mx)kQV$MCAV$oAmHP`ZXi8)Jdla#3AvL;?(v>7Z>
z+j8<ON6RjMLT(H}yBY1?iP{{sSIR}ke-iH0#W22!XC1VnLz{^WW7All-<Kp3ZiV8H
zi%*LU<>ayJS1TCX2Z)4wM@!Kgp$o6`Z&NP|uL{By>ywiHtfU)Cnnz@#UJYc>oGFyQ
zh>e5y+H?|ck4zhQ#~{Mp86BGmf!&aH72)0Z$V?XRW{L1W1g0;|X2Hj-W=`TgdBhyY
Rd*j5M<VanHdY!2n{0%nHzRCaq

delta 694
zcmah_O-my|5UuW>p2<uclPpRIL4q1o^swW8iGe+gMnMr5S@5U_dk*8rm>oN?$c*?G
zLJND4T=n4I1WzIa{S^c1)teqYh}cng$LPUox~YCuuj*ADW$!!8ebY2R+K;v=cdTY!
z<1JFVpI-=3fEcQRpW(C_elmvl5Ws=FPlkZOPw+;1fvf*8fFk&VA#ULjuE+5Jiy7Q+
z;w{`{GYF+8j!|DaB;1VCmNjvNhw_;i2?+lX|9FSE!(FMD@)VvG1EkBLb@E!MmueBD
zzKOp-g!b+b7v%eRV&zehU*fq~Yd~3I69cq%4b?X}a*a$E3rcoa-;{osU`C+s0!s#(
zeA|KqGj|o%Ue`k1`zWjG&)s@>PV_0=!&(#j&uryT$<bsz`dA}XC!x-%xK+AwdRBa*
zmqTWxaCgm#k`>=!?h;@0t6oGazU%QwpZLAxRJgnDMP!5f!dB-xGtYSvT=bod>MD<r
zBlcC1os_d)$+HdTna-VDEx(iBp1w&Ro@ih2XG`woPrr?zfeiaAX(S7_MH&`u`lI%@
eaSKi@qg*7Xr9!zt&I+_#6eZ&qG7kS526_Mr)Q6k^

diff --git a/src/modules/equipment/insert_actual_data.py b/src/modules/equipment/insert_actual_data.py
index 66cecac..a2b16d5 100644
--- a/src/modules/equipment/insert_actual_data.py
+++ b/src/modules/equipment/insert_actual_data.py
@@ -108,22 +108,13 @@ def get_recursive_query(cursor, assetnum, worktype="CM"):
 
     query = f"""
     select 
-    DATE_PART('year', a.reportdate) as tahun,
-    COUNT(DISTINCT 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(DISTINCT b.laborcode) = 0 THEN 3 
-        ELSE COUNT(DISTINCT 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_query}
-group by DATE_PART('year', a.reportdate);
-"""
+        DATE_PART('year', a.reportdate) as tahun,
+        COUNT(DISTINCT a.wonum) as raw_{worktype.lower()}_interval, 
+        sum(a.actmatcost) as raw_{worktype.lower()}_material_cost
+    from public.wo_maximo as a 
+        {where_query}
+    group by DATE_PART('year', a.reportdate);
+    """
     # Eksekusi query dan fetch hasil
     cursor.execute(query)
     return cursor.fetchall()
@@ -457,7 +448,7 @@ async def insert_ms_equipment_data():
     try:
         connection, connection_wo_db = get_connection()
         cursor_db_app = connection.cursor(cursor_factory=DictCursor)
-        query_main = "SELECT DISTINCT(assetnum) FROM ms_equipment_master"
+        query_main = f"SELECT DISTINCT(assetnum) FROM ms_equipment_master WHERE assetnum = 'A27860'"
         cursor_db_app.execute(query_main)
         results = cursor_db_app.fetchall()
 
@@ -568,7 +559,7 @@ async def insert_lcca_maximo_corrective_data():
             data_corrective_maintenance = get_recursive_query(
                 cursor_production, assetnum, worktype="CM"
             )
-            print(data_corrective_maintenance)
+            # print(data_corrective_maintenance)
             start_year = 2015
             end_year = 2056
             seq = 0
@@ -868,7 +859,7 @@ async def insert_acquisition_cost_data():
             except Exception:
                 pass
 
-async def query_data():
+async def query_data(target_assetnum: str = None):
     connection = None
     connection_wo_db = None
     connection_production_wo = None
@@ -948,7 +939,11 @@ async def query_data():
         # Query untuk mendapatkan semua data dari tabel `lcc_ms_equipment_data`
         # query_main = "SELECT * FROM lcc_ms_equipment_data"
         query_main = "SELECT DISTINCT(assetnum) FROM ms_equipment_master"
-        cursor.execute(query_main)
+        if target_assetnum:
+            query_main += " WHERE assetnum = %s"
+            cursor.execute(query_main, (target_assetnum,))
+        else:
+            cursor.execute(query_main)
 
         # Fetch semua hasil query
         results = cursor.fetchall()
@@ -1044,7 +1039,6 @@ async def query_data():
                     year=year,
                     labour_cost_lookup=labour_cost_lookup,
                 )
-
                 if not data_exists:
                     cursor.execute(
                         insert_query,
diff --git a/src/modules/equipment/run.py b/src/modules/equipment/run.py
index ebadb24..0766aa8 100644
--- a/src/modules/equipment/run.py
+++ b/src/modules/equipment/run.py
@@ -10,11 +10,11 @@ from src.modules.equipment.Eac import Eac, main as eac_run
 async def main():
     start_time = time.time()
 
-    # try:
-    #     await query_data()
-    # except Exception as e:
-    #     print(f"Error in query_data: {str(e)}")
-    #     return
+    try:
+        await query_data()
+    except Exception as e:
+        print(f"Error in query_data: {str(e)}")
+        return
 
     try:
         prediction_result = await predict_run()