Merge pull request #978 from mguidon/hotfix_storage_fix_deep_copy_path

Filename was missing in path to storage

Author: mguidon

services/storage/src/simcore_service_storage/dsm.py

@@ -469,6 +469,8 @@ async def copy_file_datcore_s3(self, user_id: str, dest_uuid: str, source_uuid:
                         if resp.status > 299:
                             _response_text = await resp.text()
 
+        return dest_uuid
+
     async def copy_file(self, user_id: str, dest_location: str, dest_uuid: str, source_location: str, source_uuid: str):
         if source_location == SIMCORE_S3_STR:
             if dest_location == DATCORE_STR:
@@ -558,7 +560,7 @@ async def deep_copy_project_simcore_s3(self, user_id: str, source_project, desti
                             src = output["path"]
                             dest = str(Path(dest_folder) / node_id)
                             logger.info("Need to copy %s to %s", src, dest)
-                            await self.copy_file_datcore_s3(user_id=user_id, dest_uuid=dest, source_uuid=src, filename_missing=True)
+                            dest = await self.copy_file_datcore_s3(user_id=user_id, dest_uuid=dest, source_uuid=src, filename_missing=True)
                             # and change the dest project accordingly
                             output["store"] = 0
                             output['path'] = dest

services/storage/tests/test_dsm.py

@@ -379,6 +379,7 @@ async def test_deep_copy_project_simcore_s3(dsm_fixture, s3_client, postgres_ser
     utils.create_full_tables(url=postgres_service_url)
 
     path_in_datcore = datcore_structured_testbucket["file_id3"]
+    file_name_in_datcore = Path(datcore_structured_testbucket["filename3"]).name
     user_id = USER_ID
 
     source_project =  {
@@ -456,8 +457,10 @@ async def test_deep_copy_project_simcore_s3(dsm_fixture, s3_client, postgres_ser
         node_mapping[node_id] = key
 
     status = await dsm.deep_copy_project_simcore_s3(user_id, source_project, destination_project, node_mapping)
+
     new_path = destination_project["workbench"]["deep-copy-uuid-48eb-a9d2-aaad6b72400a"]["outputs"]["outFile"]["path"]
     assert new_path != path_in_datcore
+    assert Path(new_path).name == file_name_in_datcore
     files = await dsm.list_files(user_id=user_id, location=SIMCORE_S3_STR)
     assert len(files) == 3
     # one of the files in s3 should be the dowloaded one from datcore