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

Save recipient address in process_sanitised_letter task

Browse Source 
If the letter passed sanitisation, the recipient address will be
returned from template preview, so we want to save this as the `to`
field of the notification.
This commit is contained in:
Katie Smith
2020-01-24 10:15:19 +00:00
parent adf9906a96
commit 35e39bcfa8
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/celery/letters_pdf_tasks.py
View File

@@ -347,7 +347,8 @@ def process_sanitised_letter(sanitise_data):
update_letter_pdf_status( update_letter_pdf_status(
reference=notification.reference, reference=notification.reference,
status=NOTIFICATION_DELIVERED if is_test_key else NOTIFICATION_CREATED, status=NOTIFICATION_DELIVERED if is_test_key else NOTIFICATION_CREATED,
billable_units=billable_units billable_units=billable_units,
recipient_address=letter_details['address']
) )
except BotoClientError: except BotoClientError:

13
tests/app/celery/test_letters_pdf_tasks.py
View File

@@ -780,12 +780,14 @@ def test_process_sanitised_letter_with_valid_letter(
'invalid_pages': None, 'invalid_pages': None,
'validation_status': 'passed', 'validation_status': 'passed',
'filename': filename, 'filename': filename,
'notification_id': str(sample_letter_notification.id) 'notification_id': str(sample_letter_notification.id),
'address': 'A. User\nThe house on the corner'
}) })
process_sanitised_letter(encrypted_data) process_sanitised_letter(encrypted_data)
assert sample_letter_notification.status == expected_status assert sample_letter_notification.status == expected_status
assert sample_letter_notification.billable_units == 1 assert sample_letter_notification.billable_units == 1
assert sample_letter_notification.to == 'A. User\nThe house on the corner'
assert not [x for x in scan_bucket.objects.all()] assert not [x for x in scan_bucket.objects.all()]
assert not [x for x in template_preview_bucket.objects.all()] assert not [x for x in template_preview_bucket.objects.all()]
@@ -823,7 +825,8 @@ def test_process_sanitised_letter_with_invalid_letter(sample_letter_notification
'invalid_pages': [1], 'invalid_pages': [1],
'validation_status': 'failed', 'validation_status': 'failed',
'filename': filename, 'filename': filename,
'notification_id': str(sample_letter_notification.id) 'notification_id': str(sample_letter_notification.id),
'address': None,
}) })
process_sanitised_letter(encrypted_data) process_sanitised_letter(encrypted_data)
@@ -851,7 +854,8 @@ def test_process_sanitised_letter_when_letter_status_is_not_pending_virus_scan(
'invalid_pages': None, 'invalid_pages': None,
'validation_status': 'passed', 'validation_status': 'passed',
'filename': 'NOTIFY.{}'.format(sample_letter_notification.reference), 'filename': 'NOTIFY.{}'.format(sample_letter_notification.reference),
'notification_id': str(sample_letter_notification.id) 'notification_id': str(sample_letter_notification.id),
'address': None
}) })
process_sanitised_letter(encrypted_data) process_sanitised_letter(encrypted_data)
@@ -871,7 +875,8 @@ def test_process_sanitised_letter_puts_letter_into_tech_failure_for_boto_errors(
'invalid_pages': None, 'invalid_pages': None,
'validation_status': 'passed', 'validation_status': 'passed',
'filename': 'NOTIFY.{}'.format(sample_letter_notification.reference), 'filename': 'NOTIFY.{}'.format(sample_letter_notification.reference),
'notification_id': str(sample_letter_notification.id) 'notification_id': str(sample_letter_notification.id),
'address': None
}) })
with pytest.raises(NotificationTechnicalFailureException): with pytest.raises(NotificationTechnicalFailureException):