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

Ensure letter personalisation is serialized correctly

Browse Source 
The personalisation for letters can take different formats depending on
how the letter was generated, for example it can contain either
address_line_1 or addressline1. This change ensures that it is always
serialized in the same way.
This commit is contained in:
Ken Tsang
2018-01-22 10:18:11 +00:00
parent b1cbe9db86
commit 3355a29d01
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models.py
View File

@@ -11,6 +11,7 @@ from sqlalchemy.dialects.postgresql import (
JSON JSON
) )
from sqlalchemy import UniqueConstraint, CheckConstraint from sqlalchemy import UniqueConstraint, CheckConstraint
from notifications_utils.columns import Columns
from notifications_utils.recipients import ( from notifications_utils.recipients import (
validate_email_address, validate_email_address,
validate_phone_number, validate_phone_number,
@@ -1223,12 +1224,13 @@ class Notification(db.Model):
} }
if self.notification_type == LETTER_TYPE: if self.notification_type == LETTER_TYPE:
serialized['line_1'] = self.personalisation['address_line_1'] col = Columns(self.personalisation)
serialized['line_2'] = self.personalisation.get('address_line_2') serialized['line_1'] = col.get('address_line_1')
serialized['line_3'] = self.personalisation.get('address_line_3') serialized['line_2'] = col.get('address_line_2')
serialized['line_4'] = self.personalisation.get('address_line_4') serialized['line_3'] = col.get('address_line_3')
serialized['line_5'] = self.personalisation.get('address_line_5') serialized['line_4'] = col.get('address_line_4')
serialized['line_6'] = self.personalisation.get('address_line_6') serialized['line_5'] = col.get('address_line_5')
serialized['line_6'] = col.get('address_line_6')
serialized['postcode'] = self.personalisation['postcode'] serialized['postcode'] = self.personalisation['postcode']
serialized['estimated_delivery'] = \ serialized['estimated_delivery'] = \
get_letter_timings(serialized['created_at'])\ get_letter_timings(serialized['created_at'])\

13
tests/app/test_model.py
View File

@@ -294,3 +294,16 @@ def test_service_get_default_contact_letter(sample_service):
def test_service_get_default_sms_sender(notify_db_session): def test_service_get_default_sms_sender(notify_db_session):
service = create_service() service = create_service()
assert service.get_default_sms_sender() == 'testing' assert service.get_default_sms_sender() == 'testing'
def test_letter_notification_serializes_correctly(client, sample_letter_notification):
sample_letter_notification.personalisation = {
'addressline1': 'test',
'addressline2': 'London',
'postcode': 'N1',
}
json = sample_letter_notification.serialize()
assert json['line_1'] == 'test'
assert json['line_2'] == 'London'
assert json['postcode'] == 'N1'