diff --git a/src/equipment/__pycache__/model.cpython-311.pyc b/src/equipment/__pycache__/model.cpython-311.pyc index a3d061b..e7bc790 100644 Binary files a/src/equipment/__pycache__/model.cpython-311.pyc and b/src/equipment/__pycache__/model.cpython-311.pyc differ diff --git a/src/equipment/__pycache__/schema.cpython-311.pyc b/src/equipment/__pycache__/schema.cpython-311.pyc index 4ff4eb5..4d2972e 100644 Binary files a/src/equipment/__pycache__/schema.cpython-311.pyc and b/src/equipment/__pycache__/schema.cpython-311.pyc differ 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 6f58f06..01ef3d4 100644 Binary files a/src/yeardata/__pycache__/model.cpython-311.pyc and b/src/yeardata/__pycache__/model.cpython-311.pyc differ diff --git a/src/yeardata/__pycache__/schema.cpython-311.pyc b/src/yeardata/__pycache__/schema.cpython-311.pyc index bb00edc..9eef501 100644 Binary files a/src/yeardata/__pycache__/schema.cpython-311.pyc and b/src/yeardata/__pycache__/schema.cpython-311.pyc differ 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)