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

Merge pull request #853 from alphagov/ignore-additional-personalisation

Browse Source 
Quietly ignore extra personalisation
This commit is contained in:
Chris Hill-Scott
2017-03-10 16:16:27 +00:00
committed by GitHub
parent c11f4b5d5d e507fed152
commit 761ff86591
6 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/notifications/process_notifications.py
View File

@@ -23,11 +23,6 @@ def check_placeholders(template_object):
message = 'Template missing personalisation: {}'.format(", ".join(template_object.missing_data))
raise BadRequestError(fields=[{'template': message}], message=message)
if template_object.additional_data:
message = 'Template personalisation not needed for template: {}'.format(
", ".join(template_object.additional_data))
raise BadRequestError(fields=[{'template': message}], message=message)
def persist_notification(template_id,
template_version,

5
app/notifications/rest.py
View File

@@ -309,11 +309,6 @@ def create_template_object_for_notification(template, personalisation):
errors = {'template': [message]}
raise InvalidRequest(errors, status_code=400)
if template_object.additional_data:
message = 'Personalisation not needed for template: {}'.format(", ".join(template_object.additional_data))
errors = {'template': [message]}
raise InvalidRequest(errors, status_code=400)
if (
template_object.template_type == SMS_TYPE and
template_object.content_count > current_app.config.get('SMS_CHAR_COUNT_LIMIT')

7
app/template/rest.py
View File

@@ -101,13 +101,6 @@ def preview_template_by_id_and_service_id(service_id, template_id):
]}, status_code=400
)
if template_object.additional_data:
raise InvalidRequest(
{'template': [
'Personalisation not needed for template: {}'.format(", ".join(template_object.additional_data))
]}, status_code=400
)
data['subject'], data['content'] = template_object.subject, str(template_object)
return jsonify(data)