diff --git a/controllers/CMakeLists.txt b/controllers/CMakeLists.txt new file mode 100644 index 0000000..c6a01b6 --- /dev/null +++ b/controllers/CMakeLists.txt @@ -0,0 +1,18 @@ +# Модуль контроллеров -- обработчиков запросов +project(la_controllers) + +# Собираем исходные файлы +file(GLOB_RECURSE SOURCES src/*.cpp) + +# Создаём библиотеку +add_library(${PROJECT_NAME} ${SOURCES}) + +# Указываем директории с заголовочными файлами +target_include_directories(${PROJECT_NAME} PUBLIC include) + +# Подключаем зависимости +target_link_libraries(${PROJECT_NAME} + la_json + la_storage + la_utils +) diff --git a/controllers/include/controllers/anomaly_logs/get.h b/controllers/include/controllers/anomaly_logs/get.h new file mode 100644 index 0000000..aac8e28 --- /dev/null +++ b/controllers/include/controllers/anomaly_logs/get.h @@ -0,0 +1,14 @@ +#pragma once + +#include + +namespace controllers::anomaly_logs { + /// @brief Получение аномальных логов + class Get : public ControllerBase { + public: + /// @brief Оператор вызова + /// @param[in] parameters Параметры + /// @returns Ответ + json operator()(const json& parameters) const override; + }; +} diff --git a/controllers/include/controllers/controller_base.h b/controllers/include/controllers/controller_base.h new file mode 100644 index 0000000..307b3f1 --- /dev/null +++ b/controllers/include/controllers/controller_base.h @@ -0,0 +1,18 @@ +#pragma once + +#include + +#include + +namespace controllers { + class ControllerBase { + public: + /// @brief Деструктор + virtual ~ControllerBase() = default; + + /// @brief Вызов логики контроллера + /// @param[in] parameters Параметры + /// @returns Ответ контроллера + virtual json operator()(const json& parameters) const = 0; + }; +} diff --git a/controllers/include/controllers/logs_clusters/create.h b/controllers/include/controllers/logs_clusters/create.h new file mode 100644 index 0000000..3380352 --- /dev/null +++ b/controllers/include/controllers/logs_clusters/create.h @@ -0,0 +1,14 @@ +#pragma once + +#include + +namespace controllers::logs_clusters { + /// @brief Создание кластера логов + class Create : public ControllerBase { + public: + /// @brief Оператор вызова + /// @param[in] parameters Параметры + /// @returns Ответ + json operator()(const json& parameters) const override; + }; +} diff --git a/controllers/include/controllers/logs_clusters/get.h b/controllers/include/controllers/logs_clusters/get.h new file mode 100644 index 0000000..a5dac3c --- /dev/null +++ b/controllers/include/controllers/logs_clusters/get.h @@ -0,0 +1,14 @@ +#pragma once + +#include + +namespace controllers::logs_clusters { + /// @brief Получение кластеров логов + class Get : public ControllerBase { + public: + /// @brief Оператор вызова + /// @param[in] parameters Параметры + /// @returns Ответ + json operator()(const json& parameters) const override; + }; +} diff --git a/controllers/include/controllers/statistics/get.h b/controllers/include/controllers/statistics/get.h new file mode 100644 index 0000000..2028aaa --- /dev/null +++ b/controllers/include/controllers/statistics/get.h @@ -0,0 +1,14 @@ +#pragma once + +#include + +namespace controllers::statistics { + /// @brief Получение статистики + class Get : public ControllerBase { + public: + /// @brief Оператор вызова + /// @param[in] parameters Параметры + /// @returns Ответ + json operator()(const json& parameters) const override; + }; +} diff --git a/controllers/src/anomaly_logs/details/fields.h b/controllers/src/anomaly_logs/details/fields.h new file mode 100644 index 0000000..3ada610 --- /dev/null +++ b/controllers/src/anomaly_logs/details/fields.h @@ -0,0 +1,17 @@ +#pragma once + +#include + +namespace controllers::anomaly_logs::fields { + /// @defgroup Поля запроса + /// @{ + constexpr std::string_view last_id = "last_id"; + /// @} + + /// @defgroup Поля ответа + /// @{ + constexpr std::string_view id = "id"; + constexpr std::string_view class_id = "class_id"; + constexpr std::string_view data = "data"; + /// @} +} diff --git a/controllers/src/anomaly_logs/details/query.cpp b/controllers/src/anomaly_logs/details/query.cpp new file mode 100644 index 0000000..f4932d7 --- /dev/null +++ b/controllers/src/anomaly_logs/details/query.cpp @@ -0,0 +1,29 @@ +#include "query.h" + +#include + +#include + +namespace controllers::anomaly_logs::details { + std::vector GetAnomalyLogs(int64_t last_id) { + std::ostringstream query; + query << "select id, cluster_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) { + AnomalyLog anomaly_log{ + row[0].as(), + row[1].as(), + row[2].as(), + }; + + result.push_back(std::move(anomaly_log)); + } + + return result; + } +} diff --git a/controllers/src/anomaly_logs/details/query.h b/controllers/src/anomaly_logs/details/query.h new file mode 100644 index 0000000..1f3dab1 --- /dev/null +++ b/controllers/src/anomaly_logs/details/query.h @@ -0,0 +1,14 @@ +#pragma once + +#include +#include + +namespace controllers::anomaly_logs::details { + struct AnomalyLog { + int64_t id; + int64_t class_id; + std::string data; + }; + + std::vector GetAnomalyLogs(int64_t last_id); +} diff --git a/controllers/src/anomaly_logs/get.cpp b/controllers/src/anomaly_logs/get.cpp new file mode 100644 index 0000000..16b3bdd --- /dev/null +++ b/controllers/src/anomaly_logs/get.cpp @@ -0,0 +1,27 @@ +#include +#include + +#include "details/fields.h" +#include "details/query.h" + +using namespace controllers::anomaly_logs; + +json Get::operator()(const json& parameters) const { + utils::CheckForRequiredFields(parameters, { fields::last_id }); + + auto last_index = parameters[fields::last_id].get(); + + auto anomaly_logs = details::GetAnomalyLogs(last_index); + + json result = json::array(); + for (auto& log : anomaly_logs) { + json item = json::object(); + item[fields::id] = log.id; + item[fields::class_id] = log.class_id; + item[fields::data] = std::move(log.data); + + result.push_back(std::move(item)); + } + + return result; +} diff --git a/controllers/src/logs_clusters/create.cpp b/controllers/src/logs_clusters/create.cpp new file mode 100644 index 0000000..57f6dd7 --- /dev/null +++ b/controllers/src/logs_clusters/create.cpp @@ -0,0 +1,15 @@ +#include +#include + +#include "details/fields.h" +#include "details/query.h" + +using namespace controllers::logs_clusters; + +json Create::operator()(const json& parameters) const { + utils::CheckForRequiredFields(parameters, { fields::id, fields::name, fields::description, fields::recommendation }); + + details::CreateLogsCluster({parameters[fields::id], parameters[fields::name], parameters[fields::description], parameters[fields::recommendation]}); + + return {}; +} diff --git a/controllers/src/logs_clusters/details/fields.h b/controllers/src/logs_clusters/details/fields.h new file mode 100644 index 0000000..ce5d1ba --- /dev/null +++ b/controllers/src/logs_clusters/details/fields.h @@ -0,0 +1,13 @@ +#pragma once + +#include + +namespace controllers::logs_clusters::fields { + /// @defgroup Поля ответа + /// @{ + constexpr std::string_view id = "id"; + constexpr std::string_view name = "name"; + constexpr std::string_view description = "description"; + constexpr std::string_view recommendation = "recommendation"; + /// @} +} diff --git a/controllers/src/logs_clusters/details/query.cpp b/controllers/src/logs_clusters/details/query.cpp new file mode 100644 index 0000000..8948226 --- /dev/null +++ b/controllers/src/logs_clusters/details/query.cpp @@ -0,0 +1,42 @@ +#include "query.h" + +#include + +#include + +namespace controllers::logs_clusters::details { + std::vector GetLogsClusters() { + std::ostringstream query; + query << "select id, name, description, recommendation from logs_clusters;"; + + auto pqxx_result = PostgreSqlStorage::Get().Do(query.str()); + + std::vector result; + result.reserve(pqxx_result.size()); + + for (const auto& row : pqxx_result) { + LogsCluster logs_cluster{ + row[0].as(), + row[1].as(), + row[2].as(), + row[3].as(), + }; + + result.push_back(std::move(logs_cluster)); + } + + return result; + } + + void CreateLogsCluster(const LogsCluster& cluster) { + std::ostringstream query; + query << "insert into logs_clusters (id, name, description, recommendation) values (" + << cluster.id << ", " + << "'" << cluster.name << "', " + << "'" << cluster.description << "', " + << "'" << cluster.recommendation << "'" + << ");"; + + PostgreSqlStorage::Get().Do(query.str()); + } +} diff --git a/controllers/src/logs_clusters/details/query.h b/controllers/src/logs_clusters/details/query.h new file mode 100644 index 0000000..1363714 --- /dev/null +++ b/controllers/src/logs_clusters/details/query.h @@ -0,0 +1,17 @@ +#pragma once + +#include +#include + +namespace controllers::logs_clusters::details { + struct LogsCluster { + int64_t id; + std::string name; + std::string description; + std::string recommendation; + }; + + std::vector GetLogsClusters(); + + void CreateLogsCluster(const LogsCluster& cluster); +} diff --git a/controllers/src/logs_clusters/get.cpp b/controllers/src/logs_clusters/get.cpp new file mode 100644 index 0000000..9540965 --- /dev/null +++ b/controllers/src/logs_clusters/get.cpp @@ -0,0 +1,24 @@ +#include +#include + +#include "details/fields.h" +#include "details/query.h" + +using namespace controllers::logs_clusters; + +json Get::operator()(const json& parameters) const { + auto clusters = details::GetLogsClusters(); + + json result = json::array(); + for (auto& cluster : clusters) { + json item = json::object(); + item[fields::id] = cluster.id; + item[fields::name] = std::move(cluster.name); + item[fields::description] = std::move(cluster.description); + item[fields::recommendation] = std::move(cluster.recommendation); + + result.push_back(std::move(item)); + } + + return result; +} diff --git a/controllers/src/statistics/details/query.cpp b/controllers/src/statistics/details/query.cpp new file mode 100644 index 0000000..c111801 --- /dev/null +++ b/controllers/src/statistics/details/query.cpp @@ -0,0 +1,24 @@ +#include "query.h" + +#include + +#include + +namespace controllers::statistics::details { + std::vector GetStatistics() { + 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) { + Statistic statistic{ row[0].as(), row[1].as() }; + result.push_back(std::move(statistic)); + } + + return result; + } +} diff --git a/controllers/src/statistics/details/query.h b/controllers/src/statistics/details/query.h new file mode 100644 index 0000000..6247420 --- /dev/null +++ b/controllers/src/statistics/details/query.h @@ -0,0 +1,13 @@ +#pragma once + +#include +#include + +namespace controllers::statistics::details { + struct Statistic { + std::string name; + size_t value; + }; + + std::vector GetStatistics(); +} diff --git a/controllers/src/statistics/get.cpp b/controllers/src/statistics/get.cpp new file mode 100644 index 0000000..e7872a6 --- /dev/null +++ b/controllers/src/statistics/get.cpp @@ -0,0 +1,16 @@ +#include + +#include "details/query.h" + +using namespace controllers::statistics; + +json Get::operator()(const json& parameters) const { + auto statistics = details::GetStatistics(); + + json result; + for (auto& statistic : statistics) { + result[std::move(statistic.name)] = statistic.value; + } + + return result; +} diff --git a/json/CMakeLists.txt b/json/CMakeLists.txt new file mode 100644 index 0000000..9750a32 --- /dev/null +++ b/json/CMakeLists.txt @@ -0,0 +1,14 @@ +# Модуль для работы с json +project(la_json) + +# Создаём библиотеку +add_library(${PROJECT_NAME} INTERFACE) + +# Указываем директории с заголовочными файлами +target_include_directories(${PROJECT_NAME} + INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR}/include +) + +# Подключаем зависимости +target_link_libraries(${PROJECT_NAME} INTERFACE nlohmann_json) diff --git a/json/include/json/json.h b/json/include/json/json.h new file mode 100644 index 0000000..b7de6b0 --- /dev/null +++ b/json/include/json/json.h @@ -0,0 +1,5 @@ +#pragma once + +#include + +using json = nlohmann::json; diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt new file mode 100644 index 0000000..58b4efb --- /dev/null +++ b/server/CMakeLists.txt @@ -0,0 +1,20 @@ +# Модуль для работы с серверной частью и исполняемым приложением +project(la_server) + +# Собираем исходные файлы +file(GLOB_RECURSE SOURCES src/*.cpp) + +# Создаём исполняемое приложение +add_executable(${PROJECT_NAME} ${SOURCES}) + +# Указываем директории с заголовочными файлами +target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) + +# Подключаем зависимости +target_link_libraries(${PROJECT_NAME} + la_configuration + la_controllers + la_json + la_storage + userver-core +) diff --git a/server/include/server/logger.h b/server/include/server/logger.h new file mode 100644 index 0000000..d6e9271 --- /dev/null +++ b/server/include/server/logger.h @@ -0,0 +1,44 @@ +#pragma once + +#include + +enum class LogLevel { + Debug, + Access, + Info, + Warning, + Error, + Severe, +}; + +/// @brief Функция логирования +using LogFunction = void (*)(LogLevel, const char*); + +class Logger { +public: + /// @brief Получение экземпляра класса Logger + static Logger& Get(); + + /// @brief Задание настроек логирования + /// @param[in] max_log_level Максимальный уровень логирования + /// @param[in] log_function Функция логирования + void SetSettings(LogLevel max_log_level, LogFunction log_function); + + /// @brief Логирование сообщения + /// @param[in] level Уровень логирования + /// @param[in] message Сообщение + void Write(LogLevel level, const char* message); + + /// @brief Логирование сообщения + /// @param[in] level Уровень логирования + /// @param[in] message Сообщение + void Write(LogLevel level, const std::string& message); + +private: + /// @brief Конструктор + Logger() = default; + +private: + LogLevel max_log_level_; ///< Максимальный уровень логирования + LogFunction log_function_; ///< Функция логирования +}; diff --git a/server/src/details/controller_wrapper.h b/server/src/details/controller_wrapper.h new file mode 100644 index 0000000..098bbca --- /dev/null +++ b/server/src/details/controller_wrapper.h @@ -0,0 +1,25 @@ +#pragma once + +#include + +#include + +#include "details.h" +#include "traits.h" + +namespace server::details { + template + class ControllerWrapper final : public userver::server::handlers::HttpHandlerBase { + public: + static constexpr std::string_view kName = server::details::traits::ControllerTraits::name; + + using HttpHandlerBase::HttpHandlerBase; + + std::string HandleRequestThrow(const userver::server::http::HttpRequest& request, userver::server::request::RequestContext&) const override { + return server::details::HandleRequest(controller_, request.RequestBody()); + } + + private: + Controller controller_; + }; +} diff --git a/server/src/details/details.cpp b/server/src/details/details.cpp new file mode 100644 index 0000000..54d676f --- /dev/null +++ b/server/src/details/details.cpp @@ -0,0 +1,58 @@ +#include "details.h" + +#include + +#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"); + } + + return json; + } + + std::string HandleRequest(const controllers::ControllerBase& controller, const std::string& request) { + json result; + try { + result = HandleRequestImpl(controller, request); + } + catch (const std::exception& e) { + json json; + json[fields::status] = "error"; + json[fields::error_message] = e.what(); + + result = json.dump(); + + return result; + } + + json json; + json[fields::status] = "ok"; + json[fields::result] = result; + + result = json.dump(); + + return result; + } +} diff --git a/server/src/details/details.h b/server/src/details/details.h new file mode 100644 index 0000000..0a36c9b --- /dev/null +++ b/server/src/details/details.h @@ -0,0 +1,15 @@ +#include + +namespace server::details { + /// @brief Парсинг строки в json + /// @param[in] data Строка + /// @throws std::runtime_error В случае ошибки парсинга (например, некорректный формат) + /// @returns json + json ParseJson(const std::string& data); + + /// @brief Обработка запроса + /// @param[in] controller Контроллер + /// @param[in] request Запрос + /// @returns Ответ + std::string HandleRequest(const controllers::ControllerBase& controller, const std::string& request); +} diff --git a/server/src/details/fields.h b/server/src/details/fields.h new file mode 100644 index 0000000..b57f7a1 --- /dev/null +++ b/server/src/details/fields.h @@ -0,0 +1,11 @@ +#pragma once + +#include + +/// @brief Поля запроса +namespace server::details::fields { + constexpr std::string_view parameters = "parameters"; ///< Параметры + 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/server/src/details/traits.h b/server/src/details/traits.h new file mode 100644 index 0000000..2cda63b --- /dev/null +++ b/server/src/details/traits.h @@ -0,0 +1,62 @@ +#pragma once + +#include + +namespace controllers { + namespace anomaly_logs { + class Get; + } + + namespace logs_clusters { + class Create; + class Get; + } + + namespace statistics { + class Get; + } +} + +namespace server::details::traits { + /// @brief Свойства контроллера + /// @tparam T Тип контроллера + template + struct ControllerTraits {}; + + /// @defgroup Свойства контроллеров Anomaly Logs + /// @{ + + template <> + struct ControllerTraits { + static constexpr std::string_view name = "anomaly-logs-get"; + }; + + /// @} + + + /// @defgroup Свойства контроллеров Logs Clusters + /// @{ + + template <> + struct ControllerTraits { + static constexpr std::string_view name = "logs-clusters-create"; + }; + + template <> + struct ControllerTraits { + static constexpr std::string_view name = "logs-clusters-get"; + }; + + /// @} + + + /// @defgroup Свойства контроллеров Statistics + /// @{ + + template <> + struct ControllerTraits { + static constexpr std::string_view name = "statistics-get"; + }; + + /// @} +} diff --git a/server/src/logger.cpp b/server/src/logger.cpp new file mode 100644 index 0000000..89aac9a --- /dev/null +++ b/server/src/logger.cpp @@ -0,0 +1,21 @@ +#include + +Logger& Logger::Get() { + static Logger logger; + return logger; +} + +void Logger::SetSettings(LogLevel max_log_level, LogFunction log_function) { + max_log_level_ = max_log_level; + log_function_ = log_function; +} + +void Logger::Write(LogLevel level, const char* message) { + if (log_function_ && level <= max_log_level_) { + log_function_(level, message); + } +} + +void Logger::Write(LogLevel level, const std::string& message) { + Write(level, message.c_str()); +} diff --git a/server/src/main.cpp b/server/src/main.cpp new file mode 100644 index 0000000..04e708f --- /dev/null +++ b/server/src/main.cpp @@ -0,0 +1,82 @@ +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "details/controller_wrapper.h" +#include "details/details.h" + +void Log(LogLevel level, const char* message) { + std::cout << message << std::endl; +} + +void ConnectToStorage(const json& configuration) { + Logger::Get().Write(LogLevel::Info, "connecting to postgresql..."); + + const auto& parameters = configuration["storage"]; + + ConnectionData connection_data; + connection_data.database = parameters["database"].get(); + connection_data.username = parameters["username"].get(); + connection_data.password = parameters["password"].get(); + connection_data.host = parameters["host"].get(); + connection_data.port = std::to_string(parameters["port"].get()); + + PostgreSqlStorage::Connect(connection_data); + + Logger::Get().Write(LogLevel::Info, "connected to postgresql"); +} + +json ParseConfiguration(const std::string& path_to_configuration) { + json required_keys; + required_keys["server"] = { "path", "port" }; + required_keys["storage"] = { "database", "username", "password", "host", "port" }; + + return ParseConfiguration(path_to_configuration, required_keys); +} + +int main(int argc, char** argv) { + if (argc < 2) { + std::cout << "usage: " << argv[0] << " " << std::endl; + return -1; + } + + try { + // Парсим конфигурационный файл + auto configuration = ParseConfiguration(argv[1]); + + // Настраиваем логирование + Logger::Get().SetSettings(LogLevel::Info, Log); + + // Подключаемся к базе данных + ConnectToStorage(configuration); + const auto component_list = userver::components::MinimalServerComponentList() + // static content + .Append("fs-cache-main") + .Append() + // anomaly logs + .Append>() + // clusters + .Append>() + .Append>() + // statistics + .Append>(); + + return userver::utils::DaemonMain(argc, argv, component_list); + } catch (const std::exception& e) { + std::cout << e.what() << std::endl; + return -1; + } +} diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt new file mode 100644 index 0000000..bdd5528 --- /dev/null +++ b/storage/CMakeLists.txt @@ -0,0 +1,11 @@ +project(la_storage) + +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 pqxx) diff --git a/storage/include/storage/postgresql/postgresql_storage.h b/storage/include/storage/postgresql/postgresql_storage.h new file mode 100644 index 0000000..381ad29 --- /dev/null +++ b/storage/include/storage/postgresql/postgresql_storage.h @@ -0,0 +1,19 @@ +#pragma once + +#include +#include + +#include + +struct ConnectionData { + std::string database, username, password, host, port; +}; + +class PostgreSqlStorage { +public: + static PostgreSqlStorage& Get(); + static void Connect(const ConnectionData& connection_data); + pqxx::result Do(std::string_view query) const; +private: + std::unique_ptr connection_; +}; diff --git a/storage/src/postgresql_storage.cpp b/storage/src/postgresql_storage.cpp new file mode 100644 index 0000000..d6fa1cf --- /dev/null +++ b/storage/src/postgresql_storage.cpp @@ -0,0 +1,32 @@ +#include + +#include + +PostgreSqlStorage& PostgreSqlStorage::Get() { + static PostgreSqlStorage storage; + return storage; +} + +void PostgreSqlStorage::Connect(const ConnectionData& connection_data) { + std::ostringstream options; + options << "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()); +} + +pqxx::result PostgreSqlStorage::Do(std::string_view query) const { + // Создаём транзакцию + pqxx::work work(*connection_); + + // Выполняем запрос + pqxx::result result = work.exec(query); + + // Завершаем транзакцию + work.commit(); + + return result; +} \ No newline at end of file diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt new file mode 100644 index 0000000..b7c41c3 --- /dev/null +++ b/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/utils/include/utils/utils.h b/utils/include/utils/utils.h new file mode 100644 index 0000000..85cd3b4 --- /dev/null +++ b/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/utils/src/utils.cpp b/utils/src/utils.cpp new file mode 100644 index 0000000..3521b0d --- /dev/null +++ b/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()); + } + } +}