darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-23 15:56:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adds notification stats update into the callback process

Browse Source 
- when a provider callback occurs and we update the status of the notification, also update the statistics table

Adds:
- Mapping object to the clients to handle mapping to various states from the response codes, this replaces the map.
- query lookup in the DAO to get the query based on response type / template type

Tests around rest class and dao to check correct updating of stats

Missing:
- multiple client callbacks will keep incrementing the counts of success/failure. This edge case needs to be handle in a future story.
This commit is contained in:
Martyn Inglis
2016-03-21 13:24:37 +00:00
parent e2cfbce8c4
commit e0316d1881
10 changed files with 289 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/notifications/rest.py
View File

@@ -11,8 +11,8 @@ from flask import (
)
from utils.template import Template
from app.clients.sms.firetext import firetext_response_status
from app.clients.email.aws_ses import ses_response_status
from app.clients.sms.firetext import FiretextResponses
from app.clients.email.aws_ses import AwsSesResponses
from app import api_user, encryption, create_uuid, DATETIME_FORMAT, DATE_FORMAT
from app.authentication.auth import require_admin
from app.dao import (
@@ -34,6 +34,9 @@ from app.errors import register_errors
register_errors(notifications)
aws_response = AwsSesResponses()
firetext_response = FiretextResponses()
@notifications.route('/notifications/email/ses', methods=['POST'])
def process_ses_response():
@@ -57,35 +60,54 @@ def process_ses_response():
result="error", message="SES callback failed: notificationType missing"
), 400
status = ses_response_status.get(ses_message['notificationType'], None)
if not status:
try:
aws_response.response_code_to_object(ses_message['notificationType'])
except KeyError:
current_app.logger.info(
"SES callback failed: status {} not found.".format(status)
"SES callback failed: status {} not found.".format(ses_message['notificationType'])
)
return jsonify(
result="error",
message="SES callback failed: status {} not found".format(ses_message['notificationType'])
), 400
notification_status = aws_response.response_code_to_notification_status(ses_message['notificationType'])
notification_statistics_status = aws_response.response_code_to_notification_statistics_status(
ses_message['notificationType']
)
try:
source = ses_message['mail']['source']
if is_not_a_notification(source):
current_app.logger.info(
"SES callback for notify success:. source {} status {}".format(source, status['notify_status'])
"SES callback for notify success:. source {} status {}".format(source, notification_status)
)
return jsonify(
result="success", message="SES callback succeeded"
), 200
reference = ses_message['mail']['messageId']
if notifications_dao.update_notification_status_by_reference(reference, status['notify_status']) == 0:
if notifications_dao.update_notification_status_by_reference(
reference,
notification_status,
notification_statistics_status
) == 0:
current_app.logger.info(
"SES callback failed: notification not found. Status {}".format(status['notify_status'])
"SES callback failed: notification not found. Status {}".format(notification_status)
)
return jsonify(
result="error",
message="SES callback failed: notification not found. Status {}".format(status['notify_status'])
message="SES callback failed: notification not found. Status {}".format(notification_status)
), 404
if not aws_response.response_code_to_notification_success(ses_message['notificationType']):
current_app.logger.info(
"SES delivery failed: notification {} has error found. Status {}".format(
reference,
aws_response.response_code_to_message(ses_message['notificationType'])
)
)
return jsonify(
result="success", message="SES callback succeeded"
), 200
@@ -149,14 +171,22 @@ def process_firetext_response():
result="error", message="Firetext callback with invalid reference {}".format(reference)
), 400
notification_status = firetext_response_status.get(status, None)
if not notification_status:
try:
firetext_response.response_code_to_object(status)
except KeyError:
current_app.logger.info(
"Firetext callback failed: status {} not found.".format(status)
)
return jsonify(result="error", message="Firetext callback failed: status {} not found.".format(status)), 400
if notifications_dao.update_notification_status_by_id(reference, notification_status['notify_status']) == 0:
notification_status = firetext_response.response_code_to_notification_status(status)
notification_statistics_status = firetext_response.response_code_to_notification_statistics_status(status)
if notifications_dao.update_notification_status_by_id(
reference,
notification_status,
notification_statistics_status
) == 0:
current_app.logger.info(
"Firetext callback failed: notification {} not found. Status {}".format(reference, status)
)
@@ -164,15 +194,15 @@ def process_firetext_response():
result="error",
message="Firetext callback failed: notification {} not found. Status {}".format(
reference,
notification_status['firetext_message']
firetext_response.response_code_to_message(status)
)
), 404
if not notification_status['success']:
if not firetext_response.response_code_to_notification_success(status):
current_app.logger.info(
"Firetext delivery failed: notification {} has error found. Status {}".format(
reference,
firetext_response_status[status]['firetext_message']
FiretextResponses().response_code_to_message(status)
)
)
return jsonify(