refactor: column for equipment and year data

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",

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)

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)

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)