Ensure that the submission alias is still unique when a project was m…

…anually created using the ELOAD id
EBIvariation · Oct 23, 2023 · 248a233 · 248a233
1 parent ee152ce
commit 248a233
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/eva_submission/ENA_submission/xlsx_to_ENA_xml.py b/eva_submission/ENA_submission/xlsx_to_ENA_xml.py
@@ -292,8 +292,12 @@ def _add_analysis(self, root, analysis_row, project_row, sample_rows, file_rows)
 
     def _create_submission_xml(self, files_to_submit, action, project_row, eload):
         root = Element('SUBMISSION_SET')
+        if self.is_existing_project:
+            submission_alias = self.existing_project + '_' + eload
+        else:
+            submission_alias = eload
         submission_elemt = add_element(root, 'SUBMISSION',
-                                       alias=eload,
+                                       alias=submission_alias,
                                        center_name=project_row.get('Center'))
         actions_elemt = add_element(submission_elemt, 'ACTIONS')
         for file_dict in files_to_submit:
@@ -315,8 +319,12 @@ def _create_submission_xml(self, files_to_submit, action, project_row, eload):
 
     def _create_submission_single_xml(self,  action, project_row, eload):
         root = Element('SUBMISSION_SET')
+        if self.is_existing_project:
+            submission_alias = self.existing_project + '_' + eload
+        else:
+            submission_alias = eload
         submission_elemt = add_element(root, 'SUBMISSION',
-                                       alias=eload,
+                                       alias=submission_alias,
                                        center_name=project_row.get('Center'))
         actions_elemt = add_element(submission_elemt, 'ACTIONS')
         action_elemt = add_element(actions_elemt, 'ACTION')

diff --git a/tests/test_xlsx_to_xml.py b/tests/test_xlsx_to_xml.py
@@ -2,8 +2,7 @@
 from datetime import datetime
 from unittest import TestCase
 import xml.etree.ElementTree as ET
-from unittest.mock import patch, Mock
-
+from unittest.mock import patch, Mock, PropertyMock
 from eva_submission import ROOT_DIR
 from eva_submission.ENA_submission.xlsx_to_ENA_xml import EnaXlsxConverter
 
@@ -250,12 +249,15 @@ def test_create_submission_files(self):
 
     def test_create_submission_files_for_existing_project(self):
         # When the project already exist not PROJECT XML will be generated
-        with patch.object(EnaXlsxConverter, 'is_existing_project', return_value=True):
+        with patch.object(EnaXlsxConverter, 'existing_project', new_callable=PropertyMock(return_value='PRJEB00001')):
             submission_file, project_file, analysis_file = self.converter.create_submission_files('ELOAD_1')
             assert os.path.exists(submission_file)
             assert project_file is None
             assert os.path.exists(analysis_file)
             assert not os.path.exists(self.converter.project_file)
+            with open(submission_file) as open_file:
+                root = ET.fromstring(open_file.read())
+                assert list(root)[0].attrib['alias'] == 'PRJEB00001_ELOAD_1'
 
     def test_create_single_submission_files(self):
         self.converter.create_single_submission_file('ELOAD_1')