refactor: update user injection methods to use new lifespan helpers

Author: pcrespov

packages/notifications-library/tests/with_db/conftest.py

@@ -16,11 +16,14 @@
 from models_library.users import UserID
 from notifications_library._templates import get_default_named_templates
 from pydantic import validate_call
+from pytest_simcore.helpers.postgres_tools import insert_and_get_row_lifespan
+from pytest_simcore.helpers.postgres_users import (
+    insert_and_get_user_and_secrets_lifespan,
+)
 from simcore_postgres_database.models.jinja2_templates import jinja2_templates
 from simcore_postgres_database.models.payments_transactions import payments_transactions
 from simcore_postgres_database.models.products import products
 from simcore_postgres_database.models.products_to_templates import products_to_templates
-from simcore_postgres_database.models.users import users
 from sqlalchemy.engine.row import Row
 from sqlalchemy.ext.asyncio.engine import AsyncEngine
 
@@ -50,16 +53,11 @@ async def user(
     and injects a user in db
     """
     assert user_id == user["id"]
-    pk_args = users.c.id, user["id"]
-
-    # NOTE: creation of primary group and setting `groupid`` is automatically triggered after creation of user by postgres
-    async with sqlalchemy_async_engine.begin() as conn:
-        row: Row = await _insert_and_get_row(conn, users, user, *pk_args)
-
-    yield row._asdict()
-
-    async with sqlalchemy_async_engine.begin() as conn:
-        await _delete_row(conn, users, *pk_args)
+    async with insert_and_get_user_and_secrets_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup
+        sqlalchemy_async_engine,
+        **user,
+    ) as row:
+        yield row
 
 
 @pytest.fixture
@@ -82,15 +80,14 @@ async def product(
     # NOTE: osparc product is already in db. This is another product
     assert product["name"] != "osparc"
 
-    pk_args = products.c.name, product["name"]
-
-    async with sqlalchemy_async_engine.begin() as conn:
-        row: Row = await _insert_and_get_row(conn, products, product, *pk_args)
-
-    yield row._asdict()
-
-    async with sqlalchemy_async_engine.begin() as conn:
-        await _delete_row(conn, products, *pk_args)
+    async with insert_and_get_row_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup
+        sqlalchemy_async_engine,
+        table=products,
+        values=product,
+        pk_col=products.c.name,
+        pk_value=product["name"],
+    ) as row:
+        yield row
 
 
 @pytest.fixture

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/users.py

@@ -1,3 +1,5 @@
+from typing import cast
+
 from models_library.users import UserID
 from pydantic import EmailStr, TypeAdapter
 from simcore_postgres_database.models.users import UserRole
@@ -15,4 +17,4 @@ async def get_user_email(self, user_id: UserID) -> EmailStr:
         return TypeAdapter(EmailStr).validate_python(email)
 
     async def get_user_role(self, user_id: UserID) -> UserRole:
-        return await self._repo().get_role(user_id=user_id)
+        return cast(UserRole, await self._repo().get_role(user_id=user_id))

services/dynamic-scheduler/tests/unit/test_repository_postgres_networks.py

@@ -17,9 +17,11 @@
     PostgresTestConfig,
     insert_and_get_row_lifespan,
 )
+from pytest_simcore.helpers.postgres_users import (
+    insert_and_get_user_and_secrets_lifespan,
+)
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_postgres_database.models.projects import projects
-from simcore_postgres_database.models.users import users
 from simcore_service_dynamic_scheduler.repository.events import (
     get_project_networks_repo,
 )
@@ -77,17 +79,14 @@ async def user_in_db(
     user_id: UserID,
 ) -> AsyncIterator[dict[str, Any]]:
     """
-    injects a user in db
+    injects a user + secrets in db
     """
     assert user_id == user["id"]
-    async with insert_and_get_row_lifespan(
+    async with insert_and_get_user_and_secrets_lifespan(
         engine,
-        table=users,
-        values=user,
-        pk_col=users.c.id,
-        pk_value=user["id"],
-    ) as row:
-        yield row
+        **user,
+    ) as user_row:
+        yield user_row
 
 
 @pytest.fixture

services/efs-guardian/tests/unit/test_efs_removal_policy_task.py

@@ -17,9 +17,11 @@
 from models_library.users import UserID
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.postgres_tools import insert_and_get_row_lifespan
+from pytest_simcore.helpers.postgres_users import (
+    insert_and_get_user_and_secrets_lifespan,
+)
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_postgres_database.models.projects import projects
-from simcore_postgres_database.models.users import users
 from simcore_postgres_database.utils_repos import transaction_context
 from simcore_service_efs_guardian.core.settings import (
     ApplicationSettings,
@@ -71,12 +73,9 @@ async def user_in_db(
     injects a user in db
     """
     assert user_id == user["id"]
-    async with insert_and_get_row_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup
+    async with insert_and_get_user_and_secrets_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup
         app.state.engine,
-        table=users,
-        values=user,
-        pk_col=users.c.id,
-        pk_value=user["id"],
+        **user,
     ) as row:
         yield row
 

services/payments/tests/unit/test_db_payments_users_repo.py

@@ -14,10 +14,12 @@
 from models_library.users import UserID
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.postgres_tools import insert_and_get_row_lifespan
+from pytest_simcore.helpers.postgres_users import (
+    insert_and_get_user_and_secrets_lifespan,
+)
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_postgres_database.models.payments_transactions import payments_transactions
 from simcore_postgres_database.models.products import products
-from simcore_postgres_database.models.users import users
 from simcore_service_payments.db.payment_users_repo import PaymentsUsersRepo
 from simcore_service_payments.services.postgres import get_engine
 
@@ -60,14 +62,10 @@ async def user(
     injects a user in db
     """
     assert user_id == user["id"]
-    async with insert_and_get_row_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup
-        get_engine(app),
-        table=users,
-        values=user,
-        pk_col=users.c.id,
-        pk_value=user["id"],
-    ) as row:
-        yield row
+    async with insert_and_get_user_and_secrets_lifespan(  # pylint:disable=contextmanager-generator-missing-cleanup
+        get_engine(app), **user
+    ) as user_row:
+        yield user_row
 
 
 @pytest.fixture

services/web/server/src/simcore_service_webserver/studies_dispatcher/_users.py

@@ -32,7 +32,6 @@
 from ..garbage_collector.settings import GUEST_USER_RC_LOCK_FORMAT
 from ..groups import api as groups_service
 from ..login._login_service import GUEST
-from ..login.login_repository_legacy import AsyncpgStorage, get_plugin_storage
 from ..products import products_web
 from ..redis import get_redis_lock_manager_client
 from ..security import security_service, security_web
@@ -99,7 +98,6 @@ async def create_temporary_guest_user(request: web.Request):
         MaxGuestUsersError: No more guest users allowed
 
     """
-    db: AsyncpgStorage = get_plugin_storage(request.app)
     redis_locks_client: aioredis.Redis = get_redis_lock_manager_client(request.app)
     settings: StudiesDispatcherSettings = get_plugin_settings(app=request.app)
     product_name = products_web.get_product_name(request)