fix qiita-spots#3451

antgonza · Jan 2, 2025 · abc554b · abc554b
1 parent ea0a7ec
commit abc554b
Show file tree

Hide file tree

Showing 4 changed files with 286 additions and 152 deletions.
diff --git a/qiita_db/util.py b/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

diff --git a/qiita_pet/handlers/analysis_handlers/base_handlers.py b/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],