Добавил слой моделей данных и обновил контроллеры

This commit is contained in:
2024-02-23 21:51:57 +03:00
parent 64f9157e85
commit c6d6be9fff
27 changed files with 371 additions and 181 deletions
@@ -1,5 +1,7 @@
#include "storage_wrapper.h"
#include <userver/yaml_config/merge_schemas.hpp>
#include <storage/storage.h>
using namespace server::details;
@@ -7,14 +9,36 @@ using namespace server::details;
StorageWrapper::StorageWrapper(const userver::components::ComponentConfig& config,
const userver::components::ComponentContext& context)
: userver::components::LoggableComponentBase(config, context) {
auto settings = config[kName];
storage::ConnectionData connection_data;
connection_data.database = settings["database"].As<std::string>();
connection_data.username = settings["username"].As<std::string>();
connection_data.password = settings["password"].As<std::string>();
connection_data.host = settings["host"].As<std::string>();
connection_data.port = settings["port"].As<std::string>();
connection_data.database = config["database"].As<std::string>();
connection_data.username = config["username"].As<std::string>();
connection_data.password = config["password"].As<std::string>();
connection_data.host = config["host"].As<std::string>();
connection_data.port = config["port"].As<std::string>();
storage::Storage::Connect(connection_data);
}
userver::yaml_config::Schema StorageWrapper::GetStaticConfigSchema() {
return userver::yaml_config::MergeSchemas<userver::components::LoggableComponentBase>(R"(
type: object
description: storage wrapper component
additionalProperties: false
properties:
database:
type: string
description: database
host:
type: string
description: host
port:
type: string
description: port
username:
type: string
description: username
password:
type: string
description: password
)");
}
@@ -2,6 +2,7 @@
#include <userver/components/component.hpp>
#include <userver/components/loggable_component_base.hpp>
#include <userver/yaml_config/schema.hpp>
namespace server::details {
/// @brief Обёртка-компонент над хранилищем
@@ -14,5 +15,9 @@ namespace server::details {
/// @param[in] config Конфигурация
/// @param[in] context Контекст
StorageWrapper(const userver::components::ComponentConfig& config, const userver::components::ComponentContext& context);
/// @brief Получение схемы статической конфигурации
/// @returns Схема статической конфигурации
static userver::yaml_config::Schema GetStaticConfigSchema();
};
}