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

change aborts to invalidrequest exceptions

Browse Source
This commit is contained in:
Leo Hemsted
2018-11-08 17:21:58 +00:00
parent d9aa220aa6
commit 98de2591a7
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/template_folder/rest.py
View File

@@ -111,18 +111,20 @@ def move_to_template_folder(service_id, target_template_folder_id=None):
try: try:
template_folder = dao_get_template_folder_by_id_and_service_id(template_folder_id, service_id) template_folder = dao_get_template_folder_by_id_and_service_id(template_folder_id, service_id)
except NoResultFound: except NoResultFound:
current_app.logger.error('Could not move to folder: No folder found with id {} for service {}'.format( msg = 'Could not move to folder: No folder found with id {} for service {}'.format(
template_folder_id, template_folder_id,
service_id service_id
)) )
abort(400) current_app.logger.error(msg)
raise InvalidRequest(msg, status_code=400)
if target_template_folder and template_folder.is_parent_of(target_template_folder): if target_template_folder and template_folder.is_parent_of(target_template_folder):
current_app.logger.error('Could not move to folder: {} is an ancestor of target folder {}'.format( msg = 'Could not move to folder: {} is an ancestor of target folder {}'.format(
template_folder_id, template_folder_id,
target_template_folder_id target_template_folder_id
)) )
abort(400) current_app.logger.error(msg)
raise InvalidRequest(msg, status_code=400)
template_folder.parent = target_template_folder template_folder.parent = target_template_folder
@@ -130,11 +132,12 @@ def move_to_template_folder(service_id, target_template_folder_id=None):
try: try:
template = dao_get_template_by_id_and_service_id(template_id, service_id) template = dao_get_template_by_id_and_service_id(template_id, service_id)
except NoResultFound: except NoResultFound:
current_app.logger.error('Could not move to folder: No template found with id {} for service {}'.format( msg = 'Could not move to folder: No template found with id {} for service {}'.format(
template_id, template_id,
service_id service_id
)) )
abort(400) current_app.logger.error(msg)
raise InvalidRequest(msg, status_code=400)
if template.archived: if template.archived:
current_app.logger.error('Could not move to folder: Template {} is archived. (Skipping)'.format( current_app.logger.error('Could not move to folder: Template {} is archived. (Skipping)'.format(