From 4043250ca5a19d20f92ad8ac9d0950af7e41a7df Mon Sep 17 00:00:00 2001 From: Kirill Volokh Date: Wed, 21 Feb 2024 11:45:29 +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=20cpp-=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cpp-server/CMakeLists.txt | 3 +- cpp-server/controllers/CMakeLists.txt | 1 + .../controllers/anomaly_logs/details/fields.h | 17 ++++++ .../controllers/anomaly_logs/details/query.h | 14 +++++ .../include/controllers/anomaly_logs/fields.h | 8 --- .../include/controllers/anomaly_logs/get.h | 17 ++++++ .../include/controllers/anomaly_logs/query.h | 11 ---- .../controllers/anomaly_logs_controller.h | 15 ----- .../include/controllers/controller_base.h | 42 ++++++++------ .../include/controllers/dispatcher.h | 56 +++++++++---------- .../controllers/include/controllers/fields.h | 15 ----- .../include/controllers/implementation.h | 17 ------ .../controllers/logs_classes/details/fields.h | 12 ++++ .../controllers/logs_classes/details/query.h | 14 +++++ .../include/controllers/logs_classes/get.h | 17 ++++++ .../include/controllers/logs_classes/put.h | 17 ++++++ .../controllers/statistics/details/query.h | 13 +++++ .../include/controllers/statistics/fields.h | 9 --- .../include/controllers/statistics/get.h | 17 ++++++ .../controllers/statistics/implementation.h | 27 --------- .../include/controllers/statistics/query.h | 11 ---- .../controllers/statistics_controller.h | 15 ----- .../src/anomaly_logs/details/query.cpp | 28 ++++++++++ .../controllers/src/anomaly_logs/get.cpp | 28 ++++++++++ .../controllers/src/anomaly_logs/query.cpp | 21 ------- .../src/anomaly_logs_controller.cpp | 21 ------- .../controllers/src/controller_base.cpp | 15 ++++- cpp-server/controllers/src/dispatcher.cpp | 51 +---------------- cpp-server/controllers/src/implementation.cpp | 24 -------- .../src/logs_classes/details/query.cpp | 28 ++++++++++ .../controllers/src/logs_classes/get.cpp | 27 +++++++++ .../controllers/src/logs_classes/put.cpp | 24 ++++++++ .../src/statistics/details/query.cpp | 23 ++++++++ cpp-server/controllers/src/statistics/get.cpp | 17 ++++++ .../controllers/src/statistics/query.cpp | 21 ------- .../controllers/src/statistics_controller.cpp | 16 ------ .../server/details/controller_invoker.h | 14 +++++ .../server/include/server/details/details.h | 11 ++++ .../server/include/server/details/fields.h | 17 ++++++ cpp-server/server/include/server/server.h | 15 ++++- .../include/server/websockets_handler.h | 6 +- .../server/src/details/controller_invoker.cpp | 49 ++++++++++++++++ cpp-server/server/src/details/details.cpp | 28 ++++++++++ cpp-server/server/src/main.cpp | 16 ++---- cpp-server/server/src/server.cpp | 17 +++--- cpp-server/server/src/websockets_handler.cpp | 8 +-- cpp-server/sql/tables.sql | 25 +++++++++ cpp-server/utils/CMakeLists.txt | 11 ++++ cpp-server/utils/include/utils/utils.h | 12 ++++ cpp-server/utils/src/utils.cpp | 14 +++++ 50 files changed, 597 insertions(+), 358 deletions(-) create mode 100644 cpp-server/controllers/include/controllers/anomaly_logs/details/fields.h create mode 100644 cpp-server/controllers/include/controllers/anomaly_logs/details/query.h delete mode 100644 cpp-server/controllers/include/controllers/anomaly_logs/fields.h create mode 100644 cpp-server/controllers/include/controllers/anomaly_logs/get.h delete mode 100644 cpp-server/controllers/include/controllers/anomaly_logs/query.h delete mode 100644 cpp-server/controllers/include/controllers/anomaly_logs_controller.h delete mode 100644 cpp-server/controllers/include/controllers/fields.h delete mode 100644 cpp-server/controllers/include/controllers/implementation.h create mode 100644 cpp-server/controllers/include/controllers/logs_classes/details/fields.h create mode 100644 cpp-server/controllers/include/controllers/logs_classes/details/query.h create mode 100644 cpp-server/controllers/include/controllers/logs_classes/get.h create mode 100644 cpp-server/controllers/include/controllers/logs_classes/put.h create mode 100644 cpp-server/controllers/include/controllers/statistics/details/query.h delete mode 100644 cpp-server/controllers/include/controllers/statistics/fields.h create mode 100644 cpp-server/controllers/include/controllers/statistics/get.h delete mode 100644 cpp-server/controllers/include/controllers/statistics/implementation.h delete mode 100644 cpp-server/controllers/include/controllers/statistics/query.h delete mode 100644 cpp-server/controllers/include/controllers/statistics_controller.h create mode 100644 cpp-server/controllers/src/anomaly_logs/details/query.cpp create mode 100644 cpp-server/controllers/src/anomaly_logs/get.cpp delete mode 100644 cpp-server/controllers/src/anomaly_logs/query.cpp delete mode 100644 cpp-server/controllers/src/anomaly_logs_controller.cpp delete mode 100644 cpp-server/controllers/src/implementation.cpp create mode 100644 cpp-server/controllers/src/logs_classes/details/query.cpp create mode 100644 cpp-server/controllers/src/logs_classes/get.cpp create mode 100644 cpp-server/controllers/src/logs_classes/put.cpp create mode 100644 cpp-server/controllers/src/statistics/details/query.cpp create mode 100644 cpp-server/controllers/src/statistics/get.cpp delete mode 100644 cpp-server/controllers/src/statistics/query.cpp delete mode 100644 cpp-server/controllers/src/statistics_controller.cpp create mode 100644 cpp-server/server/include/server/details/controller_invoker.h create mode 100644 cpp-server/server/include/server/details/details.h create mode 100644 cpp-server/server/include/server/details/fields.h create mode 100644 cpp-server/server/src/details/controller_invoker.cpp create mode 100644 cpp-server/server/src/details/details.cpp create mode 100644 cpp-server/sql/tables.sql create mode 100644 cpp-server/utils/CMakeLists.txt create mode 100644 cpp-server/utils/include/utils/utils.h create mode 100644 cpp-server/utils/src/utils.cpp diff --git a/cpp-server/CMakeLists.txt b/cpp-server/CMakeLists.txt index 316b5e6..9bff14f 100644 --- a/cpp-server/CMakeLists.txt +++ b/cpp-server/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) cmake_policy(SET CMP0077 NEW) set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) -# Проект Traffic Analysis. Названия CMake-таргетов имеют префикс "ta_" (первые буквы слов в названии проекта) +# Проект Log Analysis. Названия CMake-таргетов имеют префикс "la_" (первые буквы слов в названии проекта) project(traffic_analysis) # Указываем переменные @@ -18,3 +18,4 @@ add_subdirectory(controllers) add_subdirectory(json) add_subdirectory(server) add_subdirectory(storage) +add_subdirectory(utils) diff --git a/cpp-server/controllers/CMakeLists.txt b/cpp-server/controllers/CMakeLists.txt index 6b69454..c6a01b6 100644 --- a/cpp-server/controllers/CMakeLists.txt +++ b/cpp-server/controllers/CMakeLists.txt @@ -14,4 +14,5 @@ target_include_directories(${PROJECT_NAME} PUBLIC include) target_link_libraries(${PROJECT_NAME} la_json la_storage + la_utils ) diff --git a/cpp-server/controllers/include/controllers/anomaly_logs/details/fields.h b/cpp-server/controllers/include/controllers/anomaly_logs/details/fields.h new file mode 100644 index 0000000..704d7ab --- /dev/null +++ b/cpp-server/controllers/include/controllers/anomaly_logs/details/fields.h @@ -0,0 +1,17 @@ +#pragma once + +#include + +namespace controllers::anomaly_logs::fields { + /// @defgroup Поля запроса + /// @{ + constexpr std::string_view last_index = "last_index"; + /// @} + + /// @defgroup Поля ответа + /// @{ + constexpr std::string_view id = "id"; + constexpr std::string_view class_id = "class_id"; + constexpr std::string_view data = "data"; + /// @} +} diff --git a/cpp-server/controllers/include/controllers/anomaly_logs/details/query.h b/cpp-server/controllers/include/controllers/anomaly_logs/details/query.h new file mode 100644 index 0000000..d9e3fc8 --- /dev/null +++ b/cpp-server/controllers/include/controllers/anomaly_logs/details/query.h @@ -0,0 +1,14 @@ +#pragma once + +#include +#include + +namespace controllers::anomaly_logs::details { + struct AnomalyLogRow { + int64_t id; + int64_t class_id; + std::string data; + }; + + std::vector AnomalyLogsQuery(int64_t last_id); +} diff --git a/cpp-server/controllers/include/controllers/anomaly_logs/fields.h b/cpp-server/controllers/include/controllers/anomaly_logs/fields.h deleted file mode 100644 index 6a74dc3..0000000 --- a/cpp-server/controllers/include/controllers/anomaly_logs/fields.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -namespace fields::anomaly_logs { - /// @defgroup Поля запроса anomaly_logs - /// @{ - constexpr const char* last_index = "last_index"; - /// @} -} diff --git a/cpp-server/controllers/include/controllers/anomaly_logs/get.h b/cpp-server/controllers/include/controllers/anomaly_logs/get.h new file mode 100644 index 0000000..245c97c --- /dev/null +++ b/cpp-server/controllers/include/controllers/anomaly_logs/get.h @@ -0,0 +1,17 @@ +#pragma once + +#include + +namespace controllers::anomaly_logs { + /// @brief Контроллер для обработки запроса получения аномальных логов + class Get : public ControllerBase { + public: + /// @brief Конструктор + explicit Get(); + + /// @brief Оператор вызова + /// @param[in] parameters Параметры + /// @returns Ответ + json operator()(const json& parameters) const override; + }; +} diff --git a/cpp-server/controllers/include/controllers/anomaly_logs/query.h b/cpp-server/controllers/include/controllers/anomaly_logs/query.h deleted file mode 100644 index 353cbbf..0000000 --- a/cpp-server/controllers/include/controllers/anomaly_logs/query.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include -#include - -struct AnomalyLogRow { - int64_t index; - std::string data; -}; - -std::vector AnomalyLogsQuery(int64_t last_index); diff --git a/cpp-server/controllers/include/controllers/anomaly_logs_controller.h b/cpp-server/controllers/include/controllers/anomaly_logs_controller.h deleted file mode 100644 index dcf0724..0000000 --- a/cpp-server/controllers/include/controllers/anomaly_logs_controller.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -/// @brief Контроллер для обработки запроса получения аномальных логов -class AnomalyLogsController : public ControllerBase { -public: - /// @brief Конструктор - explicit AnomalyLogsController(); - - /// @brief Оператор вызова - /// @param[in] parameters Параметры - /// @returns Ответ - json operator()(const json& parameters) const override; -}; diff --git a/cpp-server/controllers/include/controllers/controller_base.h b/cpp-server/controllers/include/controllers/controller_base.h index 7ad3298..76bbf3d 100644 --- a/cpp-server/controllers/include/controllers/controller_base.h +++ b/cpp-server/controllers/include/controllers/controller_base.h @@ -4,24 +4,32 @@ #include -class ControllerBase { -public: - /// @brief Конструктор - /// @param[in] name Название контроллера - explicit ControllerBase(std::string name); +namespace controllers { + class ControllerBase { + public: + /// @brief Конструктор + /// @param[in] resource Ресурс контроллера + /// @param[in] operation Операция контроллера + explicit ControllerBase(std::string resource, std::string operation); - /// @brief Деструктор - virtual ~ControllerBase() = default; + /// @brief Деструктор + virtual ~ControllerBase() = default; - /// @brief Получение названия контроллера - /// @returns Название контроллера - [[nodiscard]] const std::string& Name() const; + /// @brief Получение ресурса контроллера + /// @returns Ресурс контроллера + [[nodiscard]] const std::string& Resource() const; - /// @brief Вызов логики контроллера - /// @param[in] parameters Параметры - /// @returns Ответ контроллера - virtual json operator()(const json& parameters) const = 0; + /// @brief Получение Ресурса контроллера + /// @returns Ресурс контроллера + [[nodiscard]] const std::string& Operation() const; -protected: - std::string name_; ///< Название контроллера -}; \ No newline at end of file + /// @brief Вызов логики контроллера + /// @param[in] parameters Параметры + /// @returns Ответ контроллера + virtual json operator()(const json& parameters) const = 0; + + protected: + std::string resource_; ///< Ресурс контроллера + std::string operation_; ///< Операция контроллера + }; +} diff --git a/cpp-server/controllers/include/controllers/dispatcher.h b/cpp-server/controllers/include/controllers/dispatcher.h index 944c0f0..3158703 100644 --- a/cpp-server/controllers/include/controllers/dispatcher.h +++ b/cpp-server/controllers/include/controllers/dispatcher.h @@ -4,37 +4,33 @@ #include #include -#include -/// @brief Диспетчер контроллеров. Отвечает за передачу запроса нужному контроллеру -class Dispatcher { -public: - /// @brief Конструктор - Dispatcher() = default; +namespace controllers { + /// @brief Диспетчер контроллеров. Отвечает за передачу запроса нужному контроллеру + class Dispatcher { + public: + using Controllers = std::unordered_map>; + + /// @brief Конструктор + Dispatcher() = default; + + /// @brief Добавление контроллера + /// @tparam Controller Тип контроллера + template + void AddController(); + + /// @brief Получение контроллеров + /// @returns Контроллеры + const Controllers& GetControllers() const; + + private: + Controllers controllers_; ///< Контроллеры + }; - /// @brief Добавление контроллера - /// @tparam Controller Тип контроллера template - void AddController(); - - /// @brief Обработка запроса - /// @param[in] request Тело запроса - /// @returns Тело ответа - std::string operator()(const char* request) const; - -private: - /// @brief Реализация обработки запроса - /// @param[in] request Тело запроса - /// @returns Тело ответа - json CallImpl(const char* request, std::string& command) const; - -private: - std::unordered_map> controllers_; ///< Контроллеры -}; - -template -void Dispatcher::AddController() { - auto controller = std::make_unique(); - auto name = controller->Name(); - controllers_.insert({ std::move(name), std::move(controller) }); + void Dispatcher::AddController() { + auto controller = std::make_unique(); + std::string path = '/' + controller->Resource() + '/' + controller->Operation(); + controllers_.insert({ std::move(path), std::move(controller) }); + } } diff --git a/cpp-server/controllers/include/controllers/fields.h b/cpp-server/controllers/include/controllers/fields.h deleted file mode 100644 index 1adbb56..0000000 --- a/cpp-server/controllers/include/controllers/fields.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -/// @brief Поля запроса -namespace fields::request { - static const char* command = "command"; ///< Название команды / Название контроллера - static const char* parameters = "parameters"; ///< Параметры -} - -/// @brief Поля ответа -namespace fields::response { - static const char* command = "command"; ///< Название команды / Название контроллера - static const char* status = "status"; ///< Статус ответа (ok/error) - static const char* result = "result"; ///< Результат (в случае статуса ok) - static const char* error_message = "error_message"; ///< Сообщение об ошибке (в случае статуса error) -} diff --git a/cpp-server/controllers/include/controllers/implementation.h b/cpp-server/controllers/include/controllers/implementation.h deleted file mode 100644 index ad847de..0000000 --- a/cpp-server/controllers/include/controllers/implementation.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include - -#include - -/// @brief Парсинг строки в json -/// @param[in] data Строка -/// @throws std::runtime_error В случае ошибки парсинга (например, некорректный формат) -/// @returns json -json ParseJson(const char* data); - -/// @brief Проверка наличия необходимых ключей -/// @param[in] json Объект, который надо проверить -/// @param[in] fields Необходимые ключи -/// @throws std::runtime_error В случае отсутствия хотя бы одного ключа -void CheckForRequiredFields(const json& json, std::initializer_list fields); diff --git a/cpp-server/controllers/include/controllers/logs_classes/details/fields.h b/cpp-server/controllers/include/controllers/logs_classes/details/fields.h new file mode 100644 index 0000000..a09fa34 --- /dev/null +++ b/cpp-server/controllers/include/controllers/logs_classes/details/fields.h @@ -0,0 +1,12 @@ +#pragma once + +#include + +namespace controllers::logs_classes::fields { + /// @defgroup Поля ответа + /// @{ + constexpr std::string_view id = "id"; + constexpr std::string_view name = "name"; + constexpr std::string_view description = "description"; + /// @} +} diff --git a/cpp-server/controllers/include/controllers/logs_classes/details/query.h b/cpp-server/controllers/include/controllers/logs_classes/details/query.h new file mode 100644 index 0000000..905f2c7 --- /dev/null +++ b/cpp-server/controllers/include/controllers/logs_classes/details/query.h @@ -0,0 +1,14 @@ +#pragma once + +#include +#include + +namespace controllers::logs_classes::details { + struct LogsClassesRow { + int64_t id; + std::string name; + std::string description; + }; + + std::vector LogsClassesQuery(); +} diff --git a/cpp-server/controllers/include/controllers/logs_classes/get.h b/cpp-server/controllers/include/controllers/logs_classes/get.h new file mode 100644 index 0000000..2179df0 --- /dev/null +++ b/cpp-server/controllers/include/controllers/logs_classes/get.h @@ -0,0 +1,17 @@ +#pragma once + +#include + +namespace controllers::logs_classes { + /// @brief Контроллер для обработки запроса получения классов логов + class Get : public ControllerBase { + public: + /// @brief Конструктор + explicit Get(); + + /// @brief Оператор вызова + /// @param[in] parameters Параметры + /// @returns Ответ + json operator()(const json& parameters) const override; + }; +} diff --git a/cpp-server/controllers/include/controllers/logs_classes/put.h b/cpp-server/controllers/include/controllers/logs_classes/put.h new file mode 100644 index 0000000..1c1231d --- /dev/null +++ b/cpp-server/controllers/include/controllers/logs_classes/put.h @@ -0,0 +1,17 @@ +#pragma once + +#include + +namespace controllers::logs_classes { + /// @brief Контроллер для обработки запроса обновления класса логов + class Put : public ControllerBase { + public: + /// @brief Конструктор + explicit Put(); + + /// @brief Оператор вызова + /// @param[in] parameters Параметры + /// @returns Ответ + json operator()(const json& parameters) const override; + }; +} diff --git a/cpp-server/controllers/include/controllers/statistics/details/query.h b/cpp-server/controllers/include/controllers/statistics/details/query.h new file mode 100644 index 0000000..57edc10 --- /dev/null +++ b/cpp-server/controllers/include/controllers/statistics/details/query.h @@ -0,0 +1,13 @@ +#pragma once + +#include +#include + +namespace controllers::statistics::details { + struct StatisticsRow { + std::string name; + size_t value; + }; + + std::vector StatisticsQuery(); +} diff --git a/cpp-server/controllers/include/controllers/statistics/fields.h b/cpp-server/controllers/include/controllers/statistics/fields.h deleted file mode 100644 index 48c6370..0000000 --- a/cpp-server/controllers/include/controllers/statistics/fields.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -namespace fields::statistics { - /// @defgroup Поля запроса statistics - /// @{ - constexpr const char* table = "table"; - constexpr const char* date = "date"; - /// @} -} diff --git a/cpp-server/controllers/include/controllers/statistics/get.h b/cpp-server/controllers/include/controllers/statistics/get.h new file mode 100644 index 0000000..4bea783 --- /dev/null +++ b/cpp-server/controllers/include/controllers/statistics/get.h @@ -0,0 +1,17 @@ +#pragma once + +#include + +namespace controllers::statistics { + /// @brief Контроллер для обработки запроса статистики + class Get : public ControllerBase { + public: + /// @brief Конструктор + explicit Get(); + + /// @brief Оператор вызова + /// @param[in] parameters Параметры + /// @returns Ответ + json operator()(const json& parameters) const override; + }; +} diff --git a/cpp-server/controllers/include/controllers/statistics/implementation.h b/cpp-server/controllers/include/controllers/statistics/implementation.h deleted file mode 100644 index 98092bc..0000000 --- a/cpp-server/controllers/include/controllers/statistics/implementation.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include -#include -#include - -/// @brief Алиас для набора данных. Ключ является типом транспорта, -/// значение -- массив из 24 чисел, представляющих количество учтённых транспортных средств для каждого часа -using Datasets = std::unordered_map>; - -/// @brief Получение наборов данных из хранилища -/// @param[in] table Название таблицы -/// @param[in] date Дата -/// @returns Наборы данных -Datasets GetDatasets(std::string_view table, std::string_view date); - -/// @brief Получение процентного отношения каждого типа -/// @param[in] datasets Наборы данных -/// @param[in] hour Номер часа -/// @returns Процентное отношение -std::unordered_map GetTypesPercentage(const Datasets& datasets, size_t hour); - -/// @brief Распределить количество учтённых транспортных средств указаного типа пропорционально к остальным типам -/// @param[in, out] datasets Наборы данных -/// @param[in] type_to_distribute Тип, который нужно распределить -/// @param[in] stock_type Тип, которому уйдёт излишек из-за неточности при работе с вещественными числами -void DistributeType(Datasets& datasets, const std::string& type_to_distribute, const std::string& stock_type); diff --git a/cpp-server/controllers/include/controllers/statistics/query.h b/cpp-server/controllers/include/controllers/statistics/query.h deleted file mode 100644 index bb6fff1..0000000 --- a/cpp-server/controllers/include/controllers/statistics/query.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include -#include - -struct StatisticsRow { - std::string name; - size_t value; -}; - -std::vector StatisticsQuery(); diff --git a/cpp-server/controllers/include/controllers/statistics_controller.h b/cpp-server/controllers/include/controllers/statistics_controller.h deleted file mode 100644 index f99d3b8..0000000 --- a/cpp-server/controllers/include/controllers/statistics_controller.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include - -/// @brief Контроллер для обработки запроса статистики -class StatisticsController : public ControllerBase { -public: - /// @brief Конструктор - explicit StatisticsController(); - - /// @brief Оператор вызова - /// @param[in] parameters Параметры - /// @returns Ответ - json operator()(const json& parameters) const override; -}; diff --git a/cpp-server/controllers/src/anomaly_logs/details/query.cpp b/cpp-server/controllers/src/anomaly_logs/details/query.cpp new file mode 100644 index 0000000..548217c --- /dev/null +++ b/cpp-server/controllers/src/anomaly_logs/details/query.cpp @@ -0,0 +1,28 @@ +#include + +#include +#include + +namespace controllers::anomaly_logs::details { + std::vector AnomalyLogsQuery(int64_t last_id) { + std::ostringstream query; + query << "select id, class_id, data from anomaly_logs where id > " << last_id << ";"; + + auto pqxx_result = PostgreSqlStorage::Get().Do(query.str()); + + std::vector result; + result.reserve(pqxx_result.size()); + + for (const auto& row : pqxx_result) { + AnomalyLogRow anomaly_log_row{ + row[0].as(), + row[1].as(), + row[2].as(), + }; + + result.push_back(std::move(anomaly_log_row)); + } + + return result; + } +} diff --git a/cpp-server/controllers/src/anomaly_logs/get.cpp b/cpp-server/controllers/src/anomaly_logs/get.cpp new file mode 100644 index 0000000..a12a638 --- /dev/null +++ b/cpp-server/controllers/src/anomaly_logs/get.cpp @@ -0,0 +1,28 @@ +#include +#include +#include +#include + +using namespace controllers::anomaly_logs; + +Get::Get() : ControllerBase("anomaly_logs", "get") {} + +json Get::operator()(const json& parameters) const { + utils::CheckForRequiredFields(parameters, { fields::last_index }); + + auto last_index = parameters[fields::last_index].get(); + + auto rows = details::AnomalyLogsQuery(last_index); + + json result = json::array(); + for (auto& row : rows) { + json item = json::object(); + item[fields::id] = row.id; + item[fields::class_id] = row.class_id; + item[fields::data] = std::move(row.data); + + result.push_back(std::move(item)); + } + + return result; +} diff --git a/cpp-server/controllers/src/anomaly_logs/query.cpp b/cpp-server/controllers/src/anomaly_logs/query.cpp deleted file mode 100644 index 50362bd..0000000 --- a/cpp-server/controllers/src/anomaly_logs/query.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include - -#include -#include - -std::vector AnomalyLogsQuery(int64_t last_index) { - std::ostringstream query; - query << "select id, data from anomaly_logs where id > " << last_index << ";"; - - auto pqxx_result = PostgreSqlStorage::Get().Do(query.str()); - - std::vector result; - result.reserve(pqxx_result.size()); - - for (const auto& row : pqxx_result) { - AnomalyLogRow anomaly_log_row{ row[0].as(), row[1].as() }; - result.push_back(std::move(anomaly_log_row)); - } - - return result; -} \ No newline at end of file diff --git a/cpp-server/controllers/src/anomaly_logs_controller.cpp b/cpp-server/controllers/src/anomaly_logs_controller.cpp deleted file mode 100644 index 9c820f5..0000000 --- a/cpp-server/controllers/src/anomaly_logs_controller.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include -#include -#include - -AnomalyLogsController::AnomalyLogsController() : ControllerBase("anomaly_logs") {} - -json AnomalyLogsController::operator()(const json& parameters) const { - CheckForRequiredFields(parameters, { fields::anomaly_logs::last_index }); - - auto last_index = parameters[fields::anomaly_logs::last_index].get(); - - auto rows = AnomalyLogsQuery(last_index); - - json result = json::object(); - for (const auto& row : rows) { - result[std::to_string(row.index)] = row.data; - } - - return result; -} diff --git a/cpp-server/controllers/src/controller_base.cpp b/cpp-server/controllers/src/controller_base.cpp index 53cf1a5..10ae337 100644 --- a/cpp-server/controllers/src/controller_base.cpp +++ b/cpp-server/controllers/src/controller_base.cpp @@ -1,7 +1,16 @@ #include -ControllerBase::ControllerBase(std::string name) : name_(std::move(name)) {} +using namespace controllers; -const std::string& ControllerBase::Name() const { - return name_; +ControllerBase::ControllerBase(std::string resource, std::string operation) + : resource_(std::move(resource)) + , operation_(std::move(operation)) +{} + +const std::string& ControllerBase::Resource() const { + return resource_; +} + +const std::string& ControllerBase::Operation() const { + return operation_; } diff --git a/cpp-server/controllers/src/dispatcher.cpp b/cpp-server/controllers/src/dispatcher.cpp index b12f5eb..e5d70ac 100644 --- a/cpp-server/controllers/src/dispatcher.cpp +++ b/cpp-server/controllers/src/dispatcher.cpp @@ -1,52 +1,7 @@ #include -#include -std::string Dispatcher::operator()(const char* request) const { - // todo: формирование успешного и ошибочного ответов +using namespace controllers; - std::string command; - json result; - try { - result = CallImpl(request, command); - } - catch (const std::exception& e) { - json json; - json[fields::response::command] = command; - json[fields::response::status] = "error"; - json[fields::response::error_message] = e.what(); - - result = json.dump(); - - return result; - } - - json json; - json[fields::response::command] = command; - json[fields::response::status] = "ok"; - json[fields::response::result] = result; - - result = json.dump(); - - return result; -} - -json Dispatcher::CallImpl(const char* request, std::string& command) const { - // Проверяем корректность формата запроса - auto json = ParseJson(request); - - // Проверяем наличие необходимых ключей - CheckForRequiredFields(json, { fields::request::command, fields::request::parameters }); - - // Проверяем наличие команды с указанным именем - command = json[fields::request::command].get(); - if (!controllers_.count(command)) { - return "unknown command '" + command + "'"; - } - - // Получаем команду по имени - const auto& controller = *controllers_.at(command); - - // Формируем и возвращаем ответ - auto parameters = json[fields::request::parameters]; - return controller(parameters); +const Dispatcher::Controllers& Dispatcher::GetControllers() const { + return controllers_; } diff --git a/cpp-server/controllers/src/implementation.cpp b/cpp-server/controllers/src/implementation.cpp deleted file mode 100644 index e91845f..0000000 --- a/cpp-server/controllers/src/implementation.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include -#include - -#include - -json ParseJson(const char* data) { - json json; - try { - json = json::parse(data); - } catch (const std::exception& e) { - throw std::runtime_error("failed to parse request"); - } - - return json; -} - -void CheckForRequiredFields(const json& json, std::initializer_list fields) { - for (const auto& field : fields) - if (!json.contains(field)) { - std::ostringstream message; - message << "request doesn't contain required field '" << field << "'"; - throw std::runtime_error(message.str()); - } -} diff --git a/cpp-server/controllers/src/logs_classes/details/query.cpp b/cpp-server/controllers/src/logs_classes/details/query.cpp new file mode 100644 index 0000000..8932343 --- /dev/null +++ b/cpp-server/controllers/src/logs_classes/details/query.cpp @@ -0,0 +1,28 @@ +#include + +#include +#include + +namespace controllers::logs_classes::details { + std::vector LogsClassesQuery() { + std::ostringstream query; + query << "select id, name, description from logs_classes;"; + + auto pqxx_result = PostgreSqlStorage::Get().Do(query.str()); + + std::vector result; + result.reserve(pqxx_result.size()); + + for (const auto& row : pqxx_result) { + LogsClassesRow logs_classes_row{ + row[0].as(), + row[1].as(), + row[2].as(), + }; + + result.push_back(std::move(logs_classes_row)); + } + + return result; + } +} diff --git a/cpp-server/controllers/src/logs_classes/get.cpp b/cpp-server/controllers/src/logs_classes/get.cpp new file mode 100644 index 0000000..50325f6 --- /dev/null +++ b/cpp-server/controllers/src/logs_classes/get.cpp @@ -0,0 +1,27 @@ +#include +#include +#include +#include + +using namespace controllers::logs_classes; + +Get::Get() : ControllerBase("logs_classes", "put") {} + +json Get::operator()(const json& parameters) const { + utils::CheckForRequiredFields(parameters, { fields::id, fields::description }); + + + details::LogsClassesQuery(); + + json result = json::array(); + for (auto& row : rows) { + json item = json::object(); + item[fields::id] = row.id; + item[fields::name] = std::move(row.name); + item[fields::description] = std::move(row.description); + + result.push_back(std::move(item)); + } + + return result; +} diff --git a/cpp-server/controllers/src/logs_classes/put.cpp b/cpp-server/controllers/src/logs_classes/put.cpp new file mode 100644 index 0000000..1999630 --- /dev/null +++ b/cpp-server/controllers/src/logs_classes/put.cpp @@ -0,0 +1,24 @@ +#include +#include +#include +#include + +using namespace controllers::logs_classes; + +Get::Get() : ControllerBase("logs_classes", "get") {} + +json Get::operator()(const json& parameters) const { + auto rows = details::LogsClassesQuery(); + + json result = json::array(); + for (auto& row : rows) { + json item = json::object(); + item[fields::id] = row.id; + item[fields::name] = std::move(row.name); + item[fields::description] = std::move(row.description); + + result.push_back(std::move(item)); + } + + return result; +} diff --git a/cpp-server/controllers/src/statistics/details/query.cpp b/cpp-server/controllers/src/statistics/details/query.cpp new file mode 100644 index 0000000..f1a12d7 --- /dev/null +++ b/cpp-server/controllers/src/statistics/details/query.cpp @@ -0,0 +1,23 @@ +#include + +#include +#include + +namespace controllers::statistics::details { + std::vector StatisticsQuery() { + std::ostringstream query; + query << "select name, value from statistics;"; + + auto pqxx_result = PostgreSqlStorage::Get().Do(query.str()); + + std::vector result; + result.reserve(pqxx_result.size()); + + for (const auto& row : pqxx_result) { + StatisticsRow statistics_row{ row[0].as(), row[1].as() }; + result.push_back(std::move(statistics_row)); + } + + return result; + } +} diff --git a/cpp-server/controllers/src/statistics/get.cpp b/cpp-server/controllers/src/statistics/get.cpp new file mode 100644 index 0000000..87529cf --- /dev/null +++ b/cpp-server/controllers/src/statistics/get.cpp @@ -0,0 +1,17 @@ +#include +#include + +using namespace controllers::statistics; + +Get::Get() : ControllerBase("statistics", "get") {} + +json Get::operator()(const json& parameters) const { + auto rows = details::StatisticsQuery(); + + json result; + for (auto& row : rows) { + result[std::move(row.name)] = row.value; + } + + return result; +} diff --git a/cpp-server/controllers/src/statistics/query.cpp b/cpp-server/controllers/src/statistics/query.cpp deleted file mode 100644 index 0ac3990..0000000 --- a/cpp-server/controllers/src/statistics/query.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include - -#include -#include - -std::vector StatisticsQuery() { - std::ostringstream query; - query << "select name, value from statistics;"; - - auto pqxx_result = PostgreSqlStorage::Get().Do(query.str()); - - std::vector result; - result.reserve(pqxx_result.size()); - - for (const auto& row : pqxx_result) { - StatisticsRow statistics_row{ row[0].as(), row[1].as() }; - result.push_back(std::move(statistics_row)); - } - - return result; -} \ No newline at end of file diff --git a/cpp-server/controllers/src/statistics_controller.cpp b/cpp-server/controllers/src/statistics_controller.cpp deleted file mode 100644 index f569c5d..0000000 --- a/cpp-server/controllers/src/statistics_controller.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include -#include - -StatisticsController::StatisticsController() : ControllerBase("statistics") {} - -json StatisticsController::operator()(const json& parameters) const { - auto rows = StatisticsQuery(); - - json result; - for (const auto& row : rows) { - result[row.name] = row.value; - } - - return result; -} diff --git a/cpp-server/server/include/server/details/controller_invoker.h b/cpp-server/server/include/server/details/controller_invoker.h new file mode 100644 index 0000000..73e4368 --- /dev/null +++ b/cpp-server/server/include/server/details/controller_invoker.h @@ -0,0 +1,14 @@ +#include + +#include + +namespace server::details { + class ControllerInvoker { + public: + explicit ControllerInvoker(const controllers::ControllerBase* controller); + + std::string operator()(const char* request) const; + private: + const controllers::ControllerBase* controller_; + }; +} diff --git a/cpp-server/server/include/server/details/details.h b/cpp-server/server/include/server/details/details.h new file mode 100644 index 0000000..c3f1b88 --- /dev/null +++ b/cpp-server/server/include/server/details/details.h @@ -0,0 +1,11 @@ +#include + +namespace server::details { + /// @brief Парсинг строки в json + /// @param[in] data Строка + /// @throws std::runtime_error В случае ошибки парсинга (например, некорректный формат) + /// @returns json + json ParseJson(const char* data); + + controllers::Dispatcher CreateDispatcher(); +} diff --git a/cpp-server/server/include/server/details/fields.h b/cpp-server/server/include/server/details/fields.h new file mode 100644 index 0000000..aa04281 --- /dev/null +++ b/cpp-server/server/include/server/details/fields.h @@ -0,0 +1,17 @@ +#pragma once + +#include + +/// @brief Поля запроса +namespace server::details::fields::request { + constexpr std::string_view command = "command"; ///< Название команды / Название контроллера + constexpr std::string_view parameters = "parameters"; ///< Параметры +} + +/// @brief Поля ответа +namespace server::details::fields::response { + constexpr std::string_view command = "command"; ///< Название команды / Название контроллера + constexpr std::string_view status = "status"; ///< Статус ответа (ok/error) + constexpr std::string_view result = "result"; ///< Результат (в случае статуса ok) + constexpr std::string_view error_message = "error_message"; ///< Сообщение об ошибке (в случае статуса error) +} diff --git a/cpp-server/server/include/server/server.h b/cpp-server/server/include/server/server.h index d204f32..9e1dfba 100644 --- a/cpp-server/server/include/server/server.h +++ b/cpp-server/server/include/server/server.h @@ -1,12 +1,21 @@ #pragma once +#include +#include + #include +namespace seasocks { + class Server; +} + class WebSocketServer { public: /// @brief Конструктор /// @param[in] dispatcher Диспетчер контроллеров - explicit WebSocketServer(Dispatcher&& dispatcher); + explicit WebSocketServer(const controllers::Dispatcher& dispatcher); + + ~WebSocketServer(); /// @brief Начать обслуживание запросов /// @param[in] path Директория со статическими ресурсами @@ -14,5 +23,5 @@ public: void Serve(const std::string& path, int port); protected: - Dispatcher dispatcher_; ///< Диспетчер контроллеров -}; \ No newline at end of file + std::unique_ptr server_; ///< Сервер +}; diff --git a/cpp-server/server/include/server/websockets_handler.h b/cpp-server/server/include/server/websockets_handler.h index 2d2be42..8a70aa3 100644 --- a/cpp-server/server/include/server/websockets_handler.h +++ b/cpp-server/server/include/server/websockets_handler.h @@ -2,11 +2,11 @@ #include -#include +#include class AnalysisWebSocketHandler : public seasocks::WebSocket::Handler { public: - explicit AnalysisWebSocketHandler(const Dispatcher& dispatcher); + explicit AnalysisWebSocketHandler(const controllers::ControllerBase* controller); void onConnect(seasocks::WebSocket* socket) override; @@ -15,5 +15,5 @@ public: void onDisconnect(seasocks::WebSocket* socket) override; private: - const Dispatcher& dispatcher_; + server::details::ControllerInvoker controller_invoker_; }; \ No newline at end of file diff --git a/cpp-server/server/src/details/controller_invoker.cpp b/cpp-server/server/src/details/controller_invoker.cpp new file mode 100644 index 0000000..cf6ea20 --- /dev/null +++ b/cpp-server/server/src/details/controller_invoker.cpp @@ -0,0 +1,49 @@ +#include +#include +#include +#include + +using namespace server::details; + +namespace { + json CallImpl(const controllers::ControllerBase& controller, const char* request, std::string& command) { + // Проверяем корректность формата запроса + auto json = ParseJson(request); + + // Проверяем наличие необходимых ключей + utils::CheckForRequiredFields(json, { fields::request::parameters }); + + // Формируем и возвращаем ответ + auto parameters = json[fields::request::parameters]; + return controller(parameters); + } +} + +ControllerInvoker::ControllerInvoker(const controllers::ControllerBase* controller) : controller_(controller) {} + +std::string ControllerInvoker::operator()(const char* request) const { + std::string command; + json result; + try { + result = CallImpl(*controller_, request, command); + } + catch (const std::exception& e) { + json json; + json[fields::response::command] = command; + json[fields::response::status] = "error"; + json[fields::response::error_message] = e.what(); + + result = json.dump(); + + return result; + } + + json json; + json[fields::response::command] = command; + json[fields::response::status] = "ok"; + json[fields::response::result] = result; + + result = json.dump(); + + return result; +} \ No newline at end of file diff --git a/cpp-server/server/src/details/details.cpp b/cpp-server/server/src/details/details.cpp new file mode 100644 index 0000000..10733fb --- /dev/null +++ b/cpp-server/server/src/details/details.cpp @@ -0,0 +1,28 @@ +#include +#include +#include +#include + +namespace server::details { + json ParseJson(const char* data) { + json json; + try { + json = json::parse(data); + } catch (const std::exception& e) { + throw std::runtime_error("failed to parse request"); + } + + return json; + } + + controllers::Dispatcher CreateDispatcher() { + using namespace controllers; + + Dispatcher result; + result.AddController(); + result.AddController(); + result.AddController(); + + return result; + } +} diff --git a/cpp-server/server/src/main.cpp b/cpp-server/server/src/main.cpp index b790983..9337009 100644 --- a/cpp-server/server/src/main.cpp +++ b/cpp-server/server/src/main.cpp @@ -1,12 +1,10 @@ #include #include -#include -#include -#include #include #include #include +#include #include void Log(LogLevel level, const char* message) { @@ -30,7 +28,7 @@ void ConnectToStorage(const json& configuration) { Logger::Get().Write(LogLevel::Info, "connected to postgresql"); } -json ParseConfiguration2(const std::string& path_to_configuration) { +json ParseConfiguration(const std::string& path_to_configuration) { json required_keys; required_keys["server"] = { "path", "port" }; required_keys["storage"] = { "database", "username", "password", "host", "port" }; @@ -46,7 +44,7 @@ int main(int argc, char** argv) { try { // Парсим конфигурационный файл - auto configuration = ParseConfiguration2(argv[1]); + auto configuration = ParseConfiguration(argv[1]); // Настраиваем логирование Logger::Get().SetSettings(LogLevel::Info, Log); @@ -54,13 +52,11 @@ int main(int argc, char** argv) { // Подключаемся к базе данных ConnectToStorage(configuration); - // Создаём и заполняем диспетчер контроллеров - Dispatcher dispatcher; - dispatcher.AddController(); - dispatcher.AddController(); + // Создаём диспетчер контроллеров + controllers::Dispatcher dispatcher = server::details::CreateDispatcher(); // Создаём и запускаем сервер - WebSocketServer server(std::move(dispatcher)); + WebSocketServer server(dispatcher); const std::string path = configuration["server"]["path"].get(); const int port = configuration["server"]["port"].get(); diff --git a/cpp-server/server/src/server.cpp b/cpp-server/server/src/server.cpp index c57e46c..51dce0e 100644 --- a/cpp-server/server/src/server.cpp +++ b/cpp-server/server/src/server.cpp @@ -6,13 +6,16 @@ #include #include -WebSocketServer::WebSocketServer(Dispatcher&& dispatcher) : dispatcher_(std::move(dispatcher)) {} +WebSocketServer::WebSocketServer(const controllers::Dispatcher& dispatcher) : server_(std::make_unique(std::make_shared())) { + for (const auto& [path, controller] : dispatcher.GetControllers()) { + server_->addWebSocketHandler(path.c_str(), std::make_shared(controller.get())); + } + + server_->addPageHandler(std::make_shared()); +} + +WebSocketServer::~WebSocketServer() = default; void WebSocketServer::Serve(const std::string& path, int port) { - auto logger = std::make_shared(); - - seasocks::Server server(logger); - server.addPageHandler(std::make_shared()); - server.addWebSocketHandler("/", std::make_shared(dispatcher_)); - server.serve(path.c_str(), port); + server_->serve(path.c_str(), port); } diff --git a/cpp-server/server/src/websockets_handler.cpp b/cpp-server/server/src/websockets_handler.cpp index 180b87f..491b04d 100644 --- a/cpp-server/server/src/websockets_handler.cpp +++ b/cpp-server/server/src/websockets_handler.cpp @@ -3,7 +3,7 @@ #include #include -AnalysisWebSocketHandler::AnalysisWebSocketHandler(const Dispatcher& dispatcher) : dispatcher_(dispatcher) {} +AnalysisWebSocketHandler::AnalysisWebSocketHandler(const controllers::ControllerBase* controller) : controller_invoker_(controller) {} void AnalysisWebSocketHandler::onConnect(seasocks::WebSocket* socket) { Logger::Get().Write(LogLevel::Info, "new client connected"); @@ -11,7 +11,7 @@ void AnalysisWebSocketHandler::onConnect(seasocks::WebSocket* socket) { void AnalysisWebSocketHandler::onData(seasocks::WebSocket* socket, const char* data) { try { - auto response = dispatcher_(data); + auto response = controller_invoker_(data); socket->send(response.c_str()); } catch (const std::exception& e) { std::ostringstream message; @@ -22,6 +22,4 @@ void AnalysisWebSocketHandler::onData(seasocks::WebSocket* socket, const char* d } } -void AnalysisWebSocketHandler::onDisconnect(seasocks::WebSocket* socket) { - -} \ No newline at end of file +void AnalysisWebSocketHandler::onDisconnect(seasocks::WebSocket* socket) {} diff --git a/cpp-server/sql/tables.sql b/cpp-server/sql/tables.sql new file mode 100644 index 0000000..5980ae3 --- /dev/null +++ b/cpp-server/sql/tables.sql @@ -0,0 +1,25 @@ +create database log_analysis; + +create table statistics( + name varchar(64), + value int, + primary key (name) +); + +insert into statistics (name, value) values ('total', 0), ('anomaly', 0), ('not anomaly', 0), ('undefined', 0); + +create table logs_classes( + id serial, + name text, + description text, + primary key (id) +); + +insert into logs_classes (name, description) values ('unknown', ''); + +create table anomaly_logs( + id serial, + class_id int references logs_classes(id), + data text, + primary key (id) +); diff --git a/cpp-server/utils/CMakeLists.txt b/cpp-server/utils/CMakeLists.txt new file mode 100644 index 0000000..b7c41c3 --- /dev/null +++ b/cpp-server/utils/CMakeLists.txt @@ -0,0 +1,11 @@ +project(la_utils) + +file(GLOB_RECURSE SOURCES src/*.cpp) + +add_library(${PROJECT_NAME}) + +target_sources(${PROJECT_NAME} PRIVATE ${SOURCES}) + +target_include_directories(${PROJECT_NAME} PUBLIC include PRIVATE ${THIRD_PARTY_DIR}/include) + +target_link_libraries(${PROJECT_NAME} PUBLIC la_json) diff --git a/cpp-server/utils/include/utils/utils.h b/cpp-server/utils/include/utils/utils.h new file mode 100644 index 0000000..85cd3b4 --- /dev/null +++ b/cpp-server/utils/include/utils/utils.h @@ -0,0 +1,12 @@ +#include +#include + +#include + +namespace utils { + /// @brief Проверка наличия необходимых ключей + /// @param[in] json Объект, который надо проверить + /// @param[in] fields Необходимые ключи + /// @throws std::runtime_error В случае отсутствия хотя бы одного ключа + void CheckForRequiredFields(const json& json, std::initializer_list fields); +} diff --git a/cpp-server/utils/src/utils.cpp b/cpp-server/utils/src/utils.cpp new file mode 100644 index 0000000..3521b0d --- /dev/null +++ b/cpp-server/utils/src/utils.cpp @@ -0,0 +1,14 @@ +#include + +#include + +namespace utils { + void CheckForRequiredFields(const json& json, std::initializer_list fields) { + for (const auto& field : fields) + if (!json.contains(field)) { + std::ostringstream message; + message << "request doesn't contain required field '" << field << "'"; + throw std::runtime_error(message.str()); + } + } +}