Cizz22 6 months ago
parent 93a444d062
commit 8f3ede84ee

@ -508,7 +508,7 @@ async def get_simulation_with_plot_result(
async def get_calc_result_by( 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.""" """Get a simulation node by column."""
# Build WHERE conditions from kwargs # Build WHERE conditions from kwargs
@ -516,8 +516,8 @@ async def get_calc_result_by(
AerosSimulationCalcResult.aeros_simulation_id == simulation_id AerosSimulationCalcResult.aeros_simulation_id == simulation_id
) )
if aeros_node_id: if node_name:
query = query.where(AerosSimulationCalcResult.aeros_node_id == aeros_node_id) query = query.join(AerosSimulationCalcResult.aeros_node).filter(AerosNode.node_name == node_name)
result = await db_session.execute(query) result = await db_session.execute(query)
return result.scalar() return result.scalar()

@ -20,16 +20,15 @@ async def get_model_data(*, db_session: DbSession, simulation_id: Optional[UUID]
simulation = await get_simulation_by_id( simulation = await get_simulation_by_id(
db_session=db_session, simulation_id=simulation_id, is_completed=True 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( raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND, detail="Simulation not found" status_code=status.HTTP_404_NOT_FOUND, detail="Simulation not found"
) )
main_calc_data = await get_calc_result_by( 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 -"
) )

Loading…
Cancel
Save