fix: folder body

Author: giancarloromeo

services/storage/tests/unit/test_rpc_handlers_simcore_s3.py

@@ -35,7 +35,7 @@
 from models_library.api_schemas_webserver.storage import PathToExport
 from models_library.basic_types import SHA256Str
 from models_library.products import ProductName
-from models_library.projects_nodes_io import NodeID, NodeIDStr, SimcoreS3FileID
+from models_library.projects_nodes_io import NodeID, SimcoreS3FileID
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
 from pytest_mock import MockerFixture
@@ -72,22 +72,35 @@ async def _request_copy_folders(
     rpc_client: RabbitMQRPCClient,
     user_id: UserID,
     product_name: ProductName,
-    source_project: dict[str, Any],
+    src_project: dict[str, Any],
+    src_project_nodes: dict[NodeID, dict[str, Any]],
     dst_project: dict[str, Any],
+    dst_project_nodes: dict[NodeID, dict[str, Any]],
     nodes_map: dict[NodeID, NodeID],
     *,
     client_timeout: datetime.timedelta = datetime.timedelta(seconds=60),
 ) -> dict[str, Any]:
     with log_context(
         logging.INFO,
-        f"Copying folders from {source_project['uuid']} to {dst_project['uuid']}",
+        f"Copying folders from {src_project['uuid']} to {dst_project['uuid']}",
     ) as ctx:
+        source = src_project | {
+            "workbench": {
+                f"{node_id}": node for node_id, node in src_project_nodes.items()
+            }
+        }
+        destination = dst_project | {
+            "workbench": {
+                f"{node_id}": node for node_id, node in dst_project_nodes.items()
+            }
+        }
+
         async_job_get, async_job_name = await copy_folders_from_project(
             rpc_client,
             user_id=user_id,
             product_name=product_name,
             body=FoldersBody(
-                source=source_project, destination=dst_project, nodes_map=nodes_map
+                source=source, destination=destination, nodes_map=nodes_map
             ),
         )
 
@@ -132,7 +145,9 @@ async def test_copy_folders_from_non_existing_project(
             user_id,
             product_name,
             incorrect_src_project,
+            {},
             dst_project,
+            {},
             nodes_map={},
         )
 
@@ -144,7 +159,9 @@ async def test_copy_folders_from_non_existing_project(
             user_id,
             product_name,
             src_project,
+            {},
             incorrect_dst_project,
+            {},
             nodes_map={},
         )
 
@@ -167,7 +184,9 @@ async def test_copy_folders_from_empty_project(
         user_id,
         product_name,
         src_project,
+        {},
         dst_project,
+        {},
         nodes_map={},
     )
     assert data == jsonable_encoder(dst_project)
@@ -234,25 +253,28 @@ async def test_copy_folders_from_valid_project_with_one_large_file(
         project_params
     )
     # 2. create a dst project without files
-    dst_project, _, nodes_map = clone_project_data(src_project, src_project_nodes)
+    dst_project, dst_project_nodes, nodes_map = clone_project_data(
+        src_project, src_project_nodes
+    )
     dst_project = await create_project(**dst_project)
-    # copy the project files
+
     data = await _request_copy_folders(
         storage_rabbitmq_rpc_client,
         user_id,
         product_name,
         src_project,
+        src_project_nodes,
         dst_project,
+        dst_project_nodes,
         nodes_map=nodes_map,
     )
+
     assert data == jsonable_encoder(
         await get_updated_project(sqlalchemy_async_engine, dst_project["uuid"])
     )
     # check that file meta data was effectively copied
     for src_node_id in src_projects_list:
-        dst_node_id = nodes_map.get(
-            TypeAdapter(NodeIDStr).validate_python(f"{src_node_id}")
-        )
+        dst_node_id = nodes_map.get(src_node_id)
         assert dst_node_id
         for src_file_id, src_file in src_projects_list[src_node_id].items():
             path: Any = src_file["path"]
@@ -333,26 +355,29 @@ async def test_copy_folders_from_valid_project(
         project_params
     )
     # 2. create a dst project without files
-    dst_project, _, nodes_map = clone_project_data(src_project, src_project_nodes)
+    dst_project, dst_project_nodes, nodes_map = clone_project_data(
+        src_project, src_project_nodes
+    )
     dst_project = await create_project(**dst_project)
     # copy the project files
     data = await _request_copy_folders(
         storage_rabbitmq_rpc_client,
         user_id,
         product_name,
         src_project,
+        src_project_nodes,
         dst_project,
+        dst_project_nodes,
         nodes_map=nodes_map,
     )
+    data.pop("workbench", None)  # remove workbench from the data
     assert data == jsonable_encoder(
         await get_updated_project(sqlalchemy_async_engine, dst_project["uuid"])
     )
 
     # check that file meta data was effectively copied
     for src_node_id in src_projects_list:
-        dst_node_id = nodes_map.get(
-            TypeAdapter(NodeIDStr).validate_python(f"{src_node_id}")
-        )
+        dst_node_id = nodes_map.get(src_node_id)
         assert dst_node_id
         for src_file_id, src_file in src_projects_list[src_node_id].items():
             path: Any = src_file["path"]
@@ -389,23 +414,29 @@ async def _create_and_delete_folders_from_project(
     *,
     client_timeout: datetime.timedelta = datetime.timedelta(seconds=60),
 ) -> None:
-    destination_project, _, nodes_map = clone_project_data(project, project_nodes)
-    await project_db_creator(**destination_project)
+    dst_project, dst_project_nodes, nodes_map = clone_project_data(
+        project, project_nodes
+    )
+    await project_db_creator(**dst_project)
 
     # creating a copy
     data = await _request_copy_folders(
         rpc_client,
         user_id,
         product_name,
         project,
-        destination_project,
+        project_nodes,
+        dst_project,
+        dst_project_nodes,
         nodes_map=nodes_map,
         client_timeout=client_timeout,
     )
 
+    data.pop("workbench", None)  # remove workbench from the data
+
     # data should be equal to the destination project, and all store entries should point to simcore.s3
     # NOTE: data is jsonized where destination project is not!
-    assert jsonable_encoder(destination_project) == data
+    assert jsonable_encoder(dst_project) == data
 
     project_id = data["uuid"]