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

Use same template to validate and send notification

Browse Source 
To be absolutely sure that we can send a message we should also validate
it using the same template class that we use to render it.
This commit is contained in:
Chris Hill-Scott
2020-04-06 14:25:43 +01:00
parent 8c8c8b6328
commit 025ac3ea89
9 changed files with 136 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/v2/notifications/post_notifications.py
View File

@@ -8,6 +8,7 @@ from flask import request, jsonify, current_app, abort
from notifications_utils.recipients import (
format_postcode_for_printing, is_a_real_uk_postcode, try_validate_and_format_phone_number
)
from notifications_utils.template import WithSubjectTemplate
from app import (
api_user,
@@ -166,23 +167,25 @@ def post_notification(notification_type):
if notification_type == SMS_TYPE:
create_resp_partial = functools.partial(
create_post_sms_response_from_notification,
from_number=reply_to
from_number=reply_to,
content=str(template_with_content),
)
elif notification_type == EMAIL_TYPE:
create_resp_partial = functools.partial(
create_post_email_response_from_notification,
subject=template_with_content.subject,
email_from='{}@{}'.format(authenticated_service.email_from, current_app.config['NOTIFY_EMAIL_DOMAIN'])
email_from='{}@{}'.format(authenticated_service.email_from, current_app.config['NOTIFY_EMAIL_DOMAIN']),
content=WithSubjectTemplate.__str__(template_with_content),
)
elif notification_type == LETTER_TYPE:
create_resp_partial = functools.partial(
create_post_letter_response_from_notification,
subject=template_with_content.subject,
content=WithSubjectTemplate.__str__(template_with_content),
)
resp = create_resp_partial(
notification=notification,
content=str(template_with_content),
url_root=request.url_root,
scheduled_for=scheduled_for
)

6
app/v2/template/post_template.py
View File

@@ -3,7 +3,6 @@ from flask import jsonify, request
from app import authenticated_service
from app.dao import templates_dao
from app.schema_validation import validate
from app.utils import get_template_instance
from app.v2.errors import BadRequestError
from app.v2.template import v2_template_blueprint
from app.v2.template.template_schemas import (
@@ -29,8 +28,9 @@ def post_template_preview(template_id):
template = templates_dao.dao_get_template_by_id_and_service_id(
template_id, authenticated_service.id)
template_object = get_template_instance(
template.__dict__, values=data.get('personalisation'))
template_object = template._as_utils_template_with_personalisation(
data.get('personalisation')
)
check_placeholders(template_object)