From fcbd3f91d14cd30931a53bd8e440859bd9002224 Mon Sep 17 00:00:00 2001 From: Kirill Volokh Date: Sat, 24 Feb 2024 17:41:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB?= =?UTF-8?q?=D0=BB=D0=B5=D1=80=D0=BE=D0=B2=20=D0=B8=20=D1=85=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=BB=D0=B8=D1=89=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/src/anomaly_logs/get.cpp | 7 ++-- .../src/anomaly_logs/update_cluster_id.cpp | 4 +- .../controllers/src/logs_clusters/create.cpp | 4 +- .../controllers/src/logs_clusters/get.cpp | 4 +- .../controllers/src/statistics/get.cpp | 4 +- .../server/src/details/controller_wrapper.h | 5 ++- log_analysis/server/src/details/details.cpp | 42 ++++++++++--------- log_analysis/server/src/details/details.h | 12 +++++- .../server/src/details/storage_wrapper.cpp | 2 +- .../storage/include/storage/storage.h | 10 ++--- .../storage/include/storage/transaction.h | 14 +++---- log_analysis/storage/src/storage.cpp | 10 +++-- log_analysis/storage/src/transaction.cpp | 21 ++++------ 13 files changed, 76 insertions(+), 63 deletions(-) diff --git a/log_analysis/controllers/src/anomaly_logs/get.cpp b/log_analysis/controllers/src/anomaly_logs/get.cpp index e9155c0..685d636 100644 --- a/log_analysis/controllers/src/anomaly_logs/get.cpp +++ b/log_analysis/controllers/src/anomaly_logs/get.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include "details/fields.h" @@ -12,13 +12,14 @@ json Get::operator()(const json& parameters) const { utils::CheckForRequiredFields(parameters, { fields::last_id }); // Создаём транзакцию - auto transaction = storage::Transaction::Create(); + auto transaction = storage::Storage::Get().CreateTransaction(); // Создаём модель data_models::AnomalyLogsModel anomaly_logs_model(transaction); // Запрашиваем логи - auto anomaly_logs = anomaly_logs_model.GetAll(parameters[fields::last_id]); + auto last_id = std::stoull(parameters[fields::last_id].get()); + auto anomaly_logs = anomaly_logs_model.GetAll(last_id); // Формируем ответ json result = json::array(); diff --git a/log_analysis/controllers/src/anomaly_logs/update_cluster_id.cpp b/log_analysis/controllers/src/anomaly_logs/update_cluster_id.cpp index 0648cef..b18278a 100644 --- a/log_analysis/controllers/src/anomaly_logs/update_cluster_id.cpp +++ b/log_analysis/controllers/src/anomaly_logs/update_cluster_id.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include "details/fields.h" @@ -12,7 +12,7 @@ json UpdateClusterId::operator()(const json& parameters) const { utils::CheckForRequiredFields(parameters, { fields::id, fields::cluster_id }); // Создаём транзакцию - auto transaction = storage::Transaction::Create(); + auto transaction = storage::Storage::Get().CreateTransaction(); // Создаём модель data_models::AnomalyLogsModel anomaly_logs_model(transaction); diff --git a/log_analysis/controllers/src/logs_clusters/create.cpp b/log_analysis/controllers/src/logs_clusters/create.cpp index 5db0ff1..35f089f 100644 --- a/log_analysis/controllers/src/logs_clusters/create.cpp +++ b/log_analysis/controllers/src/logs_clusters/create.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include "details/fields.h" @@ -12,7 +12,7 @@ json Create::operator()(const json& parameters) const { utils::CheckForRequiredFields(parameters, { fields::id, fields::name, fields::description, fields::recommendation }); // Создаём транзакцию - auto transaction = storage::Transaction::Create(); + auto transaction = storage::Storage::Get().CreateTransaction(); // Создаём модель data_models::LogsClustersModel logs_clusters_model(transaction); diff --git a/log_analysis/controllers/src/logs_clusters/get.cpp b/log_analysis/controllers/src/logs_clusters/get.cpp index d7579e5..9948cee 100644 --- a/log_analysis/controllers/src/logs_clusters/get.cpp +++ b/log_analysis/controllers/src/logs_clusters/get.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include "details/fields.h" @@ -8,7 +8,7 @@ using namespace controllers::logs_clusters; json Get::operator()(const json& parameters) const { // Создаём транзакцию - auto transaction = storage::Transaction::Create(); + auto transaction = storage::Storage::Get().CreateTransaction(); // Создаём модель data_models::LogsClustersModel logs_clusters_model(transaction); diff --git a/log_analysis/controllers/src/statistics/get.cpp b/log_analysis/controllers/src/statistics/get.cpp index edbe5da..0f64fed 100644 --- a/log_analysis/controllers/src/statistics/get.cpp +++ b/log_analysis/controllers/src/statistics/get.cpp @@ -1,12 +1,12 @@ #include #include -#include +#include using namespace controllers::statistics; json Get::operator()(const json& parameters) const { // Создаём транзакцию - auto transaction = storage::Transaction::Create(); + auto transaction = storage::Storage::Get().CreateTransaction(); // Создаём модель data_models::StatisticsModel statistics_model(transaction); diff --git a/log_analysis/server/src/details/controller_wrapper.h b/log_analysis/server/src/details/controller_wrapper.h index d7ef2cd..0674ee3 100644 --- a/log_analysis/server/src/details/controller_wrapper.h +++ b/log_analysis/server/src/details/controller_wrapper.h @@ -4,6 +4,8 @@ #include +#include + #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: diff --git a/log_analysis/server/src/details/details.cpp b/log_analysis/server/src/details/details.cpp index b99f2bb..6c546b1 100644 --- a/log_analysis/server/src/details/details.cpp +++ b/log_analysis/server/src/details/details.cpp @@ -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; diff --git a/log_analysis/server/src/details/details.h b/log_analysis/server/src/details/details.h index 0a36c9b..d1022a5 100644 --- a/log_analysis/server/src/details/details.h +++ b/log_analysis/server/src/details/details.h @@ -1,4 +1,9 @@ +#pragma once + +#include + #include +#include 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); } diff --git a/log_analysis/server/src/details/storage_wrapper.cpp b/log_analysis/server/src/details/storage_wrapper.cpp index c31dcf7..33a2d53 100644 --- a/log_analysis/server/src/details/storage_wrapper.cpp +++ b/log_analysis/server/src/details/storage_wrapper.cpp @@ -16,7 +16,7 @@ StorageWrapper::StorageWrapper(const userver::components::ComponentConfig& confi connection_data.host = config["host"].As(); connection_data.port = config["port"].As(); - storage::Storage::Connect(connection_data); + storage::Storage::Get().Connect(connection_data); } userver::yaml_config::Schema StorageWrapper::GetStaticConfigSchema() { diff --git a/log_analysis/storage/include/storage/storage.h b/log_analysis/storage/include/storage/storage.h index e26326a..f37c3db 100644 --- a/log_analysis/storage/include/storage/storage.h +++ b/log_analysis/storage/include/storage/storage.h @@ -3,8 +3,6 @@ #include #include -#include - #include namespace storage { @@ -22,11 +20,13 @@ namespace storage { /// @brief Подключение к хранилищу /// @param[in] connection_data Данных подключения - static void Connect(const ConnectionData& connection_data); + void Connect(const ConnectionData& connection_data); - friend class Transaction; + /// @brief Создание транзацкии + /// @returns Транзакция + Transaction CreateTransaction(); private: - std::unique_ptr connection_; ///< Соединение + std::string connection_data_; ///< Данные подключения }; } diff --git a/log_analysis/storage/include/storage/transaction.h b/log_analysis/storage/include/storage/transaction.h index 1ad3e91..7c411ac 100644 --- a/log_analysis/storage/include/storage/transaction.h +++ b/log_analysis/storage/include/storage/transaction.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include @@ -8,6 +9,9 @@ namespace storage { /// @brief Транзакция class Transaction { public: + /// @brief Конструктор + Transaction(const std::string& connection_data); + /// @brief Деструктор ~Transaction(); @@ -17,21 +21,13 @@ namespace storage { /// @brief Оператор перемещающего присваивания Transaction& operator=(Transaction&&) = default; - /// @brief Создание транзацкии - /// @pre Должно быть установлено соединение с хранилищем - /// @returns Транзакция - static Transaction Create(); - /// @brief Выполнение запроса /// @param[in] query Запрос /// @returns Результат выполнения pqxx::result Do(std::string_view query) const; private: - /// @brief Конструктор - Transaction() = default; - - private: + std::unique_ptr connection_; ///< Соединение std::unique_ptr transaction_; ///< Транзакция }; } diff --git a/log_analysis/storage/src/storage.cpp b/log_analysis/storage/src/storage.cpp index 2eae254..062f7a9 100644 --- a/log_analysis/storage/src/storage.cpp +++ b/log_analysis/storage/src/storage.cpp @@ -10,12 +10,16 @@ Storage& Storage::Get() { } void Storage::Connect(const ConnectionData& connection_data) { - std::ostringstream options; - options << "dbname = " << connection_data.database + std::ostringstream connection; + connection << "dbname = " << connection_data.database << " user = " << connection_data.username << " password = " << connection_data.password << " host = " << connection_data.host << " port = " << connection_data.port; - Get().connection_ = std::make_unique(options.str()); + connection_data_ = connection.str(); +} + +Transaction Storage::CreateTransaction() { + return { connection_data_ }; } diff --git a/log_analysis/storage/src/transaction.cpp b/log_analysis/storage/src/transaction.cpp index b6c8d2b..bf2489f 100644 --- a/log_analysis/storage/src/transaction.cpp +++ b/log_analysis/storage/src/transaction.cpp @@ -1,23 +1,20 @@ #include -#include #include using namespace storage; +Transaction::Transaction(const std::string& connection_data) + : connection_(std::make_unique(connection_data)) + , transaction_(std::make_unique(*connection_)) {} + Transaction::~Transaction() { - transaction_->commit(); -} - -Transaction Transaction::Create() { - auto& storage = storage::Storage::Get(); - - Transaction transaction; - transaction.transaction_ = std::make_unique(*storage.connection_); - - return transaction; + if (connection_ && transaction_) { + transaction_->commit(); + connection_->close(); + } } pqxx::result Transaction::Do(std::string_view query) const { return transaction_->exec(query); -} \ No newline at end of file +}