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

Merge pull request #2536 from alphagov/ensure_no_errors_when_creating_template

Browse Source 
Ensure dao_create_template doesn't clash with new trigger
This commit is contained in:
Pea (Malgorzata Tyczynska)
2019-06-25 16:19:48 +01:00
committed by GitHub
parent 08e9f1caa2 673cabe6b8
commit e4c90c4bb9
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/dao/templates_dao.py
View File

@@ -24,16 +24,19 @@ def dao_create_template(template):
template.id = uuid.uuid4() # must be set now so version history model can use same id
template.archived = False
redacted_dict = {
"template": template,
"redact_personalisation": False,
}
if template.created_by:
redacted_dict.update({"updated_by": template.created_by})
else:
redacted_dict.update({"updated_by_id": template.created_by_id})
# The template redacted is now being inserted via a trigger
# this will catch any Notify templates being added by a db migration
if not TemplateRedacted.query.filter(TemplateRedacted.template_id == template.id).first():
redacted_dict = {
"template": template,
"redact_personalisation": False,
}
if template.created_by:
redacted_dict.update({"updated_by": template.created_by})
else:
redacted_dict.update({"updated_by_id": template.created_by_id})
template.template_redacted = TemplateRedacted(**redacted_dict)
template.template_redacted = TemplateRedacted(**redacted_dict)
db.session.add(template)

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

@@ -17,7 +17,7 @@ valid_version_params = [None, 1]
])
@pytest.mark.parametrize("version", valid_version_params)
def test_get_template_by_id_returns_200(
client, sample_service, tmp_type, expected_name, expected_subject, version, postage
client, sample_service, mock, tmp_type, expected_name, expected_subject, version, postage
):
template = create_template(sample_service, template_type=tmp_type)
auth_header = create_authorization_header(service_id=sample_service.id)
@@ -36,7 +36,7 @@ def test_get_template_by_id_returns_200(
'id': '{}'.format(template.id),
'type': '{}'.format(template.template_type),
'created_at': template.created_at.strftime(DATETIME_FORMAT),
'updated_at': None,
'updated_at': mock.ANY,
'version': template.version,
'created_by': template.created_by.email_address,
'body': template.content,