Merge pull request #410 from sartography/timer-event-issues-511

Timer event issues #511

crc/scripts/email.py

@@ -12,6 +12,8 @@ from crc.services.email_service import EmailService
 from crc.services.ldap_service import LdapService
 from crc.services.study_service import StudyService
 
+import datetime
+
 
 class Email(Script):
     """Send an email from a script task, as part of a workflow.
@@ -43,7 +45,12 @@ email(subject="My Subject", recipients="user@example.com", attachments=['Study_A
         subject = self.get_subject(kwargs['subject'])
         recipients = self.get_email_addresses(kwargs['recipients'], study_id)
         content, content_html = EmailService().get_rendered_content(task.task_spec.documentation, task.data)
-        return EmailModel(subject=subject, recipients=recipients, content=content, content_html=content_html)
+        email_model = EmailModel(subject=subject,
+                                 recipients=recipients,
+                                 content=content,
+                                 content_html=content_html,
+                                 timestamp=datetime.datetime.utcnow())
+        return EmailModelSchema().dump(email_model)
 
     def do_task(self, task, study_id, workflow_id, *args, **kwargs):
 

crc/services/workflow_service.py

@@ -282,7 +282,12 @@ class WorkflowService(object):
 
         # jsonify, and de-jsonify the data to mimic how data will be returned from the front end for forms and assures
         # we aren't generating something that can't be serialized.
-        form_data_string = json.dumps(form_data)
+        try:
+            form_data_string = json.dumps(form_data)
+        except TypeError as te:
+            raise ApiError.from_task(code='serialize_error',
+                                     message=f'Something cannot be serialized. Message is: {te}',
+                                     task=task)
         task.data.update(json.loads(form_data_string))
 
     @staticmethod