fix

Author: matusdrobuliak66

services/web/server/src/simcore_service_webserver/director_v2/_comp_runs_collections_repository.py

@@ -32,7 +32,7 @@ async def create_comp_run_collection(
         )
         .returning(comp_runs_collections.c.collection_run_id)
     )
-    collection_id_tuple: tuple[UUID] = await result.first()
+    collection_id_tuple: tuple[UUID] = result.one()
     return TypeAdapter(CollectionRunID).validate_python(collection_id_tuple[0])
 
 
@@ -44,7 +44,7 @@ async def get_comp_run_collection_or_none_by_id(
             comp_runs_collections.c.collection_run_id == f"{collection_run_id}"
         )
     )
-    row = await result.first()
+    row = result.one_or_none()
     if row is None:
         return None
     return CompRunCollectionDBGet.model_validate(row)
@@ -59,7 +59,7 @@ async def get_comp_run_collection_or_none_by_client_generated_id(
             == client_or_system_generated_id
         )
     )
-    row = await result.one_or_none()
+    row = result.one_or_none()
     if row is None:
         return None
     return CompRunCollectionDBGet.model_validate(row)

services/web/server/src/simcore_service_webserver/director_v2/_comp_runs_collections_service.py

@@ -2,8 +2,9 @@
 
 from aiohttp import web
 from models_library.computations import CollectionRunID
+from simcore_postgres_database.utils_repos import transaction_context
 
-from ..db.plugin import get_database_engine_legacy
+from ..db.plugin import get_asyncpg_engine
 from . import _comp_runs_collections_repository
 from ._comp_runs_collections_models import CompRunCollectionDBGet
 
@@ -17,8 +18,7 @@ async def create_comp_run_collection(
     client_or_system_generated_display_name: str,
     is_generated_by_system: bool,
 ) -> CollectionRunID:
-    """raises: ProjectNotFoundError"""
-    async with get_database_engine_legacy(app).acquire() as conn:
+    async with transaction_context(get_asyncpg_engine(app)) as conn:
         return await _comp_runs_collections_repository.create_comp_run_collection(
             conn=conn,
             client_or_system_generated_id=client_or_system_generated_id,
@@ -30,7 +30,7 @@ async def create_comp_run_collection(
 async def get_comp_run_collection_or_none_by_id(
     app: web.Application, *, collection_run_id: CollectionRunID
 ) -> CompRunCollectionDBGet | None:
-    async with get_database_engine_legacy(app).acquire() as conn:
+    async with transaction_context(get_asyncpg_engine(app)) as conn:
         return await _comp_runs_collections_repository.get_comp_run_collection_or_none_by_id(
             conn=conn, collection_run_id=collection_run_id
         )
@@ -41,7 +41,7 @@ async def get_comp_run_collection_or_none_by_client_generated_id(
     *,
     client_or_system_generated_id: str,
 ) -> CompRunCollectionDBGet | None:
-    async with get_database_engine_legacy(app).acquire() as conn:
+    async with transaction_context(get_asyncpg_engine(app)) as conn:
         return await _comp_runs_collections_repository.get_comp_run_collection_or_none_by_client_generated_id(
             conn=conn, client_or_system_generated_id=client_or_system_generated_id
         )