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

Update model and controller to handle parent_folder_id when creating a template.

Browse Source 
If the parent_folder_id then check if the folder exists and is for the same service. If it is add the folder to the template model object, the relationship will be persisted when the template is saved. If the folder does not exist or is for a different service, then return a ResultNotFound error.
This commit is contained in:
Rebecca Law
2018-11-07 12:48:56 +00:00
committed by Rebecca Law
parent 4849ecdf63
commit 1b0b16fa74
3 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/template/rest.py
View File

@@ -48,8 +48,14 @@ def _content_count_greater_than_limit(content, template_type):
return template.content_count > SMS_CHAR_COUNT_LIMIT
def validate_parent_folder(parent_folder_id, service_id):
return TemplateFolder.query.filter_by(service_id=service_id, id=parent_folder_id).one()
def validate_parent_folder(template_json):
if template_json.get("parent_folder_id"):
return TemplateFolder.query.filter_by(
service_id=template_json['service'],
id=template_json.pop("parent_folder_id")
).one()
else:
return None
@template_blueprint.route('', methods=['POST'])
@@ -58,8 +64,7 @@ def create_template(service_id):
# permissions needs to be placed here otherwise marshmallow will interfere with versioning
permissions = fetched_service.permissions
template_json = validate(request.get_json(), post_create_template_schema)
folder = validate_parent_folder(parent_folder_id=template_json['parent_folder_id'],
service_id=template_json['service'])
folder = validate_parent_folder(template_json=template_json)
new_template = Template.from_json(template_json, folder)
if not service_has_permission(new_template.template_type, permissions):