adding unit tests

Author: matusdrobuliak66

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

@@ -317,6 +317,7 @@ async def update(
     trashed_at: datetime | None | UnSet = _unset,
     trashed_explicitly: bool | UnSet = _unset,
     workspace_id: WorkspaceID | None | UnSet = _unset,
+    user_id: UserID | None | UnSet = _unset,
 ) -> FolderDB:
     """
     Batch/single patch of folder/s
@@ -328,6 +329,7 @@ async def update(
         trashed_at=trashed_at,
         trashed_explicitly=trashed_explicitly,
         workspace_id=workspace_id,
+        user_id=user_id,
     )
 
     query = (

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

@@ -89,6 +89,7 @@ async def move_folder_into_workspace(
         folders_id_or_ids=set(folder_ids),
         product_name=product_name,
         workspace_id=workspace_id,  # <-- Updating workspace_id
+        user_id=user_id if workspace_id is None else None,  # <-- Updating user_id
     )
 
     # 6. Update source folder parent folder ID with NULL (it will appear in the root directory)
@@ -114,7 +115,7 @@ async def move_folder_into_workspace(
         app,
         connection=None,
         folders_id_or_ids=set(folder_ids),
-        user_id=user_id if workspace_id is None else None,
+        user_id=user_id if workspace_id is None else None,  # <-- Updating user_id
     )
 
     # 9. Remove all project permissions, leave only the user who moved the project

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

@@ -7,7 +7,7 @@
 from servicelib.aiohttp.application_keys import APP_SETTINGS_KEY
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
-from . import _folders_handlers, _trash_handlers
+from . import _folders_handlers, _trash_handlers, _workspaces_handlers
 
 _logger = logging.getLogger(__name__)
 
@@ -25,3 +25,4 @@ def setup_folders(app: web.Application):
     # routes
     app.router.add_routes(_folders_handlers.routes)
     app.router.add_routes(_trash_handlers.routes)
+    app.router.add_routes(_workspaces_handlers.routes)

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

@@ -123,7 +123,7 @@ async def update_project_to_folder(
     connection: AsyncConnection | None = None,
     *,
     folders_id_or_ids: FolderID | set[FolderID],
-    filter_by_user_id: UserID | None | UnSet = _unset,
+    # filter_by_user_id: UserID | None | UnSet = _unset,
     # updatable columns
     user_id: UserID | None | UnSet = _unset,
 ) -> None:
@@ -146,8 +146,8 @@ async def update_project_to_folder(
         # single-update
         query = query.where(projects_to_folders.c.folder_id == folders_id_or_ids)
 
-    if not isinstance(filter_by_user_id, UnSet):
-        query = query.where(projects_to_folders.c.user_id == filter_by_user_id)
+    # if not isinstance(filter_by_user_id, UnSet):
+    #     query = query.where(projects_to_folders.c.user_id == filter_by_user_id)
 
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         await conn.stream(query)
@@ -166,7 +166,9 @@ async def delete_all_project_to_folder_by_project_ids_not_in_folder_ids(
     if isinstance(project_id_or_ids, set):
         # batch-delete
         query = query.where(
-            projects_to_folders.c.project_uuid.in_(list(project_id_or_ids))
+            projects_to_folders.c.project_uuid.in_(
+                [f"{project_id}" for project_id in project_id_or_ids]
+            )
         )
     else:
         # single-delete
@@ -175,9 +177,7 @@ async def delete_all_project_to_folder_by_project_ids_not_in_folder_ids(
         )
 
     query = query.where(
-        projects_to_folders.c.folder_id.not_in(  # <-- NOT IN!
-            [f"{folder_id}" for folder_id in not_in_folder_ids]
-        )
+        projects_to_folders.c.folder_id.not_in(not_in_folder_ids)  # <-- NOT IN!
     )
 
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:

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

@@ -5,6 +5,7 @@
 
 import pytest
 import sqlalchemy as sa
+from simcore_postgres_database.models.projects import projects
 from simcore_postgres_database.models.workspaces import workspaces
 
 
@@ -13,3 +14,4 @@ def workspaces_clean_db(postgres_db: sa.engine.Engine) -> Iterator[None]:
     with postgres_db.connect() as con:
         yield
         con.execute(workspaces.delete())
+        con.execute(projects.delete())

services/web/server/tests/unit/with_dbs/04/workspaces/test_workspaces__moving_folders_between_workspaces.py

@@ -0,0 +1,295 @@
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
+# pylint: disable=too-many-statements
+
+
+from copy import deepcopy
+from http import HTTPStatus
+from http.client import NO_CONTENT
+
+import pytest
+from aiohttp.test_utils import TestClient
+from pytest_mock import MockerFixture
+from pytest_simcore.helpers.assert_checks import assert_status
+from pytest_simcore.helpers.webserver_login import UserInfoDict
+from pytest_simcore.helpers.webserver_projects import create_project
+from servicelib.aiohttp import status
+from simcore_service_webserver.db.models import UserRole
+from simcore_service_webserver.projects.models import ProjectDict
+
+
+@pytest.fixture
+def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
+    mocker.patch(
+        "simcore_service_webserver.projects._crud_api_read.get_services_for_user_in_product",
+        spec=True,
+        return_value=[],
+    )
+    mocker.patch(
+        "simcore_service_webserver.projects._crud_handlers.get_services_for_user_in_product",
+        spec=True,
+        return_value=[],
+    )
+    mocker.patch(
+        "simcore_service_webserver.projects._crud_handlers.project_uses_available_services",
+        spec=True,
+        return_value=True,
+    )
+
+
+# @pytest.mark.parametrize(*standard_role_response(), ids=str)
+# async def test_moving_between_workspaces_user_role_permissions(
+#     client: TestClient,
+#     logged_user: UserInfoDict,
+#     user_project: ProjectDict,
+#     expected: ExpectedResponse,
+#     mock_catalog_api_get_services_for_user_in_product: MockerFixture,
+#     fake_project: ProjectDict,
+#     workspaces_clean_db: None,
+# ):
+#     # Move project from workspace to your private workspace
+#     base_url = client.app.router["replace_folder_workspace"].url_for(
+#         folder_id="1", workspace_id="null"
+#     )
+#     resp = await client.put(f"{base_url}")
+#     await assert_status(resp, expected.no_content)
+
+
+## Usecases to test:
+# 1. Private workspace -> Shared workspace
+# 2. Shared workspace -> Shared workspace
+# 3. Shared workspace -> Private workspace
+
+
+async def _setup_test(
+    client: TestClient,
+    logged_user: UserInfoDict,
+    fake_project: ProjectDict,
+) -> str:
+    assert client.app
+
+    ### Project creation
+
+    # Create 2 projects
+    project_data = deepcopy(fake_project)
+    first_project = await create_project(
+        client.app,
+        project_data,
+        user_id=logged_user["id"],
+        product_name="osparc",
+    )
+    second_project = await create_project(
+        client.app,
+        project_data,
+        user_id=logged_user["id"],
+        product_name="osparc",
+    )
+
+    ### Folder creation
+
+    # Create folder
+    url = client.app.router["create_folder"].url_for()
+    resp = await client.post(
+        f"{url}",
+        json={
+            "name": "Original user folder",
+        },
+    )
+    first_folder, _ = await assert_status(resp, status.HTTP_201_CREATED)
+
+    # Create sub folder of previous folder
+    url = client.app.router["create_folder"].url_for()
+    resp = await client.post(
+        f"{url}",
+        json={
+            "name": "Second user folder",
+            "parentFolderId": f"{first_folder['folderId']}",
+        },
+    )
+    second_folder, _ = await assert_status(resp, status.HTTP_201_CREATED)
+
+    # Create sub sub folder of previous sub folder
+    url = client.app.router["create_folder"].url_for()
+    resp = await client.post(
+        f"{url}",
+        json={
+            "name": "Third user folder",
+            "parentFolderId": f"{second_folder['folderId']}",
+        },
+    )
+    third_folder, _ = await assert_status(resp, status.HTTP_201_CREATED)
+
+    ### Move projects to subfolder
+    # add first project to the folder
+    url = client.app.router["replace_project_folder"].url_for(
+        folder_id=f"{second_folder['folderId']}", project_id=f"{first_project['uuid']}"
+    )
+    resp = await client.put(f"{url}")
+    await assert_status(resp, status.HTTP_204_NO_CONTENT)
+    # add second project to the folder
+    url = client.app.router["replace_project_folder"].url_for(
+        folder_id=f"{second_folder['folderId']}", project_id=f"{second_project['uuid']}"
+    )
+    resp = await client.put(f"{url}")
+    await assert_status(resp, status.HTTP_204_NO_CONTENT)
+
+    ## Double check whether everything is setup OK
+    url = (
+        client.app.router["list_projects"]
+        .url_for()
+        .with_query({"folder_id": f"{second_folder['folderId']}"})
+    )
+    resp = await client.get(f"{url}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    assert len(data) == 2
+
+    url = (
+        client.app.router["list_projects"]
+        .url_for()
+        .with_query({"folder_id": f"{first_folder['folderId']}"})
+    )
+    resp = await client.get(f"{url}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    assert len(data) == 0
+
+    url = client.app.router["list_projects"].url_for().with_query({"folder_id": "null"})
+    resp = await client.get(f"{url}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    assert len(data) == 0
+
+    url = client.app.router["list_folders"].url_for().with_query({"folder_id": "null"})
+    resp = await client.get(f"{url}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    assert len(data) == 1
+
+    url = (
+        client.app.router["list_folders"]
+        .url_for()
+        .with_query({"folder_id": f"{first_folder['folderId']}"})
+    )
+    resp = await client.get(f"{url}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    assert len(data) == 1
+
+    return f"{second_folder['folderId']}"
+
+
+async def _move_folder_to_workspace_and_assert(
+    client: TestClient, folder_id: str, workspace_id: str
+):
+    assert client.app
+
+    # MOVE
+    base_url = client.app.router["replace_folder_workspace"].url_for(
+        folder_id=folder_id,
+        workspace_id=workspace_id,
+    )
+    resp = await client.put(f"{base_url}")
+    await assert_status(resp, NO_CONTENT)
+
+    # ASSERT
+    url = (
+        client.app.router["list_projects"]
+        .url_for()
+        .with_query(
+            {
+                "folder_id": folder_id,
+                "workspace_id": workspace_id,
+            }
+        )
+    )
+    resp = await client.get(f"{url}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    assert len(data) == 2
+
+    url = (
+        client.app.router["list_folders"]
+        .url_for()
+        .with_query(
+            {
+                "folder_id": folder_id,
+                "workspace_id": workspace_id,
+            }
+        )
+    )
+    resp = await client.get(f"{url}")
+    data, _ = await assert_status(resp, status.HTTP_200_OK)
+    assert len(data) == 1
+
+
+@pytest.mark.parametrize("user_role,expected", [(UserRole.USER, status.HTTP_200_OK)])
+async def test_moving_between_private_and_shared_workspaces(
+    client: TestClient,
+    logged_user: UserInfoDict,
+    # user_project: ProjectDict,
+    expected: HTTPStatus,
+    mock_catalog_api_get_services_for_user_in_product: MockerFixture,
+    fake_project: ProjectDict,
+    workspaces_clean_db: None,
+):
+    assert client.app
+
+    moving_folder_id = await _setup_test(client, logged_user, fake_project)
+
+    # We will test these scenarios of moving folders:
+    # 1. Private workspace -> Shared workspace
+    # 2. Shared workspace A -> Shared workspace B
+    # 3. Shared workspace A -> Shared workspace A (Corner case - This endpoint is not used like this)
+    # 4. Shared workspace -> Private workspace
+    # 5. Private workspace -> Private workspace (Corner case - This endpoint is not used like this)
+
+    # create a new workspace
+    url = client.app.router["create_workspace"].url_for()
+    resp = await client.post(
+        url.path,
+        json={
+            "name": "A",
+            "description": "A",
+            "thumbnail": None,
+        },
+    )
+    added_workspace, _ = await assert_status(resp, status.HTTP_201_CREATED)
+
+    # 1. Private workspace -> Shared workspace A
+    await _move_folder_to_workspace_and_assert(
+        client,
+        folder_id=moving_folder_id,
+        workspace_id=f"{added_workspace['workspaceId']}",
+    )
+
+    # create a new workspace
+    url = client.app.router["create_workspace"].url_for()
+    resp = await client.post(
+        url.path,
+        json={
+            "name": "B",
+            "description": "B",
+            "thumbnail": None,
+        },
+    )
+    second_workspace, _ = await assert_status(resp, status.HTTP_201_CREATED)
+    # 2. Shared workspace A -> Shared workspace B
+    await _move_folder_to_workspace_and_assert(
+        client,
+        folder_id=moving_folder_id,
+        workspace_id=f"{second_workspace['workspaceId']}",
+    )
+
+    # 3. (Corner case) Shared workspace A -> Shared workspace A
+    await _move_folder_to_workspace_and_assert(
+        client,
+        folder_id=moving_folder_id,
+        workspace_id=f"{second_workspace['workspaceId']}",
+    )
+
+    # 4. Shared workspace -> Private workspace
+    await _move_folder_to_workspace_and_assert(
+        client, folder_id=moving_folder_id, workspace_id="null"
+    )
+
+    # 5. (Corner case) Private workspace -> Private workspace
+    await _move_folder_to_workspace_and_assert(
+        client, folder_id=moving_folder_id, workspace_id="null"
+    )