review @pcrespov

Author: matusdrobuliak66

api/specs/web-server/_folders.py

@@ -102,9 +102,6 @@ async def delete_folder(
     ...
 
 
-### Move Folder to Workspace
-
-
 @router.put(
     "/folders/{folder_id}/workspaces/{workspace_id}",
     status_code=status.HTTP_204_NO_CONTENT,

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

@@ -463,7 +463,7 @@ async def get_projects_recursively_only_if_user_is_owner(
         return [ProjectID(row[0]) async for row in result]
 
 
-async def get_all_folders_and_projects_recursively(
+async def get_all_folders_and_projects_ids_recursively(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
@@ -504,15 +504,15 @@ async def get_all_folders_and_projects_recursively(
         final_query = select(folder_hierarchy_cte)
         result = await conn.stream(final_query)
         # list of tuples [(folder_id, parent_folder_id), ...] ex. [(1, None), (2, 1)]
-        folder_ids = [item[0] async for item in result]
+        folder_ids = [item.folder_id async for item in result]
 
         query = select(projects_to_folders.c.project_uuid).where(
             (projects_to_folders.c.folder_id.in_(folder_ids))
             & (projects_to_folders.c.user_id == private_workspace_user_id_or_none)
         )
 
         result = await conn.stream(query)
-        project_ids = [ProjectID(row[0]) async for row in result]
+        project_ids = [ProjectID(row.project_uuid) async for row in result]
 
         return folder_ids, project_ids
 

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

@@ -8,9 +8,9 @@
 from simcore_postgres_database.utils_repos import transaction_context
 
 from ..db.plugin import get_asyncpg_engine
-from ..projects import _db_v2 as projects_db
 from ..projects import _folders_db as project_to_folders_db
 from ..projects import _groups_db as project_groups_db
+from ..projects import _projects_db as projects_db
 from ..projects._access_rights_api import check_user_project_permission
 from ..users.api import get_user
 from ..workspaces.api import check_user_workspace_access
@@ -56,7 +56,7 @@ async def move_folder_into_workspace(
     (
         folder_ids,
         project_ids,
-    ) = await _folders_db.get_all_folders_and_projects_recursively(
+    ) = await _folders_db.get_all_folders_and_projects_ids_recursively(
         app,
         connection=None,
         folder_id=folder_id,

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

@@ -156,7 +156,6 @@ async def delete_all_project_to_folder_by_project_ids_not_in_folder_ids(
     connection: AsyncConnection | None = None,
     *,
     project_id_or_ids: ProjectID | set[ProjectID],
-    # Optional filter
     not_in_folder_ids: set[FolderID],
 ) -> None:
     query = projects_to_folders.delete()

services/web/server/src/simcore_service_webserver/projects/_db_v2.py renamed to services/web/server/src/simcore_service_webserver/projects/_projects_db.py

@@ -11,9 +11,9 @@
 from ..projects._access_rights_api import get_user_project_access_rights
 from ..users.api import get_user
 from ..workspaces.api import check_user_workspace_access
-from . import _db_v2 as project_db_v2
 from . import _folders_db as project_to_folders_db
 from . import _groups_db as project_groups_db
+from . import _projects_db as project_db_v2
 from .exceptions import ProjectInvalidRightsError
 
 _logger = logging.getLogger(__name__)

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

@@ -85,7 +85,7 @@
     patch_workbench,
     update_workbench,
 )
-from ._db_v2 import _SELECTION_PROJECT_DB_ARGS
+from ._projects_db import _SELECTION_PROJECT_DB_ARGS
 from .exceptions import (
     ProjectDeleteError,
     ProjectInvalidRightsError,

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

@@ -120,9 +120,8 @@
 from ..wallets import api as wallets_api
 from ..wallets.errors import WalletNotEnoughCreditsError
 from ..workspaces import _workspaces_db as workspaces_db
-from . import _crud_api_delete
-from . import _db_v2 as project_db_v2
-from . import _nodes_api
+from . import _crud_api_delete, _nodes_api
+from . import _projects_db as project_db_v2
 from ._access_rights_api import (
     check_user_project_permission,
     has_user_project_access_rights,

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

@@ -6,7 +6,6 @@
 
 
 from copy import deepcopy
-from http import HTTPStatus
 from http.client import NO_CONTENT
 
 import pytest
@@ -21,6 +20,11 @@
 from simcore_service_webserver.projects.models import ProjectDict
 
 
+@pytest.fixture
+def user_role() -> UserRole:
+    return UserRole.USER
+
+
 @pytest.fixture
 def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
     mocker.patch(
@@ -40,26 +44,28 @@ def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
     )
 
 
-async def _setup_test(
+@pytest.fixture
+async def moving_folder_id(
     client: TestClient,
     logged_user: UserInfoDict,
     fake_project: ProjectDict,
 ) -> str:
     assert client.app
+    setup_db(client.app)
 
     ### Project creation
 
     # Create 2 projects
     project_data = deepcopy(fake_project)
     first_project = await create_project(
         client.app,
-        project_data,
+        params_override=project_data,
         user_id=logged_user["id"],
         product_name="osparc",
     )
     second_project = await create_project(
         client.app,
-        project_data,
+        params_override=project_data,
         user_id=logged_user["id"],
         product_name="osparc",
     )
@@ -159,11 +165,11 @@ async def _move_folder_to_workspace_and_assert(
     assert client.app
 
     # MOVE
-    base_url = client.app.router["replace_folder_workspace"].url_for(
+    url = client.app.router["replace_folder_workspace"].url_for(
         folder_id=folder_id,
         workspace_id=workspace_id,
     )
-    resp = await client.put(f"{base_url}")
+    resp = await client.put(f"{url}")
     await assert_status(resp, NO_CONTENT)
 
     # ASSERT
@@ -196,19 +202,17 @@ async def _move_folder_to_workspace_and_assert(
     assert len(data) == 1
 
 
-@pytest.mark.parametrize("user_role,expected", [(UserRole.USER, status.HTTP_200_OK)])
+# @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,
-    expected: HTTPStatus,
+    expected,
     mock_catalog_api_get_services_for_user_in_product: MockerFixture,
     fake_project: ProjectDict,
+    moving_folder_id: str,
     workspaces_clean_db: None,
 ):
     assert client.app
-    setup_db(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
@@ -220,45 +224,45 @@ async def test_moving_between_private_and_shared_workspaces(
     # create a new workspace
     url = client.app.router["create_workspace"].url_for()
     resp = await client.post(
-        url.path,
+        f"{url}",
         json={
             "name": "A",
             "description": "A",
             "thumbnail": None,
         },
     )
-    added_workspace, _ = await assert_status(resp, status.HTTP_201_CREATED)
+    shared_workspace_A, _ = 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']}",
+        workspace_id=f"{shared_workspace_A['workspaceId']}",
     )
 
     # create a new workspace
     url = client.app.router["create_workspace"].url_for()
     resp = await client.post(
-        url.path,
+        f"{url}",
         json={
             "name": "B",
             "description": "B",
             "thumbnail": None,
         },
     )
-    second_workspace, _ = await assert_status(resp, status.HTTP_201_CREATED)
+    shared_workspace_B, _ = 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']}",
+        workspace_id=f"{shared_workspace_B['workspaceId']}",
     )
 
-    # 3. (Corner case) Shared workspace A -> Shared workspace A
+    # 3. (Corner case) Shared workspace B -> Shared workspace B
     await _move_folder_to_workspace_and_assert(
         client,
         folder_id=moving_folder_id,
-        workspace_id=f"{second_workspace['workspaceId']}",
+        workspace_id=f"{shared_workspace_B['workspaceId']}",
     )
 
     # 4. Shared workspace -> Private workspace