From 03c5155ee5d29a0c8419fc9d591cc7f764640847 Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Mon, 10 Feb 2025 10:45:23 +0700 Subject: [PATCH] refactor: column for equipment and year data --- .../__pycache__/model.cpython-311.pyc | Bin 4423 -> 4504 bytes .../__pycache__/schema.cpython-311.pyc | Bin 8564 -> 8677 bytes src/equipment/model.py | 3 ++- src/equipment/schema.py | 1 + .../__pycache__/model.cpython-311.pyc | Bin 853 -> 967 bytes .../__pycache__/schema.cpython-311.pyc | Bin 2298 -> 2496 bytes src/yeardata/model.py | 3 ++- src/yeardata/schema.py | 3 ++- 8 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/equipment/__pycache__/model.cpython-311.pyc b/src/equipment/__pycache__/model.cpython-311.pyc index a3d061bb40851d9ab8d775adb3d3bd7e9279aea0..e7bc7902d59d181c271d0d11507db11a810b42ea 100644 GIT binary patch delta 357 zcmX@EG((whIWI340}$vJtxV_O+sJ3c$Rx%%*@u~Cl(g&oaE%q ze4JC5_2hv@7Ab%TMG&D3BSe9WVn1dEh6XsiA)>hX0*@0jn*vzTWC?*vd9Zp^Gk$T{ u?N#35T| zhqUl0Ds<>34hrQK2c@H%*v-Mk!Br~FhC{Am53~&G%cN^t`{Y!DV_HCTq@K1h)x%yvaaeV=BFO6 z#YUiJ{~`=GnDPYh&i4YME42~nfC=dn? z0t%1?4B!}W2w;IDh{k?ln2u|91k*B?cYs?@FIE*6)WZms#Q}Hdv zX;Lo-Up!DaheE*getU5b-QS;2vev!gw=w5Q73rI5_n@9SAaY8!8qe< z*`(yG^E?dhp0~l%;BgIp_P_bYL6e*FE|Za&vi~55a)J7|6=XNcVzp2{xaNR Jz9?jD=O>EMtjz!b delta 865 zcma)(%S#(k6vlJS%yl%3Hl{uj$KP}oJ=zzHJpKvF*cCV-#H#*-L>cDhkhWt3++&SMj=gdXhP0HLc&HRA#TmG}~ z_4k3fFNCsBM2`?5$_u^|VQL7z)r&HECQMmJOIi!2(&Y*r%X9exCn35wqI8(M-5G_90p&n0PypzF1ylg900pqY zOH|2!D5bx~r0blt?~U60x~JN{hD8FXqVb3wRVclLN=U%6-#^dlZbT(*MN|G4_cf-` z2y{6A>p}-}kJp)I%(c5AX~(Lb#$!hH2Q(DIs73+) zjAN)cSfTPVharJaB;(6&<}j_tvrWF~Ch;K8#4VhuaL@CafCNUUHBsYwP0+7Ie>1O! zcfsF=cgxeV7xyWr&-1!7n!bIX`Z=9xnfXFe&AthV#>>F}Sna;T-5c-7vUgRz(C}6d DoTHc_ diff --git a/src/equipment/model.py b/src/equipment/model.py index f564f08..4c654a4 100644 --- a/src/equipment/model.py +++ b/src/equipment/model.py @@ -12,6 +12,7 @@ class Equipment(Base, DefaultMixin, IdentityMixin): acquisition_cost = Column(Float, nullable=False) capital_cost_record_time = Column(Integer, nullable=False) design_life = Column(Integer, nullable=False) + forecasting_start_year = Column(Integer, nullable=False) forecasting_target_year = Column(Integer, nullable=False) manhours_rate = Column(Float, nullable=False) min_eac_info = Column(Text, nullable=True) @@ -19,7 +20,7 @@ class Equipment(Base, DefaultMixin, IdentityMixin): class MasterRecords(Base, DefaultMixin, IdentityMixin): - __tablename__ = "lcc_tr_data" + __tablename__ = "lcc_equipment_tr_data" equipment = relationship( "Equipment", diff --git a/src/equipment/schema.py b/src/equipment/schema.py index d337adc..4e879a8 100644 --- a/src/equipment/schema.py +++ b/src/equipment/schema.py @@ -12,6 +12,7 @@ class EquipmentBase(DefaultBase): acquisition_cost: Optional[float] = Field(None, nullable=True) capital_cost_record_time: Optional[int] = Field(None, nullable=True) design_life: Optional[int] = Field(None, nullable=True) + forecasting_start_year: Optional[int] = Field(None, nullable=True) forecasting_target_year: Optional[int] = Field(None, nullable=True) manhours_rate: Optional[float] = Field(None, nullable=True) created_at: Optional[datetime] = Field(None, nullable=True) diff --git a/src/yeardata/__pycache__/model.cpython-311.pyc b/src/yeardata/__pycache__/model.cpython-311.pyc index 6f58f064c6401fbd30f26b4a263d3464561181bd..01ef3d4b56bccfbfffc960ec077c8a8ad4518404 100644 GIT binary patch delta 294 zcmcc0cATAeIWI340}#w9Sed?hBJW+ss)?^%O_&%`SyI_knAR{aV`5-f4a5)-#fejf zYq9~OAtU$XB*qZ2TU;giC5bulIr+sUw>WYW^Wrn|ON%CNV{~C-0~%DEJc-Fl?}niG z1hE;cD_AcG>RlAnyCSI9;B|vvw4-c7>Vnh@{5lu;b*}L1Grg$AOpyncR z5Fr61esS33=BJeAq}mn90J)4nT-*&LJ}@&fGTxYckx6#)eI~Za@0fI~*%);{FkliL SB@<#6*nR}be8D0Owh92LXH6{t delta 174 zcmX@kewB@PIWI340}wboj8FHU$a|O3ZQ^U!$tjG6jGU9FF@{WHa$#c!N*7yC_F}SP zYw&9DDiWQ%i78%31Snc03L?aS#4iq;-29Z%oK(9aDIk{-h>N>{#0O?ZM#cw|9hem+ e$1>|%voPv^V8A3gN+!fCu>A;<`GQ3nYz+VxMJg=- diff --git a/src/yeardata/__pycache__/schema.cpython-311.pyc b/src/yeardata/__pycache__/schema.cpython-311.pyc index bb00edc9bbe655e4f2f61c3ef85a10474af95931..9eef501474f432ccdf6df145437dccce78b8619d 100644 GIT binary patch delta 688 zcmZvYxl02<6vlUEC!3ABnwWTj$0QyQBY1!aYY+?ZXtdBYT4-<=QzWi#Hhmhw!Xogn z^r#fkLcvC`u(wgL5dQ^16txiq=WS3)^zF=#nfJc;&CGrTu7cX3rd3EHF4m4#_Rh3< zLJE)~Tf_(NB<86!J*E#jX$&}JM1us41*=6)Yr-BkOt0aCWg4FHm*gtqqDm!GHi$t_ z6$6^*^J|H|w^_8eM$gC8tf*slyax5pAUQAnA=RwURR~J)O&W3B+Pio}KHEd!Qcl2=+#cbb`<{K{bnb@hw_LyDdVX>zWtW!!BTr*UEN^#q%XS#g%SV& delta 545 zcmX>g{7aB`IWI340}!0#O-xtc$Q#ATXfQd0v4@d+@>fRf$pK6(K$a?#HY;x`YbxL5 zP$uok8<kn)1ma?MAo+ork&*Gi8w8(Bcs0|0`sVa5Oe diff --git a/src/yeardata/model.py b/src/yeardata/model.py index 06c1ef2..926308a 100644 --- a/src/yeardata/model.py +++ b/src/yeardata/model.py @@ -1,4 +1,3 @@ - from sqlalchemy import Column, Float, Integer, String from src.database.core import Base from src.models import DefaultMixin, IdentityMixin @@ -9,3 +8,5 @@ class Yeardata(Base, DefaultMixin, IdentityMixin): year = Column(Integer, nullable=False) rp_per_kwh = Column(Float, nullable=False) + total_lost = Column(Float, nullable=False) + man_hour = Column(Float, nullable=False) diff --git a/src/yeardata/schema.py b/src/yeardata/schema.py index 371eae8..6e34923 100644 --- a/src/yeardata/schema.py +++ b/src/yeardata/schema.py @@ -1,4 +1,3 @@ - from datetime import datetime from typing import List, Optional from uuid import UUID @@ -10,6 +9,8 @@ from src.models import DefaultBase, Pagination class YeardataBase(DefaultBase): year: Optional[int] = Field(None, nullable=True) rp_per_kwh: Optional[float] = Field(None, nullable=True) + total_lost: Optional[float] = Field(None, nullable=True) + man_hour: Optional[float] = Field(None, nullable=True) created_at: Optional[datetime] = Field(None, nullable=True) updated_at: Optional[datetime] = Field(None, nullable=True) created_by: Optional[str] = Field(None, nullable=True)