From 1e030b29a73306da241bc159afc347be8ba70b03 Mon Sep 17 00:00:00 2001
From: MrWaradana <muhammadridhowaradana@gmail.com>
Date: Thu, 9 Jan 2025 12:07:11 +0700
Subject: [PATCH] refactor: year data & model

---
 .../__pycache__/model.cpython-311.pyc         | Bin 4274 -> 4423 bytes
 .../__pycache__/schema.cpython-311.pyc        | Bin 8536 -> 8536 bytes
 .../__pycache__/service.cpython-311.pyc       | Bin 6608 -> 6608 bytes
 src/equipment/model.py                        |   5 ++++-
 .../__pycache__/service.cpython-311.pyc       | Bin 3757 -> 3895 bytes
 src/yeardata/service.py                       |   2 +-
 6 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/equipment/__pycache__/model.cpython-311.pyc b/src/equipment/__pycache__/model.cpython-311.pyc
index ad96c0df4bb4b02767cbe17a0e50562e39af3a5a..a3d061bb40851d9ab8d775adb3d3bd7e9279aea0 100644
GIT binary patch
delta 700
zcmdm_cwC8hIWI340}wols82sIkynzjZ=$+<eJ)!R8zVysLkd$4doD*52bj&A!<ow!
z#RX=w<Z$QmMDgVEM)5K-Ffq6@q_DOyq_CxOrShcmE@Ne2SPjGw5XA?UX9vo2V3p@j
z;S6Tb<a!BGuE}<b%{hPKK@GNBEFq~CB@<uzGX9xt&UoC4i6NCGl|O}L4f8T4pz%Nq
z0Z{^A8BQ!Rf+?&(gV`ptFzK^|_-P7FHe))XT*Lv?cZ(-CGcP_hF*!anFD?HTUq)h4
zdSZNWVqytUAan9BCL4Y}pt2$m!4Aa5rzg8IFEYO&EIGk!hRO<&3&MIAh4roo>oxe?
z5S5+~Hp6v=%LP%xi=u{CL=7AKK(I&wW<c^pLD9|JEQTzMe3NZC+GPcR5`LO`MM5A2
z!XQEfM2Lb2&dCosBpJmv|K>QuBq<LPQ2-H&AVL{Nh;Dws9nQ=HmH`R+X$nks=2xwU
zc#W^PFefo5IU_Z<QZK(Kw}=y{;+9}>QL<i2Vo73BVsWZoa(+>25h&Vkae>5h^HWlD
zii@~`0!2I^0_=CNb*N7G#bE<fTbh$<R}>0V#|Xs5*MY<bW=2NF8~P0H7f3;qxdrU>
hxEYN;FkliBSSI8w@cjsq`GSy^nOrVl&Y}Rc5df%9rz`*f

delta 553
zcmX@Ev`LY7IWI340}xEKPD~G-$ScX%HBnu@o{=GiA%!W2Etfrt9n5CV;mGBT;smo<
za=3E2qquW<qIeh?m>Ap{QdnCUQrJ>CQ@K-lma#H0tOjBTh~fpyvjgQhu*&nLa0WAI
za=ip8*JQoL=A55XnwvNAq{_t4zKka(J2D<;OJM=3V4dv5q|fZ9$v?T2>B!_5W*dH9
zppGIC!4Aa5izhE<Uc}$v+u&Oy3zJBmC@8vlDvKctBk$zn9PP6FKnXuhy&^%70wE9~
z3?f881jpoTPDw`5&8?hgm?ULDB4A_WKr96qA+$M*C!CoFECUh*Ip-|DYW*#~;=-K7
zoaBtu+)BOtqTC`5pyVyV;-X}|l*E$6q{QM>z2y9&)FMuhI2TAfH$Npcr??0d^hMkt
z0_+_H5DV4zUmP|-wWT?!c11xzSw<i(z6c~fFf%eT-e7RNz~HC?#01gg1p;<@oQy^v
c7%+(mEE94T_<jV*d_hQyP393aX90N@0BnJMX#fBK

diff --git a/src/equipment/__pycache__/schema.cpython-311.pyc b/src/equipment/__pycache__/schema.cpython-311.pyc
index 4177a3a5fa2e81f2a5717902b4e77f9359255b3f..d720932ddcbcb935dc5b06d0811a46944803de66 100644
GIT binary patch
delta 20
acmccNbi;{zIWI340}xyauHVS*s|Wx?hXvUH

delta 20
acmccNbi;{zIWI340}yO;soTiys|Wx>WCg7N

diff --git a/src/equipment/__pycache__/service.cpython-311.pyc b/src/equipment/__pycache__/service.cpython-311.pyc
index a697eb5a3567afa4132eda600e358849107a54b4..25ccb9b49be5d8160caba42a3d938728f7e135d3 100644
GIT binary patch
delta 20
acmca$e8HG|IWI340}!}G)^FrKDhU8RWd)M}

delta 20
acmca$e8HG|IWI340}z<I)NSNGDhU8QhXrr|

diff --git a/src/equipment/model.py b/src/equipment/model.py
index bd9c4d9..f564f08 100644
--- a/src/equipment/model.py
+++ b/src/equipment/model.py
@@ -1,4 +1,4 @@
-from sqlalchemy import Column, Float, Integer, String, ForeignKey
+from sqlalchemy import Column, Float, Integer, String, ForeignKey, Text
 from sqlalchemy.orm import relationship
 from src.database.core import Base
 from src.models import DefaultMixin, IdentityMixin
@@ -14,6 +14,9 @@ class Equipment(Base, DefaultMixin, IdentityMixin):
     design_life = Column(Integer, nullable=False)
     forecasting_target_year = Column(Integer, nullable=False)
     manhours_rate = Column(Float, nullable=False)
+    min_eac_info = Column(Text, nullable=True)
+    harga_saat_ini = Column(Float, nullable=True)
+
 
 class MasterRecords(Base, DefaultMixin, IdentityMixin):
     __tablename__ = "lcc_tr_data"
diff --git a/src/yeardata/__pycache__/service.cpython-311.pyc b/src/yeardata/__pycache__/service.cpython-311.pyc
index 56b12944296ed8477cfb7c693ae2a3fb62f93871..147f16599d4754c05931dda8d4bbeda6053ff960 100644
GIT binary patch
delta 347
zcmZ20yIqcVIWI340}!lmtxJEokvEcsDS~lw28-TgB_<uF1uT;nG6_$<&cr{tgGHQ?
z6~tp^DB+!~$D|-r!Uxg^0n3;e7*+!@1T5eHYhz_KVHBQh#Tu^7Rm2RGDdGSUw>a{P
zQc{cJlPYhqRHh~t-C{{eElw^H2FbGmiOFkNgKRW`3?U#cUI`>#0AT~eR{;iI;i(oE
zd1S8e$Xw@9y~LxsG-FBbbv27iY8DsOtgfh8UF5O8!ehNzj%_j{qt@h2?8=M=ldrKC
zG3syj<dA1n&;goti@i9tB(bEVs7MdU(_|~+2U11)AVO<$2d5dM`R4tcrx_XbCU<jd
xF<Ncj#;wPw2Xal30f;aM5mq2V2}H<%2q_@(i^C>2KczG$)vm~Svk>oWMgRj<RB`|S

delta 266
zcmdlkw^o*SIWI340}yao*QKA@$Q#MR_-pcCE`6?AmKvra&l;8mOp_HkMVLz1C+jhZ
zOS6EKf<Osa6NJ5tiGg7?)8t)Da+6b7jT!kT&tMIg<|twY$`)~e2w@Px3M6i^RHh~t
zO_pK{QcwqSg@CxY7f8GS!Ul$~0t~#uQ!Os?$Xwx(*}Q^nG9#nLWE&1;M!m@i97T+}
zn=f<7Gb(6-%waE1ElDgXDJs$d@-*3s_<>ZBE{M>WEW~BTXu8>x>og;y&SX&@Ek=vY
e4m^5{0w5cU^gx6uh_IMk$1BU|xOoomY(@a4?Kt%S

diff --git a/src/yeardata/service.py b/src/yeardata/service.py
index 34147d7..84f21ff 100644
--- a/src/yeardata/service.py
+++ b/src/yeardata/service.py
@@ -23,7 +23,7 @@ async def get_all(
     common,
 ):
     """Returns all documents."""
-    query = Select(Yeardata)
+    query = Select(Yeardata).order_by(Yeardata.year.desc())
     if search:
         query = query.filter(cast(Yeardata.year, String).ilike(f"%{search}%"))