darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-05-05 16:48:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use the notification types enum for the notifications.notification_type.

Browse Source 
Reuse EMAIL_TYPE in template_types and notification_types.
This commit is contained in:
Rebecca Law
2016-06-29 11:50:54 +01:00
parent 60e159e3c0
commit 25db1bce74
6 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/celery/tasks.py
View File

@@ -37,8 +37,8 @@ from app.dao.services_dao import dao_fetch_service_by_id
from app.dao.templates_dao import dao_get_template_by_id
from app.models import (
Notification,
TEMPLATE_TYPE_EMAIL,
TEMPLATE_TYPE_SMS
EMAIL_TYPE,
SMS_TYPE
)
@@ -94,7 +94,7 @@ def process_job(job_id):
}
})
if template.template_type == 'sms':
if template.template_type == SMS_TYPE:
send_sms.apply_async((
str(job.service_id),
create_uuid(),
@@ -103,7 +103,7 @@ def process_job(job_id):
queue='bulk-sms'
)
if template.template_type == 'email':
if template.template_type == EMAIL_TYPE:
send_email.apply_async((
str(job.service_id),
create_uuid(),
@@ -158,9 +158,9 @@ def send_sms(self, service_id, notification_id, encrypted_notification, created_
status='created',
created_at=datetime.strptime(created_at, DATETIME_FORMAT),
personalisation=notification.get('personalisation'),
notification_type='sms'
notification_type=SMS_TYPE
)
dao_create_notification(notification_db_object, TEMPLATE_TYPE_SMS)
dao_create_notification(notification_db_object, SMS_TYPE)
send_sms_to_provider.apply_async((service_id, notification_id), queue='sms')
@@ -207,7 +207,7 @@ def send_email(service_id, notification_id, encrypted_notification, created_at,
notification_type='email'
)
dao_create_notification(notification_db_object, TEMPLATE_TYPE_EMAIL)
dao_create_notification(notification_db_object, EMAIL_TYPE)
statsd_client.timing_with_dates(
"notifications.tasks.send-email.queued-for",
sent_at,