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

Merge pull request #2924 from alphagov/add-contact-block-to-serialize-template

Browse Source 
Add contact block to serialize template for v2
This commit is contained in:
Pea M. Tyczynska
2020-07-23 15:42:17 +01:00
committed by GitHub
parent ec5eeac0aa f6f88750b5
commit a2f911b253
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models.py
View File

@@ -1009,6 +1009,7 @@ class TemplateBase(db.Model):
for key in self._as_utils_template().placeholders for key in self._as_utils_template().placeholders
}, },
"postage": self.postage, "postage": self.postage,
"letter_contact_block": self.service_letter_contact.contact_block if self.service_letter_contact else None,
} }
return serialized return serialized

5
tests/app/db.py
View File

@@ -184,6 +184,7 @@ def create_template(
folder=None, folder=None,
postage=None, postage=None,
process_type='normal', process_type='normal',
contact_block_id=None
): ):
data = { data = {
'name': template_name or '{} Template Name'.format(template_type), 'name': template_name or '{} Template Name'.format(template_type),
@@ -194,10 +195,12 @@ def create_template(
'reply_to': reply_to, 'reply_to': reply_to,
'hidden': hidden, 'hidden': hidden,
'folder': folder, 'folder': folder,
'process_type': process_type 'process_type': process_type,
} }
if template_type == LETTER_TYPE: if template_type == LETTER_TYPE:
data["postage"] = postage or "second" data["postage"] = postage or "second"
if contact_block_id:
data['service_letter_contact_id'] = contact_block_id
if template_type != SMS_TYPE: if template_type != SMS_TYPE:
data['subject'] = subject data['subject'] = subject
template = Template(**data) template = Template(**data)

8
tests/app/v2/template/test_get_template.py
View File

@@ -19,7 +19,12 @@ valid_version_params = [None, 1]
def test_get_template_by_id_returns_200( def test_get_template_by_id_returns_200(
client, sample_service, tmp_type, expected_name, expected_subject, version, postage client, sample_service, tmp_type, expected_name, expected_subject, version, postage
): ):
template = create_template(sample_service, template_type=tmp_type) letter_contact_block_id = None
if tmp_type == 'letter':
letter_contact_block = create_letter_contact(sample_service, "Buckingham Palace, London, SW1A 1AA")
letter_contact_block_id = letter_contact_block.id
template = create_template(sample_service, template_type=tmp_type, contact_block_id=(letter_contact_block_id))
auth_header = create_authorization_header(service_id=sample_service.id) auth_header = create_authorization_header(service_id=sample_service.id)
version_path = '/version/{}'.format(version) if version else '' version_path = '/version/{}'.format(version) if version else ''
@@ -44,6 +49,7 @@ def test_get_template_by_id_returns_200(
'name': expected_name, 'name': expected_name,
'personalisation': {}, 'personalisation': {},
'postage': postage, 'postage': postage,
'letter_contact_block': letter_contact_block.contact_block if letter_contact_block_id else None,
} }
assert json_response == expected_response assert json_response == expected_response