Skip to content

Commit 85a17ed

Browse files
authored
Merge pull request #216 from OpenUpSA/isoalte-rbac-fix
Enhance SQL queries to include project visibility and names for isola…
2 parents 28468df + 82f0d26 commit 85a17ed

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

app.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2755,9 +2755,11 @@ def post(self, project_id, submission_id):
27552755

27562756
# Get published isolates to re-index in Elasticsearch
27572757
cursor.execute("""
2758-
SELECT i.*, s.project_id, p.pathogen_id FROM isolates i
2758+
SELECT i.*, s.project_id, p.pathogen_id, p.privacy as visibility, p.name as project_name, pat.name as pathogen_name
2759+
FROM isolates i
27592760
LEFT JOIN submissions s ON i.submission_id = s.id
27602761
LEFT JOIN projects p ON s.project_id = p.id
2762+
LEFT JOIN pathogens pat ON p.pathogen_id = pat.id
27612763
WHERE i.submission_id = %s
27622764
AND i.status = 'published'
27632765
""", (submission_id,))
@@ -2799,9 +2801,11 @@ def post(self, project_id, submission_id):
27992801

28002802
# Get unpublished isolates to re-index in Elasticsearch with updated status
28012803
cursor.execute("""
2802-
SELECT i.*, s.project_id, p.pathogen_id FROM isolates i
2804+
SELECT i.*, s.project_id, p.pathogen_id, p.privacy as visibility, p.name as project_name, pat.name as pathogen_name
2805+
FROM isolates i
28032806
LEFT JOIN submissions s ON i.submission_id = s.id
28042807
LEFT JOIN projects p ON s.project_id = p.id
2808+
LEFT JOIN pathogens pat ON p.pathogen_id = pat.id
28052809
WHERE i.submission_id = %s
28062810
AND i.status = 'validated'
28072811
""", (submission_id,))

0 commit comments

Comments
 (0)