open api specs

Author: matusdrobuliak66

api/specs/web-server/_folders.py

@@ -102,13 +102,13 @@ async def delete_folder(
     ...
 
 
-@router.put(
-    "/folders/{folder_id}/workspaces/{workspace_id}",
+@router.post(
+    "/folders/{folder_id}/workspaces/{workspace_id}:move",
     status_code=status.HTTP_204_NO_CONTENT,
     summary="Move folder to the workspace",
     tags=["workspaces"],
 )
-async def replace_folder_workspace(
+async def move_folder_to_workspace(
     _path: Annotated[_FolderWorkspacesPathParams, Depends()],
 ):
     ...

api/specs/web-server/_projects_workspaces.py

@@ -23,12 +23,12 @@
 )
 
 
-@router.put(
-    "/projects/{project_id}/workspaces/{workspace_id}",
+@router.post(
+    "/projects/{project_id}/workspaces/{workspace_id}:move",
     status_code=status.HTTP_204_NO_CONTENT,
     summary="Move project to the workspace",
 )
-async def replace_project_workspace(
+async def move_project_to_workspace(
     _path: Annotated[_ProjectWorkspacesPathParams, Depends()],
 ):
     ...

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -2944,13 +2944,13 @@ paths:
               schema:
                 $ref: '#/components/schemas/EnvelopedError'
           description: Service Unavailable
-  /v0/folders/{folder_id}/workspaces/{workspace_id}:
-    put:
+  /v0/folders/{folder_id}/workspaces/{workspace_id}:move:
+    post:
       tags:
       - folders
       - workspaces
       summary: Move folder to the workspace
-      operationId: replace_folder_workspace
+      operationId: move_folder_to_workspace
       parameters:
       - name: folder_id
         in: path
@@ -4759,13 +4759,13 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Envelope_WalletGet_'
-  /v0/projects/{project_id}/workspaces/{workspace_id}:
-    put:
+  /v0/projects/{project_id}/workspaces/{workspace_id}:move:
+    post:
       tags:
       - projects
       - workspaces
       summary: Move project to the workspace
-      operationId: replace_project_workspace
+      operationId: move_project_to_workspace
       parameters:
       - name: project_id
         in: path

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

@@ -17,14 +17,14 @@
 routes = web.RouteTableDef()
 
 
-@routes.put(
-    f"/{VTAG}/folders/{{folder_id}}/workspaces/{{workspace_id}}",
-    name="replace_folder_workspace",
+@routes.post(
+    f"/{VTAG}/folders/{{folder_id}}/workspaces/{{workspace_id}}:move",
+    name="move_folder_to_workspace",
 )
 @login_required
 @permission_required("folder.update")
 @handle_plugin_requests_exceptions
-async def replace_project_workspace(request: web.Request):
+async def move_folder_to_workspace(request: web.Request):
     req_ctx = FoldersRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(_FolderWorkspacesPathParams, request)
 

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

@@ -51,19 +51,21 @@ async def wrapper(request: web.Request) -> web.StreamResponse:
 
 class _ProjectWorkspacesPathParams(BaseModel):
     project_id: ProjectID
-    workspace_id: Annotated[WorkspaceID | None, BeforeValidator(null_or_none_str_to_none_validator)] = Field(default=None)
+    workspace_id: Annotated[
+        WorkspaceID | None, BeforeValidator(null_or_none_str_to_none_validator)
+    ] = Field(default=None)
 
     model_config = ConfigDict(extra="forbid")
 
 
-@routes.put(
-    f"/{VTAG}/projects/{{project_id}}/workspaces/{{workspace_id}}",
-    name="replace_project_workspace",
+@routes.post(
+    f"/{VTAG}/projects/{{project_id}}/workspaces/{{workspace_id}}:move",
+    name="move_project_to_workspace",
 )
 @login_required
 @permission_required("project.workspaces.*")
 @_handle_projects_workspaces_exceptions
-async def replace_project_workspace(request: web.Request):
+async def move_project_to_workspace(request: web.Request):
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(
         _ProjectWorkspacesPathParams, request

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

@@ -165,7 +165,7 @@ async def _move_folder_to_workspace_and_assert(
     assert client.app
 
     # MOVE
-    url = client.app.router["replace_folder_workspace"].url_for(
+    url = client.app.router["move_folder_to_workspace"].url_for(
         folder_id=folder_id,
         workspace_id=workspace_id,
     )

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

@@ -55,7 +55,7 @@ async def test_moving_between_workspaces_user_role_permissions(
     workspaces_clean_db: None,
 ):
     # Move project from workspace to your private workspace
-    base_url = client.app.router["replace_project_workspace"].url_for(
+    base_url = client.app.router["move_project_to_workspace"].url_for(
         project_id=fake_project["uuid"], workspace_id="null"
     )
     resp = await client.put(f"{base_url}")
@@ -103,7 +103,7 @@ async def test_moving_between_private_and_shared_workspaces(
     assert data["workspaceId"] == added_workspace["workspaceId"]  # <-- Workspace ID
 
     # Move project from workspace to your private workspace
-    base_url = client.app.router["replace_project_workspace"].url_for(
+    base_url = client.app.router["move_project_to_workspace"].url_for(
         project_id=project["uuid"], workspace_id="null"
     )
     resp = await client.put(f"{base_url}")
@@ -116,7 +116,7 @@ async def test_moving_between_private_and_shared_workspaces(
     assert data["workspaceId"] is None  # <-- Workspace ID is None
 
     # Move project from your private workspace to shared workspace
-    base_url = client.app.router["replace_project_workspace"].url_for(
+    base_url = client.app.router["move_project_to_workspace"].url_for(
         project_id=project["uuid"], workspace_id=f"{added_workspace['workspaceId']}"
     )
     resp = await client.put(f"{base_url}")
@@ -182,7 +182,7 @@ async def test_moving_between_shared_and_shared_workspaces(
     assert data["workspaceId"] == added_workspace["workspaceId"]  # <-- Workspace ID
 
     # Move project from workspace to your private workspace
-    base_url = client.app.router["replace_project_workspace"].url_for(
+    base_url = client.app.router["move_project_to_workspace"].url_for(
         project_id=project["uuid"], workspace_id=f"{second_workspace['workspaceId']}"
     )
     resp = await client.put(f"{base_url}")
@@ -262,7 +262,7 @@ async def test_moving_between_workspaces_check_removed_from_folder(
     assert data["workspaceId"] == added_workspace["workspaceId"]  # <-- Workspace ID
 
     # Move project from workspace to your private workspace
-    base_url = client.app.router["replace_project_workspace"].url_for(
+    base_url = client.app.router["move_project_to_workspace"].url_for(
         project_id=project["uuid"], workspace_id="none"
     )
     resp = await client.put(f"{base_url}")