From 4b7976aa6a5ea31faa0f3c759f4321004244b12a Mon Sep 17 00:00:00 2001 From: Cizz22 Date: Tue, 24 Jun 2025 10:51:53 +0700 Subject: [PATCH] minor fir --- src/aeros_equipment/service.py | 2 -- src/aeros_simulation/service.py | 32 +++++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/aeros_equipment/service.py b/src/aeros_equipment/service.py index 095b430..119492f 100644 --- a/src/aeros_equipment/service.py +++ b/src/aeros_equipment/service.py @@ -130,8 +130,6 @@ async def save_default_equipment(*, db_session: DbSession, project_name: str): results = response.json() - raise Exception(updateNodeReq) - nodes = [] # save to db diff --git a/src/aeros_simulation/service.py b/src/aeros_simulation/service.py index b434c11..7b59c6f 100644 --- a/src/aeros_simulation/service.py +++ b/src/aeros_simulation/service.py @@ -269,7 +269,10 @@ async def save_default_simulation_node( # delete old data await db_session.execute(delete(AerosNode)) - for result in results["nodeResultOuts"]: + plotResult = results["plotNodeOuts"] + nodeResult = results["nodeResultOuts"] + + for result in nodeResult: aeros_node = AerosNode( node_name=result["nodeName"], node_type=result["nodeType"], @@ -288,6 +291,33 @@ async def save_default_simulation_node( ) nodes.append(aeros_node) + for result in plotResult: + nodeId = convert_id_to_none_if_negative(result["nodeId"]) + nodeName = result["nodeName"] + + # Check in node name and nodeid already exists in nodes + if not any( + node.node_name == nodeName and node.node_id == nodeId for node in nodes + ): + aeros_node = AerosNode( + node_name=nodeName, + node_type=result["nodeType"], + node_id=nodeId, + original_node_id=convert_id_to_none_if_negative(result["originalNodeId"]), + schematic_name=result["schematicName"], + schematic_id=convert_id_to_none_if_negative(result["parentSchematicId"]), + original_schematic_id=convert_id_to_none_if_negative( + result["originalParentSchematicId"] + ), + ref_schematic_id=convert_id_to_none_if_negative(result["targetSchematicId"]), + orignal_ref_schematic_id=convert_id_to_none_if_negative( + result["originalTargetSchematicId"] + ), + ) + nodes.append(aeros_node) + + + db_session.add_all(nodes) await db_session.commit()