fixed tests

Author: sanderegg

packages/postgres-database/src/simcore_postgres_database/utils_user_preferences.py

@@ -1,17 +1,16 @@
 from typing import Any
 
 import sqlalchemy as sa
-from aiopg.sa.connection import SAConnection
 from sqlalchemy.dialects.postgresql import insert as pg_insert
+from sqlalchemy.ext.asyncio import AsyncConnection
 
 from .models.user_preferences import (
     user_preferences_frontend,
     user_preferences_user_service,
 )
 
 
-class CouldNotCreateOrUpdateUserPreferenceError(Exception):
-    ...
+class CouldNotCreateOrUpdateUserPreferenceError(Exception): ...
 
 
 class BasePreferencesRepo:
@@ -20,7 +19,7 @@ class BasePreferencesRepo:
     @classmethod
     async def save(
         cls,
-        conn: SAConnection,
+        conn: AsyncConnection,
         *,
         user_id: int,
         product_name: str,
@@ -49,7 +48,7 @@ async def save(
     @classmethod
     async def load(
         cls,
-        conn: SAConnection,
+        conn: AsyncConnection,
         *,
         user_id: int,
         product_name: str,

packages/postgres-database/tests/test_utils_user_preferences.py

@@ -1,11 +1,11 @@
 # pylint: disable=inconsistent-return-statements
 # pylint: disable=redefined-outer-name
 
-from collections.abc import Awaitable, Callable
+from collections.abc import AsyncIterator, Awaitable, Callable
 from typing import Any
 
 import pytest
-from aiopg.sa.connection import SAConnection
+from aiopg.sa.connection import AsyncConnection
 from aiopg.sa.result import RowProxy
 from faker import Faker
 from pytest_simcore.helpers.faker_factories import random_user
@@ -15,6 +15,7 @@
     FrontendUserPreferencesRepo,
     UserServicesUserPreferencesRepo,
 )
+from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
 
 @pytest.fixture
@@ -38,8 +39,16 @@ def preference_repo(request: pytest.FixtureRequest) -> type[BasePreferencesRepo]
     return request.param
 
 
+@pytest.fixture
+async def connection(
+    asyncpg_engine: AsyncEngine,
+) -> AsyncIterator[AsyncConnection]:
+    async with asyncpg_engine.begin() as connection:
+        yield connection
+
+
 async def _assert_save_get_preference(
-    connection: SAConnection,
+    connection: AsyncConnection,
     preference_repo: type[BasePreferencesRepo],
     *,
     user_id: int,
@@ -65,7 +74,7 @@ async def _assert_save_get_preference(
 
 
 async def _assert_preference_not_saved(
-    connection: SAConnection,
+    connection: AsyncConnection,
     preference_repo: type[BasePreferencesRepo],
     *,
     user_id: int,
@@ -92,7 +101,7 @@ def _get_random_payload(
     pytest.fail(f"Did not define a casa for {preference_repo=}. Please add one.")
 
 
-async def _get_user_id(connection: SAConnection, faker: Faker) -> int:
+async def _get_user_id(connection: AsyncConnection, faker: Faker) -> int:
     data = random_user(role=faker.random_element(elements=UserRole))
     user_id = await connection.scalar(
         users.insert().values(**data).returning(users.c.id)
@@ -102,7 +111,7 @@ async def _get_user_id(connection: SAConnection, faker: Faker) -> int:
 
 
 async def test_user_preference_repo_workflow(
-    connection: SAConnection,
+    connection: AsyncConnection,
     preference_repo: type[BasePreferencesRepo],
     preference_one: str,
     product_name: str,
@@ -144,7 +153,7 @@ async def test_user_preference_repo_workflow(
 
 
 async def test__same_preference_name_product_name__different_users(
-    connection: SAConnection,
+    connection: AsyncConnection,
     preference_repo: type[BasePreferencesRepo],
     preference_one: str,
     product_name: str,
@@ -193,7 +202,7 @@ async def test__same_preference_name_product_name__different_users(
 
 
 async def test__same_user_preference_name__different_product_name(
-    connection: SAConnection,
+    connection: AsyncConnection,
     create_fake_product: Callable[..., Awaitable[RowProxy]],
     preference_repo: type[BasePreferencesRepo],
     preference_one: str,
@@ -244,7 +253,7 @@ async def test__same_user_preference_name__different_product_name(
 
 
 async def test__same_product_name_user__different_preference_name(
-    connection: SAConnection,
+    connection: AsyncConnection,
     preference_repo: type[BasePreferencesRepo],
     preference_one: str,
     preference_two: str,

services/web/server/src/simcore_service_webserver/users/_preferences_repository.py

@@ -4,7 +4,7 @@
 from models_library.users import UserID
 from simcore_postgres_database.utils_user_preferences import FrontendUserPreferencesRepo
 
-from ..db.plugin import get_database_engine
+from ..db.plugin import get_asyncpg_engine
 
 
 def _get_user_preference_name(user_id: UserID, preference_name: PreferenceName) -> str:
@@ -18,7 +18,7 @@ async def get_user_preference(
     product_name: ProductName,
     preference_class: type[FrontendUserPreference],
 ) -> FrontendUserPreference | None:
-    async with get_database_engine(app).acquire() as conn:
+    async with get_asyncpg_engine(app).connect() as conn:
         preference_payload: dict | None = await FrontendUserPreferencesRepo.load(
             conn,
             user_id=user_id,
@@ -42,7 +42,7 @@ async def set_user_preference(
     product_name: ProductName,
     preference: FrontendUserPreference,
 ) -> None:
-    async with get_database_engine(app).acquire() as conn:
+    async with get_asyncpg_engine(app).begin() as conn:
         await FrontendUserPreferencesRepo.save(
             conn,
             user_id=user_id,