refactor: simplify user creation in tests by utilizing sync_insert_and_get_user_and_secrets_lifespan and removing unused asyncpg_storage_system_mock fixture

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/db_entries_mocks.py

@@ -3,6 +3,7 @@
 # pylint:disable=redefined-outer-name
 # pylint:disable=no-value-for-parameter
 
+import contextlib
 from collections.abc import AsyncIterator, Awaitable, Callable, Iterator
 from typing import Any
 from uuid import uuid4
@@ -19,14 +20,15 @@
 from simcore_postgres_database.models.projects import ProjectType, projects
 from simcore_postgres_database.models.projects_to_products import projects_to_products
 from simcore_postgres_database.models.services import services_access_rights
-from simcore_postgres_database.models.users import UserRole, UserStatus, users
+from simcore_postgres_database.models.users import UserRole, UserStatus
 from simcore_postgres_database.utils_projects_nodes import (
     ProjectNodeCreate,
     ProjectNodesRepo,
 )
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 from .helpers.postgres_tools import insert_and_get_row_lifespan
+from .helpers.postgres_users import sync_insert_and_get_user_and_secrets_lifespan
 
 
 @pytest.fixture()
@@ -35,36 +37,27 @@ def create_registered_user(
 ) -> Iterator[Callable[..., dict]]:
     created_user_ids = []
 
-    def _(**user_kwargs) -> dict[str, Any]:
-        with postgres_db.connect() as con:
-            # removes all users before continuing
-            user_config = {
-                "id": len(created_user_ids) + 1,
-                "name": faker.name(),
-                "email": faker.email(),
-                "password_hash": faker.password(),
-                "status": UserStatus.ACTIVE,
-                "role": UserRole.USER,
-            }
-            user_config.update(user_kwargs)
+    with contextlib.ExitStack() as stack:
 
-            con.execute(
-                users.insert().values(user_config).returning(sa.literal_column("*"))
-            )
-            # this is needed to get the primary_gid correctly
-            result = con.execute(
-                sa.select(users).where(users.c.id == user_config["id"])
+        def _(**user_kwargs) -> dict[str, Any]:
+
+            user_id = len(created_user_ids) + 1
+            user = stack.enter_context(
+                sync_insert_and_get_user_and_secrets_lifespan(
+                    postgres_db,
+                    status=UserStatus.ACTIVE,
+                    role=UserRole.USER,
+                    **user_kwargs,
+                )
             )
-            user = result.first()
-            assert user
+
             print(f"--> created {user=}")
+            assert user["id"] == user_id
             created_user_ids.append(user["id"])
-        return dict(user._asdict())
+            return user
 
-    yield _
+        yield _
 
-    with postgres_db.connect() as con:
-        con.execute(users.delete().where(users.c.id.in_(created_user_ids)))
     print(f"<-- deleted users {created_user_ids=}")
 
 

packages/pytest-simcore/src/pytest_simcore/helpers/postgres_users.py

@@ -1,11 +1,15 @@
 import contextlib
 
+import sqlalchemy as sa
 from simcore_postgres_database.models.users import users
 from simcore_postgres_database.models.users_secrets import users_secrets
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 from .faker_factories import random_user, random_user_secrets
-from .postgres_tools import insert_and_get_row_lifespan
+from .postgres_tools import (
+    insert_and_get_row_lifespan,
+    sync_insert_and_get_row_lifespan,
+)
 
 
 def _get_kwargs_from_overrides(overrides: dict) -> tuple[dict, dict]:
@@ -48,6 +52,38 @@ async def insert_and_get_user_and_secrets_lifespan(
         yield {**user, **secrets}
 
 
+@contextlib.contextmanager
+def sync_insert_and_get_user_and_secrets_lifespan(
+    sqlalchemy_sync_engine: sa.engine.Engine, **overrides
+):
+    user_kwargs, secrets_kwargs = _get_kwargs_from_overrides(overrides)
+
+    with contextlib.ExitStack() as stack:
+        # users
+        user = stack.enter_context(
+            sync_insert_and_get_row_lifespan(
+                sqlalchemy_sync_engine,
+                table=users,
+                values=random_user(**user_kwargs),
+                pk_col=users.c.id,
+            )
+        )
+
+        # users_secrets
+        secrets = stack.enter_context(
+            sync_insert_and_get_row_lifespan(
+                sqlalchemy_sync_engine,
+                table=users_secrets,
+                values=random_user_secrets(user_id=user["id"], **secrets_kwargs),
+                pk_col=users_secrets.c.user_id,
+            )
+        )
+
+        assert secrets.pop("user_id", None) == user["id"]
+
+        yield {**user, **secrets}
+
+
 async def insert_user_and_secrets(conn, **overrides) -> int:
     # NOTE: Legacy adapter. Use insert_and_get_user_and_secrets_lifespan instead
     # Temporarily used where conn is produce by aiopg_engine

services/web/server/tests/unit/with_dbs/04/garbage_collector/test_resource_manager.py

@@ -673,7 +673,6 @@ async def test_interactive_services_removed_per_project(
     mocked_notification_system,
     socketio_client_factory: Callable,
     client_session_id_factory: Callable[[], str],
-    asyncpg_storage_system_mock,
     storage_subsystem_mock,  # when guest user logs out garbage is collected
     expected_save_state: bool,
     open_project: Callable,

services/web/server/tests/unit/with_dbs/conftest.py

@@ -420,14 +420,6 @@ async def _mock_result() -> None:
     return MockedStorageSubsystem(mock, mock1, mock2, mock3)
 
 
-@pytest.fixture
-def asyncpg_storage_system_mock(mocker):
-    return mocker.patch(
-        "simcore_service_webserver.login._login_repository_legacy.AsyncpgStorage.delete_user",
-        return_value="",
-    )
-
-
 @pytest.fixture
 async def mocked_dynamic_services_interface(
     mocker: MockerFixture,