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 #2751 from alphagov/validate-and-format-postcode-api-flow

Browse Source 
Validate and format postcode for the API letter sending flow.
This commit is contained in:
Pea M. Tyczynska
2020-04-01 11:09:25 +01:00
committed by GitHub
parent ac8fc49539 d80fef8fe8
commit cff7f7b72d
3 changed files with 73 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,9 @@ from datetime import datetime
from boto.exception import SQSError
from flask import request, jsonify, current_app, abort
from notifications_utils.recipients import try_validate_and_format_phone_number
from notifications_utils.recipients import (
format_postcode_for_printing, is_a_real_uk_postcode, try_validate_and_format_phone_number
)
from app import (
api_user,
@@ -56,7 +58,7 @@ from app.notifications.validators import (
validate_template,
)
from app.schema_validation import validate
from app.v2.errors import BadRequestError
from app.v2.errors import BadRequestError, ValidationError
from app.v2.notifications import v2_notification_blueprint
from app.v2.notifications.create_response import (
create_post_sms_response_from_notification,
@@ -344,12 +346,18 @@ def process_letter_notification(*, letter_data, api_key, template, reply_to_text
template=template,
reply_to_text=reply_to_text)
postcode = letter_data['personalisation']['postcode']
if not is_a_real_uk_postcode(postcode):
raise ValidationError(message='Must be a real UK postcode')
test_key = api_key.key_type == KEY_TYPE_TEST
# if we don't want to actually send the letter, then start it off in SENDING so we don't pick it up
status = NOTIFICATION_CREATED if not test_key else NOTIFICATION_SENDING
queue = QueueNames.CREATE_LETTERS_PDF if not test_key else QueueNames.RESEARCH_MODE
letter_data['personalisation']['postcode'] = format_postcode_for_printing(postcode)
notification = create_letter_notification(letter_data=letter_data,
template=template,
api_key=api_key,