From c42c0a100316a34dd27a17c1d9a55f77e5fe31e2 Mon Sep 17 00:00:00 2001 From: Bartosz Wieczorek Date: Tue, 20 Mar 2018 12:50:41 +0100 Subject: [PATCH] change directories --- src/app/main.cpp | 24 +++++++++++-------- src/libs/auth/src/PgUserAuth.cpp | 14 +++++------ .../include/eedb/{db => }/pg/Parameter.hpp | 2 +- .../eedb/{db => }/pg/ParametersRepository.hpp | 2 +- .../eedb/{db => }/pg/PgAuthIdentity.hpp | 4 ++-- .../include/eedb/{db => }/pg/PgAuthToken.hpp | 4 ++-- .../include/eedb/{db => }/pg/PgCategories.hpp | 2 +- .../{db => }/pg/PgCategoriesRepository.hpp | 2 +- .../include/eedb/{db => }/pg/PgCategory.hpp | 2 +- .../include/eedb/{db => }/pg/PgItem.hpp | 2 +- .../include/eedb/{db => }/pg/PgItems.hpp | 2 +- .../eedb/{db => }/pg/PgItemsRepository.hpp | 2 +- .../include/eedb/{db => }/pg/PgUser.hpp | 4 ++-- .../include/eedb/{db => }/pg/PgUsers.hpp | 2 +- .../include/eedb/{db => }/pg/RawSql.hpp | 0 .../include/eedb/{db => }/pg/Stats.hpp | 2 +- .../include/eedb/{db => }/pg/config.hpp | 0 .../include/eedb/{db => }/pg/connection.hpp | 0 .../include/eedb/{db => }/pg/model/all.hpp | 24 +++++++++---------- .../eedb/{db => }/pg/model/auth_identity.h | 0 .../eedb/{db => }/pg/model/auth_info.h | 0 .../eedb/{db => }/pg/model/auth_token.h | 0 .../include/eedb/{db => }/pg/model/category.h | 0 .../eedb/{db => }/pg/model/category_items.h | 0 .../include/eedb/{db => }/pg/model/group.h | 0 .../include/eedb/{db => }/pg/model/item.h | 0 .../eedb/{db => }/pg/model/parameter.h | 0 .../include/eedb/{db => }/pg/model/stat.h | 0 .../eedb/{db => }/pg/model/system_info.h | 0 .../include/eedb/{db => }/pg/model/unit.h | 0 .../eedb/{db => }/pg/model/user_audit.h | 0 .../{db => }/pg/model/user_audit_action.h | 0 .../eedb/mock/db/pg/AuthIdentitiesMock.hpp | 2 +- .../include/eedb/mock/db/pg/AuthInfoMock.hpp | 2 +- .../include/eedb/mock/db/pg/AuthTokenMock.hpp | 6 ++--- .../eedb/mock/db/pg/AuthTokensMock.hpp | 2 +- .../eedb/mock/db/pg/CategoriesMock.hpp | 2 +- .../include/eedb/mock/db/pg/CategoryMock.hpp | 4 ++-- .../eedb/mock/db/pg/ItemQueryFiltersMock.hpp | 2 +- .../include/eedb/mock/db/pg/ItemsMock.hpp | 2 +- .../include/eedb/mock/db/pg/ParameterMock.hpp | 4 ++-- .../mock/include/eedb/mock/db/pg/UserMock.hpp | 8 +++---- .../include/eedb/mock/db/pg/UserNameMock.hpp | 2 +- .../include/eedb/mock/db/pg/UsersMock.hpp | 2 +- .../db/postgresql_connector/src/RawSql.cpp | 4 ++-- .../db/postgresql_connector/src/config.cpp | 2 +- .../postgresql_connector/src/connection.cpp | 4 ++-- .../src/data/Parameter.cpp | 2 +- .../src/data/ParametersRepository.cpp | 10 ++++---- .../src/data/PgAuthIdentity.cpp | 8 +++---- .../src/data/PgAuthToken.cpp | 8 +++---- .../src/data/PgCategories.cpp | 8 +++---- .../src/data/PgCategoriesRepository.cpp | 8 +++---- .../src/data/PgCategory.cpp | 12 +++++----- .../postgresql_connector/src/data/PgItem.cpp | 8 +++---- .../src/data/PgItemsRepository.cpp | 18 +++++++------- .../postgresql_connector/src/data/PgUser.cpp | 12 +++++----- .../postgresql_connector/src/data/PgUsers.cpp | 20 ++++++++-------- .../postgresql_connector/test/DbTestBase.hpp | 6 ++--- .../test/test_eedb_data_Item.cpp | 4 ++-- .../test/test_eedb_data_PgAuthIdentities.cpp | 2 +- .../test/test_eedb_data_PgAuthIdentity.cpp | 2 +- .../test/test_eedb_data_PgAuthToken.cpp | 8 +++---- .../test/test_eedb_data_PgAuthTokens.cpp | 2 +- .../test/test_eedb_data_PgCategories.cpp | 2 +- .../test_eedb_data_PgCategoriesRepository.cpp | 2 +- .../test/test_eedb_data_PgCategory.cpp | 2 +- .../test/test_eedb_data_PgItemsRepository.cpp | 4 ++-- .../test/test_eedb_data_PgParameter.cpp | 2 +- .../test_eedb_data_PgParametersRepository.cpp | 2 +- .../test/test_eedb_data_PgUser.cpp | 10 ++++---- .../test/test_eedb_data_PgUsers.cpp | 8 +++---- .../include/eedb/{db => }/AuthIdentities.hpp | 0 .../eedb/{db => }/AuthIdentitiesConst.hpp | 2 +- .../include/eedb/{db => }/AuthIdentity.hpp | 0 .../eedb/{db => }/AuthIdentityConst.hpp | 2 +- .../eedb/include/eedb/{db => }/AuthInfo.hpp | 2 +- .../include/eedb/{db => }/AuthInfoConst.hpp | 6 ++--- .../eedb/include/eedb/{db => }/AuthToken.hpp | 0 .../eedb/include/eedb/{db => }/AuthTokens.hpp | 2 +- .../eedb/include/eedb/{db => }/Category.hpp | 0 src/libs/eedb/include/eedb/{db => }/Email.hpp | 0 src/libs/eedb/include/eedb/{db => }/Item.hpp | 0 .../eedb/include/eedb/{db => }/Parameter.hpp | 0 .../eedb/include/eedb/{db => }/Password.hpp | 0 src/libs/eedb/include/eedb/{db => }/User.hpp | 0 src/libs/eedb/include/eedb/{db => }/Users.hpp | 0 src/libs/eedb/include/eedb/Value.hpp | 2 +- .../eedb/mock/db/AuthIdentitiesMock.hpp | 2 +- .../include/eedb/mock/db/AuthInfoMock.hpp | 2 +- .../include/eedb/mock/db/AuthTokenMock.hpp | 2 +- .../include/eedb/mock/db/AuthTokensMock.hpp | 2 +- .../include/eedb/mock/db/CategoriesMock.hpp | 2 +- .../include/eedb/mock/db/CategoryMock.hpp | 2 +- .../mock/include/eedb/mock/db/ItemMock.hpp | 4 ++-- .../eedb/mock/db/ItemQueryFiltersMock.hpp | 2 +- .../mock/include/eedb/mock/db/ItemsMock.hpp | 2 +- .../include/eedb/mock/db/ParameterMock.hpp | 2 +- .../eedb/mock/db/ParametersRepositoryMock.hpp | 2 +- .../mock/include/eedb/mock/db/UserMock.hpp | 10 ++++---- .../include/eedb/mock/db/UserNameMock.hpp | 2 +- .../mock/include/eedb/mock/db/UsersMock.hpp | 2 +- .../include/eedb/WebApplicationFactory.hpp | 2 +- .../webapp/include/widget/CategoryThree.hpp | 2 +- src/libs/webapp/src/DefaultCategoryTree.cpp | 2 +- src/libs/webapp/src/WebApplicationFactory.cpp | 6 ++--- .../webapp/test/test_eedb_DefaultHomePage.cpp | 2 +- .../webapp/test/test_eedb_application.cpp | 2 +- 108 files changed, 193 insertions(+), 189 deletions(-) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/Parameter.hpp (93%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/ParametersRepository.hpp (94%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/PgAuthIdentity.hpp (93%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/PgAuthToken.hpp (94%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/PgCategories.hpp (92%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/PgCategoriesRepository.hpp (93%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/PgCategory.hpp (95%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/PgItem.hpp (95%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/PgItems.hpp (75%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/PgItemsRepository.hpp (96%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/PgUser.hpp (90%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/PgUsers.hpp (96%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/RawSql.hpp (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/Stats.hpp (95%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/config.hpp (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/connection.hpp (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/all.hpp (55%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/auth_identity.h (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/auth_info.h (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/auth_token.h (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/category.h (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/category_items.h (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/group.h (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/item.h (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/parameter.h (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/stat.h (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/system_info.h (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/unit.h (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/user_audit.h (100%) rename src/libs/db/postgresql_connector/include/eedb/{db => }/pg/model/user_audit_action.h (100%) rename src/libs/eedb/include/eedb/{db => }/AuthIdentities.hpp (100%) rename src/libs/eedb/include/eedb/{db => }/AuthIdentitiesConst.hpp (96%) rename src/libs/eedb/include/eedb/{db => }/AuthIdentity.hpp (100%) rename src/libs/eedb/include/eedb/{db => }/AuthIdentityConst.hpp (93%) rename src/libs/eedb/include/eedb/{db => }/AuthInfo.hpp (95%) rename src/libs/eedb/include/eedb/{db => }/AuthInfoConst.hpp (86%) rename src/libs/eedb/include/eedb/{db => }/AuthToken.hpp (100%) rename src/libs/eedb/include/eedb/{db => }/AuthTokens.hpp (91%) rename src/libs/eedb/include/eedb/{db => }/Category.hpp (100%) rename src/libs/eedb/include/eedb/{db => }/Email.hpp (100%) rename src/libs/eedb/include/eedb/{db => }/Item.hpp (100%) rename src/libs/eedb/include/eedb/{db => }/Parameter.hpp (100%) rename src/libs/eedb/include/eedb/{db => }/Password.hpp (100%) rename src/libs/eedb/include/eedb/{db => }/User.hpp (100%) rename src/libs/eedb/include/eedb/{db => }/Users.hpp (100%) diff --git a/src/app/main.cpp b/src/app/main.cpp index 54fd3d3..512f46b 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -1,10 +1,11 @@ #include -#include -#include +#include +#include -#include -#include +#include +#include +#include #include #include @@ -16,9 +17,8 @@ static auto _createSinks() { std::vector< spdlog::sink_ptr > sinks; auto stdout_sink = spdlog::sinks::stdout_sink_mt::instance(); - auto color_sink = std::make_shared< spdlog::sinks::ansicolor_sink >(stdout_sink); - sinks.push_back(color_sink); - sinks.push_back(std::make_shared< spdlog::sinks::daily_file_sink_st >("logfile", 23, 59)); + sinks.emplace_back(std::make_shared< spdlog::sinks::ansicolor_sink >(stdout_sink)); + sinks.emplace_back(std::make_shared< spdlog::sinks::daily_file_sink_st >("logfile", 23, 59)); return sinks; } @@ -67,15 +67,19 @@ int main(int argc, char ** argv) { // users factory [db = dbIt->get()]() { // - spdlog::get("default")->info("Creating user repository"); + spdlog::get("default")->info("Creating user repository"); return std::make_unique< eedb::PgUsers >(*db); }, - // categories factory - [db = dbIt->get()](eedb::User *) { // + // categories repository + [db = dbIt->get()]() { // return std::make_unique< eedb::PgCategoriesRepository >(*db); }, + // items repository + // [db = dbIt->get()]() { // + // return std::make_unique< eedb::PgItemsRepository >(*db); + // }, env); }); return 0; diff --git a/src/libs/auth/src/PgUserAuth.cpp b/src/libs/auth/src/PgUserAuth.cpp index b7892b3..2a919e1 100644 --- a/src/libs/auth/src/PgUserAuth.cpp +++ b/src/libs/auth/src/PgUserAuth.cpp @@ -1,13 +1,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/Parameter.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/Parameter.hpp similarity index 93% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/Parameter.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/Parameter.hpp index 088bf54..ed1411d 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/Parameter.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/Parameter.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/ParametersRepository.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/ParametersRepository.hpp similarity index 94% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/ParametersRepository.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/ParametersRepository.hpp index 91d9439..6321373 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/ParametersRepository.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/ParametersRepository.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgAuthIdentity.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/PgAuthIdentity.hpp similarity index 93% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/PgAuthIdentity.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/PgAuthIdentity.hpp index e6b6d13..5990c00 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgAuthIdentity.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/PgAuthIdentity.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgAuthToken.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/PgAuthToken.hpp similarity index 94% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/PgAuthToken.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/PgAuthToken.hpp index 58d2fd0..3c01303 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgAuthToken.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/PgAuthToken.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgCategories.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/PgCategories.hpp similarity index 92% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/PgCategories.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/PgCategories.hpp index edb713a..05d7e48 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgCategories.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/PgCategories.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgCategoriesRepository.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/PgCategoriesRepository.hpp similarity index 93% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/PgCategoriesRepository.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/PgCategoriesRepository.hpp index 44860be..0119a95 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgCategoriesRepository.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/PgCategoriesRepository.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgCategory.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/PgCategory.hpp similarity index 95% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/PgCategory.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/PgCategory.hpp index 3a92f34..3c75e87 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgCategory.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/PgCategory.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgItem.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/PgItem.hpp similarity index 95% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/PgItem.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/PgItem.hpp index 168c72d..da0020a 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgItem.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/PgItem.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgItems.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/PgItems.hpp similarity index 75% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/PgItems.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/PgItems.hpp index b92c308..a76fd33 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgItems.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/PgItems.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace eedb { class PgItems : public Items {}; diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgItemsRepository.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/PgItemsRepository.hpp similarity index 96% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/PgItemsRepository.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/PgItemsRepository.hpp index 7ff6c9e..223c474 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgItemsRepository.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/PgItemsRepository.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgUser.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/PgUser.hpp similarity index 90% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/PgUser.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/PgUser.hpp index 2cfbdba..deba49f 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgUser.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/PgUser.hpp @@ -1,8 +1,8 @@ #pragma once -#include +#include -#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgUsers.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/PgUsers.hpp similarity index 96% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/PgUsers.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/PgUsers.hpp index b424794..82b82db 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/PgUsers.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/PgUsers.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/RawSql.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/RawSql.hpp similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/RawSql.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/RawSql.hpp diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/Stats.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/Stats.hpp similarity index 95% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/Stats.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/Stats.hpp index d921565..7996a44 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/Stats.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/Stats.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/config.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/config.hpp similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/config.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/config.hpp diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/connection.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/connection.hpp similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/connection.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/connection.hpp diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/all.hpp b/src/libs/db/postgresql_connector/include/eedb/pg/model/all.hpp similarity index 55% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/all.hpp rename to src/libs/db/postgresql_connector/include/eedb/pg/model/all.hpp index 1d72a5d..a6276ea 100644 --- a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/all.hpp +++ b/src/libs/db/postgresql_connector/include/eedb/pg/model/all.hpp @@ -1,17 +1,17 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static constexpr eedb::db::auth_identity t_auth_identity; static constexpr eedb::db::auth_info t_auth_info; diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/auth_identity.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/auth_identity.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/auth_identity.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/auth_identity.h diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/auth_info.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/auth_info.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/auth_info.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/auth_info.h diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/auth_token.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/auth_token.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/auth_token.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/auth_token.h diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/category.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/category.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/category.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/category.h diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/category_items.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/category_items.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/category_items.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/category_items.h diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/group.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/group.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/group.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/group.h diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/item.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/item.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/item.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/item.h diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/parameter.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/parameter.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/parameter.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/parameter.h diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/stat.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/stat.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/stat.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/stat.h diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/system_info.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/system_info.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/system_info.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/system_info.h diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/unit.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/unit.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/unit.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/unit.h diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/user_audit.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/user_audit.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/user_audit.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/user_audit.h diff --git a/src/libs/db/postgresql_connector/include/eedb/db/pg/model/user_audit_action.h b/src/libs/db/postgresql_connector/include/eedb/pg/model/user_audit_action.h similarity index 100% rename from src/libs/db/postgresql_connector/include/eedb/db/pg/model/user_audit_action.h rename to src/libs/db/postgresql_connector/include/eedb/pg/model/user_audit_action.h diff --git a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthIdentitiesMock.hpp b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthIdentitiesMock.hpp index a56a08d..5355c54 100644 --- a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthIdentitiesMock.hpp +++ b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthIdentitiesMock.hpp @@ -5,7 +5,7 @@ #define AUTHIDENTITIESMOCK_HPP #include -#include "././eedb/db/AuthIdentities.hpp" +#include "././eedb/AuthIdentities.hpp" namespace eedb { diff --git a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthInfoMock.hpp b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthInfoMock.hpp index 572399d..de3a0f3 100644 --- a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthInfoMock.hpp +++ b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthInfoMock.hpp @@ -5,7 +5,7 @@ #define AUTHINFOMOCK_HPP #include -#include "././eedb/db/AuthInfo.hpp" +#include "././eedb/AuthInfo.hpp" namespace eedb { diff --git a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthTokenMock.hpp b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthTokenMock.hpp index 472c8e2..681786f 100644 --- a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthTokenMock.hpp +++ b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthTokenMock.hpp @@ -5,15 +5,15 @@ #include -#include -#include +#include +#include #include #include #include -#include +#include namespace eedb::db { diff --git a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthTokensMock.hpp b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthTokensMock.hpp index 4162d6c..284199d 100644 --- a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthTokensMock.hpp +++ b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthTokensMock.hpp @@ -5,7 +5,7 @@ #define AUTHTOKENSMOCK_HPP #include -#include "././eedb/db/AuthTokens.hpp" +#include "././eedb/AuthTokens.hpp" namespace eedb { diff --git a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/CategoriesMock.hpp b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/CategoriesMock.hpp index b333a83..6382bb1 100644 --- a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/CategoriesMock.hpp +++ b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/CategoriesMock.hpp @@ -6,7 +6,7 @@ #include -#include +#include namespace eedb { diff --git a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/CategoryMock.hpp b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/CategoryMock.hpp index a26bffa..9653ca9 100644 --- a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/CategoryMock.hpp +++ b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/CategoryMock.hpp @@ -4,8 +4,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ItemQueryFiltersMock.hpp b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ItemQueryFiltersMock.hpp index 89d9faf..6d9cdcb 100644 --- a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ItemQueryFiltersMock.hpp +++ b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ItemQueryFiltersMock.hpp @@ -5,7 +5,7 @@ #define ITEMQUERYFILTERSMOCK_HPP #include -#include "././eedb/db/Item.hpp" +#include "././eedb/Item.hpp" namespace eedb { diff --git a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ItemsMock.hpp b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ItemsMock.hpp index 2a69451..277461d 100644 --- a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ItemsMock.hpp +++ b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ItemsMock.hpp @@ -5,7 +5,7 @@ #define ITEMSMOCK_HPP #include -#include "././eedb/db/Item.hpp" +#include "././eedb/Item.hpp" namespace eedb { diff --git a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ParameterMock.hpp b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ParameterMock.hpp index c721136..bba19c5 100644 --- a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ParameterMock.hpp +++ b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ParameterMock.hpp @@ -5,8 +5,8 @@ #include #include -#include -#include +#include +#include namespace eedb::db::pg { diff --git a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UserMock.hpp b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UserMock.hpp index 3310707..66b2b50 100644 --- a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UserMock.hpp +++ b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UserMock.hpp @@ -4,14 +4,14 @@ #include -#include -#include +#include +#include #include #include -#include -#include +#include +#include namespace eedb::db::pg { diff --git a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UserNameMock.hpp b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UserNameMock.hpp index 9581c34..5c1ff56 100644 --- a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UserNameMock.hpp +++ b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UserNameMock.hpp @@ -5,7 +5,7 @@ #define USERNAMEMOCK_HPP #include -#include "././eedb/db/User.hpp" +#include "././eedb/User.hpp" namespace eedb { diff --git a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UsersMock.hpp b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UsersMock.hpp index 3591436..4bc1dc1 100644 --- a/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UsersMock.hpp +++ b/src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UsersMock.hpp @@ -6,7 +6,7 @@ #include -#include +#include namespace eedb { diff --git a/src/libs/db/postgresql_connector/src/RawSql.cpp b/src/libs/db/postgresql_connector/src/RawSql.cpp index 31a9d6b..56d4bdb 100644 --- a/src/libs/db/postgresql_connector/src/RawSql.cpp +++ b/src/libs/db/postgresql_connector/src/RawSql.cpp @@ -1,9 +1,9 @@ -#include +#include #include #include -#include +#include #include namespace eedb::db{ diff --git a/src/libs/db/postgresql_connector/src/config.cpp b/src/libs/db/postgresql_connector/src/config.cpp index 9c6ae84..e464b2e 100644 --- a/src/libs/db/postgresql_connector/src/config.cpp +++ b/src/libs/db/postgresql_connector/src/config.cpp @@ -1,4 +1,4 @@ -#include "eedb/db/pg/config.hpp" +#include "eedb/pg/config.hpp" namespace eedb::db { diff --git a/src/libs/db/postgresql_connector/src/connection.cpp b/src/libs/db/postgresql_connector/src/connection.cpp index 3ffb6ac..8d543e8 100644 --- a/src/libs/db/postgresql_connector/src/connection.cpp +++ b/src/libs/db/postgresql_connector/src/connection.cpp @@ -1,5 +1,5 @@ -#include "eedb/db/pg/connection.hpp" -#include "eedb/db/pg/config.hpp" +#include "eedb/pg/connection.hpp" +#include "eedb/pg/config.hpp" namespace eedb::db { diff --git a/src/libs/db/postgresql_connector/src/data/Parameter.cpp b/src/libs/db/postgresql_connector/src/data/Parameter.cpp index 1a66243..c315700 100644 --- a/src/libs/db/postgresql_connector/src/data/Parameter.cpp +++ b/src/libs/db/postgresql_connector/src/data/Parameter.cpp @@ -1 +1 @@ -#include +#include diff --git a/src/libs/db/postgresql_connector/src/data/ParametersRepository.cpp b/src/libs/db/postgresql_connector/src/data/ParametersRepository.cpp index cae7296..83dd39f 100644 --- a/src/libs/db/postgresql_connector/src/data/ParametersRepository.cpp +++ b/src/libs/db/postgresql_connector/src/data/ParametersRepository.cpp @@ -1,10 +1,10 @@ -#include +#include -#include -#include -#include +#include +#include +#include -#include +#include #include namespace eedb { diff --git a/src/libs/db/postgresql_connector/src/data/PgAuthIdentity.cpp b/src/libs/db/postgresql_connector/src/data/PgAuthIdentity.cpp index 30ac4d2..aab6a74 100644 --- a/src/libs/db/postgresql_connector/src/data/PgAuthIdentity.cpp +++ b/src/libs/db/postgresql_connector/src/data/PgAuthIdentity.cpp @@ -1,8 +1,8 @@ -#include "eedb/db/pg/PgAuthIdentity.hpp" +#include "eedb/pg/PgAuthIdentity.hpp" -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/libs/db/postgresql_connector/src/data/PgAuthToken.cpp b/src/libs/db/postgresql_connector/src/data/PgAuthToken.cpp index 8e04d82..757b7b7 100644 --- a/src/libs/db/postgresql_connector/src/data/PgAuthToken.cpp +++ b/src/libs/db/postgresql_connector/src/data/PgAuthToken.cpp @@ -1,9 +1,9 @@ -#include +#include -#include +#include -#include -#include +#include +#include #include diff --git a/src/libs/db/postgresql_connector/src/data/PgCategories.cpp b/src/libs/db/postgresql_connector/src/data/PgCategories.cpp index 69a4115..91da2e8 100644 --- a/src/libs/db/postgresql_connector/src/data/PgCategories.cpp +++ b/src/libs/db/postgresql_connector/src/data/PgCategories.cpp @@ -1,8 +1,8 @@ -#include "eedb/db/pg/PgCategories.hpp" +#include "eedb/pg/PgCategories.hpp" -#include -#include -#include +#include +#include +#include #include diff --git a/src/libs/db/postgresql_connector/src/data/PgCategoriesRepository.cpp b/src/libs/db/postgresql_connector/src/data/PgCategoriesRepository.cpp index ca832a8..cd73ef9 100644 --- a/src/libs/db/postgresql_connector/src/data/PgCategoriesRepository.cpp +++ b/src/libs/db/postgresql_connector/src/data/PgCategoriesRepository.cpp @@ -1,9 +1,9 @@ -#include +#include -#include +#include -#include -#include +#include +#include namespace eedb { struct PgCategoriesRepository::PgCategoriesRepositoryPriv { diff --git a/src/libs/db/postgresql_connector/src/data/PgCategory.cpp b/src/libs/db/postgresql_connector/src/data/PgCategory.cpp index bdc0c24..12568e4 100644 --- a/src/libs/db/postgresql_connector/src/data/PgCategory.cpp +++ b/src/libs/db/postgresql_connector/src/data/PgCategory.cpp @@ -1,15 +1,15 @@ -#include +#include -#include -#include -#include +#include +#include +#include -#include +#include #include #include -#include +#include namespace eedb { diff --git a/src/libs/db/postgresql_connector/src/data/PgItem.cpp b/src/libs/db/postgresql_connector/src/data/PgItem.cpp index 45c87b9..202da12 100644 --- a/src/libs/db/postgresql_connector/src/data/PgItem.cpp +++ b/src/libs/db/postgresql_connector/src/data/PgItem.cpp @@ -1,10 +1,10 @@ -#include +#include #include -#include +#include -#include -#include +#include +#include #include diff --git a/src/libs/db/postgresql_connector/src/data/PgItemsRepository.cpp b/src/libs/db/postgresql_connector/src/data/PgItemsRepository.cpp index 837947a..2a34ad2 100644 --- a/src/libs/db/postgresql_connector/src/data/PgItemsRepository.cpp +++ b/src/libs/db/postgresql_connector/src/data/PgItemsRepository.cpp @@ -1,20 +1,20 @@ -#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include #include diff --git a/src/libs/db/postgresql_connector/src/data/PgUser.cpp b/src/libs/db/postgresql_connector/src/data/PgUser.cpp index 14752e4..fe9c3ee 100644 --- a/src/libs/db/postgresql_connector/src/data/PgUser.cpp +++ b/src/libs/db/postgresql_connector/src/data/PgUser.cpp @@ -1,10 +1,10 @@ -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/libs/db/postgresql_connector/src/data/PgUsers.cpp b/src/libs/db/postgresql_connector/src/data/PgUsers.cpp index b7ac867..9815ecb 100644 --- a/src/libs/db/postgresql_connector/src/data/PgUsers.cpp +++ b/src/libs/db/postgresql_connector/src/data/PgUsers.cpp @@ -1,16 +1,16 @@ -#include +#include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/libs/db/postgresql_connector/test/DbTestBase.hpp b/src/libs/db/postgresql_connector/test/DbTestBase.hpp index 551020a..a5052a1 100644 --- a/src/libs/db/postgresql_connector/test/DbTestBase.hpp +++ b/src/libs/db/postgresql_connector/test/DbTestBase.hpp @@ -1,8 +1,8 @@ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_Item.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_Item.cpp index 09cb91d..da893ce 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_Item.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_Item.cpp @@ -1,7 +1,7 @@ #include -#include -#include +#include +#include #include "DbTestBase.hpp" diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthIdentities.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthIdentities.cpp index 77c2077..0acafc7 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthIdentities.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthIdentities.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include "DbTestBase.hpp" diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthIdentity.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthIdentity.cpp index e7b9ef5..13b1dc1 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthIdentity.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthIdentity.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include "DbTestBase.hpp" diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthToken.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthToken.cpp index 872c9ca..4ccc402 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthToken.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthToken.cpp @@ -1,11 +1,11 @@ #include -#include +#include -#include -#include +#include +#include -#include +#include #include #include "DbTestBase.hpp" diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthTokens.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthTokens.cpp index 950e2be..349cbc3 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthTokens.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthTokens.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include "DbTestBase.hpp" diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_PgCategories.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_PgCategories.cpp index 3a5cab1..d3227c9 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_PgCategories.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_PgCategories.cpp @@ -1,4 +1,4 @@ -#include +#include #include "DbTestBase.hpp" diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_PgCategoriesRepository.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_PgCategoriesRepository.cpp index 4f4de69..33c75f4 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_PgCategoriesRepository.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_PgCategoriesRepository.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include "DbTestBase.hpp" diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_PgCategory.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_PgCategory.cpp index 95064c5..05cd83e 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_PgCategory.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_PgCategory.cpp @@ -1,4 +1,4 @@ -#include +#include #include "DbTestBase.hpp" diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_PgItemsRepository.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_PgItemsRepository.cpp index 2b7269f..f056ab3 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_PgItemsRepository.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_PgItemsRepository.cpp @@ -1,8 +1,8 @@ #include -#include +#include -#include +#include #include #include "DbTestBase.hpp" diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_PgParameter.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_PgParameter.cpp index f74416c..5cfb88b 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_PgParameter.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_PgParameter.cpp @@ -1,4 +1,4 @@ -#include +#include #include "DbTestBase.hpp" diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_PgParametersRepository.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_PgParametersRepository.cpp index a33d59c..5ecc331 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_PgParametersRepository.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_PgParametersRepository.cpp @@ -1,4 +1,4 @@ -#include +#include #include "DbTestBase.hpp" diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_PgUser.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_PgUser.cpp index 92bd7aa..0690f2d 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_PgUser.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_PgUser.cpp @@ -1,9 +1,9 @@ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/libs/db/postgresql_connector/test/test_eedb_data_PgUsers.cpp b/src/libs/db/postgresql_connector/test/test_eedb_data_PgUsers.cpp index 4842a2c..9b53d70 100644 --- a/src/libs/db/postgresql_connector/test/test_eedb_data_PgUsers.cpp +++ b/src/libs/db/postgresql_connector/test/test_eedb_data_PgUsers.cpp @@ -1,8 +1,8 @@ -#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/src/libs/eedb/include/eedb/db/AuthIdentities.hpp b/src/libs/eedb/include/eedb/AuthIdentities.hpp similarity index 100% rename from src/libs/eedb/include/eedb/db/AuthIdentities.hpp rename to src/libs/eedb/include/eedb/AuthIdentities.hpp diff --git a/src/libs/eedb/include/eedb/db/AuthIdentitiesConst.hpp b/src/libs/eedb/include/eedb/AuthIdentitiesConst.hpp similarity index 96% rename from src/libs/eedb/include/eedb/db/AuthIdentitiesConst.hpp rename to src/libs/eedb/include/eedb/AuthIdentitiesConst.hpp index 1146ef7..871d505 100644 --- a/src/libs/eedb/include/eedb/db/AuthIdentitiesConst.hpp +++ b/src/libs/eedb/include/eedb/AuthIdentitiesConst.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace eebd { diff --git a/src/libs/eedb/include/eedb/db/AuthIdentity.hpp b/src/libs/eedb/include/eedb/AuthIdentity.hpp similarity index 100% rename from src/libs/eedb/include/eedb/db/AuthIdentity.hpp rename to src/libs/eedb/include/eedb/AuthIdentity.hpp diff --git a/src/libs/eedb/include/eedb/db/AuthIdentityConst.hpp b/src/libs/eedb/include/eedb/AuthIdentityConst.hpp similarity index 93% rename from src/libs/eedb/include/eedb/db/AuthIdentityConst.hpp rename to src/libs/eedb/include/eedb/AuthIdentityConst.hpp index 5115aee..bc44c72 100644 --- a/src/libs/eedb/include/eedb/db/AuthIdentityConst.hpp +++ b/src/libs/eedb/include/eedb/AuthIdentityConst.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace eedb { class AuthIdentityConst final : public AuthIdentity { diff --git a/src/libs/eedb/include/eedb/db/AuthInfo.hpp b/src/libs/eedb/include/eedb/AuthInfo.hpp similarity index 95% rename from src/libs/eedb/include/eedb/db/AuthInfo.hpp rename to src/libs/eedb/include/eedb/AuthInfo.hpp index 5e182b7..ce937f3 100644 --- a/src/libs/eedb/include/eedb/db/AuthInfo.hpp +++ b/src/libs/eedb/include/eedb/AuthInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace eedb { diff --git a/src/libs/eedb/include/eedb/db/AuthInfoConst.hpp b/src/libs/eedb/include/eedb/AuthInfoConst.hpp similarity index 86% rename from src/libs/eedb/include/eedb/db/AuthInfoConst.hpp rename to src/libs/eedb/include/eedb/AuthInfoConst.hpp index ae48704..72eb660 100644 --- a/src/libs/eedb/include/eedb/db/AuthInfoConst.hpp +++ b/src/libs/eedb/include/eedb/AuthInfoConst.hpp @@ -1,9 +1,9 @@ #pragma once -#include +#include -#include -#include +#include +#include namespace eedb { class AuthInfoConst final : public AuthInfo { diff --git a/src/libs/eedb/include/eedb/db/AuthToken.hpp b/src/libs/eedb/include/eedb/AuthToken.hpp similarity index 100% rename from src/libs/eedb/include/eedb/db/AuthToken.hpp rename to src/libs/eedb/include/eedb/AuthToken.hpp diff --git a/src/libs/eedb/include/eedb/db/AuthTokens.hpp b/src/libs/eedb/include/eedb/AuthTokens.hpp similarity index 91% rename from src/libs/eedb/include/eedb/db/AuthTokens.hpp rename to src/libs/eedb/include/eedb/AuthTokens.hpp index 6d19325..d5959b9 100644 --- a/src/libs/eedb/include/eedb/db/AuthTokens.hpp +++ b/src/libs/eedb/include/eedb/AuthTokens.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/src/libs/eedb/include/eedb/db/Category.hpp b/src/libs/eedb/include/eedb/Category.hpp similarity index 100% rename from src/libs/eedb/include/eedb/db/Category.hpp rename to src/libs/eedb/include/eedb/Category.hpp diff --git a/src/libs/eedb/include/eedb/db/Email.hpp b/src/libs/eedb/include/eedb/Email.hpp similarity index 100% rename from src/libs/eedb/include/eedb/db/Email.hpp rename to src/libs/eedb/include/eedb/Email.hpp diff --git a/src/libs/eedb/include/eedb/db/Item.hpp b/src/libs/eedb/include/eedb/Item.hpp similarity index 100% rename from src/libs/eedb/include/eedb/db/Item.hpp rename to src/libs/eedb/include/eedb/Item.hpp diff --git a/src/libs/eedb/include/eedb/db/Parameter.hpp b/src/libs/eedb/include/eedb/Parameter.hpp similarity index 100% rename from src/libs/eedb/include/eedb/db/Parameter.hpp rename to src/libs/eedb/include/eedb/Parameter.hpp diff --git a/src/libs/eedb/include/eedb/db/Password.hpp b/src/libs/eedb/include/eedb/Password.hpp similarity index 100% rename from src/libs/eedb/include/eedb/db/Password.hpp rename to src/libs/eedb/include/eedb/Password.hpp diff --git a/src/libs/eedb/include/eedb/db/User.hpp b/src/libs/eedb/include/eedb/User.hpp similarity index 100% rename from src/libs/eedb/include/eedb/db/User.hpp rename to src/libs/eedb/include/eedb/User.hpp diff --git a/src/libs/eedb/include/eedb/db/Users.hpp b/src/libs/eedb/include/eedb/Users.hpp similarity index 100% rename from src/libs/eedb/include/eedb/db/Users.hpp rename to src/libs/eedb/include/eedb/Users.hpp diff --git a/src/libs/eedb/include/eedb/Value.hpp b/src/libs/eedb/include/eedb/Value.hpp index 62133d8..3b1617c 100644 --- a/src/libs/eedb/include/eedb/Value.hpp +++ b/src/libs/eedb/include/eedb/Value.hpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include diff --git a/src/libs/eedb/mock/include/eedb/mock/db/AuthIdentitiesMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/AuthIdentitiesMock.hpp index a56a08d..5355c54 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/AuthIdentitiesMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/AuthIdentitiesMock.hpp @@ -5,7 +5,7 @@ #define AUTHIDENTITIESMOCK_HPP #include -#include "././eedb/db/AuthIdentities.hpp" +#include "././eedb/AuthIdentities.hpp" namespace eedb { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/AuthInfoMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/AuthInfoMock.hpp index 572399d..de3a0f3 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/AuthInfoMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/AuthInfoMock.hpp @@ -5,7 +5,7 @@ #define AUTHINFOMOCK_HPP #include -#include "././eedb/db/AuthInfo.hpp" +#include "././eedb/AuthInfo.hpp" namespace eedb { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/AuthTokenMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/AuthTokenMock.hpp index d1e7caa..320ed35 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/AuthTokenMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/AuthTokenMock.hpp @@ -2,7 +2,7 @@ #include -#include +#include namespace eedb { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/AuthTokensMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/AuthTokensMock.hpp index 4162d6c..284199d 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/AuthTokensMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/AuthTokensMock.hpp @@ -5,7 +5,7 @@ #define AUTHTOKENSMOCK_HPP #include -#include "././eedb/db/AuthTokens.hpp" +#include "././eedb/AuthTokens.hpp" namespace eedb { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/CategoriesMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/CategoriesMock.hpp index 98a436e..0e7bfcf 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/CategoriesMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/CategoriesMock.hpp @@ -6,7 +6,7 @@ #include -#include +#include namespace eedb { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/CategoryMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/CategoryMock.hpp index 1fea9b8..71ae558 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/CategoryMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/CategoryMock.hpp @@ -6,7 +6,7 @@ #include -#include +#include namespace eedb { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/ItemMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/ItemMock.hpp index 946e009..e1e7cbb 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/ItemMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/ItemMock.hpp @@ -6,10 +6,10 @@ #include -#include +#include #include -#include +#include namespace eedb { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/ItemQueryFiltersMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/ItemQueryFiltersMock.hpp index 89d9faf..6d9cdcb 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/ItemQueryFiltersMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/ItemQueryFiltersMock.hpp @@ -5,7 +5,7 @@ #define ITEMQUERYFILTERSMOCK_HPP #include -#include "././eedb/db/Item.hpp" +#include "././eedb/Item.hpp" namespace eedb { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/ItemsMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/ItemsMock.hpp index 2a69451..277461d 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/ItemsMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/ItemsMock.hpp @@ -5,7 +5,7 @@ #define ITEMSMOCK_HPP #include -#include "././eedb/db/Item.hpp" +#include "././eedb/Item.hpp" namespace eedb { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/ParameterMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/ParameterMock.hpp index 3efd533..4f13f5d 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/ParameterMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/ParameterMock.hpp @@ -2,7 +2,7 @@ #include -#include +#include namespace eedb { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/ParametersRepositoryMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/ParametersRepositoryMock.hpp index 0cb33bf..78567e6 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/ParametersRepositoryMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/ParametersRepositoryMock.hpp @@ -2,7 +2,7 @@ #include -#include +#include namespace eedb { class ParametersRepositoryMock : public ParametersRepository { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/UserMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/UserMock.hpp index 5454027..3404ddb 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/UserMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/UserMock.hpp @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace eedb { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/UserNameMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/UserNameMock.hpp index 9581c34..5c1ff56 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/UserNameMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/UserNameMock.hpp @@ -5,7 +5,7 @@ #define USERNAMEMOCK_HPP #include -#include "././eedb/db/User.hpp" +#include "././eedb/User.hpp" namespace eedb { diff --git a/src/libs/eedb/mock/include/eedb/mock/db/UsersMock.hpp b/src/libs/eedb/mock/include/eedb/mock/db/UsersMock.hpp index 3591436..4bc1dc1 100644 --- a/src/libs/eedb/mock/include/eedb/mock/db/UsersMock.hpp +++ b/src/libs/eedb/mock/include/eedb/mock/db/UsersMock.hpp @@ -6,7 +6,7 @@ #include -#include +#include namespace eedb { diff --git a/src/libs/webapp/include/eedb/WebApplicationFactory.hpp b/src/libs/webapp/include/eedb/WebApplicationFactory.hpp index 8f6872e..eb0ae21 100644 --- a/src/libs/webapp/include/eedb/WebApplicationFactory.hpp +++ b/src/libs/webapp/include/eedb/WebApplicationFactory.hpp @@ -19,7 +19,7 @@ namespace eedb { class WebApplicationFactory { public: using UsersFactory = std::function< std::unique_ptr< eedb::Users >() >; - using CategoriesFactory = std::function< std::unique_ptr< eedb::CategoriesRepository >(eedb::User *) >; + using CategoriesFactory = std::function< std::unique_ptr< eedb::CategoriesRepository >() >; using DbHolder = std::function< void() >; public: diff --git a/src/libs/webapp/include/widget/CategoryThree.hpp b/src/libs/webapp/include/widget/CategoryThree.hpp index 8638c09..8323e4f 100644 --- a/src/libs/webapp/include/widget/CategoryThree.hpp +++ b/src/libs/webapp/include/widget/CategoryThree.hpp @@ -2,7 +2,7 @@ #include -#include +#include namespace Wt { class WContainerWidget; diff --git a/src/libs/webapp/src/DefaultCategoryTree.cpp b/src/libs/webapp/src/DefaultCategoryTree.cpp index ff86c1c..3f7a861 100644 --- a/src/libs/webapp/src/DefaultCategoryTree.cpp +++ b/src/libs/webapp/src/DefaultCategoryTree.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include diff --git a/src/libs/webapp/src/WebApplicationFactory.cpp b/src/libs/webapp/src/WebApplicationFactory.cpp index 0fd03c3..f67f590 100644 --- a/src/libs/webapp/src/WebApplicationFactory.cpp +++ b/src/libs/webapp/src/WebApplicationFactory.cpp @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/libs/webapp/test/test_eedb_DefaultHomePage.cpp b/src/libs/webapp/test/test_eedb_DefaultHomePage.cpp index d6fd85b..39e66a1 100644 --- a/src/libs/webapp/test/test_eedb_DefaultHomePage.cpp +++ b/src/libs/webapp/test/test_eedb_DefaultHomePage.cpp @@ -6,7 +6,7 @@ //#include "mocks/widgets/NavigationBarMock.hpp" //#include -//#include +//#include //#include diff --git a/src/libs/webapp/test/test_eedb_application.cpp b/src/libs/webapp/test/test_eedb_application.cpp index 652f4dd..b8f687a 100644 --- a/src/libs/webapp/test/test_eedb_application.cpp +++ b/src/libs/webapp/test/test_eedb_application.cpp @@ -10,7 +10,7 @@ //#include //#include -//#include +//#include //#include