Merge pull request #3256 from antgonza/fix-error-sending-emails

Fix error sending emails

Author: charles-cowart

qiita_db/processing_job.py

@@ -741,7 +741,7 @@ def _generate_notification_message(self, value, error_msg):
                        f'{self.command.parameters}')
         else:
             for artifact in input_artifacts:
-                if artifact.prep_templates is not None:
+                if artifact.prep_templates:
                     # this is a processing job. display the study id as link,
                     # prep ids, data_type, and command name.
                     study_ids = [x.study_id for x in artifact.prep_templates]
@@ -775,18 +775,16 @@ def _generate_notification_message(self, value, error_msg):
                     data_type = data_types.pop()
 
                     message = f'Processing Job: {self.command.name}\n'
-                    message += 'Study <A HREF="https://qiita.ucsd.edu/study/'
-                    message += f'description/{study_id}">{study_id}'
-                    message += '</A>\n'
+                    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 is not None:
+                elif artifact.analysis:
                     # this is an analysis job. display analysis id as link and
                     # the command name.
-                    message = f'Analysis Job {self.command.name} '
-                    message += '<A HREF="https://qiita.ucsd.edu/analysis/'
-                    message += f'description/{artifact.analysis.id}">'
-                    message += f'{artifact.analysis.id}</A>\n'
+                    message = f'Analysis Job {self.command.name}\n'
+                    message += f'{qiita_config.base_url}analysis/'
+                    message += f'description/{artifact.analysis.id}/\n'
                 else:
                     raise qdb.exceptions.QiitaError("Unknown Condition")
 

qiita_db/test/test_processing_job.py

@@ -18,6 +18,7 @@
 
 import qiita_db as qdb
 from qiita_core.util import qiita_test_checker
+from qiita_core.qiita_settings import qiita_config
 
 
 def _create_job(force=True):
@@ -871,47 +872,51 @@ 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\nStudy '
-                           '<A HREF="https://qiita.ucsd.edu/study/description'
-                           '/1">1</A>\nPrep IDs: 1\nData Type: 18S\nNew '
+               'message': ('Processing Job: Split libraries FASTQ\n'
+                           f'{qiita_config.base_url}study/description/1'
+                           '\nPrep IDs: 1\nData Type: 18S\nNew '
                            'status: error')}
-
         self.assertDictEqual(obs, exp)
 
         obs = self.tester1._generate_notification_message('error',
                                                           'An Error Message')
-
         exp = {'subject': ('Job status change: Split libraries FASTQ '
                            '(063e553b-327c-4818-ab4a-adfe58e49860)'),
-               'message': ('Processing Job: Split libraries FASTQ\nStudy '
-                           '<A HREF="https://qiita.ucsd.edu/study/description'
-                           '/1">1</A>\nPrep IDs: 1\nData Type: 18S\nNew status'
+               'message': ('Processing Job: Split libraries FASTQ\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)
 
         # The inclusion of an error message has no effect on other valid
         # status types e.g. 'running'.
         obs = self.tester1._generate_notification_message('running', None)
-
         exp = {'subject': ('Job status change: Split libraries FASTQ '
                            '(063e553b-327c-4818-ab4a-adfe58e49860)'),
-               'message': ('Processing Job: Split libraries FASTQ\nStudy '
-                           '<A HREF="https://qiita.ucsd.edu/study/description'
-                           '/1">1</A>\nPrep IDs: 1\nData Type: 18S\nNew status'
+               'message': ('Processing Job: Split libraries FASTQ\n'
+                           f'{qiita_config.base_url}study/description/1\n'
+                           'Prep IDs: 1\nData Type: 18S\nNew status'
                            ': running')}
-
         self.assertDictEqual(obs, exp)
 
         obs = self.tester1._generate_notification_message('running', 'Yahoo!')
-
         exp = {'subject': ('Job status change: Split libraries FASTQ '
                            '(063e553b-327c-4818-ab4a-adfe58e49860)'),
-               'message': ('Processing Job: Split libraries FASTQ\nStudy '
-                           '<A HREF="https://qiita.ucsd.edu/study/description'
-                           '/1">1</A>\nPrep IDs: 1\nData Type: 18S\nNew status'
+               'message': ('Processing Job: Split libraries FASTQ\n'
+                           f'{qiita_config.base_url}study/description/1\n'
+                           'Prep IDs: 1\nData Type: 18S\nNew status'
                            ': running')}
+        self.assertDictEqual(obs, exp)
 
+        # checking analysis emails
+        jid = '8a7a8461-e8a1-4b4e-a428-1bc2f4d3ebd0'
+        pj = qdb.processing_job.ProcessingJob(jid)
+        obs = pj._generate_notification_message('running', 'Yahoo!')
+        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'
+                          'New status: running'}
         self.assertDictEqual(obs, exp)
 
         # as '[email protected]' is not set to receive notifications, let's
@@ -920,7 +925,6 @@ def test_notification_mail_generation(self):
         # privileged user.
         sql = ("UPDATE qiita.qiita_user SET receive_processing_job_emails"
                " = false WHERE email = '[email protected]'")
-
         with qdb.sql_connection.TRN:
             qdb.sql_connection.TRN.add(sql)