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

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

5
app/v2/template/get_template.py
View File

@@ -1,7 +1,6 @@
from flask import jsonify
from jsonschema.exceptions import ValidationError
from app import api_user
from app import authenticated_service
from app.dao import templates_dao
from app.schema_validation import validate
from app.v2.template import v2_template_blueprint
@@ -18,6 +17,6 @@ def get_template_by_id(template_id, version=None):
data = validate(_data, get_template_by_id_request)
template = templates_dao.dao_get_template_by_id_and_service_id(
template_id, api_user.service_id, data.get('version'))
template_id, authenticated_service.id, data.get('version'))
return jsonify(template.serialize()), 200

6
app/v2/template/post_template.py
View File

@@ -1,9 +1,7 @@
from flask import jsonify, request
from jsonschema.exceptions import ValidationError
from app import api_user
from app import authenticated_service
from app.dao import templates_dao
from app.models import SMS_TYPE
from app.schema_validation import validate
from app.utils import get_template_instance
from app.v2.errors import BadRequestError
@@ -22,7 +20,7 @@ def post_template_preview(template_id):
data = validate(_data, post_template_preview_request)
template = templates_dao.dao_get_template_by_id_and_service_id(
template_id, api_user.service_id)
template_id, authenticated_service.id)
template_object = get_template_instance(
template.__dict__, values=data.get('personalisation'))