fix #3451 (#3452)

* fix #3451

* fix test_base_handlers.py

* fix test_generate_analysis_list

Author: antgonza

qiita_db/test/test_util.py

@@ -790,9 +790,11 @@ def test_generate_analysis_list(self):
         exp = [{'mapping_files': [
                 (16, qdb.util.get_filepath_information(16)['fullpath'])],
                 'description': 'A test analysis', 'artifacts': [8, 9], 'name':
-                'SomeAnalysis', 'analysis_id': 1, 'visibility': 'private'},
+                'SomeAnalysis', 'owner': '[email protected]', 'analysis_id': 1,
+                'visibility': 'private'},
                {'mapping_files': [], 'description': 'Another test analysis',
                 'artifacts': [], 'name': 'SomeSecondAnalysis',
+                'owner': '[email protected]',
                 'analysis_id': 2, 'visibility': 'private'}]
         # removing timestamp for testing
         for i in range(len(obs)):

qiita_db/util.py

@@ -2114,7 +2114,7 @@ def generate_analysis_list(analysis_ids, public_only=False):
         return []
 
     sql = """
-        SELECT analysis_id, a.name, a.description, a.timestamp,
+        SELECT analysis_id, a.name, a.description, a.timestamp, a.email,
             array_agg(DISTINCT artifact_id),
             array_agg(DISTINCT visibility),
             array_agg(DISTINCT CASE WHEN filepath_type = 'plain_text'
@@ -2135,7 +2135,8 @@ def generate_analysis_list(analysis_ids, public_only=False):
 
         qdb.sql_connection.TRN.add(sql, [tuple(analysis_ids)])
         for row in qdb.sql_connection.TRN.execute_fetchindex():
-            aid, name, description, ts, artifacts, av, mapping_files = row
+            aid, name, description, ts, owner, artifacts, \
+                av, mapping_files = row
 
             av = 'public' if set(av) == {'public'} else 'private'
             if av != 'public' and public_only:
@@ -2156,7 +2157,7 @@ def generate_analysis_list(analysis_ids, public_only=False):
             results.append({
                 'analysis_id': aid, 'name': name, 'description': description,
                 'timestamp': ts.strftime("%m/%d/%y %H:%M:%S"),
-                'visibility': av, 'artifacts': artifacts,
+                'visibility': av, 'artifacts': artifacts, 'owner': owner,
                 'mapping_files': mapping_files})
 
     return results

qiita_pet/handlers/analysis_handlers/base_handlers.py

@@ -85,6 +85,7 @@ def analysis_description_handler_get_request(analysis_id, user):
             'analysis_is_public': analysis.is_public,
             'analysis_description': analysis.description,
             'analysis_mapping_id': analysis.mapping_file,
+            'analysis_owner': analysis.owner.email,
             'alert_type': alert_type,
             'artifacts': artifacts,
             'analysis_reservation': analysis._slurm_reservation()[0],

qiita_pet/handlers/analysis_handlers/tests/test_base_handlers.py

@@ -38,6 +38,7 @@ def test_analysis_description_handler_get_request(self):
                'analysis_id': 1,
                'analysis_description': 'A test analysis',
                'analysis_mapping_id': 16,
+               'analysis_owner': '[email protected]',
                'analysis_is_public': False,
                'alert_type': 'info',
                'artifacts': {
@@ -67,6 +68,7 @@ def test_analysis_description_handler_get_request(self):
                'analysis_id': 1,
                'analysis_description': 'A test analysis',
                'analysis_mapping_id': 16,
+               'analysis_owner': '[email protected]',
                'analysis_is_public': False,
                'alert_type': 'info',
                'artifacts': {
@@ -98,6 +100,7 @@ def test_analysis_description_handler_get_request(self):
                'analysis_id': 1,
                'analysis_description': 'A test analysis',
                'analysis_mapping_id': 16,
+               'analysis_owner': '[email protected]',
                'analysis_is_public': False,
                'alert_type': 'danger',
                'artifacts': {