update

Author: matusdrobuliak66

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

@@ -245,7 +245,9 @@ async def list_(  # pylint: disable=too-many-arguments,too-many-branches
 
     # Ordering and pagination
     list_query = (
-        combined_query.order_by(_to_expression(order_by)).offset(offset).limit(limit)
+        combined_query.order_by(_to_expression(order_by), folders_v2.c.folder_id)
+        .offset(offset)
+        .limit(limit)
     )
 
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
@@ -294,7 +296,9 @@ async def list_trashed_folders(
 
     # Ordering and pagination
     list_query = (
-        base_query.order_by(_to_expression(order_by)).offset(offset).limit(limit)
+        base_query.order_by(_to_expression(order_by), folders_v2.c.folder_id)
+        .offset(offset)
+        .limit(limit)
     )
 
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
@@ -534,7 +538,7 @@ async def get_all_folders_and_projects_ids_recursively(
     product_name: ProductName,
 ) -> tuple[list[FolderID], list[ProjectID]]:
     """
-    The purpose of this function is to retrieve all projects within the provided folder ID.
+    The purpose of this function is to retrieve all subfolders and projects within the provided folder ID.
     """
 
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:

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

@@ -132,15 +132,17 @@ async def trash_folder(
         )
 
         # 2. Trash all child projects that I am an owner
-        child_projects: list[
-            ProjectID
-        ] = await _folders_repository.get_projects_recursively_only_if_user_is_owner(
-            app,
-            connection,
-            folder_id=folder_id,
-            private_workspace_user_id_or_none=user_id if workspace_is_private else None,
-            user_id=user_id,
-            product_name=product_name,
+        child_projects: list[ProjectID] = (
+            await _folders_repository.get_projects_recursively_only_if_user_is_owner(
+                app,
+                connection,
+                folder_id=folder_id,
+                private_workspace_user_id_or_none=(
+                    user_id if workspace_is_private else None
+                ),
+                user_id=user_id,
+                product_name=product_name,
+            )
         )
 
         for project_id in child_projects:
@@ -178,14 +180,14 @@ async def untrash_folder(
     )
 
     # 3.2 UNtrash all child projects that I am an owner
-    child_projects: list[
-        ProjectID
-    ] = await _folders_repository.get_projects_recursively_only_if_user_is_owner(
-        app,
-        folder_id=folder_id,
-        private_workspace_user_id_or_none=user_id if workspace_is_private else None,
-        user_id=user_id,
-        product_name=product_name,
+    child_projects: list[ProjectID] = (
+        await _folders_repository.get_projects_recursively_only_if_user_is_owner(
+            app,
+            folder_id=folder_id,
+            private_workspace_user_id_or_none=user_id if workspace_is_private else None,
+            user_id=user_id,
+            product_name=product_name,
+        )
     )
 
     for project_id in child_projects:
@@ -204,7 +206,7 @@ def _can_delete(
         folder_db.trashed
         and (until_equal_datetime is None or folder_db.trashed < until_equal_datetime)
         and my_access_rights.delete
-        and folder_db.trashed_by == user_id
+        and folder_db.trashed_by == user_id  # <-- Ask PC - is this correct?
         and folder_db.trashed_explicitly
     )
 

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

@@ -0,0 +1,8 @@
+from ._folders_service import delete_folder, list_folders
+
+__all__: tuple[str, ...] = (
+    "list_folders",
+    "delete_folder",
+)
+
+# nopycln: file

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

@@ -21,7 +21,7 @@
 
 from ..catalog import catalog_service
 from ..folders import _folders_repository
-from ..workspaces._workspaces_service import check_user_workspace_access
+from ..workspaces.api import check_user_workspace_access
 from . import _projects_service
 from ._projects_repository import batch_get_trashed_by_primary_gid
 from ._projects_repository_legacy import ProjectDBAPI

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

@@ -5,10 +5,12 @@
     check_user_project_permission,
     has_user_project_access_rights,
 )
+from ._crud_api_read import list_projects
 from ._groups_service import (
     create_project_group_without_checking_permissions,
     delete_project_group_without_checking_permissions,
 )
+from ._projects_service import delete_project_by_user
 from ._wallets_service import (
     check_project_financial_status,
     connect_wallet_to_project,
@@ -23,6 +25,8 @@
     "delete_project_group_without_checking_permissions",
     "get_project_wallet",
     "has_user_project_access_rights",
+    "list_projects",
+    "delete_project_by_user",
 )
 
 

services/web/server/src/simcore_service_webserver/workspaces/_workspaces_rest.py

@@ -23,7 +23,7 @@
 from ..login.decorators import login_required
 from ..security.decorators import permission_required
 from ..utils_aiohttp import envelope_json_response
-from . import _workspaces_service
+from . import _workspaces_service, _workspaces_service_crud_read
 from ._common.exceptions_handlers import handle_plugin_requests_exceptions
 from ._common.models import (
     WorkspacesFilters,
@@ -76,7 +76,7 @@ async def list_workspaces(request: web.Request):
         query_params.filters = WorkspacesFilters()
 
     assert query_params.filters
-    total_count, workspaces = await _workspaces_service.list_workspaces(
+    total_count, workspaces = await _workspaces_service_crud_read.list_workspaces(
         app=request.app,
         user_id=req_ctx.user_id,
         product_name=req_ctx.product_name,
@@ -110,7 +110,7 @@ async def get_workspace(request: web.Request):
     req_ctx = WorkspacesRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(WorkspacesPathParams, request)
 
-    workspace = await _workspaces_service.get_workspace(
+    workspace = await _workspaces_service_crud_read.get_workspace(
         app=request.app,
         workspace_id=path_params.workspace_id,
         user_id=req_ctx.user_id,

services/web/server/src/simcore_service_webserver/workspaces/_workspaces_service.py

@@ -1,22 +1,29 @@
 # pylint: disable=unused-argument
 
+import asyncio
 import logging
 
 from aiohttp import web
+from common_library.pagination_tools import iter_pagination_params
+from models_library.basic_types import IDStr
+from models_library.folders import FolderID
 from models_library.products import ProductName
-from models_library.rest_ordering import OrderBy
+from models_library.projects import Project, ProjectID
+from models_library.rest_ordering import OrderBy, OrderDirection
+from models_library.rest_pagination import MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
 from models_library.users import UserID
 from models_library.workspaces import (
     UserWorkspaceWithAccessRights,
     WorkspaceID,
     WorkspaceUpdates,
 )
-from pydantic import NonNegativeInt
 
-from ..projects._projects_repository_legacy_utils import PermissionStr
+from ..folders.service import delete_folder, list_folders  # <-- MD: wrong
+from ..projects.api import delete_project_by_user, list_projects  # <-- MD: wrong
+from ..projects.models import ProjectTypeAPI
 from ..users.api import get_user
 from . import _workspaces_repository as db
-from .errors import WorkspaceAccessForbiddenError
+from ._workspaces_service_crud_read import check_user_workspace_access
 
 _logger = logging.getLogger(__name__)
 
@@ -47,47 +54,6 @@ async def create_workspace(
     )
 
 
-async def get_workspace(
-    app: web.Application,
-    *,
-    user_id: UserID,
-    workspace_id: WorkspaceID,
-    product_name: ProductName,
-) -> UserWorkspaceWithAccessRights:
-    return await get_user_workspace(
-        app=app,
-        user_id=user_id,
-        workspace_id=workspace_id,
-        product_name=product_name,
-        permission="read",
-    )
-
-
-async def list_workspaces(
-    app: web.Application,
-    *,
-    user_id: UserID,
-    product_name: ProductName,
-    filter_trashed: bool | None,
-    filter_by_text: str | None,
-    offset: NonNegativeInt,
-    limit: int,
-    order_by: OrderBy,
-) -> tuple[int, list[UserWorkspaceWithAccessRights]]:
-    total_count, workspaces = await db.list_workspaces_for_user(
-        app,
-        user_id=user_id,
-        product_name=product_name,
-        filter_trashed=filter_trashed,
-        filter_by_text=filter_by_text,
-        offset=offset,
-        limit=limit,
-        order_by=order_by,
-    )
-
-    return total_count, workspaces
-
-
 async def update_workspace(
     app: web.Application,
     *,
@@ -133,67 +99,75 @@ async def delete_workspace(
         permission="delete",
     )
 
-    await db.delete_workspace(
-        app,
-        workspace_id=workspace_id,
-        product_name=product_name,
-    )
-
-
-async def get_user_workspace(
-    app: web.Application,
-    *,
-    user_id: UserID,
-    workspace_id: WorkspaceID,
-    product_name: ProductName,
-    permission: PermissionStr | None,
-) -> UserWorkspaceWithAccessRights:
-    """
-
-    Here checking access is optional. A use case is when the caller has guarantees that
-    `user_id` has granted access and we do not want to re-check
+    # Get all root projects
+    for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
+        (
+            projects,
+            page_params.total_number_of_items,
+        ) = await list_projects(
+            app,
+            user_id=user_id,
+            product_name=product_name,
+            show_hidden=True,
+            workspace_id=workspace_id,
+            project_type=ProjectTypeAPI.all,
+            folder_id=None,
+            trashed=None,
+            offset=page_params.offset,
+            limit=page_params.limit,
+            order_by=OrderBy(
+                field=IDStr("last_change_date"), direction=OrderDirection.DESC
+            ),
+        )
 
-    Raises:
-        WorkspaceAccessForbiddenError: if permission not None and user_id does not have access
-    """
-    workspace: UserWorkspaceWithAccessRights = await db.get_workspace_for_user(
-        app=app, user_id=user_id, workspace_id=workspace_id, product_name=product_name
-    )
+        workspace_root_projects: list[ProjectID] = [
+            Project(**project).uuid for project in projects
+        ]
 
-    # NOTE: check here is optional
-    if permission is not None:
-        has_user_granted_permission = getattr(
-            workspace.my_access_rights, permission, False
-        )
-        if not has_user_granted_permission:
-            raise WorkspaceAccessForbiddenError(
-                user_id=user_id,
-                workspace_id=workspace_id,
-                product_name=product_name,
-                permission_checked=permission,
+        # Delete projects properly
+        await asyncio.gather(
+            *(
+                delete_project_by_user(app, project_uuid=project_uuid, user_id=user_id)
+                for project_uuid in workspace_root_projects
             )
-    return workspace
+        )
 
+    # Get all root folders
+    for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
+        (
+            folders,
+            page_params.total_number_of_items,
+        ) = await list_folders(
+            app,
+            user_id=user_id,
+            product_name=product_name,
+            workspace_id=workspace_id,
+            folder_id=None,
+            trashed=None,
+            offset=page_params.offset,
+            limit=page_params.limit,
+            order_by=OrderBy(field=IDStr("folder_id"), direction=OrderDirection.ASC),
+        )
 
-async def check_user_workspace_access(
-    app: web.Application,
-    *,
-    user_id: UserID,
-    workspace_id: WorkspaceID,
-    product_name: ProductName,
-    permission: PermissionStr,
-) -> UserWorkspaceWithAccessRights:
-    """
-    As `get_user_workspace` but here access check is required
+        workspace_root_folders: list[FolderID] = [
+            folder.folder_db.folder_id for folder in folders
+        ]
+
+        # Delete folders properly
+        await asyncio.gather(
+            *(
+                delete_folder(
+                    app,
+                    user_id=user_id,
+                    product_name=product_name,
+                    folder_id=folder_id,
+                )
+                for folder_id in workspace_root_folders
+            )
+        )
 
-    Raises:
-        WorkspaceAccessForbiddenError
-    """
-    return await get_user_workspace(
+    await db.delete_workspace(
         app,
-        user_id=user_id,
         workspace_id=workspace_id,
         product_name=product_name,
-        # NOTE: check here is required
-        permission=permission,
     )