🐛Fixes batch-get operations on trash (ITISFoundation#7194)

Author: pcrespov

services/web/server/src/simcore_service_webserver/folders/_folders_repository.py

@@ -566,7 +566,10 @@ async def get_folders_recursively(
 
 
 def _select_trashed_by_primary_gid_query():
-    return sa.select(users.c.primary_gid.label("trashed_by_primary_gid")).select_from(
+    return sa.select(
+        folders_v2.c.folder_id,
+        users.c.primary_gid.label("trashed_by_primary_gid"),
+    ).select_from(
         folders_v2.outerjoin(users, folders_v2.c.trashed_by == users.c.id),
     )
 
@@ -583,7 +586,7 @@ async def get_trashed_by_primary_gid(
 
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         result = await conn.execute(query)
-        row = result.first()
+        row = result.one_or_none()
         return row.trashed_by_primary_gid if row else None
 
 
@@ -611,4 +614,6 @@ async def batch_get_trashed_by_primary_gid(
 
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         result = await conn.stream(query)
-        return [row.trashed_by_primary_gid async for row in result]
+        rows = {row.folder_id: row.trashed_by_primary_gid async for row in result}
+
+    return [rows.get(folder_id) for folder_id in folders_ids]

services/web/server/src/simcore_service_webserver/projects/_projects_db.py

@@ -53,6 +53,7 @@ async def patch_project(
 
 def _select_trashed_by_primary_gid_query() -> sql.Select:
     return sa.select(
+        projects.c.uuid,
         users.c.primary_gid.label("trashed_by_primary_gid"),
     ).select_from(projects.outerjoin(users, projects.c.trashed_by == users.c.id))
 
@@ -106,4 +107,6 @@ async def batch_get_trashed_by_primary_gid(
     )
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         result = await conn.stream(query)
-        return [row.trashed_by_primary_gid async for row in result]
+        rows = {row.uuid: row.trashed_by_primary_gid async for row in result}
+
+    return [rows.get(uuid) for uuid in projects_uuids_str]

services/web/server/tests/unit/with_dbs/03/test_project_db.py

@@ -13,6 +13,7 @@
 from uuid import UUID, uuid5
 
 import aiopg.sa
+import arrow
 import pytest
 import sqlalchemy as sa
 from aiohttp.test_utils import TestClient
@@ -31,6 +32,9 @@
 from simcore_postgres_database.utils_projects_nodes import ProjectNodesRepo
 from simcore_service_webserver.projects._db_utils import PermissionStr
 from simcore_service_webserver.projects._groups_db import update_or_insert_project_group
+from simcore_service_webserver.projects._projects_db import (
+    batch_get_trashed_by_primary_gid,
+)
 from simcore_service_webserver.projects.api import has_user_project_access_rights
 from simcore_service_webserver.projects.db import ProjectAccessRights, ProjectDBAPI
 from simcore_service_webserver.projects.exceptions import (
@@ -962,3 +966,42 @@ async def test_check_project_node_has_all_required_inputs_ok(
         project_uuid=UUID(inserted_project["uuid"]),
         node_id=UUID("324d6ef2-a82c-414d-9001-dc84da1cbea3"),
     )
+
+
+@pytest.mark.parametrize(
+    "user_role",
+    [UserRole.USER],
+)
+async def test_batch_get_trashed_by_primary_gid(
+    client: TestClient,
+    logged_user: UserInfoDict,
+    insert_project_in_db: Callable[..., Awaitable[dict[str, Any]]],
+    fake_project: ProjectDict,
+):
+    assert client.app
+
+    # Insert two different projects
+    fake_project_1 = deepcopy(fake_project)
+    fake_project_1["trashed_by"] = logged_user["id"]
+    fake_project_1["trashed"] = arrow.now().datetime
+    fake_project_1["trashed_explicitly"] = True
+
+    project_1 = await insert_project_in_db(fake_project_1, user_id=logged_user["id"])
+    project_2 = await insert_project_in_db(fake_project, user_id=logged_user["id"])
+
+    # Test with two different project UUIDs
+    trashed_by_primary_gid = await batch_get_trashed_by_primary_gid(
+        client.app,
+        projects_uuids=[project_1["uuid"], project_2["uuid"]],
+    )
+    assert trashed_by_primary_gid == [logged_user["primary_gid"], None]
+
+    # Test with two identical project UUIDs
+    trashed_by_primary_gid = await batch_get_trashed_by_primary_gid(
+        client.app,
+        projects_uuids=[project_1["uuid"], project_1["uuid"]],
+    )
+    assert trashed_by_primary_gid == [
+        logged_user["primary_gid"],
+        logged_user["primary_gid"],
+    ]

services/web/server/tests/unit/with_dbs/04/folders/test_folders_repository.py

@@ -0,0 +1,82 @@
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
+
+from typing import Any
+
+import arrow
+import pytest
+from aiohttp.test_utils import TestClient
+from common_library.users_enums import UserRole
+from models_library.products import ProductName
+from simcore_service_webserver.folders import _folders_repository
+
+
+@pytest.fixture
+def user_role():
+    return UserRole.USER
+
+
+@pytest.fixture
+def product_name():
+    return "osparc"
+
+
+async def test_batch_get_trashed_by_primary_gid(
+    client: TestClient,
+    logged_user: dict[str, Any],
+    product_name: ProductName,
+):
+    assert client.app
+
+    # Create two folders
+    folder_1 = await _folders_repository.create(
+        client.app,
+        created_by_gid=logged_user["primary_gid"],
+        folder_name="Folder 1",
+        product_name=product_name,
+        parent_folder_id=None,
+        user_id=logged_user["id"],
+        workspace_id=None,
+    )
+    folder_2 = await _folders_repository.create(
+        client.app,
+        created_by_gid=logged_user["primary_gid"],
+        folder_name="Folder 2",
+        product_name=product_name,
+        parent_folder_id=None,
+        user_id=logged_user["id"],
+        workspace_id=None,
+    )
+
+    # Update the trashed flag for folder_1
+    await _folders_repository.update(
+        client.app,
+        folders_id_or_ids=folder_1.folder_id,
+        product_name=product_name,
+        trashed=arrow.now().datetime,
+        trashed_explicitly=True,
+        trashed_by=logged_user["id"],
+    )
+
+    # Test batch_get_trashed_by_primary_gid
+    trashed_by_primary_gid = await _folders_repository.batch_get_trashed_by_primary_gid(
+        client.app,
+        folders_ids=[folder_1.folder_id, folder_2.folder_id],
+    )
+    assert trashed_by_primary_gid == [logged_user["primary_gid"], None]
+
+    # flipped
+    trashed_by_primary_gid = await _folders_repository.batch_get_trashed_by_primary_gid(
+        client.app,
+        folders_ids=[folder_2.folder_id, folder_1.folder_id],
+    )
+    assert trashed_by_primary_gid == [None, logged_user["primary_gid"]]
+
+    # repeated
+    trashed_by_primary_gid = await _folders_repository.batch_get_trashed_by_primary_gid(
+        client.app,
+        folders_ids=[folder_1.folder_id] * 3,
+    )
+    assert trashed_by_primary_gid == [logged_user["primary_gid"]] * 3