darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-02 17:48:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove all DAO get service calls, replaced with reference to new service object in context.

Browse Source
This commit is contained in:
Martyn Inglis
2017-05-05 15:23:06 +01:00
parent 064b7436db
commit 0e38259cb4
6 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/v2/notifications/get_notifications.py
View File

@@ -3,7 +3,7 @@ import uuid
from flask import jsonify, request, url_for, current_app
from werkzeug.exceptions import abort
from app import api_user
from app import api_user, authenticated_service
from app.dao import notifications_dao
from app.schema_validation import validate
from app.v2.notifications import v2_notification_blueprint
@@ -17,7 +17,7 @@ def get_notification_by_id(id):
except ValueError or AttributeError:
abort(404)
notification = notifications_dao.get_notification_with_personalisation(
api_user.service_id, casted_id, key_type=None
authenticated_service.id, casted_id, key_type=None
)
return jsonify(notification.serialize()), 200
@@ -38,7 +38,7 @@ def get_notifications():
data = validate(_data, get_notifications_request)
paginated_notifications = notifications_dao.get_notifications_for_service(
str(api_user.service_id),
str(authenticated_service.id),
filter_dict=data,
key_type=api_user.key_type,
personalisation=True,

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

@@ -1,7 +1,7 @@
from flask import request, jsonify, current_app
from sqlalchemy.orm.exc import NoResultFound
from app import api_user
from app import api_user, authenticated_service
from app.dao import services_dao, templates_dao
from app.models import SMS_TYPE, EMAIL_TYPE, PRIORITY
from app.notifications.process_notifications import (
@@ -32,17 +32,15 @@ def post_notification(notification_type):
else:
form = validate(request.get_json(), post_sms_request)
service = services_dao.dao_fetch_service_by_id(api_user.service_id)
check_rate_limiting(service, api_user)
check_rate_limiting(authenticated_service, api_user)
form_send_to = form['phone_number'] if notification_type == SMS_TYPE else form['email_address']
send_to = validate_and_format_recipient(send_to=form_send_to,
key_type=api_user.key_type,
service=service,
service=authenticated_service,
notification_type=notification_type)
template, template_with_content = __validate_template(form, service, notification_type)
template, template_with_content = __validate_template(form, authenticated_service, notification_type)
# Do not persist or send notification to the queue if it is a simulated recipient
simulated = simulated_recipient(send_to, notification_type)
@@ -50,7 +48,7 @@ def post_notification(notification_type):
notification = persist_notification(template_id=template.id,
template_version=template.version,
recipient=form_send_to,
service=service,
service=authenticated_service,
personalisation=form.get('personalisation', None),
notification_type=notification_type,
api_key_id=api_user.id,
@@ -60,23 +58,32 @@ def post_notification(notification_type):
if not simulated:
queue_name = 'priority' if template.process_type == PRIORITY else None
send_notification_to_queue(notification=notification, research_mode=service.research_mode, queue=queue_name)
send_notification_to_queue(
notification=notification,
research_mode=authenticated_service.research_mode,
queue=queue_name
)
else:
current_app.logger.info("POST simulated notification for id: {}".format(notification.id))
if notification_type == SMS_TYPE:
sms_sender = service.sms_sender if service.sms_sender else current_app.config.get('FROM_NUMBER')
sms_sender = (authenticated_service.sms_sender
if authenticated_service.sms_sender
else current_app.config.get('FROM_NUMBER')
)
resp = create_post_sms_response_from_notification(notification=notification,
body=str(template_with_content),
from_number=sms_sender,
url_root=request.url_root,
service_id=service.id)
service_id=authenticated_service.id)
else:
resp = create_post_email_response_from_notification(notification=notification,
content=str(template_with_content),
subject=template_with_content.subject,
email_from=service.email_from,
email_from=authenticated_service.email_from,
url_root=request.url_root,
service_id=service.id)
service_id=authenticated_service.id)
return jsonify(resp), 201