diff --git a/src/aeros_equipment/service.py b/src/aeros_equipment/service.py index 8125d27..8229320 100644 --- a/src/aeros_equipment/service.py +++ b/src/aeros_equipment/service.py @@ -7,7 +7,7 @@ from sqlalchemy import Delete, Select, func from sqlalchemy.orm import selectinload from src.auth.service import CurrentUser -from src.config import AEROS_BASE_URL +from src.config import AEROS_BASE_URL, DEFAULT_PROJECT_NAME from src.database.core import DbSession from src.database.service import search_filter_sort_paginate @@ -28,7 +28,7 @@ async def get_all(*, common): node.node_name: node for node in results["items"] } - updateNodeReq = {"projectName": "trialapi", "equipmentNames": reg_nodes} + updateNodeReq = {"projectName": DEFAULT_PROJECT_NAME, "equipmentNames": reg_nodes} try: response = await client.post( @@ -127,7 +127,7 @@ async def save_default_equipment(*, db_session: DbSession, project_name: str): reg_nodes = [node.location_tag for node in equipment_nodes.scalars().all()] - updateNodeReq = {"projectName": "trialapi", "equipmentNames": reg_nodes} + updateNodeReq = {"projectName": DEFAULT_PROJECT_NAME, "equipmentNames": reg_nodes} # Delete old data query = Delete(AerosEquipment) diff --git a/src/aeros_simulation/service.py b/src/aeros_simulation/service.py index a4e7b6c..9479c67 100644 --- a/src/aeros_simulation/service.py +++ b/src/aeros_simulation/service.py @@ -7,7 +7,7 @@ from fastapi import HTTPException, status from sqlalchemy import delete, select from sqlalchemy.orm import selectinload -from src.config import AEROS_BASE_URL +from src.config import AEROS_BASE_URL, DEFAULT_PROJECT_NAME from src.database.core import DbSession from src.database.service import CommonParameters, search_filter_sort_paginate @@ -259,7 +259,7 @@ async def save_default_simulation_node( *, db_session: DbSession, project_name: str = "trialapi" ): sim_data = { - "projectName": "trialapi", + "projectName": DEFAULT_PROJECT_NAME, "SchematicName": "Boiler", "SimSeed": 1, "SimDuration": 3, diff --git a/src/config.py b/src/config.py index 537c76f..cb3058c 100644 --- a/src/config.py +++ b/src/config.py @@ -76,3 +76,5 @@ MAXIMO_API_KEY = config("MAXIMO_API_KEY", default="keys") AUTH_SERVICE_API = config("AUTH_SERVICE_API", default="http://192.168.1.82:8000/auth") AEROS_BASE_URL = config("AEROS_BASE_URL", default="http://192.168.1.87") WINDOWS_AEROS_BASE_URL = config("WINDOWS_AEROS_BASE_URL", default="http://192.168.1.87:8800") + +DEFAULT_PROJECT_NAME = config("DEFAULT_PROJECT_NAME", default="RBD TJB")