darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-25 00:33:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

return replaced subject back from send_notification API

Browse Source
This commit is contained in:
Leo Hemsted
2016-06-21 15:03:33 +01:00
parent fa20e67941
commit 5cd3043fc5
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/notifications/rest.py
View File

@@ -365,7 +365,7 @@ def get_notification_return_data(notification_id, notification, template):
} }
if template.template_type == 'email': if template.template_type == 'email':
output.update({'subject': template.subject}) output.update({'subject': template.replaced_subject})
return output return output

23
tests/app/notifications/rest/test_send_notification.py
View File

@@ -90,39 +90,40 @@ def test_send_notification_invalid_template_id(notify_api, sample_template, mock
@freeze_time("2016-01-01 11:09:00.061258") @freeze_time("2016-01-01 11:09:00.061258")
def test_send_notification_with_placeholders_replaced(notify_api, sample_template_with_placeholders, mocker): def test_send_notification_with_placeholders_replaced(notify_api, sample_email_template_with_placeholders, mocker):
with notify_api.test_request_context(): with notify_api.test_request_context():
with notify_api.test_client() as client: with notify_api.test_client() as client:
mocker.patch('app.celery.tasks.send_sms.apply_async') mocker.patch('app.celery.tasks.send_email.apply_async')
data = { data = {
'to': '+447700900855', 'to': 'ok@ok.com',
'template': str(sample_template_with_placeholders.id), 'template': str(sample_email_template_with_placeholders.id),
'personalisation': { 'personalisation': {
'name': 'Jo' 'name': 'Jo'
} }
} }
auth_header = create_authorization_header(service_id=sample_template_with_placeholders.service.id) auth_header = create_authorization_header(service_id=sample_email_template_with_placeholders.service.id)
response = client.post( response = client.post(
path='/notifications/sms', path='/notifications/email',
data=json.dumps(data), data=json.dumps(data),
headers=[('Content-Type', 'application/json'), auth_header]) headers=[('Content-Type', 'application/json'), auth_header])
response_data = json.loads(response.data)['data'] response_data = json.loads(response.data)['data']
notification_id = response_data['notification']['id'] notification_id = response_data['notification']['id']
data.update({"template_version": sample_template_with_placeholders.version}) data.update({"template_version": sample_email_template_with_placeholders.version})
app.celery.tasks.send_sms.apply_async.assert_called_once_with( app.celery.tasks.send_email.apply_async.assert_called_once_with(
(str(sample_template_with_placeholders.service.id), (str(sample_email_template_with_placeholders.service.id),
notification_id, notification_id,
ANY, ANY,
"2016-01-01T11:09:00.061258"), "2016-01-01T11:09:00.061258"),
queue="sms" queue="email"
) )
assert response.status_code == 201 assert response.status_code == 201
assert encryption.decrypt(app.celery.tasks.send_sms.apply_async.call_args[0][0][2]) == data assert encryption.decrypt(app.celery.tasks.send_email.apply_async.call_args[0][0][2]) == data
assert response_data['body'] == 'Hello Jo' assert response_data['body'] == 'Hello Jo'
assert response_data['subject'] == 'Jo'
def test_should_not_send_notification_for_archived_template(notify_api, sample_template): def test_should_not_send_notification_for_archived_template(notify_api, sample_template):