setup with folders and projects

Author: pcrespov

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

@@ -209,6 +209,9 @@ async def get_for_user_or_workspace(
         return FolderDB.from_orm(row)
 
 
+_MAX_ITEMS_UPDATE: Final = 100
+
+
 async def update(
     app: web.Application,
     *,
@@ -238,9 +241,10 @@ async def update(
     )
 
     if isinstance(folder_id, set):
-        if len(folder_id) == 0:
-            msg = f"Expected one or more folder_id to update, got {folder_id}"
+        if len(folder_id) == 0 or len(folder_id) > _MAX_ITEMS_UPDATE:
+            msg = f"Number of items for batch update is out-of-range, got {len(folder_id)=}"
             raise ValueError(msg)
+
         # batch-update
         query = query.where(folders_v2.c.folder_id.in_(list(folder_id)))
     else:

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

@@ -181,16 +181,16 @@ async def test_trash_projects(  # noqa: PLR0915
 @pytest.mark.acceptance_test(
     "For https://github.com/ITISFoundation/osparc-simcore/pull/6642"
 )
-async def test_trash_single_folder(
-    client: TestClient, logged_user: UserInfoDict, is_project_running: bool, force: bool
-):
+async def test_trash_single_folder(client: TestClient, logged_user: UserInfoDict):
     assert client.app
 
-    # CREATE a  folder
+    # CREATE a folder
     resp = await client.post("/v0/folders", json={"name": "My first folder"})
     data, _ = await assert_status(resp, status.HTTP_201_CREATED)
     folder = FolderGet.parse_obj(data)
 
+    # ---------------------------------------------------------------------
+
     # LIST NOT trashed
     resp = await client.get("/v0/folders")
     await assert_status(resp, status.HTTP_200_OK)
@@ -253,3 +253,130 @@ async def test_trash_single_folder(
 
     assert got.folder_id == folder.folder_id
     assert got.trashed_at is None
+
+
+@pytest.mark.acceptance_test(
+    "For https://github.com/ITISFoundation/osparc-simcore/pull/6642"
+)
+async def test_trash_folder_with_content(
+    client: TestClient,
+    logged_user: UserInfoDict,
+    user_project: ProjectDict,
+    mocked_catalog: None,
+    mocked_director_v2: None,
+):
+    assert client.app
+    project_uuid = UUID(user_project["uuid"])
+
+    # CREATE a folder
+    resp = await client.post("/v0/folders", json={"name": "My first folder"})
+    data, _ = await assert_status(resp, status.HTTP_201_CREATED)
+    folder = FolderGet.parse_obj(data)
+
+    # CREATE a SUB-folder
+    resp = await client.post(
+        "/v0/folders",
+        json={"name": "My subfolder 1", "parentFolderId": folder.folder_id},
+    )
+    data, _ = await assert_status(resp, status.HTTP_201_CREATED)
+    subfolder = FolderGet.parse_obj(data)
+
+    # MOVE project to SUB-folder
+    resp = await client.put(
+        f"/v0/projects/{project_uuid}/folders/{subfolder.folder_id}"
+    )
+    await assert_status(resp, status.HTTP_204_NO_CONTENT)
+
+    # CHECK created
+    resp = await client.get("/v0/folders")
+    await assert_status(resp, status.HTTP_200_OK)
+    page = Page[FolderGet].parse_obj(await resp.json())
+    assert page.meta.total == 1
+    assert page.data[0] == folder
+
+    resp = await client.get("/v0/folders", params={"folder_id": f"{folder.folder_id}"})
+    await assert_status(resp, status.HTTP_200_OK)
+    page = Page[FolderGet].parse_obj(await resp.json())
+    assert page.meta.total == 1
+    assert page.data[0] == subfolder
+
+    resp = await client.get("/v0/projects")
+    await assert_status(resp, status.HTTP_200_OK)
+    page = Page[ProjectListItem].parse_obj(await resp.json())
+    assert page.meta.total == 1
+    assert page.data[0].uuid == project_uuid
+    assert page.data[0].folder_id == subfolder.folder_id
+
+    # ---------------------------------------------------------------------
+
+    # TRASH folder
+    resp = await client.post(f"/v0/folders/{folder.folder_id}:trash")
+    await assert_status(resp, status.HTTP_204_NO_CONTENT)
+
+    # ONLY folder listed in trash. The rest is not listed anymore!
+    resp = await client.get("/v0/folders", params={"filters": '{"trashed": true}'})
+    await assert_status(resp, status.HTTP_200_OK)
+    page = Page[FolderGet].parse_obj(await resp.json())
+    assert page.meta.total == 1
+    assert page.data[0].folder_id == folder.folder_id
+
+    resp = await client.get(
+        "/v0/folders",
+        params={"filters": '{"trashed": true}', "folder_id": f"{folder.folder_id}"},
+    )
+    await assert_status(resp, status.HTTP_200_OK)
+    page = Page[FolderGet].parse_obj(await resp.json())
+    assert page.meta.total == 0
+    assert page.data[0].folder_id == subfolder.folder_id
+
+    resp = await client.get("/v0/projects", params={"filters": '{"trashed": true}'})
+    await assert_status(resp, status.HTTP_200_OK)
+    page = Page[ProjectListItem].parse_obj(await resp.json())
+    assert page.meta.total == 0
+
+    # CHECK marked as trashed
+    resp = await client.get(f"/v0/folders/{folder.folder_id}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    got = FolderGet.parse_obj(data)
+    assert got.trashed_at is not None
+
+    resp = await client.get(f"/v0/folders/{subfolder.folder_id}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    got = FolderGet.parse_obj(data)
+    assert got.trashed_at is not None
+
+    resp = await client.get(f"/v0/projects/{project_uuid}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    got = FolderGet.parse_obj(data)
+    assert got.trashed_at is not None
+
+    # UNTRASH folder
+    resp = await client.post(f"/v0/folders/{folder.folder_id}:untrash")
+    await assert_status(resp, status.HTTP_204_NO_CONTENT)
+
+    # NO folders listed in trash.
+    resp = await client.get("/v0/folders", params={"filters": '{"trashed": true}'})
+    await assert_status(resp, status.HTTP_200_OK)
+    page = Page[FolderGet].parse_obj(await resp.json())
+    assert page.meta.total == 0
+
+    resp = await client.get("/v0/projects", params={"filters": '{"trashed": true}'})
+    await assert_status(resp, status.HTTP_200_OK)
+    page = Page[ProjectListItem].parse_obj(await resp.json())
+    assert page.meta.total == 0
+
+    # CHECK marked as trashed
+    resp = await client.get(f"/v0/folders/{folder.folder_id}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    got = FolderGet.parse_obj(data)
+    assert got.trashed_at is None
+
+    resp = await client.get(f"/v0/folders/{subfolder.folder_id}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    got = FolderGet.parse_obj(data)
+    assert got.trashed_at is None
+
+    resp = await client.get(f"/v0/projects/{project_uuid}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    got = FolderGet.parse_obj(data)
+    assert got.trashed_at is None