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

re-add content_char_count to public GET /notification endpoints

Browse Source 
we shouldn't remove stuff from endpoints or we'll break clients
This commit is contained in:
Leo Hemsted
2016-08-09 17:28:55 +01:00
parent 4e01277318
commit 5b7af00295
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/schemas.py
View File

@@ -308,8 +308,13 @@ class NotificationWithPersonalisationSchema(NotificationWithTemplateSchema):
renderer=PassThrough() renderer=PassThrough()
) )
in_data['body'] = template.replaced in_data['body'] = template.replaced
if in_data['template']['template_type'] == 'email': template_type = in_data['template']['template_type']
if template_type == 'email':
in_data['subject'] = template.replaced_subject in_data['subject'] = template.replaced_subject
in_data['content_char_count'] = None
else:
in_data['content_char_count'] = len(in_data['body'])
in_data.pop('personalisation', None) in_data.pop('personalisation', None)
in_data['template'].pop('content', None) in_data['template'].pop('content', None)
in_data['template'].pop('subject', None) in_data['template'].pop('subject', None)

2
tests/app/notifications/test_rest.py
View File

@@ -557,6 +557,7 @@ def test_get_notification_by_id_returns_merged_template_content(notify_db,
assert response.status_code == 200 assert response.status_code == 200
assert notification['body'] == 'Hello world\nYour thing is due soon' assert notification['body'] == 'Hello world\nYour thing is due soon'
assert 'subject' not in notification assert 'subject' not in notification
assert notification['content_char_count'] == 34
def test_get_notification_by_id_returns_merged_template_content_for_email( def test_get_notification_by_id_returns_merged_template_content_for_email(
@@ -580,6 +581,7 @@ def test_get_notification_by_id_returns_merged_template_content_for_email(
assert response.status_code == 200 assert response.status_code == 200
assert notification['body'] == 'Hello world\nThis is an email from GOV.UK' assert notification['body'] == 'Hello world\nThis is an email from GOV.UK'
assert notification['subject'] == 'world' assert notification['subject'] == 'world'
assert notification['content_char_count'] is None
def test_get_notifications_for_service_returns_merged_template_content(notify_api, def test_get_notifications_for_service_returns_merged_template_content(notify_api,