Keep transfer items schema intact

materials-data-facility · Jan 28, 2024 · 5410d0c · 5410d0c
1 parent 9bca054
commit 5410d0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/aws/automate_manager.py b/aws/automate_manager.py
@@ -177,6 +177,7 @@ def create_transfer_items(self, data_sources, organization,
                                 "label": "MDF Flow Test Transfer1",
                                 "source_endpoint_id": None,
                                 "submitting-user-id": submitting_user_id,
+                                "dataset_path": destination_parsed.path+source_id+"/",
                                 "transfer_items": []
                                 }
 
@@ -214,7 +215,6 @@ def create_transfer_items(self, data_sources, organization,
                                 "All datasets must come from the same globus endpoint")
                     user_transfer_inputs['transfer_items'].append(
                         {
-                            "dataset_path": destination_parsed.path+source_id+"/",
                             "destination_path": destination_parsed.path+source_id+"/"+version+"/",
                             "recursive": True,
                             "source_path": transfer_params['origin_path'][0]

diff --git a/aws/tests/test_automate_manager.py b/aws/tests/test_automate_manager.py
@@ -93,10 +93,11 @@ def test_create_transfer_items(self, _, secrets, organization, set_environ):
         assert result['destination_endpoint_id'] == '82f1b5c6-6e9b-11e5-ba47-22000b92c6ec'
         assert result['source_endpoint_id'] == 'e38ee745-6d04-11e5-ba46-22000b92c6ec'
         assert result['submitting-user-id'] == '12-33-55'
+        assert result['dataset_path'] == '/mdf_open/myTestDataset/'
+
         assert len(result['transfer_items']) == 1
         assert result['transfer_items'][0]['source_path'] == '/MDF/mdf_connect/test_files/canonical_datasets/dft/'
         assert result['transfer_items'][0]['destination_path'] == '/mdf_open/myTestDataset/1.0.1/'
-        assert result['transfer_items'][0]['dataset_path'] == '/mdf_open/myTestDataset/'
         print(result)