Databsae service refactoring. Warning, loses stars and listens stats

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

@@ -38,7 +38,7 @@ namespace Auth
 		Session& session {getDbSession()};
 		auto transaction {session.createUniqueTransaction()};
 
-		User::pointer user {User::getByLoginName(session, loginName)};
+		User::pointer user {User::find(session, loginName)};
 		if (!user)
 		{
 			const UserType type {User::getCount(session) == 0 ? UserType::ADMIN : UserType::REGULAR};
@@ -58,7 +58,7 @@ namespace Auth
 		Session& session {getDbSession()};
 		auto transaction {session.createUniqueTransaction()};
 
-		User::pointer user {User::getById(session, userId)};
+		User::pointer user {User::find(session, userId)};
 		if (user)
 			user.modify()->setLastLogin(Wt::WDateTime::currentDateTime());
 	}

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

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

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

@@ -24,6 +24,7 @@
 #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 "utils/Exception.hpp"
@@ -55,7 +56,7 @@ namespace Auth
 
 		auto transaction {session.createUniqueTransaction()};
 
-		Database::User::pointer user {Database::User::getById(session, userId)};
+		Database::User::pointer user {Database::User::find(session, userId)};
 		if (!user)
 			throw Exception {"User deleted"};
 
@@ -77,7 +78,7 @@ namespace Auth
 		Database::Session& session {getDbSession()};
 		auto transaction {session.createUniqueTransaction()};
 
-		Database::AuthToken::pointer authToken {Database::AuthToken::getByValue(session, secretHash)};
+		Database::AuthToken::pointer authToken {Database::AuthToken::find(session, secretHash)};
 		if (!authToken)
 			return std::nullopt;
 
@@ -132,7 +133,7 @@ namespace Auth
 
 		auto transaction {session.createUniqueTransaction()};
 
-		Database::User::pointer user {Database::User::getById(session, userId)};
+		Database::User::pointer user {Database::User::find(session, userId)};
 		if (!user)
 			throw Exception {"User deleted"};
 

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

@@ -51,7 +51,7 @@ namespace Auth
 			Database::Session& session {getDbSession()};
 			auto transaction {session.createSharedTransaction()};
 
-			const Database::User::pointer user {Database::User::getByLoginName(session, loginName)};
+			const Database::User::pointer user {Database::User::find(session, loginName)};
 			if (!user)
 			{
 				LMS_LOG(AUTH, DEBUG) << "hashing random stuff";
@@ -102,7 +102,7 @@ namespace Auth
 		Database::Session& session {getDbSession()};
 		auto transaction {session.createUniqueTransaction()};
 
-		Database::User::pointer user {Database::User::getById(session, userId)};
+		Database::User::pointer user {Database::User::find(session, userId)};
 		if (!user)
 			throw Exception {"User not found!"};
 

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/Types.hpp"
+#include "services/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/Types.hpp"
+#include "services/database/UserId.hpp"
 
 namespace Database
 {

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

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