darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-05 08:28:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated to use client instead of dao

Browse Source
This commit is contained in:
Adam Shimali
2016-03-29 16:59:06 +01:00
parent 0bbe35cd7d
commit 08d4e13185
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/main/views/send.py
View File

@@ -26,8 +26,10 @@ from app.main.uploader import (
s3download s3download
) )
from app.main.dao import templates_dao from app.main.dao import templates_dao
from app.main.dao import services_dao from app import (
from app import job_api_client job_api_client,
service_api_client
)
from app.utils import user_has_permissions, get_errors_for_csv from app.utils import user_has_permissions, get_errors_for_csv
@@ -70,7 +72,7 @@ def get_page_headings(template_type):
admin_override=True, or_=True) admin_override=True, or_=True)
def choose_template(service_id, template_type): def choose_template(service_id, template_type):
service = services_dao.get_service_by_id_or_404(service_id) service = service_api_client.get_service(service_id)['data']
if template_type not in ['email', 'sms']: if template_type not in ['email', 'sms']:
abort(404) abort(404)
@@ -98,7 +100,7 @@ def choose_template(service_id, template_type):
@user_has_permissions('send_texts', 'send_emails', 'send_letters') @user_has_permissions('send_texts', 'send_emails', 'send_letters')
def send_messages(service_id, template_id): def send_messages(service_id, template_id):
service = services_dao.get_service_by_id_or_404(service_id) service = service_api_client.get_service(service_id)['data']
template = Template( template = Template(
templates_dao.get_service_template_or_404(service_id, template_id)['data'], templates_dao.get_service_template_or_404(service_id, template_id)['data'],
prefix=service['name'] prefix=service['name']
@@ -225,7 +227,7 @@ def check_messages(service_id, template_type, upload_id):
if not session.get('upload_data'): if not session.get('upload_data'):
return redirect(url_for('main.choose_template', service_id=service_id, template_type=template_type)) return redirect(url_for('main.choose_template', service_id=service_id, template_type=template_type))
service = services_dao.get_service_by_id_or_404(service_id) service = service_api_client.get_service(service_id)['data']
contents = s3download(service_id, upload_id) contents = s3download(service_id, upload_id)
if not contents: if not contents:
@@ -283,7 +285,7 @@ def check_messages(service_id, template_type, upload_id):
def start_job(service_id, upload_id): def start_job(service_id, upload_id):
upload_data = session['upload_data'] upload_data = session['upload_data']
services_dao.get_service_by_id_or_404(service_id) service = service_api_client.get_service(service_id)['data']
if request.files or not upload_data.get('valid'): if request.files or not upload_data.get('valid'):
# The csv was invalid, validate the csv again # The csv was invalid, validate the csv again