diff --git a/src/aeros_simulation/schema.py b/src/aeros_simulation/schema.py index 3f9f6a1..c0bfdab 100644 --- a/src/aeros_simulation/schema.py +++ b/src/aeros_simulation/schema.py @@ -5,7 +5,7 @@ from uuid import UUID from pydantic import Field from src.models import BaseModel, Pagination -from src.aeros_equipment.schema import Equipment +from src.aeros_equipment.schema import MasterEquipment # Pydantic models for request/response validation class SimulationInput(BaseModel): @@ -26,7 +26,7 @@ class SimulationNode(BaseModel): structure_name: Optional[str] schematic_name: Optional[str] schematic_id: Optional[UUID] - equipment:Optional[List[Equipment]] + equipment:Optional[MasterEquipment] = None class SimulationCalc(BaseModel): id: UUID diff --git a/src/aeros_simulation/service.py b/src/aeros_simulation/service.py index d182238..1d3f130 100644 --- a/src/aeros_simulation/service.py +++ b/src/aeros_simulation/service.py @@ -487,9 +487,11 @@ async def get_simulation_with_calc_result( ).filter(AerosNode.structure_name.contains(schematic_name)) query = query.options( - selectinload(AerosSimulationCalcResult.aeros_node)).options( + selectinload(AerosSimulationCalcResult.aeros_node).options( selectinload(AerosNode.equipment) - ) + )) + + simulation = await db_session.execute(query)