fixing test

services/web/server/src/simcore_service_webserver/garbage_collector/_core_guests.py

@@ -21,6 +21,7 @@
     delete_user_without_projects,
     get_guest_user_ids_and_names,
     get_user,
+    get_user_primary_group_id,
     get_user_role,
 )
 from ..users.exceptions import UserNotFoundError
@@ -45,6 +46,9 @@ async def _delete_all_projects_for_user(app: web.Application, user_id: int) -> N
     """
     # recover user's primary_gid
     try:
+        project_owner_primary_gid = await get_user_primary_group_id(
+            app=app, user_id=user_id
+        )
         project_owner: dict = await get_user(app=app, user_id=user_id)
     except exceptions.UserNotFoundError:
         _logger.warning(
@@ -170,6 +174,7 @@ async def remove_guest_user_with_all_its_resources(
         ProjectNotFoundError,
         UserNotFoundError,
         ProjectDeleteError,
+        Exception,
     ) as error:
         _logger.warning(
             "Failed to delete guest user %s and its resources: %s",

services/web/server/src/simcore_service_webserver/garbage_collector/plugin.py

@@ -31,6 +31,7 @@ def setup_garbage_collector(app: web.Application) -> None:
     # - project needs access to socketio via notify_project_state_update
     setup_socketio(app)
     # - project needs access to user-api that is connected to login plugin
+    # TODO: dont need this anymore!?
     setup_login_storage(app)
 
     settings = get_plugin_settings(app)

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

@@ -78,6 +78,20 @@ async def get_user_or_raise(
         return user
 
 
+async def get_user_primary_group_id(
+    engine: AsyncEngine, connection: AsyncConnection | None = None, *, user_id: UserID
+) -> GroupID:
+    async with pass_or_acquire_connection(engine, connection) as conn:
+        primary_gid: GroupID | None = await conn.scalar(
+            sa.select(
+                users.c.primary_gid,
+            ).where(users.c.id == user_id)
+        )
+        if primary_gid is None:
+            raise UserNotFoundError(uid=user_id)
+        return primary_gid
+
+
 async def get_users_ids_in_group(
     engine: AsyncEngine,
     connection: AsyncConnection | None = None,
@@ -147,7 +161,8 @@ async def get_user_role(app: web.Application, *, user_id: UserID) -> UserRole:
         )
         if user_role is None:
             raise UserNotFoundError(uid=user_id)
-        return UserRole(user_role)
+        assert isinstance(user_role, UserRole)  # nosec
+        return user_role
 
 
 async def list_user_permissions(

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

@@ -96,6 +96,12 @@ async def get_user(app: web.Application, user_id: UserID) -> dict[str, Any]:
     )
 
 
+async def get_user_primary_group_id(app: web.Application, user_id: UserID) -> GroupID:
+    return await _users_repository.get_user_primary_group_id(
+        engine=get_asyncpg_engine(app), user_id=user_id
+    )
+
+
 async def get_user_id_from_gid(app: web.Application, primary_gid: GroupID) -> UserID:
     return await _users_repository.get_user_id_from_pgid(app, primary_gid)
 

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

@@ -11,6 +11,7 @@
     get_user_id_from_gid,
     get_user_invoice_address,
     get_user_name_and_email,
+    get_user_primary_group_id,
     get_user_role,
     get_users_in_group,
     set_user_as_deleted,
@@ -20,14 +21,15 @@
 __all__: tuple[str, ...] = (
     "delete_user_without_projects",
     "get_guest_user_ids_and_names",
-    "get_user",
     "get_user_credentials",
     "get_user_display_and_id_names",
     "get_user_fullname",
     "get_user_id_from_gid",
     "get_user_invoice_address",
     "get_user_name_and_email",
+    "get_user_primary_group_id",
     "get_user_role",
+    "get_user",
     "get_users_in_group",
     "set_user_as_deleted",
     "update_expired_users",

services/web/server/tests/integration/01/test_garbage_collection.py

@@ -35,6 +35,7 @@
 from simcore_service_webserver.db.plugin import setup_db
 from simcore_service_webserver.director_v2.plugin import setup_director_v2
 from simcore_service_webserver.garbage_collector import _core as gc_core
+from simcore_service_webserver.garbage_collector._tasks_core import _GC_TASK_NAME
 from simcore_service_webserver.garbage_collector.plugin import setup_garbage_collector
 from simcore_service_webserver.groups._groups_api import create_standard_group
 from simcore_service_webserver.groups.api import add_user_in_group
@@ -1019,6 +1020,12 @@ async def test_t10_owner_and_all_shared_users_marked_as_guests(
     USER "u1", "u2" and "u3" are manually marked as "GUEST";
     EXPECTED: the project and all the users are removed
     """
+
+    gc_task: asyncio.Task = next(
+        task for task in asyncio.all_tasks() if task.get_name() == _GC_TASK_NAME
+    )
+    assert not gc_task.done()
+
     u1 = await login_user(client)
     u2 = await login_user(client)
     u3 = await login_user(client)