From 5c2cf398ca47a5658ac9c879149093da6a37304b Mon Sep 17 00:00:00 2001
From: MrWaradana <muhammadridhowaradana@gmail.com>
Date: Mon, 10 Feb 2025 17:21:30 +0700
Subject: [PATCH] refactor: equipment API

---
 .../__pycache__/model.cpython-311.pyc         | Bin 4504 -> 4514 bytes
 .../__pycache__/router.cpython-311.pyc        | Bin 5304 -> 5341 bytes
 .../__pycache__/schema.cpython-311.pyc        | Bin 8677 -> 8802 bytes
 .../__pycache__/service.cpython-311.pyc       | Bin 7241 -> 10866 bytes
 src/equipment/model.py                        |  74 ++++++++--------
 src/equipment/router.py                       |  12 ++-
 src/equipment/schema.py                       |   5 +-
 src/equipment/service.py                      |  80 +++++++++++++++++-
 8 files changed, 127 insertions(+), 44 deletions(-)

diff --git a/src/equipment/__pycache__/model.cpython-311.pyc b/src/equipment/__pycache__/model.cpython-311.pyc
index e7bc7902d59d181c271d0d11507db11a810b42ea..06ea0b008a94613d5e2f88e512b06350dfe3b1f8 100644
GIT binary patch
delta 1601
zcmb`G!E4h{9LLu!>Ds!~VB4f=vn5%{=FGGmUD_449j2QMCW=rGUSw#df(+c&c@di9
zj)7islHg%R^bpx)pnrq>9=t=?f1r4n;91PJ9E!dtLwxXZc;DaW`@ZkJU);*;O7;!M
zWd@@0?(ps7FWiT$!kXzvsrTvq!Dua-XXAcmaKK7hB;~@H(tF8D39c8glF1SHi>Fm2
zg+EhzKPluTDw&JPwWL%gITvExPLeZ;ROez$ex{HmDp`(6d6=AOG}iA7lQSt)XEi2Y
zQOI#BS&7MSluUZ8t0{7(NviYZnB1h0SE!^Blb=%3D(UU6QpsynrP}+N`k1Ko_S1E3
zi;Wuhh}~I#(%C#3+P0n_rJrs;Sbw<FS%0?0MB2e|x-!&ldTkgn(1?LY40}1u@Ou-E
z=$Vk2LYXO?nX<2kyx=6A7k&ZwD&nh{uiC4jAUhjw+i!zVM?xJ7b^CT$*4&1t2RfAJ
zP<alQ=YT1O#W6SOcKi+$O;j{-(FCRtN{TCZY`}ulZ6K+Er3Ns<fAj3KR42To*9khH
zE+BOQs|&!4hT5bj`0ODI+9K*|i&$F(X6&ER_wA$`-aUW$a2fO^q%UE837GM|bM{rr
z<L-)Q1}4ZYBzId_ZUG~aw<q3cNp&Z@LQsHG6P22{)C5Kh#ZhP1wR{W2StQP4aTb_-
zc#g_$T&n2qu4e@nDDy~}$I3h~@_G2b;W^1^xVo=Hu7+|ooU7Suf3!pQv>%8;^Cf4+
zHGLEEGblfU^E39XFq_}oaN1GJW(|}zaMrMIl2Z~L3G@NS-%Yfpj|ZBG-#^X`ciQK^
OpC~^F@|G6;L%#sgH@FP|

delta 1103
zcmb`{zi-n(6bJA|*rqXwF~qUs#I555ry)&KwKUETsmTzM3JHXSL{_GTy;8H<V>c{$
zxzS<(vjugj#6R&)y1^5F024?|EYQ4mh`>S>!oz2H_r7<}*2!<Hq$<77X2rG3XZPg8
z>vid)Wb#3dS5oOf;`Nk>-a#{Hc4_d27qIIt)@1Y^dLPZ93YuRUyb`Vw8rBM^juz1p
zYM>iSgWcO#2@`8&)Iuw06@7r(OM{=+i7l+v(T8XQ-A0?}PVi;@Q>qobOFs%er?vAR
z>FO=l3CECW&`g768s0b-<+GZvhBk<GD%P1;_eQa-`hq`?c#vCEZZWy#J&9GrpOI;F
z4C(<@514x3J&#Kkal+c74W%9}^;oF~Tp=!O5`oMYJQN&Sa9F_sE+6YAQA1&o2i@&Z
zy~FelaO!{Cb7jkNEfm7}1rOx`Ee}|E0Nh4wZG~ziT;#zTQr8+XYY5!tKTW@KlD!>H
zqshffut(G$F?$4DW#v6rI*kgMgwA3NMxPpPpBa7N^yK3czi6>cYN5KYq1dIxE-Q9{
z(_(GIpOaa13R;_LZKkz>Q{o$Ry4S6yP3GZjaSG-kH4mA22%K?~{NLg^-FHYWYC~?1
z=Jr@_&wKjEb#U=MBo3++{RwfRF(~^~*=NeW_bir_vzb2)k3niusmY|Kca%J3;*JUF
gb4`Ac>g{}8>!g0ie@vQD_S<shd&2UGb@>PR1zb{NuK)l5

diff --git a/src/equipment/__pycache__/router.cpython-311.pyc b/src/equipment/__pycache__/router.cpython-311.pyc
index 72c53128cd61d4612b5817906f6fae184fac90fa..d70c62c440ce019e538b59d6b221ef7727871740 100644
GIT binary patch
delta 533
zcmdm?c~_HnIWI340}#lZS(*M|BX2Z2BiCdNK0ARJHU@@TrdsA&mRi<Ywp#Ydf4HqC
zzh_tCs$pNlvJ5D>nr*TqM+PI?<R%VZp<4nuiNz)HiOD6Ui8=9=sfk6C&vRHYa!lsp
zRJJLy0-9gU0VEWlphy$Qxy75FS`wdHSejXoo0?ZrWCIj41gTsLBwhev1H)IL$;q6`
z(){eKY&SUMZ*Yj+;1IgOA$o&@{|1M|2Q~&CvB?v7RVN?d6xX~VtNVeMosa7y1CaOv
zB0dN(2<m+h=Hg-d$N(h1fQSzaT$BHDZez5ayoJk?%@$};k=<lwZhcl~Ak%-dId=i0
zrVB_E<d7mGAfd@zBoAUcfe4U>DoK~bl0=2lf|SVzxx^<w=MiMH2FW>0{>P&z0M-mK
z7p!ZtKCddP2ap-LIg)oVBct2ozkJ>@U=3m*1=2tQW(8QU)8rI>Wma#XaN*`2{`HKO
zpkTShQjlL<QUr43E#`vKk|L0aMIc2*x*$RuM1aEd7l%!5eoARhs$Eg^<`O|pCT%H3
lwgsLa7=Y9cVK9XtJ~A^fc{5&N^!mUAl>T6~d4;e5BLKUVfye*=

delta 441
zcmcbsxkHn8IWI340}$9Lbfp(;<c((M;so-Vf%x-*$$wZRCg<_V^2M++Fw`>DGS{-y
zvevRqR^+joe3p-A@?Ul_jx{XHfRd|OC(CkVFtSc=<M5sQl*5XVeX;_lGHWqA(45JB
zoHC-;K!za@7cT)4FMzOt;VawZdQN2_W(L*(#tSUcGvZc6?T|ge{()oiE>3&358P~g
zTpt;L#1|0pfsa8@?}H#G58FouAn^r6d|=?5ti-jA(Pr{ZE>AWaput79lQp>YS)G7P
z&&@I11&lJzAW@LTMMgkEletJ9#C8M`Hj`iQn6g=cnD&#Ec@+h~Y9Ype6-^G|Rb_Pt
zGJ`kQ@h)a$be*ik?=1t?AO=z(4J2SDg7rF1?&Mcy^#TfKZ{Enio>3a)>su@Z`Nbtg
zAUEA&E+{Q20-0FkHMv?)mN9DcOhHa2Z4pMc1)d)mfYc6QFohsKGBYrFGhSiz`oIK~
M{-C${tgrwh0E32QlmGw#

diff --git a/src/equipment/__pycache__/schema.cpython-311.pyc b/src/equipment/__pycache__/schema.cpython-311.pyc
index 4d2972ec8f7e0f0732b22cb53fd0048f78656664..754cd1c7ab527258ec1c3ec5ca13543b40a5e0f4 100644
GIT binary patch
delta 764
zcmZwD&ui0Q7{Kwo-J8&M&04y)HcQ*2>zrnB4h$&@4u90`A|6DXpv>AfQ42kFwKx#j
zY3#5=;RWeD31W5l1GUgUK~y}XFp7E<93Cf#;6di|J~HrNc;7Fd_kEH}z81cmksr%)
zP=IIl!{&|OujID@5@O4~8R#bV6E-l!Z;oNBL#7yYMK{DYK%=O4pcral*c9WaRZs%e
z1MNd?gOaF3$P^XSJZKEn1gWSFD1{n;(kMwb#SAJB(ookyI_e%Mi+TeZNBsolP?IC3
zIDuLK?MJPGCQ&`m0n|3=ASw|yMFTYtnnE=}CaMEEgc^XRQBuSd4|8?%kzYPC!_NDS
zxB<VmuJKIqm^?bGj_%H>dfR>wdr3Xj?yL5eYOl<#9c>lXXFY1e>Qnopl4-}=jVF$$
zSbfFXQmmE2TC$Z}PkYpY)u-0O=P`-AXD`M!@;<@!JJb=MNgbacJca%Dxh%UucSPAc
z3NCd5$KmAA3xW}3=hRB<bEH;UY7|SA#;sDVxa^kdMwq=;PfJ(ey}HJB)GT?#qN%%#
zN)xh2Pr|B?^VvnV>sPwHRE|s+`8myVjYsFn^5Ba(uEo7vVp4{YMRq@Pd$__cDNa~g
zO9soFJXhHXEl<j<snsO>vdq3|>EKNm5!g$EZdfmnBN919c7*@8b@n?>e*8O+vOC%8
EA8`)1C;$Ke

delta 672
zcmZY5L1@!Z7zgma^u1s^V`E$6y7VPk-KJ@(C)21G!P;It$*`wQsdElNJxmz`L8{2u
zVTZy8Iz0`PiMMH`S8t*ql0q4t1$*(bfe1Uz?|mR13}61=FYkK~9{GOpN6mO`80iE)
z&+fcg`0&>Fl!9fg0{68n^fU)vVIN{2V7HPE@MIPmNk^FTVm<}8l7To(dXCDHKBID^
z=13s&q!rW=QV(U3hNz<?>tG;8Nextiw1gTXZK7<_HmXR{jX+3J73Gj_qFmBblt=oA
z8Ylfml}J;E0&$GgL`{%ZP?Mw{YKk;O9Vc0tK%5{oP(Eo1RVHns0@60BLekAZoK)&o
z%{`5sg3AYd)5o8@=&2~H2;gpRzb;GbS2j*>O~f+l%V;2@c763sr@nSR<`Gt(N8fC3
zJ>1A|@z@Ugb~v!Zc5QXEGr8u*JjCkr@a4O_&R#%87U0WRTff1l6MhOF+jE+4z@B{p
z>P5*O!Cdj79`mzU-4R)1=2dkKsp6Un4|WT=^o*j4COmL}%|OOoHm|Ei{&%wI(9V|n
zRxu0j-70IrPxrP?$6GM#$@Bt_7{2$ucAt1PRu=5sPU8RQT-sHuzy6I(*dMnbQ=0w*
D*e<I{

diff --git a/src/equipment/__pycache__/service.cpython-311.pyc b/src/equipment/__pycache__/service.cpython-311.pyc
index 03dd30b9b18626983201b19131815471d5345fd9..778a0a25714e753e8ef97df2d74b4dde2ac6fe09 100644
GIT binary patch
delta 4220
zcmaJ^TX0)P8QztSbk5QJesr@fJHAA*owgw%m!`#a5{J}HdP%08hEmOm&WWQ&w;mlQ
zO_4_J&`HzMGARqxK$$Ag6nEMeFwC?(6<#PaFi0Lv<2g`BADDp$m_va+@Wj7+EZ<U)
zbv}Lj?Z5x-{`;TZ^{@ARa?1B3uh)g(^TF@ln)@{QiZ6~Ier0TKrW8IM#z;YmSd5gS
zr=yI!im{S(T4LN?jF%Fp6Tm&Hq<Gb&;!{&<TJ<KVH}+BcUTG(q{mdZ945F%Mz51+E
z2|dT19#H&B_%+O|B5Fp7GRyQPOF@Y}=R7^gY$P>!mQ&);a)^}^tek}MHdaol9wniM
zz<V0B;TRL4duY@L!ieHOiL(8qjK7EN#AO?D8?NJWO;@#PxkkoqkJ~=w$#LH&OAY&9
zZRF=p5B3qv$B4-L$v3zIB;%NdCq}Bghx~>Y1;uvWMrTX*3&(JTV0(lFB0jF+)iHUU
zmvEF^<D;a`i{w40*DYC*K}f%y{EZ)_8cvX0P$GYH)^U;yI-=AwXqcDCH~FFe+kOvD
zu@3hNK^WyP90|bRJ5mmR-QP<0hO)g8s0XyZdO)$S$Nt%<erIne2w8P>niFNL;6@M{
z2q4<l8!$ao=jwdjRS(ufb?;dx@royLKas^SmdLzVj>=CNVxg9k^ZLA8G@P}(T$D9(
zQ@l$EYcc3flgNnct?5`1;=O8>yQIom?#X#oyJSeW=$cxaFX~2MYX$kO>mVNnkC{w{
zc-=YoJ-~hN)TZo97v0~*0dF@x-tkX#{SzHwvMWrIUEZ;z|Hat1yxqXq;vLI@iH<ng
z6(>y*IZ~#FyyM;;ly=^b_AE<#I?~>*w71PgmUwRr3y;jT-E(bjZfVGu#}6i<7sFOi
zv=k66O`#7U%ULr#M5`Uve4N(sYaD1W(2O=kE5$ig&z-rH0~cR}@(lUVui<HOEYOdS
zEu9Pe5aWA^CzOO_7z>Tf(uC3I3z~IW9o$QWV*rLTUn!L;Wo?EkM*(V10NPQnE1q^G
z7mM0MP;s1mC-ke4X<!Dg$hw>>l=DzvADY1eJYR+9pTD$2{y*k<!p^Dy&fCbde3)f@
z+vXXh(_tS4TdDshM(AyLtWU#6K9=I-hA-?#U$H-oUbSE5Fsh@Lb2TG_%?-MU3P`cl
z@p^9rD|Q6~atZ=;Fmy8H843(VhAxI~h8~7qhCYUVh5?2_h9Qbg=rYWT5r$EQF@_Su
zIKu?PB*PTLG{ZiI{R{^fW*81K9AdbQ;&lugC{l)Bvt7px`y6U;x*vk1u0~1^t`hix
z2#CFsGV(O6I4EpmrYb0aZ^AOY%{CjR;mzg4=*v$$2DJ@G!&$et+`aeT+2HGZ%R{%8
z`)SUue(KK6%cgIvb8N0tMqjgSR$xK7mXG=zUrQ4h=2!vM`8V*_@mA}X&O-wDVMx&^
zx3%tnrG`G(8!H53ODovIx1Z2xEHw6pi~=+KntU;rFF|6%ZhirFpvbCFl0hiQ#azBp
z(~aP&T9nUJw47cjsYa+LHJNs9z9g3|ch#-#K==%Ipl)@yCRyGRw2P{yDuujWxS(z{
zPp(%rH`H0}*c>Y7KC4quw|2TFS&jQG&y^?Cyq?qL+W9SR*u0CCS}j+Z*Q@h-u6g_s
zBT5@>6suYxuUf&ZR8>vZ3zc#&m~40@nTEV9m-DI>;;@#d3$Zy+0ZX)o%vOS$ZH{LX
z)`!}y1&`Uqsj@Y6YaVV14t1~=hz$;`Fl-)_2W(-k`f6%4Y17^u*XMG}1ifIVSM**K
zcva5l%GC=-m=d{MhVw61DqCK&woS5}f08-YvNU_$09l(hMEMScnn*iAm7qp<S<MSz
zI4+)3HFZ7D*~w$={sr9-)$)9aE{bY6G`T#dYWLGd(%Fip=HZ+zl;>dOHF^@zqt@W^
zmFgwKIbVe{KsD^JaE4Q^R@Jg%@UqfW=y_q-i)uM5SO?BYIuLrs7=bf#P0i`hOAU^A
zNCLyNp-?k~nhFOWB!R)PuG|}I>G8sjrnS>4GN+c=z&E&jw5(kQ!^h#N9fO_aFYxya
z`nMB_{+Amap|30S{Ymt_7=5|X^^Yt{-R%Bl|Nf46per6&(?=Hvm;K`%aiS|um^^a0
zOc!!T$xq@(n=9O;X&Z?<SA@{jqut1`X@|m1A$;{g(*ewcev%8jO`dWAi32Up6e)Kh
zF}-lgbW`p@V&8&ddMWo=_I}C(mVJ=&kYyjHJYv~Lfj7+<5{Fx-Oo>*+kvP&)%mn30
zt8t3*wAHwe@_wuF0Oc7ZW*3LeLCS|LeH-P7!Y~put%x~7`KaY=jPmUk&r-gliNyW|
z-5jTd2_&W#4x5vd@3i#WD8Jp(@1T4a61TMuo1de6w`H@3^3Pi~dnw;%+3ctM01~AI
z&b*WIgVrqWqWo^F?H8J~FolsAUx=9ZU|O1nQt0Y#^AIZ?h7uj&5msUoo53hEyb_ko
zW9u5Nfa{rg0;5Rmnfv~n-1d>+y)xJJjV=Z|z8#B4yA!h?$eoG%JHi89;eqx;C;wr$
zrJVn2B0v*490wS@;JYGR9fn1h#%{#Mmt*6d*km_0dBwdVgl`DRWg&U}<YMI7qi;O=
zv)a4+e%$zJqn$be-;OZT6=vGP%!&}XA*7at)c23K)BE7NIBWfOg#BG%f17=8a=sf}
zY?+H)t&1IQxXTT<xnc5$$Z!bK+T*`c@3_-lce>4`wP_-U$KuP7{Idw7SCPJUse-fB
zPFmrY;`-Vx0S-mDBfMj?ZUN+DN2Cd-vJFl~?rG_ero!u8%gC9sdNHF^@~}sg^_?eR
zt6>*$_ENK*#-VwjKf_h3C~7gM%$KT$T~-wBBB<<L%-XFc&r@Llphi#pwYS)rXI*Ju
zLx@MO)9TCQ2a(5jedOw2-0^O)?V9blX1lK0Huo9d6?X*IQJZG2m%PydoOuDb!Pit>
z)^&}IqIdJ9eQVE?`(j!D6s7eZERyGA-^SBR{n7xQ(k@W>2nBXSr}OAd;Sg2nR<>md
zFmn}d2n1^0BhC1;PCB6MC~+pfgpZRmiGyQW2o%GqU#h}>s?q;Ej9^X6@1z%Lx-0I?
z!*;7h$oq*{GfHdiHC;0t`h2wryJ4{arJW#a_fVkMeyu@)-pg5#Y4}!WL`T660V^z1
zQ2dW@5SC}YsNSv72-B>n?SjjXX~!6^psDu8FL@wYCDX|?`7pU}W;Z^ESHfx2&dBz0
zi`;a$uI#?*?YjG0jz#X8r|q8TIwnmAH8RmHSS6=YPaU}%_bnDo1V8WJ#(uWKw9Sd5
XEzv~q^X>rq*$N@@_tYaCjqZN|h2xKl

delta 1430
zcmZ`&O>7%Q6yCAD>;K=_>o|5D$IYJu1dv)3606V@rH4cnC~c|Sg0=BX5=-mY%&tp|
zHnM_xsJKA&B#;nDiHe|6FCbsIz!mitq#mjj2d=#ZPN*Qkn=w&ofzj^U_rCZ4-t4dE
z@6E-&ibg{Uo|j4=Z1@wmV#8$d*3?FiC{&?AbEuWBr6nISGcCQQOFnF7Tf?<s<ReU{
zQI?}IHp22OniG-aVFen0&#x%!p2yg_MiV!DwPVsNDZSDx@`OHx`XY_f-q2@6nx)w&
z%}CSy6Q%*G-_U9$X_IBibsrr@*D)#QScGO-3e$}sRz6CHHhGkf)A*`VDLfQqRy0>z
zWhQIbuJ#&!ZRV;=X4|k~muwRc6g_2F@x0}EUxODXz62+^(*NB1&;!5uBV-6p`!nJ6
zpj}0=XP_6Hgyle#=&%#ip&i&JS$HQfhVq`4g~?zU94+*}z9-2rjCs>=FPMa@{&|vv
zZ~WtvPLv;WqSX6%N;?_*<WW*Z8R#&9KC?wA*^Z$@0KtEZUE*=a=lGqF6LaG0D(r<;
zGkNaCFg%XL)z+J)%{bQ~7~X;p!}Eaz&j_s!KZf_=yU2nsfg=1FsfXv0iQ#MQd-~1j
zr=<T$JVMm)g#+J({@p}_ltihnr%Cw;GCVIx0ZGL-2w8>MR3Y=SFbZxkyS{e4j<%;!
zu0lP<OAEr5xSGWb-q>_wO`El>dWZ3P$Jk(evHwfzHYuDD{%WgDnR#wssRRejL=fdU
z_&PnctP57$?20zXD?Ioj5?5=qTdnpMe?=g#BC#|iC3(0k%r6QvOp`C8;tZ5CKad6Z
zy);F>fEOk*0qSWg4%sERp)#zEQO)t-mGZ))v5|}XEV^K?q7*kI3#`*_tK)hNN(ZT%
zcEvlWX$6gV5s4*sfdvfGYYol}+{YUTo)=mJu9e@8J_x4|d}%HQ#EbpF@ljGbhrH{z
zm~GfL=dYu5)UJriSK#b;B_&(Zx*aNFUPAl|^u|B-i8%0mLhnC6p^-&beRq>_#!m@9
zxj7l_??S5r74v$kP#i!0H2gAZTF{-`(d72V;g8A7WC<=!ReP>xU+*-xHh2nc+@!@D
zvsj0*W>{>t(Z+;B0#69s=-QjJ7UNf&4aUWf<$5ifyQ<yon9TK=O_XL3=Hd#<8{>ML
zTee)1oRw@&79+PHCY4v@NFN2NxQedHPVr52Ciq%Gn47+-pEywd<AI;1=ay#3Me<;%
zaOjoH^fLqIXEk*5#7EKl;o`1($F~<b2tRvYeeO^dMu*D3=oP3{u9a1i*$o~l`1y8J
Oex4=?$j-beSMnDzuTs_k

diff --git a/src/equipment/model.py b/src/equipment/model.py
index 4c654a4..0c74809 100644
--- a/src/equipment/model.py
+++ b/src/equipment/model.py
@@ -38,40 +38,40 @@ class MasterRecords(Base, DefaultMixin, IdentityMixin):
     # )
 
     assetnum = Column(String, nullable=False)
-    tahun = Column(String, nullable=False)
-    seq = Column(String, nullable=False)
-    is_actual = Column(String, nullable=False)
-    raw_cm_interval = Column(String, nullable=False)
-    raw_cm_material_cost = Column(String, nullable=False)
-    raw_cm_labor_time = Column(String, nullable=False)
-    raw_cm_labor_human = Column(String, nullable=False)
-    raw_pm_interval = Column(String, nullable=False)
-    raw_pm_material_cost = Column(String, nullable=False)
-    raw_pm_labor_time = Column(String, nullable=False)
-    raw_pm_labor_human = Column(String, nullable=False)
-    raw_predictive_labor_time = Column(String, nullable=False)
-    raw_predictive_labor_human = Column(String, nullable=False)
-    raw_oh_material_cost = Column(String, nullable=False)
-    raw_oh_labor_time = Column(String, nullable=False)
-    raw_oh_labor_human = Column(String, nullable=False)
-    raw_project_task_material_cost = Column(String, nullable=False)
-    raw_loss_output_MW = Column(String, nullable=False)
-    raw_loss_output_price = Column(String, nullable=False)
-    raw_operational_cost = Column(String, nullable=False)
-    raw_maintenance_cost = Column(String, nullable=False)
-    rc_cm_material_cost = Column(String, nullable=False)
-    rc_cm_labor_cost = Column(String, nullable=False)
-    rc_pm_material_cost = Column(String, nullable=False)
-    rc_pm_labor_cost = Column(String, nullable=False)
-    rc_predictive_labor_cost = Column(String, nullable=False)
-    rc_oh_material_cost = Column(String, nullable=False)
-    rc_oh_labor_cost = Column(String, nullable=False)
-    rc_project_material_cost = Column(String, nullable=False)
-    rc_lost_cost = Column(String, nullable=False)
-    rc_operation_cost = Column(String, nullable=False)
-    rc_maintenance_cost = Column(String, nullable=False)
-    rc_total_cost = Column(String, nullable=False)
-    eac_npv = Column(String, nullable=False)
-    eac_annual_mnt_cost = Column(String, nullable=False)
-    eac_annual_acq_cost = Column(String, nullable=False)
-    eac_eac = Column(String, nullable=False)
+    tahun = Column(Integer, nullable=False)
+    seq = Column(Integer, nullable=False)
+    is_actual = Column(Integer, nullable=False)
+    raw_cm_interval = Column(Float, nullable=False)
+    raw_cm_material_cost = Column(Float, nullable=False)
+    raw_cm_labor_time = Column(Float, nullable=False)
+    raw_cm_labor_human = Column(Float, nullable=False)
+    raw_pm_interval = Column(Float, nullable=False)
+    raw_pm_material_cost = Column(Float, nullable=False)
+    raw_pm_labor_time = Column(Float, nullable=False)
+    raw_pm_labor_human = Column(Float, nullable=False)
+    raw_predictive_labor_time = Column(Float, nullable=False)
+    raw_predictive_labor_human = Column(Float, nullable=False)
+    raw_oh_material_cost = Column(Float, nullable=False)
+    raw_oh_labor_time = Column(Float, nullable=False)
+    raw_oh_labor_human = Column(Float, nullable=False)
+    raw_project_task_material_cost = Column(Float, nullable=False)
+    raw_loss_output_MW = Column(Float, nullable=False)
+    raw_loss_output_price = Column(Float, nullable=False)
+    raw_operational_cost = Column(Float, nullable=False)
+    raw_maintenance_cost = Column(Float, nullable=False)
+    rc_cm_material_cost = Column(Float, nullable=False)
+    rc_cm_labor_cost = Column(Float, nullable=False)
+    rc_pm_material_cost = Column(Float, nullable=False)
+    rc_pm_labor_cost = Column(Float, nullable=False)
+    rc_predictive_labor_cost = Column(Float, nullable=False)
+    rc_oh_material_cost = Column(Float, nullable=False)
+    rc_oh_labor_cost = Column(Float, nullable=False)
+    rc_project_material_cost = Column(Float, nullable=False)
+    rc_lost_cost = Column(Float, nullable=False)
+    rc_operation_cost = Column(Float, nullable=False)
+    rc_maintenance_cost = Column(Float, nullable=False)
+    rc_total_cost = Column(Float, nullable=False)
+    eac_npv = Column(Float, nullable=False)
+    eac_annual_mnt_cost = Column(Float, nullable=False)
+    eac_annual_acq_cost = Column(Float, nullable=False)
+    eac_eac = Column(Float, nullable=False)
diff --git a/src/equipment/router.py b/src/equipment/router.py
index cd04937..07a7340 100644
--- a/src/equipment/router.py
+++ b/src/equipment/router.py
@@ -48,9 +48,14 @@ async def get_equipment_tree():
 
 @router.get("/{assetnum}", response_model=StandardResponse[EquipmentRead])
 async def get_equipment(db_session: DbSession, assetnum: str):
-    equipment_master_record, equipment_data, chart_data, min_eac_value, min_seq = (
-        await get_master_by_assetnum(db_session=db_session, assetnum=assetnum)
-    )
+    (
+        equipment_master_record,
+        equipment_data,
+        chart_data,
+        min_eac_value,
+        min_seq,
+        last_actual_year,
+    ) = await get_master_by_assetnum(db_session=db_session, assetnum=assetnum)
     # raise Exception(equipment[0])
     if not chart_data:
         raise HTTPException(
@@ -65,6 +70,7 @@ async def get_equipment(db_session: DbSession, assetnum: str):
             chart_data=chart_data,
             min_eac_value=min_eac_value,
             min_seq=min_seq,
+            last_actual_year=last_actual_year,
         ),
         message="Data retrieved successfully",
     )
diff --git a/src/equipment/schema.py b/src/equipment/schema.py
index 4e879a8..0ccbf81 100644
--- a/src/equipment/schema.py
+++ b/src/equipment/schema.py
@@ -28,8 +28,8 @@ class EquipmentMasterBase(DefaultBase):
 
 class MasterBase(DefaultBase):
     assetnum: Optional[str] = Field(None, nullable=True)
-    tahun: Optional[float] = Field(None, nullable=True)
-    seq: Optional[float] = Field(None, nullable=True)
+    tahun: Optional[int] = Field(None, nullable=True)
+    seq: Optional[int] = Field(None, nullable=True)
     is_actual: Optional[float] = Field(None, nullable=True)
     raw_cm_interval: Optional[float] = Field(None, nullable=True)
     raw_cm_material_cost: Optional[float] = Field(None, nullable=True)
@@ -81,6 +81,7 @@ class EquipmentRead(DefaultBase):
     chart_data: List[MasterBase]
     min_eac_value: Optional[float] = Field(None, nullable=True)
     min_seq: Optional[float] = Field(None, nullable=True)
+    last_actual_year: Optional[int] = Field(None, nullable=True)
 
 
 class EquipmentDataMaster(EquipmentBase):
diff --git a/src/equipment/service.py b/src/equipment/service.py
index e35e224..5fac574 100644
--- a/src/equipment/service.py
+++ b/src/equipment/service.py
@@ -4,7 +4,7 @@ from sqlalchemy.orm import selectinload
 from src.database.service import search_filter_sort_paginate
 from .model import Equipment, MasterRecords
 from ..equipment_master.model import EquipmentMaster
-from .schema import EquipmentCreate, EquipmentUpdate
+from .schema import EquipmentCreate, EquipmentUpdate, MasterBase
 from typing import Optional
 
 from src.database.core import DbSession
@@ -37,6 +37,16 @@ async def get_master_by_assetnum(
     master_result = await db_session.execute(master_query)
     records = master_result.scalars().all()
 
+    # Get the last actual year
+    last_actual_year_query = (
+        Select(func.max(MasterRecords.tahun))
+        .join(MasterRecords.equipment)
+        .filter(Equipment.assetnum == assetnum)
+        .filter(MasterRecords.is_actual == 1)
+    )
+    last_actual_year_result = await db_session.execute(last_actual_year_query)
+    last_actual_year = last_actual_year_result.scalar()
+
     # Third query specifically for minimum eac_eac
     min_query = (
         Select(func.min(func.cast(MasterRecords.eac_eac, Float)), MasterRecords.seq)
@@ -53,7 +63,7 @@ async def get_master_by_assetnum(
     )
     min_seq = min_record[1] if min_record else None
 
-    return equipment_master_record, equipment_record, records, min_eac_value, min_seq
+    return equipment_master_record, equipment_record, records, min_eac_value, min_seq, last_actual_year
     # return result.scalars().all()
 
 
@@ -81,11 +91,77 @@ async def get_all(
     return result
 
 
+async def generate_transaction(*, db_session: DbSession, data_in: EquipmentCreate):
+    # Delete all existing master records for this asset number and prediction data
+    query = (
+        Delete(MasterRecords)
+        .where(MasterRecords.assetnum == data_in.assetnum)
+        .where(MasterRecords.is_actual == 0)
+    )
+    await db_session.execute(query)
+    await db_session.commit()
+    """Generate transaction for equipment."""
+    base_transaction = {
+        "assetnum": data_in.assetnum,
+        "is_actual": 0,
+        "raw_cm_interval": None,
+        "raw_cm_material_cost": None,
+        "raw_cm_labor_time": None,
+        "raw_cm_labor_human": None,
+        "raw_pm_interval": None,
+        "raw_pm_material_cost": None,
+        "raw_pm_labor_time": None,
+        "raw_pm_labor_human": None,
+        "raw_predictive_labor_time": None,
+        "raw_predictive_labor_human": None,
+        "raw_oh_material_cost": None,
+        "raw_oh_labor_time": None,
+        "raw_oh_labor_human": None,
+        "raw_project_task_material_cost": None,
+        "raw_loss_output_MW": None,
+        "raw_loss_output_price": None,
+        "raw_operational_cost": None,
+        "raw_maintenance_cost": None,
+        "rc_cm_material_cost": None,
+        "rc_cm_labor_cost": None,
+        "rc_pm_material_cost": None,
+        "rc_pm_labor_cost": None,
+        "rc_predictive_labor_cost": None,
+        "rc_oh_material_cost": None,
+        "rc_oh_labor_cost": None,
+        "rc_project_material_cost": None,
+        "rc_lost_cost": None,
+        "rc_operation_cost": None,
+        "rc_maintenance_cost": None,
+        "rc_total_cost": None,
+        "eac_npv": None,
+        "eac_annual_mnt_cost": None,
+        "eac_annual_acq_cost": None,
+        "eac_eac": None,
+    }
+
+    transactions = []
+
+    for sequence, year in enumerate(
+        range(data_in.acquisition_year - 1, data_in.forecasting_target_year + 1), 0
+    ):
+        transaction = base_transaction.copy()
+        transaction.update({"tahun": int(year), "seq": int(sequence)})
+        transactions.append(MasterRecords(**transaction))
+
+    db_session.add_all(transactions)
+    await db_session.commit()
+
+    # Return the number of transactions created
+    return len(transactions)
+
+
 async def create(*, db_session: DbSession, equipment_in: EquipmentCreate):
     """Creates a new document."""
     equipment = Equipment(**equipment_in.model_dump())
     db_session.add(equipment)
     await db_session.commit()
+    await generate_transaction(db_session=db_session, data_in=equipment_in)
     return equipment