darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 18:01:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor send notification into one route

Browse Source 
Using a URL parameter means that sending a notification can be done in one
route, rather than two separate routes and an extra method.

This commit also refactors that one remaining method to be shorter/cleaner/more
readable (or I think so anyway).

No functional changes in this commit.
This commit is contained in:
Chris Hill-Scott
2016-02-29 11:03:48 +00:00
parent a2b1dc0432
commit 68f31c6f84
1 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/notifications/rest.py
View File

@@ -8,6 +8,8 @@ from flask import (
url_for url_for
) )
from utils.template import Template
from app import api_user, encryption, create_uuid from app import api_user, encryption, create_uuid
from app.authentication.auth import require_admin from app.authentication.auth import require_admin
from app.dao import ( from app.dao import (
@@ -29,9 +31,6 @@ from app.errors import register_errors
register_errors(notifications) register_errors(notifications)
SMS_NOTIFICATION = 'sms'
EMAIL_NOTIFICATION = 'email'
@notifications.route('/notifications/<string:notification_id>', methods=['GET']) @notifications.route('/notifications/<string:notification_id>', methods=['GET'])
def get_notifications(notification_id): def get_notifications(notification_id):
@@ -122,32 +121,24 @@ def pagination_links(pagination, endpoint, args):
return links return links
@notifications.route('/notifications/sms', methods=['POST']) @notifications.route('/notifications/<string:notification_type>', methods=['POST'])
def create_sms_notification():
return send_notification(notification_type=SMS_NOTIFICATION)
@notifications.route('/notifications/email', methods=['POST'])
def create_email_notification():
return send_notification(notification_type=EMAIL_NOTIFICATION)
def send_notification(notification_type): def send_notification(notification_type):
assert notification_type if notification_type not in ['sms', 'email']:
assert False
service_id = api_user['client'] service_id = api_user['client']
schema = sms_template_notification_schema if notification_type is SMS_NOTIFICATION else email_notification_schema notification, errors = (
sms_template_notification_schema if notification_type == 'sms' else email_notification_schema
).load(request.get_json())
notification, errors = schema.load(request.get_json())
if errors: if errors:
return jsonify(result="error", message=errors), 400 return jsonify(result="error", message=errors), 400
template = templates_dao.dao_get_template_by_id_and_service_id( template = Template(templates_dao.dao_get_template_by_id_and_service_id(
template_id=notification['template'], template_id=notification['template'],
service_id=service_id service_id=service_id
) ))
if not template: if not template:
return jsonify( return jsonify(
result="error", result="error",
@@ -157,33 +148,28 @@ def send_notification(notification_type):
), 404 ), 404
service = services_dao.dao_fetch_service_by_id(api_user['client']) service = services_dao.dao_fetch_service_by_id(api_user['client'])
if service.restricted:
if notification_type is SMS_NOTIFICATION:
if notification['to'] not in [user.mobile_number for user in service.users]:
return jsonify(
result="error", message={'to': ['Invalid phone number for restricted service']}), 400
else:
if notification['to'] not in [user.email_address for user in service.users]:
return jsonify(
result="error", message={'to': ['Email address not permitted for restricted service']}), 400
notification_id = create_uuid() notification_id = create_uuid()
if notification_type is SMS_NOTIFICATION: if notification_type == 'sms':
if service.restricted and notification['to'] not in [user.mobile_number for user in service.users]:
return jsonify(
result="error", message={'to': ['Invalid phone number for restricted service']}), 400
send_sms.apply_async(( send_sms.apply_async((
service_id, service_id,
notification_id, notification_id,
encryption.encrypt(notification), encryption.encrypt(notification),
str(datetime.utcnow())), str(datetime.utcnow())
queue='sms') ), queue='sms')
else: else:
if service.restricted and notification['to'] not in [user.email_address for user in service.users]:
return jsonify(
result="error", message={'to': ['Email address not permitted for restricted service']}), 400
send_email.apply_async(( send_email.apply_async((
service_id, service_id,
notification_id, notification_id,
template.subject, template.subject,
"{}@{}".format(service.email_from, current_app.config['NOTIFY_EMAIL_DOMAIN']), "{}@{}".format(service.email_from, current_app.config['NOTIFY_EMAIL_DOMAIN']),
encryption.encrypt(notification), encryption.encrypt(notification),
str(datetime.utcnow())), str(datetime.utcnow())
queue='email') ), queue='email')
return jsonify({'notification_id': notification_id}), 201 return jsonify({'notification_id': notification_id}), 201