refactor: master data attributes

.gitignore

@@ -1,4 +1,4 @@
 env/
 .env
 
-__pycache__/
+__pycache__/*

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)

src/masterdata/model.py

@@ -1,13 +1,15 @@
-
+from sqlalchemy import Column, Float, String
-from sqlalchemy import Column, Float
 from src.database.core import Base
 from src.models import DefaultMixin, IdentityMixin
 
 
-
 class MasterData(Base, DefaultMixin, IdentityMixin):
-    __tablename__ = "lcc_master"
+    __tablename__ = "lcc_ms_master"
-    
+
-    discount_rate = Column(Float, nullable=True)
+    # discount_rate = Column(Float, nullable=True)
-    inflation_rate = Column(Float, nullable=True)
+    # inflation_rate = Column(Float, nullable=True)
-    manhours_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)

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]
+    # discount_rate: Optional[float]
-    inflation_rate: Optional[float]
+    # inflation_rate: Optional[float]
-    manhours_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)