From 562d420a9553385df92e121b6c93195462f6a6b9 Mon Sep 17 00:00:00 2001 From: Keiran Price Date: Mon, 30 Sep 2019 10:49:28 +0100 Subject: [PATCH] Revert "#39: Handle exception and send response" This reverts commit b755af3d18feef84241d655699a76172cc8e1a09. --- common/database_helpers.py | 2 +- common/helpers.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/common/database_helpers.py b/common/database_helpers.py index 1d9857d6..5127f0be 100644 --- a/common/database_helpers.py +++ b/common/database_helpers.py @@ -224,7 +224,7 @@ def __init__(self, included_filters): def apply_filter(self, query): <<<<<<< HEAD if not query.include_related_entities: - query.include_related_entities = True + query.include_related_entities = True else: raise MultipleIncludeError("Attempted multiple includes on a single query") ======= diff --git a/common/helpers.py b/common/helpers.py index a9ef36dd..bd7ac32b 100644 --- a/common/helpers.py +++ b/common/helpers.py @@ -8,7 +8,7 @@ from common.database_helpers import QueryFilterFactory from common.exceptions import MissingRecordError, BadFilterError, AuthenticationError, BadRequestError, \ - MissingCredentialsError, MultipleIncludeError + MissingCredentialsError from common.models.db_models import SESSION from common.session_manager import session_manager @@ -63,9 +63,6 @@ def wrapper_gets_records(*args, **kwargs): except MissingRecordError as e: log.exception(e) return "No such record in table", 404 - except MultipleIncludeError as e: - log.exception(e) - return "Bad request, only one include filter may be given per request", 400 except BadFilterError as e: log.exception(e) return "Invalid filter requested", 400 @@ -81,6 +78,7 @@ def wrapper_gets_records(*args, **kwargs): except BadRequestError as e: log.exception(e) return "Bad request", 400 + return wrapper_gets_records