diff --git a/.gitignore b/.gitignore index 0189096..49334db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ env/ .env -__pycache__/ \ No newline at end of file +__pycache__/* \ No newline at end of file diff --git a/src/api.py b/src/api.py index 803de21..8eb9da1 100644 --- a/src/api.py +++ b/src/api.py @@ -38,21 +38,26 @@ def healthcheck(): return {"status": "ok"} -authenticated_api_router = APIRouter(dependencies=[Depends(JWTBearer())], - ) +authenticated_api_router = APIRouter( + dependencies=[Depends(JWTBearer())], +) # Master Data authenticated_api_router.include_router( - masterdata_router, prefix="/masterdata", tags=["masterdata"]) + masterdata_router, prefix="/masterdata", tags=["masterdata"] +) authenticated_api_router.include_router( - equipment_router, prefix="/equipment", tags=["equipment"]) + equipment_router, prefix="/equipment", tags=["equipment"] +) authenticated_api_router.include_router( - equipment_master_router, prefix="/equipment-master", tags=["equipment_master"]) + equipment_master_router, prefix="/equipment-master", tags=["equipment_master"] +) authenticated_api_router.include_router( - yeardata_router, prefix="/yeardata", tags=["yeardata"]) + yeardata_router, prefix="/yeardata", tags=["yeardata"] +) api_router.include_router(authenticated_api_router) diff --git a/src/masterdata/model.py b/src/masterdata/model.py index 1a5cac6..af6b699 100644 --- a/src/masterdata/model.py +++ b/src/masterdata/model.py @@ -1,13 +1,15 @@ - -from sqlalchemy import Column, Float +from sqlalchemy import Column, Float, String from src.database.core import Base from src.models import DefaultMixin, IdentityMixin - class MasterData(Base, DefaultMixin, IdentityMixin): - __tablename__ = "lcc_master" - - discount_rate = Column(Float, nullable=True) - inflation_rate = Column(Float, nullable=True) - manhours_rate = Column(Float, nullable=True) \ No newline at end of file + __tablename__ = "lcc_ms_master" + + # discount_rate = Column(Float, nullable=True) + # inflation_rate = Column(Float, nullable=True) + # manhours_rate = Column(Float, nullable=True) + + name = Column(String, nullable=True) + value_num = Column(Float, nullable=True) + value_str = Column(String, nullable=True) diff --git a/src/masterdata/schema.py b/src/masterdata/schema.py index be51f30..1540b59 100644 --- a/src/masterdata/schema.py +++ b/src/masterdata/schema.py @@ -1,4 +1,3 @@ - from datetime import datetime from typing import List, Optional from uuid import UUID @@ -9,9 +8,12 @@ from src.auth.service import CurrentUser class MasterdataBase(DefultBase): - discount_rate: Optional[float] - inflation_rate: Optional[float] - manhours_rate: Optional[float] + # discount_rate: Optional[float] + # inflation_rate: Optional[float] + # manhours_rate: Optional[float] + name: Optional[str] = Field(None, nullable=True) + value_num: Optional[float] = Field(None, nullable=True) + value_str: Optional[str] = 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)