change directories

src/app/main.cpp

@@ -1,10 +1,11 @@
 #include <spdlog/spdlog.h>
 
-#include <eedb/db/pg/config.hpp>
-#include <eedb/db/pg/connection.hpp>
+#include <eedb/pg/config.hpp>
+#include <eedb/pg/connection.hpp>
 
-#include <eedb/db/pg/PgCategoriesRepository.hpp>
-#include <eedb/db/pg/PgUsers.hpp>
+#include <eedb/pg/PgCategoriesRepository.hpp>
+#include <eedb/pg/PgUsers.hpp>
+#include <eedb/pg/PgItemsRepository.hpp>
 
 #include <eedb/WebApplicationFactory.hpp>
 #include <eedb/WebServer.hpp>
@@ -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;

src/libs/auth/src/PgUserAuth.cpp

@@ -1,13 +1,13 @@
 #include <eedb/auth/PgUserAuth.hpp>
 
 #include <eedb/auth/Services.hpp>
-#include <eedb/db/AuthIdentities.hpp>
-#include <eedb/db/AuthIdentityConst.hpp>
-#include <eedb/db/AuthInfoConst.hpp>
-#include <eedb/db/AuthTokens.hpp>
-#include <eedb/db/Email.hpp>
-#include <eedb/db/Password.hpp>
-#include <eedb/db/Users.hpp>
+#include <eedb/AuthIdentities.hpp>
+#include <eedb/AuthIdentityConst.hpp>
+#include <eedb/AuthInfoConst.hpp>
+#include <eedb/AuthTokens.hpp>
+#include <eedb/Email.hpp>
+#include <eedb/Password.hpp>
+#include <eedb/Users.hpp>
 
 #include <Wt/Auth/AuthService.h>
 

src/libs/db/postgresql_connector/include/eedb/pg/Parameter.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/Parameter.hpp>
+#include <eedb/Parameter.hpp>
 
 #include <utils/spimpl.hpp>
 

src/libs/db/postgresql_connector/include/eedb/pg/ParametersRepository.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/Parameter.hpp>
+#include <eedb/Parameter.hpp>
 
 #include <utils/spimpl.hpp>
 

src/libs/db/postgresql_connector/include/eedb/pg/PgAuthIdentity.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <eedb/db/AuthIdentity.hpp>
-#include <eedb/db/AuthIdentities.hpp>
+#include <eedb/AuthIdentity.hpp>
+#include <eedb/AuthIdentities.hpp>
 
 #include <utils/spimpl.hpp>
 

src/libs/db/postgresql_connector/include/eedb/pg/PgAuthToken.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <eedb/db/AuthToken.hpp>
-#include <eedb/db/AuthTokens.hpp>
+#include <eedb/AuthToken.hpp>
+#include <eedb/AuthTokens.hpp>
 
 #include <utils/spimpl.hpp>
 

src/libs/db/postgresql_connector/include/eedb/pg/PgCategories.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/Category.hpp>
+#include <eedb/Category.hpp>
 
 #include <utils/spimpl.hpp>
 

src/libs/db/postgresql_connector/include/eedb/pg/PgCategoriesRepository.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/Category.hpp>
+#include <eedb/Category.hpp>
 
 #include <utils/spimpl.hpp>
 

src/libs/db/postgresql_connector/include/eedb/pg/PgCategory.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/Category.hpp>
+#include <eedb/Category.hpp>
 
 #include <utils/spimpl.hpp>
 

src/libs/db/postgresql_connector/include/eedb/pg/PgItem.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/Item.hpp>
+#include <eedb/Item.hpp>
 
 #include <utils/spimpl.hpp>
 

src/libs/db/postgresql_connector/include/eedb/pg/PgItems.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/Item.hpp>
+#include <eedb/Item.hpp>
 
 namespace eedb {
 class PgItems : public Items {};

src/libs/db/postgresql_connector/include/eedb/pg/PgItemsRepository.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/Item.hpp>
+#include <eedb/Item.hpp>
 
 #include <utils/spimpl.hpp>
 

src/libs/db/postgresql_connector/include/eedb/pg/PgUser.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <eedb/db/User.hpp>
+#include <eedb/User.hpp>
 
-#include <eedb/db/AuthInfo.hpp>
+#include <eedb/AuthInfo.hpp>
 
 #include <utils/spimpl.hpp>
 

src/libs/db/postgresql_connector/include/eedb/pg/PgUsers.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/Users.hpp>
+#include <eedb/Users.hpp>
 
 #include <utils/spimpl.hpp>
 

src/libs/db/postgresql_connector/include/eedb/pg/Stats.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/User.hpp>
+#include <eedb/User.hpp>
 
 #include <sqlpp11/sqlpp11.h>
 

src/libs/db/postgresql_connector/include/eedb/pg/model/all.hpp

@@ -1,17 +1,17 @@
 #pragma once
 
-#include <eedb/db/pg/model/auth_identity.h>
-#include <eedb/db/pg/model/auth_info.h>
-#include <eedb/db/pg/model/auth_token.h>
-#include <eedb/db/pg/model/category.h>
-#include <eedb/db/pg/model/category_items.h>
-#include <eedb/db/pg/model/group.h>
-#include <eedb/db/pg/model/item.h>
-#include <eedb/db/pg/model/parameter.h>
-#include <eedb/db/pg/model/stat.h>
-#include <eedb/db/pg/model/system_info.h>
-#include <eedb/db/pg/model/unit.h>
-#include <eedb/db/pg/model/user_audit.h>
+#include <eedb/pg/model/auth_identity.h>
+#include <eedb/pg/model/auth_info.h>
+#include <eedb/pg/model/auth_token.h>
+#include <eedb/pg/model/category.h>
+#include <eedb/pg/model/category_items.h>
+#include <eedb/pg/model/group.h>
+#include <eedb/pg/model/item.h>
+#include <eedb/pg/model/parameter.h>
+#include <eedb/pg/model/stat.h>
+#include <eedb/pg/model/system_info.h>
+#include <eedb/pg/model/unit.h>
+#include <eedb/pg/model/user_audit.h>
 
 static constexpr eedb::db::auth_identity t_auth_identity;
 static constexpr eedb::db::auth_info t_auth_info;

src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthIdentitiesMock.hpp

@@ -5,7 +5,7 @@
 #define AUTHIDENTITIESMOCK_HPP
 
 #include <gmock/gmock.h>
-#include "././eedb/db/AuthIdentities.hpp"
+#include "././eedb/AuthIdentities.hpp"
 
 namespace eedb {
 

src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthInfoMock.hpp

@@ -5,7 +5,7 @@
 #define AUTHINFOMOCK_HPP
 
 #include <gmock/gmock.h>
-#include "././eedb/db/AuthInfo.hpp"
+#include "././eedb/AuthInfo.hpp"
 
 namespace eedb {
 

src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthTokenMock.hpp

@@ -5,15 +5,15 @@
 
 #include <eedb/mock/db/AuthTokenMock.hpp>
 
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/all.hpp>
 
 #include <sqlpp11/postgresql/insert.h>
 #include <sqlpp11/sqlpp11.h>
 
 #include <random>
 
-#include <eedb/db/User.hpp>
+#include <eedb/User.hpp>
 
 namespace eedb::db {
 

src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/AuthTokensMock.hpp

@@ -5,7 +5,7 @@
 #define AUTHTOKENSMOCK_HPP
 
 #include <gmock/gmock.h>
-#include "././eedb/db/AuthTokens.hpp"
+#include "././eedb/AuthTokens.hpp"
 
 namespace eedb {
 

src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/CategoriesMock.hpp

@@ -6,7 +6,7 @@
 
 #include <gmock/gmock.h>
 
-#include <eedb/db/Category.hpp>
+#include <eedb/Category.hpp>
 
 namespace eedb {
 

src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/CategoryMock.hpp

@@ -4,8 +4,8 @@
 
 #include <eedb/mock/db/CategoryMock.hpp>
 
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/all.hpp>
 
 #include <sqlpp11/postgresql/insert.h>
 #include <sqlpp11/sqlpp11.h>

src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ItemQueryFiltersMock.hpp

@@ -5,7 +5,7 @@
 #define ITEMQUERYFILTERSMOCK_HPP
 
 #include <gmock/gmock.h>
-#include "././eedb/db/Item.hpp"
+#include "././eedb/Item.hpp"
 
 namespace eedb {
 

src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ItemsMock.hpp

@@ -5,7 +5,7 @@
 #define ITEMSMOCK_HPP
 
 #include <gmock/gmock.h>
-#include "././eedb/db/Item.hpp"
+#include "././eedb/Item.hpp"
 
 namespace eedb {
 

src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/ParameterMock.hpp

@@ -5,8 +5,8 @@
 #include <sqlpp11/postgresql/insert.h>
 #include <sqlpp11/sqlpp11.h>
 
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/all.hpp>
 
 namespace eedb::db::pg {
 

src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UserMock.hpp

@@ -4,14 +4,14 @@
 
 #include <eedb/mock/db/UserMock.hpp>
 
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/all.hpp>
 
 #include <sqlpp11/postgresql/insert.h>
 #include <sqlpp11/sqlpp11.h>
 
-#include <eedb/db/AuthIdentityConst.hpp>
-#include <eedb/db/pg/Stats.hpp>
+#include <eedb/AuthIdentityConst.hpp>
+#include <eedb/pg/Stats.hpp>
 
 namespace eedb::db::pg {
 

src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UserNameMock.hpp

@@ -5,7 +5,7 @@
 #define USERNAMEMOCK_HPP
 
 #include <gmock/gmock.h>
-#include "././eedb/db/User.hpp"
+#include "././eedb/User.hpp"
 
 namespace eedb {
 

src/libs/db/postgresql_connector/mock/include/eedb/mock/db/pg/UsersMock.hpp

@@ -6,7 +6,7 @@
 
 #include <gmock/gmock.h>
 
-#include <eedb/db/Users.hpp>
+#include <eedb/Users.hpp>
 
 namespace eedb {
 

src/libs/db/postgresql_connector/src/RawSql.cpp

@@ -1,9 +1,9 @@
-#include <eedb/db/pg/RawSql.hpp>
+#include <eedb/pg/RawSql.hpp>
 
 #include <string>
 #include <fstream>
 
-#include <eedb/db/pg/connection.hpp>
+#include <eedb/pg/connection.hpp>
 #include <sqlpp11/sqlpp11.h>
 
 namespace eedb::db{

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 {
 

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 {
 

src/libs/db/postgresql_connector/src/data/Parameter.cpp

@@ -1 +1 @@
-#include <eedb/db/pg/Parameter.hpp>
+#include <eedb/pg/Parameter.hpp>

src/libs/db/postgresql_connector/src/data/ParametersRepository.cpp

@@ -1,10 +1,10 @@
-#include <eedb/db/pg/ParametersRepository.hpp>
+#include <eedb/pg/ParametersRepository.hpp>
 
-#include <eedb/db/User.hpp>
-#include <eedb/db/pg/Parameter.hpp>
-#include <eedb/db/pg/connection.hpp>
+#include <eedb/User.hpp>
+#include <eedb/pg/Parameter.hpp>
+#include <eedb/pg/connection.hpp>
 
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/pg/model/all.hpp>
 #include <sqlpp11/sqlpp11.h>
 
 namespace eedb {

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 <eedb/db/User.hpp>
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/auth_identity.h>
+#include <eedb/User.hpp>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/auth_identity.h>
 
 #include <sqlpp11/postgresql/exception.h>
 #include <sqlpp11/sqlpp11.h>

src/libs/db/postgresql_connector/src/data/PgAuthToken.cpp

@@ -1,9 +1,9 @@
-#include <eedb/db/pg/PgAuthToken.hpp>
+#include <eedb/pg/PgAuthToken.hpp>
 
-#include <eedb/db/User.hpp>
+#include <eedb/User.hpp>
 
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/auth_token.h>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/auth_token.h>
 
 #include <utils/Visitor.hpp>
 

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 <eedb/db/pg/PgCategory.hpp>
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/pg/PgCategory.hpp>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/all.hpp>
 
 #include <boost/iterator/transform_iterator.hpp>
 

src/libs/db/postgresql_connector/src/data/PgCategoriesRepository.cpp

@@ -1,9 +1,9 @@
-#include <eedb/db/pg/PgCategoriesRepository.hpp>
+#include <eedb/pg/PgCategoriesRepository.hpp>
 
-#include <eedb/db/pg/PgCategory.hpp>
+#include <eedb/pg/PgCategory.hpp>
 
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/all.hpp>
 
 namespace eedb {
 struct PgCategoriesRepository::PgCategoriesRepositoryPriv {

src/libs/db/postgresql_connector/src/data/PgCategory.cpp

@@ -1,15 +1,15 @@
-#include <eedb/db/pg/PgCategory.hpp>
+#include <eedb/pg/PgCategory.hpp>
 
-#include <eedb/db/pg/PgCategories.hpp>
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/pg/PgCategories.hpp>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/all.hpp>
 
-#include <eedb/db/User.hpp>
+#include <eedb/User.hpp>
 
 #include <spdlog/spdlog.h>
 #include <sqlpp11/sqlpp11.h>
 
-#include <eedb/db/pg/Stats.hpp>
+#include <eedb/pg/Stats.hpp>
 
 namespace eedb {
 

src/libs/db/postgresql_connector/src/data/PgItem.cpp

@@ -1,10 +1,10 @@
-#include <eedb/db/pg/PgItem.hpp>
+#include <eedb/pg/PgItem.hpp>
 
 #include <eedb/Value.hpp>
-#include <eedb/db/Category.hpp>
+#include <eedb/Category.hpp>
 
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/all.hpp>
 
 #include <sqlpp11/sqlpp11.h>
 

src/libs/db/postgresql_connector/src/data/PgItemsRepository.cpp

@@ -1,20 +1,20 @@
-#include <eedb/db/pg/PgItemsRepository.hpp>
+#include <eedb/pg/PgItemsRepository.hpp>
 
 #include <eedb/Value.hpp>
-#include <eedb/db/Parameter.hpp>
-#include <eedb/db/User.hpp>
-#include <eedb/db/pg/ParametersRepository.hpp>
-#include <eedb/db/pg/PgCategory.hpp>
-#include <eedb/db/pg/PgItem.hpp>
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/Parameter.hpp>
+#include <eedb/User.hpp>
+#include <eedb/pg/ParametersRepository.hpp>
+#include <eedb/pg/PgCategory.hpp>
+#include <eedb/pg/PgItem.hpp>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/all.hpp>
 
 #include <nlohmann/json.hpp>
 #include <spdlog/spdlog.h>
 #include <sqlpp11/postgresql/exception.h>
 #include <sqlpp11/sqlpp11.h>
 
-#include <eedb/db/pg/Stats.hpp>
+#include <eedb/pg/Stats.hpp>
 
 #include <boost/iterator/transform_iterator.hpp>
 

src/libs/db/postgresql_connector/src/data/PgUser.cpp

@@ -1,10 +1,10 @@
-#include <eedb/db/pg/PgUser.hpp>
+#include <eedb/pg/PgUser.hpp>
 
-#include <eedb/db/AuthInfoConst.hpp>
-#include <eedb/db/pg/PgAuthIdentity.hpp>
-#include <eedb/db/pg/PgAuthToken.hpp>
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/AuthInfoConst.hpp>
+#include <eedb/pg/PgAuthIdentity.hpp>
+#include <eedb/pg/PgAuthToken.hpp>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/all.hpp>
 
 #include <sqlpp11/sqlpp11.h>
 

src/libs/db/postgresql_connector/src/data/PgUsers.cpp

@@ -1,16 +1,16 @@
-#include <eedb/db/pg/PgUsers.hpp>
+#include <eedb/pg/PgUsers.hpp>
 
-#include <eedb/db/pg/PgUser.hpp>
+#include <eedb/pg/PgUser.hpp>
 
-#include <eedb/db/AuthIdentity.hpp>
-#include <eedb/db/AuthToken.hpp>
-#include <eedb/db/Email.hpp>
-#include <eedb/db/Password.hpp>
+#include <eedb/AuthIdentity.hpp>
+#include <eedb/AuthToken.hpp>
+#include <eedb/Email.hpp>
+#include <eedb/Password.hpp>
 
-#include <eedb/db/pg/connection.hpp>
-#include <eedb/db/pg/model/auth_identity.h>
-#include <eedb/db/pg/model/auth_info.h>
-#include <eedb/db/pg/model/auth_token.h>
+#include <eedb/pg/connection.hpp>
+#include <eedb/pg/model/auth_identity.h>
+#include <eedb/pg/model/auth_info.h>
+#include <eedb/pg/model/auth_token.h>
 
 #include <sqlpp11/sqlpp11.h>
 

src/libs/db/postgresql_connector/test/DbTestBase.hpp

@@ -1,8 +1,8 @@
 #include <gmock/gmock.h>
 
-#include <eedb/db/pg/RawSql.hpp>
-#include <eedb/db/pg/config.hpp>
-#include <eedb/db/pg/connection.hpp>
+#include <eedb/pg/RawSql.hpp>
+#include <eedb/pg/config.hpp>
+#include <eedb/pg/connection.hpp>
 #include <sqlpp11/postgresql/exception.h>
 #include <sqlpp11/sqlpp11.h>
 

src/libs/db/postgresql_connector/test/test_eedb_data_Item.cpp

@@ -1,7 +1,7 @@
 #include <gmock/gmock.h>
 
-#include <eedb/db/pg/PgItem.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/pg/PgItem.hpp>
+#include <eedb/pg/model/all.hpp>
 
 #include "DbTestBase.hpp"
 

src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthIdentities.cpp

@@ -1,6 +1,6 @@
 #include <gmock/gmock.h>
 
-#include <eedb/db/pg/PgAuthIdentity.hpp>
+#include <eedb/pg/PgAuthIdentity.hpp>
 
 #include "DbTestBase.hpp"
 

src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthIdentity.cpp

@@ -1,6 +1,6 @@
 #include <gmock/gmock.h>
 
-#include <eedb/db/pg/PgAuthIdentity.hpp>
+#include <eedb/pg/PgAuthIdentity.hpp>
 
 #include "DbTestBase.hpp"
 

src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthToken.cpp

@@ -1,11 +1,11 @@
 #include <gmock/gmock.h>
 
-#include <eedb/db/pg/PgAuthToken.hpp>
+#include <eedb/pg/PgAuthToken.hpp>
 
-#include <eedb/db/AuthIdentity.hpp>
-#include <eedb/db/Users.hpp>
+#include <eedb/AuthIdentity.hpp>
+#include <eedb/Users.hpp>
 
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/pg/model/all.hpp>
 #include <sqlpp11/sqlpp11.h>
 
 #include "DbTestBase.hpp"

src/libs/db/postgresql_connector/test/test_eedb_data_PgAuthTokens.cpp

@@ -1,6 +1,6 @@
 #include <gmock/gmock.h>
 
-#include <eedb/db/pg/PgAuthToken.hpp>
+#include <eedb/pg/PgAuthToken.hpp>
 
 #include "DbTestBase.hpp"
 

src/libs/db/postgresql_connector/test/test_eedb_data_PgCategories.cpp

@@ -1,4 +1,4 @@
-#include <eedb/db/pg/PgCategories.hpp>
+#include <eedb/pg/PgCategories.hpp>
 
 #include "DbTestBase.hpp"
 

src/libs/db/postgresql_connector/test/test_eedb_data_PgCategoriesRepository.cpp

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <eedb/db/pg/PgCategoriesRepository.hpp>
+#include <eedb/pg/PgCategoriesRepository.hpp>
 
 #include "DbTestBase.hpp"
 

src/libs/db/postgresql_connector/test/test_eedb_data_PgCategory.cpp

@@ -1,4 +1,4 @@
-#include <eedb/db/pg/PgCategory.hpp>
+#include <eedb/pg/PgCategory.hpp>
 
 #include "DbTestBase.hpp"
 

src/libs/db/postgresql_connector/test/test_eedb_data_PgItemsRepository.cpp

@@ -1,8 +1,8 @@
 #include <gmock/gmock.h>
 
-#include <eedb/db/pg/PgItemsRepository.hpp>
+#include <eedb/pg/PgItemsRepository.hpp>
 
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/pg/model/all.hpp>
 #include <sqlpp11/sqlpp11.h>
 
 #include "DbTestBase.hpp"

src/libs/db/postgresql_connector/test/test_eedb_data_PgParameter.cpp

@@ -1,4 +1,4 @@
-#include <eedb/db/pg/Parameter.hpp>
+#include <eedb/pg/Parameter.hpp>
 
 #include "DbTestBase.hpp"
 

src/libs/db/postgresql_connector/test/test_eedb_data_PgParametersRepository.cpp

@@ -1,4 +1,4 @@
-#include <eedb/db/pg/ParametersRepository.hpp>
+#include <eedb/pg/ParametersRepository.hpp>
 
 #include "DbTestBase.hpp"
 

src/libs/db/postgresql_connector/test/test_eedb_data_PgUser.cpp

@@ -1,9 +1,9 @@
-#include <eedb/db/pg/PgUser.hpp>
+#include <eedb/pg/PgUser.hpp>
 
-#include <eedb/db/AuthIdentities.hpp>
-#include <eedb/db/AuthIdentityConst.hpp>
-#include <eedb/db/AuthInfoConst.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/AuthIdentities.hpp>
+#include <eedb/AuthIdentityConst.hpp>
+#include <eedb/AuthInfoConst.hpp>
+#include <eedb/pg/model/all.hpp>
 
 #include <sqlpp11/sqlpp11.h>
 

src/libs/db/postgresql_connector/test/test_eedb_data_PgUsers.cpp

@@ -1,8 +1,8 @@
-#include <eedb/db/pg/PgUsers.hpp>
+#include <eedb/pg/PgUsers.hpp>
 
-#include <eedb/db/AuthIdentityConst.hpp>
-#include <eedb/db/AuthInfoConst.hpp>
-#include <eedb/db/pg/model/all.hpp>
+#include <eedb/AuthIdentityConst.hpp>
+#include <eedb/AuthInfoConst.hpp>
+#include <eedb/pg/model/all.hpp>
 
 #include <sqlpp11/sqlpp11.h>
 

src/libs/eedb/include/eedb/AuthIdentitiesConst.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/AuthIdentities.hpp>
+#include <eedb/AuthIdentities.hpp>
 
 namespace eebd {
 

src/libs/eedb/include/eedb/AuthIdentityConst.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/AuthIdentity.hpp>
+#include <eedb/AuthIdentity.hpp>
 
 namespace eedb {
 class AuthIdentityConst final : public AuthIdentity {

src/libs/eedb/include/eedb/AuthInfo.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/User.hpp>
+#include <eedb/User.hpp>
 
 namespace eedb {
 

src/libs/eedb/include/eedb/AuthInfoConst.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <eedb/db/AuthInfo.hpp>
+#include <eedb/AuthInfo.hpp>
 
-#include <eedb/db/Email.hpp>
-#include <eedb/db/Password.hpp>
+#include <eedb/Email.hpp>
+#include <eedb/Password.hpp>
 
 namespace eedb {
 class AuthInfoConst final : public AuthInfo {

src/libs/eedb/include/eedb/AuthTokens.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <eedb/db/AuthToken.hpp>
+#include <eedb/AuthToken.hpp>
 
 #include <variant>
 

src/libs/eedb/include/eedb/Value.hpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <variant>
 
-#include <eedb/db/Parameter.hpp>
+#include <eedb/Parameter.hpp>
 
 #include <nlohmann/json.hpp>
 

src/libs/eedb/mock/include/eedb/mock/db/AuthIdentitiesMock.hpp

@@ -5,7 +5,7 @@
 #define AUTHIDENTITIESMOCK_HPP
 
 #include <gmock/gmock.h>
-#include "././eedb/db/AuthIdentities.hpp"
+#include "././eedb/AuthIdentities.hpp"
 
 namespace eedb {
 

src/libs/eedb/mock/include/eedb/mock/db/AuthInfoMock.hpp

@@ -5,7 +5,7 @@
 #define AUTHINFOMOCK_HPP
 
 #include <gmock/gmock.h>
-#include "././eedb/db/AuthInfo.hpp"
+#include "././eedb/AuthInfo.hpp"
 
 namespace eedb {
 

src/libs/eedb/mock/include/eedb/mock/db/AuthTokenMock.hpp

@@ -2,7 +2,7 @@
 
 #include <gmock/gmock.h>
 
-#include <eedb/db/AuthToken.hpp>
+#include <eedb/AuthToken.hpp>
 
 namespace eedb {
 

src/libs/eedb/mock/include/eedb/mock/db/AuthTokensMock.hpp

@@ -5,7 +5,7 @@
 #define AUTHTOKENSMOCK_HPP
 
 #include <gmock/gmock.h>
-#include "././eedb/db/AuthTokens.hpp"
+#include "././eedb/AuthTokens.hpp"
 
 namespace eedb {
 

src/libs/eedb/mock/include/eedb/mock/db/CategoriesMock.hpp

@@ -6,7 +6,7 @@
 
 #include <gmock/gmock.h>
 
-#include <eedb/db/Category.hpp>
+#include <eedb/Category.hpp>
 
 namespace eedb {
 

src/libs/eedb/mock/include/eedb/mock/db/CategoryMock.hpp

@@ -6,7 +6,7 @@
 
 #include <gmock/gmock.h>
 
-#include <eedb/db/Category.hpp>
+#include <eedb/Category.hpp>
 
 namespace eedb {
 

src/libs/eedb/mock/include/eedb/mock/db/ItemMock.hpp

@@ -6,10 +6,10 @@
 
 #include <gmock/gmock.h>
 
-#include <eedb/db/Item.hpp>
+#include <eedb/Item.hpp>
 
 #include <eedb/Value.hpp>
-#include <eedb/db/Parameter.hpp>
+#include <eedb/Parameter.hpp>
 
 namespace eedb {
 

src/libs/eedb/mock/include/eedb/mock/db/ItemQueryFiltersMock.hpp

@@ -5,7 +5,7 @@
 #define ITEMQUERYFILTERSMOCK_HPP
 
 #include <gmock/gmock.h>
-#include "././eedb/db/Item.hpp"
+#include "././eedb/Item.hpp"
 
 namespace eedb {
 

src/libs/eedb/mock/include/eedb/mock/db/ItemsMock.hpp

@@ -5,7 +5,7 @@
 #define ITEMSMOCK_HPP
 
 #include <gmock/gmock.h>
-#include "././eedb/db/Item.hpp"
+#include "././eedb/Item.hpp"
 
 namespace eedb {
 

src/libs/eedb/mock/include/eedb/mock/db/ParameterMock.hpp

@@ -2,7 +2,7 @@
 
 #include <gmock/gmock.h>
 
-#include <eedb/db/Parameter.hpp>
+#include <eedb/Parameter.hpp>
 
 namespace eedb {
 

src/libs/eedb/mock/include/eedb/mock/db/ParametersRepositoryMock.hpp

@@ -2,7 +2,7 @@
 
 #include <gmock/gmock.h>
 
-#include <eedb/db/Parameter.hpp>
+#include <eedb/Parameter.hpp>
 
 namespace eedb {
 class ParametersRepositoryMock : public ParametersRepository {

src/libs/eedb/mock/include/eedb/mock/db/UserMock.hpp

@@ -2,11 +2,11 @@
 
 #include <gmock/gmock.h>
 
-#include <eedb/db/AuthIdentities.hpp>
-#include <eedb/db/AuthIdentity.hpp>
-#include <eedb/db/AuthInfo.hpp>
-#include <eedb/db/AuthTokens.hpp>
-#include <eedb/db/User.hpp>
+#include <eedb/AuthIdentities.hpp>
+#include <eedb/AuthIdentity.hpp>
+#include <eedb/AuthInfo.hpp>
+#include <eedb/AuthTokens.hpp>
+#include <eedb/User.hpp>
 
 namespace eedb {