diff --git a/src/calculation_time_constrains/flows.py b/src/calculation_time_constrains/flows.py index cbf7e1c..da53f40 100644 --- a/src/calculation_time_constrains/flows.py +++ b/src/calculation_time_constrains/flows.py @@ -22,6 +22,7 @@ from .service import (create_calculation_result_service, create_param_and_data, get_calculation_data_by_id, get_calculation_result, get_corrective_cost_time_chart, get_overhaul_cost_by_time_chart, run_simulation) +from src.database.core import CollectorDbSession async def get_create_calculation_parameters( @@ -83,6 +84,7 @@ async def create_calculation( *, token: str, db_session: DbSession, + collector_db_session: CollectorDbSession, calculation_time_constrains_in: CalculationTimeConstrainsParametersCreate, created_by: str ): @@ -96,7 +98,7 @@ async def create_calculation( # db_session=db_session, calculation=calculation_data, token=token # ) results = await run_simulation( - db_session=db_session, calculation=calculation_data, token=token + db_session=db_session, calculation=calculation_data, token=token, collector_db_session=collector_db_session ) return results["id"] diff --git a/src/calculation_time_constrains/router.py b/src/calculation_time_constrains/router.py index a026996..c65f799 100644 --- a/src/calculation_time_constrains/router.py +++ b/src/calculation_time_constrains/router.py @@ -18,6 +18,7 @@ from .schema import (CalculationResultsRead, CalculationTimeConstrainsRead, EquipmentResult) from .service import (bulk_update_equipment, get_calculation_result, get_calculation_result_by_day, get_calculation_by_assetnum) +from src.database.core import CollectorDbSession router = APIRouter() @@ -28,6 +29,7 @@ router = APIRouter() async def create_calculation_time_constrains( token: Token, db_session: DbSession, + collector_db_session: CollectorDbSession, current_user: CurrentUser, calculation_time_constrains_in: CalculationTimeConstrainsParametersCreate, scope_calculation_id: Optional[str] = Query(None), @@ -45,6 +47,7 @@ async def create_calculation_time_constrains( results = await create_calculation( token=token, db_session=db_session, + collector_db_session=collector_db_session, calculation_time_constrains_in=calculation_time_constrains_in, created_by=current_user.name, ) diff --git a/src/calculation_time_constrains/service.py b/src/calculation_time_constrains/service.py index e6a7778..0f7e28b 100644 --- a/src/calculation_time_constrains/service.py +++ b/src/calculation_time_constrains/service.py @@ -15,6 +15,7 @@ from src.overhaul_scope.service import get as get_scope, get_prev_oh from src.utils import get_latest_numOfFail from src.workorder.model import MasterWorkOrder from src.sparepart.model import MasterSparePart +from src.database.core import CollectorDbSession from src.overhaul_activity.model import OverhaulActivity from .model import (CalculationData, CalculationEquipmentResult, CalculationResult) @@ -1317,9 +1318,9 @@ class OptimumCostModel: -async def run_simulation(*, db_session: DbSession, calculation: CalculationData, token: str): +async def run_simulation(*, db_session: DbSession, calculation: CalculationData, token: str, collector_db_session: CollectorDbSession): equipments = await get_standard_scope_by_session_id( - db_session=db_session, overhaul_session_id=calculation.overhaul_session_id + db_session=db_session, overhaul_session_id=calculation.overhaul_session_id, collector_db=collector_db_session )