darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 16:01:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use query to get TemplateFolder by id and service_id

Browse Source
This commit is contained in:
Rebecca Law
2018-11-07 16:34:51 +00:00
parent 1b0b16fa74
commit 1e5b990069
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/template/rest.py
View File

@@ -15,6 +15,7 @@ from requests import post as requests_post
from app.dao.notifications_dao import get_notification_by_id from app.dao.notifications_dao import get_notification_by_id
from app.dao.services_dao import dao_fetch_service_by_id from app.dao.services_dao import dao_fetch_service_by_id
from app.dao.template_folder_dao import dao_get_template_folder_by_id_and_service_id
from app.dao.templates_dao import ( from app.dao.templates_dao import (
dao_update_template, dao_update_template,
dao_create_template, dao_create_template,
@@ -29,7 +30,7 @@ from app.errors import (
InvalidRequest InvalidRequest
) )
from app.letters.utils import get_letter_pdf from app.letters.utils import get_letter_pdf
from app.models import SMS_TYPE, Template, TemplateFolder from app.models import SMS_TYPE, Template
from app.notifications.validators import service_has_permission, check_reply_to from app.notifications.validators import service_has_permission, check_reply_to
from app.schema_validation import validate from app.schema_validation import validate
from app.schemas import (template_schema, template_history_schema) from app.schemas import (template_schema, template_history_schema)
@@ -50,10 +51,8 @@ def _content_count_greater_than_limit(content, template_type):
def validate_parent_folder(template_json): def validate_parent_folder(template_json):
if template_json.get("parent_folder_id"): if template_json.get("parent_folder_id"):
return TemplateFolder.query.filter_by( return dao_get_template_folder_by_id_and_service_id(template_folder_id=template_json.pop("parent_folder_id"),
service_id=template_json['service'], service_id=template_json['service'])
id=template_json.pop("parent_folder_id")
).one()
else: else:
return None return None