Обновление контроллеров и хранилища

This commit is contained in:
2024-02-24 17:41:17 +03:00
parent 393eb5844c
commit fcbd3f91d1
13 changed files with 76 additions and 63 deletions
@@ -4,6 +4,8 @@
#include <userver/server/handlers/http_handler_base.hpp>
#include <json/json.h>
#include "details.h"
#include "traits.h"
@@ -23,7 +25,8 @@ namespace server::details {
/// @param[in] context Контекст
/// @returns Ответ
std::string HandleRequestThrow(const userver::server::http::HttpRequest& request, userver::server::request::RequestContext&) const override {
return server::details::HandleRequest(controller_, request.RequestBody());
auto request_body = server::details::GetRequestBody(request);
return server::details::HandleRequest(controller_, request_body);
}
private:
+22 -20
View File
@@ -5,40 +5,42 @@
#include "fields.h"
namespace {
json HandleRequestImpl(const controllers::ControllerBase& controller, const std::string& request) {
using namespace server::details;
// Проверяем корректность формата запроса
auto json = ParseJson(request);
// Проверяем наличие необходимых ключей
utils::CheckForRequiredFields(json, { fields::parameters });
// Формируем и возвращаем ответ
auto parameters = json[fields::parameters];
return controller(parameters);
}
}
namespace server::details {
json ParseJson(const std::string& data) {
json json;
try {
json = json::parse(data);
} catch (const std::exception& e) {
throw std::runtime_error("failed to parse request");
throw std::runtime_error("failed to parse json, details: " + std::string(e.what()));
}
return json;
}
std::string HandleRequest(const controllers::ControllerBase& controller, const std::string& request) {
Logger::Get().Write(LogLevel::Info, "accepted request '" + request + "'");
json GetRequestBody(const userver::server::http::HttpRequest& request) {
json body;
if (!request.RequestBody().empty() && request.RequestBody() != "null") {
body = json::parse(request.RequestBody());
}
for (const auto& argument_name : request.ArgNames()) {
if (body.contains(argument_name)) {
throw std::runtime_error("body already has parameter '" + argument_name + "'");
}
body[argument_name] = request.GetArg(argument_name);
}
return body;
}
std::string HandleRequest(const controllers::ControllerBase& controller, const json& request) {
Logger::Get().Write(LogLevel::Info, "accepted request '" + request.dump() + "'");
json result;
try {
result = HandleRequestImpl(controller, request);
result = controller(request);
}
catch (const std::exception& e) {
json json;
+11 -1
View File
@@ -1,4 +1,9 @@
#pragma once
#include <userver/server/http/http_request.hpp>
#include <controllers/controller_base.h>
#include <json/json.h>
namespace server::details {
/// @brief Парсинг строки в json
@@ -7,9 +12,14 @@ namespace server::details {
/// @returns json
json ParseJson(const std::string& data);
/// @brief Получение тела запроса
/// @param[in] request Запрос
/// @returns Тело запроса
json GetRequestBody(const userver::server::http::HttpRequest& request);
/// @brief Обработка запроса
/// @param[in] controller Контроллер
/// @param[in] request Запрос
/// @returns Ответ
std::string HandleRequest(const controllers::ControllerBase& controller, const std::string& request);
std::string HandleRequest(const controllers::ControllerBase& controller, const json& request);
}
@@ -16,7 +16,7 @@ StorageWrapper::StorageWrapper(const userver::components::ComponentConfig& confi
connection_data.host = config["host"].As<std::string>();
connection_data.port = config["port"].As<std::string>();
storage::Storage::Connect(connection_data);
storage::Storage::Get().Connect(connection_data);
}
userver::yaml_config::Schema StorageWrapper::GetStaticConfigSchema() {