From 979f3d4124a443b0bcbeb8a3b1e3e19030b373eb Mon Sep 17 00:00:00 2001
From: cmanso <cmanso@protonmail.com>
Date: Tue, 13 Sep 2022 16:24:46 +0200
Subject: [PATCH] Topology model updated to SQLAlchemy
---
.../service/grpc_server/ContextServiceServicerImpl.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/context/service/grpc_server/ContextServiceServicerImpl.py b/src/context/service/grpc_server/ContextServiceServicerImpl.py
index bf51bf316..9952444b7 100644
--- a/src/context/service/grpc_server/ContextServiceServicerImpl.py
+++ b/src/context/service/grpc_server/ContextServiceServicerImpl.py
@@ -195,7 +195,7 @@ class ContextServiceServicerImpl(ContextServiceServicer):
return TopologyList(topologies=[db_topology.dump() for db_topology in db_topologies])
@safe_and_metered_rpc_method(METRICS, LOGGER)
- def GetTopology(self, request: TopologyId, contextt : grpc.ServicerContext) -> Topology:
+ def GetTopology(self, request: TopologyId, context : grpc.ServicerContext) -> Topology:
context_uuid = request.context_id.context_uuid.uuid
topology_uuid = request.topology_uuid.uuid
@@ -215,10 +215,9 @@ class ContextServiceServicerImpl(ContextServiceServicer):
with self.session() as session:
db_context: ContextModel = session.query(ContextModel).filter_by(context_uuid=context_uuid).one()
- topology_add = TopologyModel(topology_uuid=topology_uuid, context_fk=context_uuid)
- topology_add.context = db_context
- updated = True
- with self.session() as session:
+ topology_add = TopologyModel(topology_uuid=topology_uuid, context_fk=context_uuid)
+ topology_add.context = db_context
+ updated = True
result = session.query(TopologyModel).join(TopologyModel.context).filter(TopologyModel.topology_uuid==topology_uuid).options(contains_eager(TopologyModel.context)).one_or_none()
if not result:
--
GitLab