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

Pass date of letter to template preview

Browse Source 
Otherwise all letters will show the current date.

Also beefed up the tests around this part of the code a bit.
This commit is contained in:
Chris Hill-Scott
2018-04-30 15:47:49 +01:00
parent 238e85ea9e
commit 8ae800b117
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/template/rest.py
View File

@@ -247,6 +247,7 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
'letter_contact_block': notification.reply_to_text, 'letter_contact_block': notification.reply_to_text,
'template': template_for_letter_print, 'template': template_for_letter_print,
'values': notification.personalisation, 'values': notification.personalisation,
'date': notification.created_at.isoformat(),
'dvla_org_id': service.dvla_organisation_id, 'dvla_org_id': service.dvla_organisation_id,
} }

30
tests/app/template/test_rest.py
View File

@@ -816,12 +816,15 @@ def test_preview_letter_template_by_id_invalid_file_type(
assert ['file_type must be pdf or png'] == resp['message']['content'] assert ['file_type must be pdf or png'] == resp['message']['content']
@freeze_time('2012-12-12')
@pytest.mark.parametrize('file_type', ('png', 'pdf'))
def test_preview_letter_template_by_id_valid_file_type( def test_preview_letter_template_by_id_valid_file_type(
notify_api, notify_api,
client, sample_letter_notification,
admin_request, admin_request,
sample_letter_notification): file_type,
):
sample_letter_notification.created_at = datetime.utcnow()
with set_config_values(notify_api, { with set_config_values(notify_api, {
'TEMPLATE_PREVIEW_API_HOST': 'http://localhost/notifications-template-preview', 'TEMPLATE_PREVIEW_API_HOST': 'http://localhost/notifications-template-preview',
'TEMPLATE_PREVIEW_API_KEY': 'test-key' 'TEMPLATE_PREVIEW_API_KEY': 'test-key'
@@ -830,7 +833,7 @@ def test_preview_letter_template_by_id_valid_file_type(
content = b'\x00\x01' content = b'\x00\x01'
mock_post = request_mock.post( mock_post = request_mock.post(
'http://localhost/notifications-template-preview/preview.pdf', 'http://localhost/notifications-template-preview/preview.{}'.format(file_type),
content=content, content=content,
headers={'X-pdf-page-count': '1'}, headers={'X-pdf-page-count': '1'},
status_code=200 status_code=200
@@ -840,10 +843,21 @@ def test_preview_letter_template_by_id_valid_file_type(
'template.preview_letter_template_by_notification_id', 'template.preview_letter_template_by_notification_id',
service_id=sample_letter_notification.service_id, service_id=sample_letter_notification.service_id,
notification_id=sample_letter_notification.id, notification_id=sample_letter_notification.id,
file_type='pdf' file_type=file_type,
) )
assert mock_post.last_request.json() post_json = mock_post.last_request.json()
assert post_json['template']['id'] == str(sample_letter_notification.template_id)
assert post_json['values'] == {
'address_line_1': 'A1',
'address_line_2': 'A2',
'address_line_3': 'A3',
'address_line_4': 'A4',
'address_line_5': 'A5',
'address_line_6': 'A6',
'postcode': 'A_POST',
}
assert post_json['date'] == '2012-12-12T00:00:00'
assert base64.b64decode(resp['content']) == content assert base64.b64decode(resp['content']) == content