mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-20 15:31:15 -05:00
dce79832ff
This PR is a proposal to reduce the average messages we see for a single notification from about 7 messages to 2.
Messaging would change to something like this:
February 2nd 2018, 15:39:05.885 Full delivery response from Firetext for notification: 8eda51d5-cd82-4569-bfc9-d5570cdf2126
{'status': ['0'], 'reference': ['8eda51d5-cd82-4569-bfc9-d5570cdf2126'], 'time': ['2018-02-02 15:39:01'], 'code': ['000']}
February 2nd 2018, 15:39:05.885 Firetext callback return status of 0 for reference: 8eda51d5-cd82-4569-bfc9-d5570cdf2126
February 2nd 2018, 15:38:57.727 SMS 8eda51d5-cd82-4569-bfc9-d5570cdf2126 sent to provider firetext at 2018-02-02 15:38:56.716814
February 2nd 2018, 15:38:56.727 Starting sending SMS 8eda51d5-cd82-4569-bfc9-d5570cdf2126 to provider at 2018-02-02 15:38:56.408181
February 2nd 2018, 15:38:56.727 Firetext request for 8eda51d5-cd82-4569-bfc9-d5570cdf2126 finished in 0.30376038211397827
February 2nd 2018, 15:38:49.449 sms 8eda51d5-cd82-4569-bfc9-d5570cdf2126 created at 2018-02-02 15:38:48.439113
February 2nd 2018, 15:38:49.449 sms 8eda51d5-cd82-4569-bfc9-d5570cdf2126 sent to the priority-tasks queue for delivery
To somthing like this:
February 2nd 2018, 15:39:05.885 Firetext callback return status of 0 for reference: 8eda51d5-cd82-4569-bfc9-d5570cdf2126
February 2nd 2018, 15:38:49.449 sms 8eda51d5-cd82-4569-bfc9-d5570cdf2126 created at 2018-02-02 15:38:48.439113
64 lines
2.1 KiB
Python
64 lines
2.1 KiB
Python
import json
|
|
|
|
from functools import wraps
|
|
|
|
from flask import (
|
|
Blueprint,
|
|
jsonify,
|
|
request,
|
|
current_app
|
|
)
|
|
|
|
from app.celery.tasks import update_letter_notifications_statuses
|
|
from app.v2.errors import register_errors
|
|
from app.notifications.utils import autoconfirm_subscription
|
|
from app.schema_validation import validate
|
|
from app.config import QueueNames
|
|
|
|
letter_callback_blueprint = Blueprint('notifications_letter_callback', __name__)
|
|
register_errors(letter_callback_blueprint)
|
|
|
|
|
|
dvla_sns_callback_schema = {
|
|
"$schema": "http://json-schema.org/draft-04/schema#",
|
|
"description": "sns callback received on s3 update",
|
|
"type": "object",
|
|
"title": "dvla internal sns callback",
|
|
"properties": {
|
|
"Type": {"enum": ["Notification", "SubscriptionConfirmation"]},
|
|
"MessageId": {"type": "string"},
|
|
"Message": {"type": ["string", "object"]}
|
|
},
|
|
"required": ["Type", "MessageId", "Message"]
|
|
}
|
|
|
|
|
|
def validate_schema(schema):
|
|
def decorator(f):
|
|
@wraps(f)
|
|
def wrapper(*args, **kw):
|
|
validate(request.get_json(force=True), schema)
|
|
return f(*args, **kw)
|
|
return wrapper
|
|
return decorator
|
|
|
|
|
|
@letter_callback_blueprint.route('/notifications/letter/dvla', methods=['POST'])
|
|
@validate_schema(dvla_sns_callback_schema)
|
|
def process_letter_response():
|
|
req_json = request.get_json(force=True)
|
|
current_app.logger.debug('Received SNS callback: {}'.format(req_json))
|
|
if not autoconfirm_subscription(req_json):
|
|
# The callback should have one record for an S3 Put Event.
|
|
message = json.loads(req_json['Message'])
|
|
filename = message['Records'][0]['s3']['object']['key']
|
|
current_app.logger.info('Received file from DVLA: {}'.format(filename))
|
|
|
|
if filename.lower().endswith('rs.txt') or filename.lower().endswith('rsp.txt'):
|
|
current_app.logger.info('DVLA callback: Calling task to update letter notifications')
|
|
update_letter_notifications_statuses.apply_async([filename], queue=QueueNames.NOTIFY)
|
|
|
|
return jsonify(
|
|
result="success", message="DVLA callback succeeded"
|
|
), 200
|