From 9d2cc354474cb09de923cee929f11b8de87904a7 Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Fri, 21 Oct 2022 16:36:26 +0400 Subject: [PATCH] Extracted InternalServer::handle_search_request() --- src/server/internalServer.cpp | 15 ++++++++++----- src/server/internalServer.h | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp index dd65d7e17..8d253fac0 100644 --- a/src/server/internalServer.cpp +++ b/src/server/internalServer.cpp @@ -813,6 +813,16 @@ std::unique_ptr InternalServer::handle_search(const RequestContext& re } try { + return handle_search_request(request); + } catch (const Error& e) { + return HTTP400Response(*this, request) + + invalidUrlMsg + + e.message(); + } +} + +std::unique_ptr InternalServer::handle_search_request(const RequestContext& request) +{ auto searchInfo = getSearchInfo(request); auto bookIds = searchInfo.getBookIds(); @@ -888,11 +898,6 @@ std::unique_ptr InternalServer::handle_search(const RequestContext& re } */ return std::move(response); - } catch (const Error& e) { - return HTTP400Response(*this, request) - + invalidUrlMsg - + e.message(); - } } std::unique_ptr InternalServer::handle_random(const RequestContext& request) diff --git a/src/server/internalServer.h b/src/server/internalServer.h index 02360443a..c3990c44d 100644 --- a/src/server/internalServer.h +++ b/src/server/internalServer.h @@ -134,6 +134,7 @@ class InternalServer { std::unique_ptr handle_catalog_v2_languages(const RequestContext& request); std::unique_ptr handle_catalog_v2_illustration(const RequestContext& request); std::unique_ptr handle_search(const RequestContext& request); + std::unique_ptr handle_search_request(const RequestContext& request); std::unique_ptr handle_suggest(const RequestContext& request); std::unique_ptr handle_random(const RequestContext& request); std::unique_ptr handle_catch(const RequestContext& request);