mirror of
https://github.com/GSA/notifications-api.git
synced 2026-08-20 22:39:43 -04:00
Refactoring the send to provider code out of the tasks folder
- building a rest endpoint to call that code to compliment the existing task based approach.
This commit is contained in:
34
app/delivery/rest.py
Normal file
34
app/delivery/rest.py
Normal file
@@ -0,0 +1,34 @@
|
||||
from flask import Blueprint, jsonify
|
||||
|
||||
from app.delivery import send_to_providers
|
||||
from app.models import EMAIL_TYPE
|
||||
from app.celery import provider_tasks
|
||||
from sqlalchemy.orm.exc import NoResultFound
|
||||
|
||||
delivery = Blueprint('delivery', __name__)
|
||||
|
||||
from app.errors import (
|
||||
register_errors,
|
||||
InvalidRequest
|
||||
)
|
||||
|
||||
register_errors(delivery)
|
||||
|
||||
|
||||
@delivery.route('/deliver/notification/<uuid:notification_id>', methods=['POST'])
|
||||
def send_notification_to_provider(notification_type, notification_id):
|
||||
|
||||
if notification_type == EMAIL_TYPE:
|
||||
send_response(send_to_providers.send_email_response, provider_tasks.deliver_email, notification_id, 'send-email')
|
||||
else:
|
||||
send_response(send_to_providers.send_sms_response, provider_tasks.deliver_sms, notification_id, 'send-sms')
|
||||
return jsonify({}), 204
|
||||
|
||||
|
||||
def send_response(send_call, task_call, notification_id, queue):
|
||||
try:
|
||||
send_call(notification_id)
|
||||
except NoResultFound as e:
|
||||
raise InvalidRequest(e, status_code=404)
|
||||
except Exception as e:
|
||||
task_call.apply_async((str(notification_id)), queue=queue)
|
||||
@@ -20,10 +20,9 @@ from app.dao.templates_dao import dao_get_template_by_id
|
||||
from app.models import SMS_TYPE, KEY_TYPE_TEST, BRANDING_ORG, EMAIL_TYPE
|
||||
|
||||
|
||||
def send_sms_to_provider(notification_id):
|
||||
notification = get_notification_by_id(notification_id)
|
||||
def send_sms_to_provider(notification):
|
||||
service = dao_fetch_service_by_id(notification.service_id)
|
||||
provider = provider_to_use(SMS_TYPE, notification_id)
|
||||
provider = provider_to_use(SMS_TYPE, notification.id)
|
||||
if notification.status == 'created':
|
||||
template_model = dao_get_template_by_id(notification.template_id, notification.template_version)
|
||||
template = Template(
|
||||
@@ -33,7 +32,7 @@ def send_sms_to_provider(notification_id):
|
||||
)
|
||||
if service.research_mode or notification.key_type == KEY_TYPE_TEST:
|
||||
send_sms_response.apply_async(
|
||||
(provider.get_name(), str(notification_id), notification.to), queue='research-mode'
|
||||
(provider.get_name(), str(notification.id), notification.to), queue='research-mode'
|
||||
)
|
||||
notification.billable_units = 0
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user