From 8f3ede84eeb4460952de3291baf89ab33addc5e4 Mon Sep 17 00:00:00 2001 From: Cizz22 Date: Thu, 24 Jul 2025 10:47:01 +0700 Subject: [PATCH] fix --- src/aeros_simulation/service.py | 6 +++--- src/dashboard_model/service.py | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/aeros_simulation/service.py b/src/aeros_simulation/service.py index 09f962a..f86dbed 100644 --- a/src/aeros_simulation/service.py +++ b/src/aeros_simulation/service.py @@ -508,7 +508,7 @@ async def get_simulation_with_plot_result( async def get_calc_result_by( - *, db_session: DbSession, simulation_id: UUID, aeros_node_id: Optional[UUID] = None + *, db_session: DbSession, simulation_id: UUID, node_name: Optional[str] = None ): """Get a simulation node by column.""" # Build WHERE conditions from kwargs @@ -516,8 +516,8 @@ async def get_calc_result_by( AerosSimulationCalcResult.aeros_simulation_id == simulation_id ) - if aeros_node_id: - query = query.where(AerosSimulationCalcResult.aeros_node_id == aeros_node_id) + if node_name: + query = query.join(AerosSimulationCalcResult.aeros_node).filter(AerosNode.node_name == node_name) result = await db_session.execute(query) return result.scalar() diff --git a/src/dashboard_model/service.py b/src/dashboard_model/service.py index 8796642..c11274d 100644 --- a/src/dashboard_model/service.py +++ b/src/dashboard_model/service.py @@ -20,16 +20,15 @@ async def get_model_data(*, db_session: DbSession, simulation_id: Optional[UUID] simulation = await get_simulation_by_id( db_session=db_session, simulation_id=simulation_id, is_completed=True ) - main_node = await get_simulation_node_by(db_session=db_session, node_name="- BTG_PC -") - if not simulation and not main_node: + if not simulation: raise HTTPException( status_code=status.HTTP_404_NOT_FOUND, detail="Simulation not found" ) main_calc_data = await get_calc_result_by( - db_session=db_session, simulation_id=simulation.id, aeros_node_id=main_node.id + db_session=db_session, simulation_id=simulation.id, node_name="- TJB - Unit 3 -" )