diff --git a/src/__pycache__/api.cpython-311.pyc b/src/__pycache__/api.cpython-311.pyc index 71794e2..1b878e3 100644 Binary files a/src/__pycache__/api.cpython-311.pyc and b/src/__pycache__/api.cpython-311.pyc differ diff --git a/src/api.py b/src/api.py index cb0835a..f53eedc 100644 --- a/src/api.py +++ b/src/api.py @@ -60,6 +60,7 @@ authenticated_api_router.include_router( authenticated_api_router.include_router( plant_masterdata, prefix="/plant-masterdata", tags=["plant_masterdata"] ) + authenticated_api_router.include_router( plant_transaction_data, prefix="/plant-transaction-data", diff --git a/src/equipment/__pycache__/service.cpython-311.pyc b/src/equipment/__pycache__/service.cpython-311.pyc index 0c962e3..a3d79d8 100644 Binary files a/src/equipment/__pycache__/service.cpython-311.pyc and b/src/equipment/__pycache__/service.cpython-311.pyc differ diff --git a/src/masterdata/__pycache__/model.cpython-311.pyc b/src/masterdata/__pycache__/model.cpython-311.pyc index 4d68131..892b12a 100644 Binary files a/src/masterdata/__pycache__/model.cpython-311.pyc and b/src/masterdata/__pycache__/model.cpython-311.pyc differ diff --git a/src/masterdata/__pycache__/schema.cpython-311.pyc b/src/masterdata/__pycache__/schema.cpython-311.pyc index e8d9714..cdaf5c7 100644 Binary files a/src/masterdata/__pycache__/schema.cpython-311.pyc and b/src/masterdata/__pycache__/schema.cpython-311.pyc differ diff --git a/src/masterdata/__pycache__/service.cpython-311.pyc b/src/masterdata/__pycache__/service.cpython-311.pyc index 8a2904d..72d2c35 100644 Binary files a/src/masterdata/__pycache__/service.cpython-311.pyc and b/src/masterdata/__pycache__/service.cpython-311.pyc differ diff --git a/src/modules/equipment/__pycache__/insert_actual_data.cpython-311.pyc b/src/modules/equipment/__pycache__/insert_actual_data.cpython-311.pyc index a685b17..ab268e4 100644 Binary files a/src/modules/equipment/__pycache__/insert_actual_data.cpython-311.pyc and b/src/modules/equipment/__pycache__/insert_actual_data.cpython-311.pyc differ diff --git a/src/modules/equipment/__pycache__/run.cpython-311.pyc b/src/modules/equipment/__pycache__/run.cpython-311.pyc index f5309f3..ff6e68f 100644 Binary files a/src/modules/equipment/__pycache__/run.cpython-311.pyc and b/src/modules/equipment/__pycache__/run.cpython-311.pyc differ diff --git a/src/plant_transaction_data/__pycache__/router.cpython-311.pyc b/src/plant_transaction_data/__pycache__/router.cpython-311.pyc index fba91d2..1d09206 100644 Binary files a/src/plant_transaction_data/__pycache__/router.cpython-311.pyc and b/src/plant_transaction_data/__pycache__/router.cpython-311.pyc differ diff --git a/src/plant_transaction_data/__pycache__/schema.cpython-311.pyc b/src/plant_transaction_data/__pycache__/schema.cpython-311.pyc index 3978162..98f7c19 100644 Binary files a/src/plant_transaction_data/__pycache__/schema.cpython-311.pyc and b/src/plant_transaction_data/__pycache__/schema.cpython-311.pyc differ diff --git a/src/plant_transaction_data/__pycache__/service.cpython-311.pyc b/src/plant_transaction_data/__pycache__/service.cpython-311.pyc index 7cf3ef3..7a03b80 100644 Binary files a/src/plant_transaction_data/__pycache__/service.cpython-311.pyc and b/src/plant_transaction_data/__pycache__/service.cpython-311.pyc differ diff --git a/src/plant_transaction_data_simulations/router.py b/src/plant_transaction_data_simulations/router.py index 576e219..ac8bf52 100644 --- a/src/plant_transaction_data_simulations/router.py +++ b/src/plant_transaction_data_simulations/router.py @@ -3,13 +3,13 @@ from fastapi import APIRouter, HTTPException, status, Query from src.plant_transaction_data_simulations.model import PlantTransactionDataSimulations from src.plant_transaction_data_simulations.schema import ( - PlantTransactionDataPagination, - PlantTransactionDataRead, - PlantChartData, - PlantTransactionChart, - PlantTransactionDataCreate, - PlantTransactionDataUpdate, - PlantTransactionFSImport, + PlantTransactionDataSimulationsPagination, + PlantTransactionDataSimulationsRead, + PlantChartDataSimulations, + PlantTransactionChartSimulations, + PlantTransactionDataSimulationsCreate, + PlantTransactionDataSimulationsUpdate, + PlantTransactionFSImportSimulations, ) from src.plant_transaction_data_simulations.service import ( get, @@ -29,7 +29,7 @@ from src.models import StandardResponse router = APIRouter() -@router.get("", response_model=StandardResponse[PlantTransactionDataPagination]) +@router.get("", response_model=StandardResponse[PlantTransactionDataSimulationsPagination]) async def get_transaction_datas( db_session: DbSession, common: CommonParameters, @@ -49,7 +49,7 @@ async def get_transaction_datas( message="Data retrieved successfully", ) -@router.get("/charts", response_model=StandardResponse[PlantChartData]) +@router.get("/charts", response_model=StandardResponse[PlantChartDataSimulations]) async def get_chart_data(db_session: DbSession, common: CommonParameters): chart_data, bep_year, bep_total_lcc = await get_charts( db_session=db_session, common=common @@ -71,11 +71,11 @@ async def get_chart_data(db_session: DbSession, common: CommonParameters): @router.post( "/charts/fs/import", - response_model=StandardResponse[List[PlantTransactionDataRead]], + response_model=StandardResponse[List[PlantTransactionDataSimulationsRead]], ) async def import_fs_chart_data( db_session: DbSession, - payload: PlantTransactionFSImport, + payload: PlantTransactionFSImportSimulations, current_user: CurrentUser, ): updated_records, missing_years = await update_fs_charts_from_matrix( @@ -98,7 +98,7 @@ async def import_fs_chart_data( return StandardResponse(data=updated_records, message=message) @router.get( - "/{transaction_data_id}", response_model=StandardResponse[PlantTransactionDataRead] + "/{transaction_data_id}", response_model=StandardResponse[PlantTransactionDataSimulationsRead] ) async def get_transaction_data(db_session: DbSession, transaction_data_id: str): transaction_data = await get( @@ -115,10 +115,10 @@ async def get_transaction_data(db_session: DbSession, transaction_data_id: str): ) -@router.post("", response_model=StandardResponse[PlantTransactionDataRead]) +@router.post("", response_model=StandardResponse[PlantTransactionDataSimulationsRead]) async def create_transaction_data( db_session: DbSession, - transaction_data_in: PlantTransactionDataCreate, + transaction_data_in: PlantTransactionDataSimulationsCreate, current_user: CurrentUser, ): transaction_data_in.created_by = current_user.name @@ -129,12 +129,12 @@ async def create_transaction_data( return StandardResponse(data=transaction_data, message="Data created successfully") @router.put( - "/bulk", response_model=StandardResponse[List[PlantTransactionDataRead]] + "/bulk", response_model=StandardResponse[List[PlantTransactionDataSimulationsRead]] ) async def bulk_update_transaction_data( db_session: DbSession, ids: List[str], - updates: List[PlantTransactionDataUpdate], + updates: List[PlantTransactionDataSimulationsUpdate], current_user: CurrentUser, ): if len(ids) != len(updates): @@ -159,12 +159,12 @@ async def bulk_update_transaction_data( ) @router.put( - "/{transaction_data_id}", response_model=StandardResponse[PlantTransactionDataRead] + "/{transaction_data_id}", response_model=StandardResponse[PlantTransactionDataSimulationsRead] ) async def update_transaction_data( db_session: DbSession, transaction_data_id: str, - transaction_data_in: PlantTransactionDataUpdate, + transaction_data_in: PlantTransactionDataSimulationsUpdate, current_user: CurrentUser, ): transaction_data = await get( @@ -189,7 +189,7 @@ async def update_transaction_data( @router.delete( - "/{transaction_data_id}", response_model=StandardResponse[PlantTransactionDataRead] + "/{transaction_data_id}", response_model=StandardResponse[PlantTransactionDataSimulationsRead] ) async def delete_transaction_data(db_session: DbSession, transaction_data_id: str): transaction_data = await get(