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

Quietly ignore extra personalisation

app/notifications/process_notifications.py

@@ -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,

app/notifications/rest.py

@@ -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')

app/template/rest.py

@@ -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)

tests/app/notifications/rest/test_send_notification.py

@@ -913,14 +913,12 @@ def test_create_template_raises_invalid_request_exception_with_missing_personali
     assert {'template': ['Missing personalisation:  Name']} == e.value.message
 
 
-def test_create_template_raises_invalid_request_exception_with_too_much_personalisation_data(
+def test_create_template_doesnt_raise_with_too_much_personalisation(
         sample_template_with_placeholders
 ):
     from app.notifications.rest import create_template_object_for_notification
     template = Template.query.get(sample_template_with_placeholders.id)
-    with pytest.raises(InvalidRequest) as e:
-        create_template_object_for_notification(template, {'name': 'Jo', 'extra': 'stuff'})
-        assert {'template': ['Personalisation not needed for template: foo']} in e.value.message
+    create_template_object_for_notification(template, {'name': 'Jo', 'extra': 'stuff'})
 
 
 @pytest.mark.parametrize(

tests/app/notifications/test_process_notification.py

@@ -36,11 +36,9 @@ def test_create_content_for_notification_fails_with_missing_personalisation(samp
         create_content_for_notification(template, None)
 
 
-def test_create_content_for_notification_fails_with_additional_personalisation(sample_template_with_placeholders):
+def test_create_content_for_notification_allows_additional_personalisation(sample_template_with_placeholders):
     template = Template.query.get(sample_template_with_placeholders.id)
-    with pytest.raises(BadRequestError) as e:
-        create_content_for_notification(template, {'name': 'Bobby', 'Additional placeholder': 'Data'})
-    assert e.value.message == 'Template personalisation not needed for template: Additional placeholder'
+    create_content_for_notification(template, {'name': 'Bobby', 'Additional placeholder': 'Data'})
 
 
 @freeze_time("2016-01-01 11:09:00.061258")

tests/app/template/test_rest.py

@@ -374,8 +374,9 @@ def test_should_get_a_single_template(
             'about your ((thing))',
             'hello ((name)) we’ve received your ((thing))',
             '/service/{}/template/{}/preview?name=Amala&thing=document&foo=bar',
-            None, None,
-            'Personalisation not needed for template: foo'
+            'about your document',
+            'hello Amala we’ve received your document',
+            None,
         )
     ]
 )