introduce implicit trashing of projects/folders when workspace is trashed

Author: matusdrobuliak66

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

@@ -386,7 +386,7 @@ async def update(
     parent_folder_id: FolderID | None | UnSet = UnSet.VALUE,
     trashed: datetime | None | UnSet = UnSet.VALUE,
     trashed_explicitly: bool | UnSet = UnSet.VALUE,
-    trashed_by: UserID | UnSet = UnSet.VALUE,  # who trashed
+    trashed_by: UserID | None | UnSet = UnSet.VALUE,  # who trashed
     workspace_id: WorkspaceID | None | UnSet = UnSet.VALUE,
     user_id: UserID | None | UnSet = UnSet.VALUE,  # ownership
 ) -> FolderDB:

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

@@ -209,7 +209,7 @@ async def delete_folder_group(request: web.Request):
     req_ctx = FoldersRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(FoldersPathParams, request)
 
-    await _folders_service.delete_folder(
+    await _folders_service.delete_folder_with_all_content(
         app=request.app,
         user_id=req_ctx.user_id,
         folder_id=path_params.folder_id,

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

@@ -317,7 +317,7 @@ async def update_folder(
     )
 
 
-async def delete_folder(
+async def delete_folder_with_all_content(
     app: web.Application,
     user_id: UserID,
     folder_id: FolderID,

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

@@ -39,6 +39,7 @@ async def trash_folder(request: web.Request):
         user_id=user_id,
         folder_id=path_params.folder_id,
         force_stop_first=query_params.force,
+        explicit=True,
     )
 
     return web.json_response(status=status.HTTP_204_NO_CONTENT)

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

@@ -63,23 +63,24 @@ async def _check_exists_and_access(
     return workspace_is_private
 
 
-async def _folders_db_update(
+async def _folders_db_trashed_state_update(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
     product_name: ProductName,
     folder_id: FolderID,
     trashed_at: datetime | None,
-    trashed_by: UserID,
+    trashed_explicitly: bool,
+    trashed_by: UserID | None,
 ):
-    # EXPLICIT un/trash
+    # EXPLICIT or IMPLICIT un/trash
     await _folders_repository.update(
         app,
         connection,
         folders_id_or_ids=folder_id,
         product_name=product_name,
         trashed=trashed_at,
-        trashed_explicitly=trashed_at is not None,
+        trashed_explicitly=trashed_explicitly,
         trashed_by=trashed_by,
     )
 
@@ -111,6 +112,7 @@ async def trash_folder(
     user_id: UserID,
     folder_id: FolderID,
     force_stop_first: bool,
+    explicit: bool,
 ):
 
     workspace_is_private = await _check_exists_and_access(
@@ -123,12 +125,13 @@ async def trash_folder(
     async with transaction_context(get_asyncpg_engine(app)) as connection:
 
         # 1. Trash folder and children
-        await _folders_db_update(
+        await _folders_db_trashed_state_update(
             app,
             connection,
             folder_id=folder_id,
             product_name=product_name,
             trashed_at=trashed_at,
+            trashed_explicitly=explicit,
             trashed_by=user_id,
         )
 
@@ -172,12 +175,13 @@ async def untrash_folder(
     # 3. UNtrash
 
     # 3.1 UNtrash folder and children
-    await _folders_db_update(
+    await _folders_db_trashed_state_update(
         app,
         folder_id=folder_id,
         product_name=product_name,
         trashed_at=None,
-        trashed_by=user_id,
+        trashed_by=None,
+        trashed_explicitly=False,
     )
 
     # 3.2 UNtrash all child projects that I am an owner
@@ -278,7 +282,7 @@ async def delete_trashed_folder(
         )
 
     # NOTE: this function deletes folder AND its content recursively!
-    await _folders_service.delete_folder(
+    await _folders_service.delete_folder_with_all_content(
         app, user_id=user_id, folder_id=folder_id, product_name=product_name
     )
 

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

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

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

@@ -91,7 +91,7 @@ async def list_projects(  # pylint: disable=too-many-arguments
     folder_id: FolderID | None,
     # attrs filter
     project_type: ProjectTypeAPI,
-    show_hidden: bool,
+    show_hidden: bool,  # NOTE: Be careful, this filters only hidden projects
     trashed: bool | None,
     # search
     search_by_multi_columns: str | None = None,

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

@@ -17,15 +17,16 @@
     WorkspaceUpdates,
 )
 from simcore_postgres_database.utils_repos import transaction_context
+from simcore_service_webserver.folders.service import list_folders
+from simcore_service_webserver.projects.api import list_projects
+from simcore_service_webserver.projects.models import ProjectTypeAPI
 
 from ..db.plugin import get_asyncpg_engine
-from ..folders._folders_service import list_folders
 from ..folders._trash_service import (
     batch_delete_folders_with_content_in_root_workspace_as_admin,
     trash_folder,
     untrash_folder,
 )
-from ..projects._crud_api_read import ProjectTypeAPI, list_projects
 from ..projects._trash_service import (
     batch_delete_projects_in_root_workspace_as_admin,
     trash_project,
@@ -53,7 +54,7 @@ async def _check_exists_and_access(
     )
 
 
-async def _list_child_folders(
+async def _list_root_child_folders(
     app: web.Application,
     *,
     product_name: ProductName,
@@ -83,7 +84,7 @@ async def _list_child_folders(
     return child_folders
 
 
-async def _list_child_projects(
+async def _list_root_child_projects(
     app: web.Application,
     *,
     product_name: ProductName,
@@ -100,14 +101,14 @@ async def _list_child_projects(
             app,
             user_id=user_id,
             product_name=product_name,
-            show_hidden=True,
+            show_hidden=False,
             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("trashed"), direction=OrderDirection.ASC),
+            order_by=OrderBy(field=IDStr("id"), direction=OrderDirection.ASC),
         )
 
         child_projects.extend([Project(**project).uuid for project in projects])
@@ -140,7 +141,7 @@ async def trash_workspace(
         )
 
         # IMPLICIT trash
-        child_folders: list[FolderID] = await _list_child_folders(
+        child_folders: list[FolderID] = await _list_root_child_folders(
             app,
             product_name=product_name,
             user_id=user_id,
@@ -154,9 +155,10 @@ async def trash_workspace(
                 user_id=user_id,
                 folder_id=folder_id,
                 force_stop_first=force_stop_first,
+                explicit=False,
             )
 
-        child_projects: list[ProjectID] = await _list_child_projects(
+        child_projects: list[ProjectID] = await _list_root_child_projects(
             app,
             product_name=product_name,
             user_id=user_id,
@@ -195,7 +197,7 @@ async def untrash_workspace(
             updates=WorkspaceUpdates(trashed=None, trashed_by=None),
         )
 
-        child_folders: list[FolderID] = await _list_child_folders(
+        child_folders: list[FolderID] = await _list_root_child_folders(
             app,
             product_name=product_name,
             user_id=user_id,
@@ -210,7 +212,7 @@ async def untrash_workspace(
                 folder_id=folder_id,
             )
 
-        child_projects: list[ProjectID] = await _list_child_projects(
+        child_projects: list[ProjectID] = await _list_root_child_projects(
             app,
             product_name=product_name,
             user_id=user_id,
@@ -264,7 +266,7 @@ async def delete_trashed_workspace(
         )
 
     # NOTE: this function deletes workspace AND its content recursively!
-    await _workspaces_service.delete_workspace(
+    await _workspaces_service.delete_workspace_with_all_content(
         app,
         user_id=user_id,
         product_name=product_name,

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

@@ -206,7 +206,7 @@ async def get_workspace_db_get(
     connection: AsyncConnection | None = None,
     *,
     workspace_id: WorkspaceID,
-):
+) -> WorkspaceDBGet:
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         result = await conn.execute(
             select(
@@ -218,7 +218,7 @@ async def get_workspace_db_get(
         row = result.one_or_none()
         if row is None:
             raise WorkspaceNotFoundError(reason=f"Workspace {workspace_id} not found.")
-        return WorkspaceDBGet.model_validate(row)
+    return WorkspaceDBGet.model_validate(row)
 
 
 async def update_workspace(

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

@@ -153,7 +153,7 @@ async def delete_workspace(request: web.Request):
     req_ctx = WorkspacesRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(WorkspacesPathParams, request)
 
-    await _workspaces_service.delete_workspace(
+    await _workspaces_service.delete_workspace_with_all_content(
         app=request.app,
         user_id=req_ctx.user_id,
         workspace_id=path_params.workspace_id,