Skip to content

fix email url #3257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 23, 2023
Merged

fix email url #3257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qiita_db/processing_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,15 +775,15 @@ def _generate_notification_message(self, value, error_msg):
data_type = data_types.pop()

message = f'Processing Job: {self.command.name}\n'
message += f'{qiita_config.base_url}study/'
message += f'{qiita_config.base_url}/study/'
message += f'description/{study_id}\n'
message += f'Prep IDs: {prep_ids}\n'
message += f'Data Type: {data_type}\n'
elif artifact.analysis:
# this is an analysis job. display analysis id as link and
# the command name.
message = f'Analysis Job {self.command.name}\n'
message += f'{qiita_config.base_url}analysis/'
message += f'{qiita_config.base_url}/analysis/'
message += f'description/{artifact.analysis.id}/\n'
else:
raise qdb.exceptions.QiitaError("Unknown Condition")
Expand Down
10 changes: 5 additions & 5 deletions qiita_db/test/test_processing_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ def test_notification_mail_generation(self):
exp = {'subject': ('Job status change: Split libraries FASTQ '
'(063e553b-327c-4818-ab4a-adfe58e49860)'),
'message': ('Processing Job: Split libraries FASTQ\n'
f'{qiita_config.base_url}study/description/1'
f'{qiita_config.base_url}/study/description/1'
'\nPrep IDs: 1\nData Type: 18S\nNew '
'status: error')}
self.assertDictEqual(obs, exp)
Expand All @@ -883,7 +883,7 @@ def test_notification_mail_generation(self):
exp = {'subject': ('Job status change: Split libraries FASTQ '
'(063e553b-327c-4818-ab4a-adfe58e49860)'),
'message': ('Processing Job: Split libraries FASTQ\n'
f'{qiita_config.base_url}study/description/1\n'
f'{qiita_config.base_url}/study/description/1\n'
'Prep IDs: 1\nData Type: 18S\nNew status'
': error\n\nError:\nAn Error Message')}
self.assertDictEqual(obs, exp)
Expand All @@ -894,7 +894,7 @@ def test_notification_mail_generation(self):
exp = {'subject': ('Job status change: Split libraries FASTQ '
'(063e553b-327c-4818-ab4a-adfe58e49860)'),
'message': ('Processing Job: Split libraries FASTQ\n'
f'{qiita_config.base_url}study/description/1\n'
f'{qiita_config.base_url}/study/description/1\n'
'Prep IDs: 1\nData Type: 18S\nNew status'
': running')}
self.assertDictEqual(obs, exp)
Expand All @@ -903,7 +903,7 @@ def test_notification_mail_generation(self):
exp = {'subject': ('Job status change: Split libraries FASTQ '
'(063e553b-327c-4818-ab4a-adfe58e49860)'),
'message': ('Processing Job: Split libraries FASTQ\n'
f'{qiita_config.base_url}study/description/1\n'
f'{qiita_config.base_url}/study/description/1\n'
'Prep IDs: 1\nData Type: 18S\nNew status'
': running')}
self.assertDictEqual(obs, exp)
Expand All @@ -915,7 +915,7 @@ def test_notification_mail_generation(self):
exp = {'subject': 'Job status change: Single Rarefaction '
'(8a7a8461-e8a1-4b4e-a428-1bc2f4d3ebd0)',
'message': 'Analysis Job Single Rarefaction\n'
f'{qiita_config.base_url}analysis/description/1/\n'
f'{qiita_config.base_url}/analysis/description/1/\n'
'New status: running'}
self.assertDictEqual(obs, exp)

Expand Down