Removed the database lib from services as it is still not a service

src/libs/services/auth/impl/AuthServiceBase.cpp

@@ -19,9 +19,9 @@
 
 #include "AuthServiceBase.hpp"
 
-#include "services/database/Db.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/User.hpp"
+#include "database/Db.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/ILogger.hpp"
 
 namespace Auth

src/libs/services/auth/impl/AuthServiceBase.hpp

@@ -20,7 +20,7 @@
 #pragma once
 
 #include <string_view>
-#include "services/database/UserId.hpp"
+#include "database/UserId.hpp"
 
 namespace Database
 {

src/libs/services/auth/impl/AuthTokenService.cpp

@@ -24,9 +24,9 @@
 #include <Wt/WRandom.h>
 
 #include "services/auth/Types.hpp"
-#include "services/database/AuthToken.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/User.hpp"
+#include "database/AuthToken.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/ILogger.hpp"
 

src/libs/services/auth/impl/PasswordServiceBase.cpp

@@ -28,8 +28,8 @@
 #endif // LMS_SUPPORT_PAM
 
 #include "services/auth/Types.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/ILogger.hpp"
 

src/libs/services/auth/impl/internal/InternalPasswordService.cpp

@@ -22,8 +22,8 @@
 
 #include "services/auth/IAuthTokenService.hpp"
 #include "services/auth/Types.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/ILogger.hpp"
 

src/libs/services/auth/impl/internal/InternalPasswordService.hpp

@@ -22,7 +22,7 @@
 #include <Wt/Auth/HashFunction.h>
 #include <Wt/Auth/PasswordStrengthValidator.h>
 
-#include "services/database/User.hpp"
+#include "database/User.hpp"
 #include "PasswordServiceBase.hpp"
 #include "LoginThrottler.hpp"
 

src/libs/services/auth/impl/pam/PAMPasswordService.cpp

@@ -27,7 +27,7 @@
 #include <security/pam_appl.h>
 
 #include "services/auth/Types.hpp"
-#include "services/database/Session.hpp"
+#include "database/Session.hpp"
 #include "utils/ILogger.hpp"
 
 namespace Auth

src/libs/services/auth/include/services/auth/IAuthTokenService.hpp

@@ -27,7 +27,7 @@
 #include <boost/asio/ip/address.hpp>
 #include <Wt/WDateTime.h>
 
-#include "services/database/UserId.hpp"
+#include "database/UserId.hpp"
 
 namespace Database
 {

src/libs/services/auth/include/services/auth/IEnvService.hpp

@@ -22,7 +22,7 @@
 #include <optional>
 #include <string>
 
-#include "services/database/UserId.hpp"
+#include "database/UserId.hpp"
 
 namespace Database
 {

src/libs/services/auth/include/services/auth/IPasswordService.hpp

@@ -27,7 +27,7 @@
 #include <Wt/Dbo/ptr.h>
 
 #include "services/auth/Types.hpp"
-#include "services/database/UserId.hpp"
+#include "database/UserId.hpp"
 
 namespace Database
 {

src/libs/services/auth/include/services/auth/Types.hpp

@@ -20,7 +20,7 @@
 #pragma once
 
 #include <string>
-#include "services/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/Exception.hpp"
 
 namespace Auth