From 4042cd442f4b4f47f213b60a885c591374062674 Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Thu, 20 Nov 2025 11:53:57 +0700 Subject: [PATCH] add disposal cost --- .../__pycache__/model.cpython-311.pyc | Bin 6574 -> 6641 bytes .../__pycache__/router.cpython-311.pyc | Bin 5741 -> 5755 bytes .../__pycache__/schema.cpython-311.pyc | Bin 13585 -> 13806 bytes .../__pycache__/service.cpython-311.pyc | Bin 8601 -> 8709 bytes src/plant_transaction_data/model.py | 1 + src/plant_transaction_data/router.py | 4 ++-- src/plant_transaction_data/schema.py | 2 ++ src/plant_transaction_data/service.py | 3 ++- .../__pycache__/model.cpython-311.pyc | Bin 1525 -> 1590 bytes .../__pycache__/schema.cpython-311.pyc | Bin 3505 -> 3632 bytes 10 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plant_transaction_data/__pycache__/model.cpython-311.pyc b/src/plant_transaction_data/__pycache__/model.cpython-311.pyc index 52f675a40b50f71b4d690c786342cc38a7ae5b54..81692c070f977d2a8d1bb0202572c27922c1fde4 100644 GIT binary patch delta 192 zcmZ2y{Lz?qIWI340}wo)E|=Lqk@q>{i;Z8;a!mffD9IQ*`4Fc)W87vYE*U0aq2&DH zlK7O&;)49*#GH5#Z?h~76mi>Z54cKS^6&*Pf delta 162 zcmexpyv~?+IWI340}vd{<;jek$orh}+{UkGIVRuXv}cUnEW;(kwAqIzhLw?J^Gd^IL~^IWI340}x!8A(vUdkynI`QEajwo7iM+wv^yBp!f?QY+(2*z@VaiLs<5P txatjlQ6T!j$*RKkkpW120TCYvWl~PWB?LhK*R?IRzciEgXdR11|FFkykeW*v-R);0M;TPJpcdz diff --git a/src/plant_transaction_data/__pycache__/schema.cpython-311.pyc b/src/plant_transaction_data/__pycache__/schema.cpython-311.pyc index 5eb248eb947aa824f69dda08d302be5f5ff40458..e16d7c58573acaf1e8b69d55e09a54e15a22eb21 100644 GIT binary patch delta 1234 zcmaixQAkr^6vyv(x4BI>MQ5Q-BpW)1xV1SUQr9*mE1hj^YY~Ku?uE3~?9L+Dsx5}# ziy`MlC`P^5LqW)W3F;*x=%E*%Dyb+4dW%Uu`BLBcmbN=b-LW6%e&>JA`JeAD&-}Pl z|Hx>p<>(_8I;O98uhlOT@K_tnwW9 zn1^YL8SHu^)^z^22G;cs;s8>MbTY;nml_94lD6ZtN>U+CAWl+js8Vy1G!Cmx zr+Hp4Z#Q{0Q0%qIM_TTyNCe)QJNP$Rcu2-&fBTpge(Ch^xxJb6K~BHFhB>gycP$@? zMsm|`^2M&V#Auf$uzdhA2|lZ-?G%PVgbC4%IEx5D${HbVcx8=P=J6nmh#;bf*bc^M zkQ$Z;db}zq^x9y8dMxxlkg$J>mQBV|^-g_hx)xuVnVT4C5Fx}ZM8)hh zo-shdktq#I!+}GAV--Ux>atjexIzCv8z{27zxQfgcC@r#mbMxhh|UV}IdM|TQCX#d zJf0yk7~DayZS(NO*$SghzpKJX4NBNGS6EuW1R@L1oCiy*EYL19qu6@VrY-+ssAUt? zJ5^PCE@Bpuhb5P@)N>JDyTXUrM`IV4MGaenIbbD9Yumb^%Squ{Li9*W5bU2nKS&0P l++M7tH}Q1qZz@B2NP-l(>RcJ$WSOn<{2AzWe^=uj{swx#2aNy# delta 1041 zcmZvZO-vI}5XblJw%t-&8iYnkkwhX|qTA9Ui60e8MNle8`hmvi!K8Z-Fq%b4Y*DJ% zq#jHpBMFHf(1RZ6LGxlF2an#ont&G$#uzRJ0($V|n^_TEx|{uF-~8Xqf9AdKBh$mx zuRI=?B%Y>a|J8Eyo9b!CN_>tzRh{MFOIecUWmtAz+FHz4`Msg2NRTC6$+E0m4#KCZ z5DS9cg={D4#2MlT;tyi;4&0L=7Kv|(Ux_|9s;Ar`-ydsi44;cp-L9X2hi?BirGu1( z3QDI?VzA=&Yu0LAsMMRK1$8ysg%f32N@|JoE1rWgpYwiUEY2U)WSCD8nsFL&M&PqD zcGEEWV0~v&UUKr@+L)cc-u+BrDd=x#l%J^ZoF(|XhF;Y{1vP$j-xA}y_J3rZnvuXV zXA%7f6;Xq*BL)!X5VeRp#CgOZ;sWdmq+vWT*qFp+3Xw((ZK6l~jMed#KuqDuLyNM5 z_6$L5=x4^_Y}?E+{iqSLpFn}SA=5j!wD{#PhPVOw)(O)j2am%iAr^M^Sd1*WlbDMb z7vH*9pz!xyv^fji=3JAaTtX`d*=jz8F$8sS4_7qh6ughr!`?_dVrjsETj)?NtrSr} z+=ZD)lQ~9FR2lBhi{Ls@RG7Swt6Kef4NDDcBY%l9LPZVhGDZf5)j$jZd5kHH zlNGtu7= z)=sINP-Xj;IN^m@^$Q=W%6YJ<7`H%C`A8-)t6M3!s!HXORGq zD)OAXSlEWmAH)op{8U(pH514z*~}yIgpo02^GDI8%;w%8Ngoj53nKhL1QUn|0ujL= zA_Pci3KoR|sax#DsU?XeB}J33ORAX0fn?)B1T%<801=5GA_+t!g9xx|cp$Dx0SS0c zR+EyGN(C{~Ktwu-fVdFE%9tD{rNmkQWKP@MDrL#c7(RKwtQKoAP~hO?ce0b%z;;GV zZj-w%U1SN;p#vg7fm;OfToFiXQSsyod0DOoAQKc{#oss2mycjnvSkcod>|nCffdB~ Oz<@zIFijRwYy|*K&x;TM delta 495 zcmZp5nd!{CoR^o20SMCHN@a3v8-QUM9E6(>Y!;o}1jrX~I^^Q^TFb zGx;=UGru%QIRvCIm&i_z$n)Q4QOAYJfU~V-=fyq_eb(48`^d{T$+~RTr zsx|@QVy?-`yz|+#Sd~98XiYxBtIEdAz$yHJYZIR_qr!xW1+o{o^)9gJ6$=5?9+4Ap z(PuiM&*Ngpdc>B|#cp#F|7;dsbD)$aXORGqDsrF9C1S(o3u5|B_7PEHO$RcIHy4XM zVPs6&93i%p+0hdu=>;OZL4*&8U;+^VAR-V%1OW+6!J=Rwb&I_?wIs2mq^KwqBohWC zCYwm9XfuO&aUdcdL?nQSL=XXX4G+XMNgx6D$-Po?Qpq4@3W!Jr5fB%GSZR}wN-44C z0hv=bzmc+JW(=LICa1+(2oyLlIaF>ETMS55*yOiz*QIYUXXcd@>3{@4;a3FmToFiX tQQ_qK^0Hj@Kqey)7k}E!rVzm>Ys0AjKtS>XE0F%cfJ)RcPHs?a1ppaDa^L^} diff --git a/src/plant_transaction_data/model.py b/src/plant_transaction_data/model.py index 387a8ae..8fea61a 100644 --- a/src/plant_transaction_data/model.py +++ b/src/plant_transaction_data/model.py @@ -39,6 +39,7 @@ class PlantTransactionData(Base, DefaultMixin, IdentityMixin): cost_bd_total = Column(Float, nullable=True) cost_bd_pv = Column(Float, nullable=True) cost_bd_annualized = Column(Float, nullable=True) + cost_disposal_cost = Column(Float, nullable=True) total_expense = Column(Float, nullable=True) total_cost_eac = Column(Float, nullable=True) total_profit_loss = Column(Float, nullable=True) diff --git a/src/plant_transaction_data/router.py b/src/plant_transaction_data/router.py index be7c870..664d505 100644 --- a/src/plant_transaction_data/router.py +++ b/src/plant_transaction_data/router.py @@ -28,7 +28,7 @@ async def get_transaction_datas( search: Optional[str] = Query(None), ): """Get all transaction_data pagination.""" - year_data = await get_all( + plant_transaction_data = await get_all( db_session=db_session, items_per_page=items_per_page, search=search, @@ -36,7 +36,7 @@ async def get_transaction_datas( ) # return return StandardResponse( - data=year_data, + data=plant_transaction_data, message="Data retrieved successfully", ) diff --git a/src/plant_transaction_data/schema.py b/src/plant_transaction_data/schema.py index 506454a..68f5e58 100644 --- a/src/plant_transaction_data/schema.py +++ b/src/plant_transaction_data/schema.py @@ -40,6 +40,7 @@ class PlantTransactionDataBase(DefaultBase): cost_bd_total: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) cost_bd_pv: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) cost_bd_annualized: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) + cost_disposal_cost: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) total_expense: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) total_cost_eac: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) total_profit_loss: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) @@ -88,6 +89,7 @@ class PlantTransactionChart(DefaultBase): chart_capex_biaya_investasi_tambahan: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) chart_capex_acquisition_cost: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) chart_capex_annualized: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) + cost_disposal_cost: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) fs_chart_total_revenue: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) fs_chart_revenue_a: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) fs_chart_revenue_b: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000) diff --git a/src/plant_transaction_data/service.py b/src/plant_transaction_data/service.py index 26dc898..38eb199 100644 --- a/src/plant_transaction_data/service.py +++ b/src/plant_transaction_data/service.py @@ -70,6 +70,7 @@ async def get_charts( item.chart_capex_annualized + item.chart_oem_annualized + item.chart_fuel_cost_annualized + + item.cost_disposal_cost ) revenue = item.chart_revenue_annualized @@ -109,7 +110,7 @@ async def get_charts( previous_revenue = revenue previous_year = item.tahun - return chart_data, bep_year, bep_total_lcc + return chart_data, int(bep_year) if bep_year is not None else None, bep_total_lcc async def create( diff --git a/src/yeardata/__pycache__/model.cpython-311.pyc b/src/yeardata/__pycache__/model.cpython-311.pyc index 5f12680ef5695f2b04aa2fb9f4b8d9d6cc376394..49c4e89f8c0661a26a076b185b8f4f605eaea78c 100644 GIT binary patch delta 218 zcmey$y^V)=IWI340}xE~m(AQdk@qg6*T&cSjFSx*B^iY#OEDQT3UBsd@?n&@C6!oQ zoLUl}T$EW7pIT8;lo+2@nwk@zoL^irc?Pos6EEZBTg+c%Zz!rS5L>~zgY|-<-9<&a zD~fg(SmYq6NPhA)mUv}3plwC+AVL91{Nk|5%}*)KNwq6d0dg6ExVU?A1Z#vfAEW&T W227%(WJ1gW+m9fbFIc3(CIbL!-afhj delta 185 zcmdnS^Oc)-IWI340}y<3k3j#>pm3hKxd+)0li1C!b?>VEVx@S%BpW z#|0KuAS#lZtjHR#BMa13BnKkofy6Hko80`A(wtPgB4r?#5r~VY0*MdIjEsyoCa-5z hn0$s+-<6lqjqw8mcCw>nLd*i&k6_s^IMjeG1OUDrEzAG_ diff --git a/src/yeardata/__pycache__/schema.cpython-311.pyc b/src/yeardata/__pycache__/schema.cpython-311.pyc index fc5bb50fbcf0e2e29c951bb6cfbe66bef945578f..02ab7022c7eb01ec6856fc87f44a4300143842f2 100644 GIT binary patch delta 722 zcmdley+MX|IWI340}!P6%Vy?o8j)p83=FG*7y_b1fa*mj|7VsKMVAo+%jmO6$D+%K17##o>=4Imha`r2 z36S~}#$X0b$<5^~0gN)Yq!NpZQ%mBLi!w{%Q!7e}664cKQ*+{z^NUL+A7`~-l$ylW zAteLURm2P;WI==+khsNMTvAjdKY1>j3*&;#kJz3uY8shuP~E|DpyWb8;Dxa43r0B? zjdHFSHqTfnhGbP4|j79cz4B1_KX*Bq*o-*6N#YD|vhbaPVxnW+dOlt6?!h|mBL znjk_OMt~ggnIA|rz~K!Rjs_QqTJ6a%Iqh|IK#I`}&X=AQlbnZ&`dG_iGc{^$)VgzY+zFifTm>F zpqXF-Qpf^Rjnyn;kSvH$pRCAZ05QvWayU=09@x`hM}zGHD@1k3FAkgB{FKt1RJ$U} h$v1c^wfGsWKQLet6RbaiM86=UR3=yRZe#&D902u(Z?^yd