minor

Author: pcrespov

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

@@ -572,7 +572,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),
     )
 
@@ -589,7 +592,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
 
 
@@ -617,4 +620,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/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