darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 15:46:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into move-scheduler-tasks

Browse Source 
Conflicts:
	tests/app/celery/test_tasks.py
This commit is contained in:
Rebecca Law
2016-06-21 11:24:26 +01:00
parent 2da6226ace 4cb67e8767
commit 6c81d0f465
10 changed files with 210 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/celery/tasks.py
View File

@@ -156,7 +156,8 @@ def send_sms(self, service_id, notification_id, encrypted_notification, created_
job_id=notification.get('job', None),
job_row_number=notification.get('row_number', None),
status='sending',
created_at=datetime.strptime(created_at, DATETIME_FORMAT)
created_at=datetime.strptime(created_at, DATETIME_FORMAT),
personalisation=notification.get('personalisation')
)
dao_create_notification(notification_db_object, TEMPLATE_TYPE_SMS)
@@ -200,7 +201,8 @@ def send_email(service_id, notification_id, encrypted_notification, created_at,
status='sending',
created_at=datetime.strptime(created_at, DATETIME_FORMAT),
sent_at=sent_at,
sent_by=provider.get_name()
sent_by=provider.get_name(),
personalisation=notification.get('personalisation')
)
dao_create_notification(notification_db_object, TEMPLATE_TYPE_EMAIL)