darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-11 02:23:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use service ID, not from token to build notification

Browse Source
This commit is contained in:
Martyn Inglis
2016-02-24 11:11:02 +00:00
parent b0609b1813
commit 8389976250
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/notifications/rest.py
+2 -2
View File
@@ -119,13 +119,13 @@ def send_notification(notification_type, service_id=None, expects_job=False):
if notification_type is SMS_NOTIFICATION: if notification_type is SMS_NOTIFICATION:
send_sms.apply_async(( send_sms.apply_async((
api_user['client'], service_id,
notification_id, notification_id,
encryption.encrypt(notification)), encryption.encrypt(notification)),
queue='sms') queue='sms')
else: else:
send_email.apply_async(( send_email.apply_async((
api_user['client'], service_id,
notification_id, notification_id,
template.subject, template.subject,
"{}@{}".format(service.email_from, current_app.config['NOTIFY_EMAIL_DOMAIN']), "{}@{}".format(service.email_from, current_app.config['NOTIFY_EMAIL_DOMAIN']),
tests/app/notifications/test_rest.py
+1 -1
View File
@@ -487,7 +487,7 @@ def test_should_allow_valid_sms_notification_for_job(notify_api, sample_job, moc
notification_id = json.loads(response.data)['notification_id'] notification_id = json.loads(response.data)['notification_id']
app.celery.tasks.send_sms.apply_async.assert_called_once_with( app.celery.tasks.send_sms.apply_async.assert_called_once_with(
(str(sample_job.template.service_id), (str(sample_job.service_id),
notification_id, notification_id,
"something_encrypted"), "something_encrypted"),
queue="sms" queue="sms"