Refactor createPrivilegedUser to accept PrivilegedUser object and adjust LoginController for consistency.
This commit is contained in:
@@ -210,15 +210,16 @@ public class LoginController implements LoginApi {
|
||||
try {
|
||||
log.debug("Loading user by uuid {}", uuid.toString());
|
||||
PrivilegedUserMapper mapper = sqlSession.getMapper(PrivilegedUserMapper.class);
|
||||
Optional<PrivilegedUser> privilegedUser = mapper
|
||||
Optional<PrivilegedUser> optionalPrivilegedUser = mapper
|
||||
.getUserByUuid(uuid);
|
||||
|
||||
if (privilegedUser.isEmpty()) {
|
||||
int privilegedUserId = mapper.createPrivilegedUser(uuid);
|
||||
if (optionalPrivilegedUser.isEmpty()) {
|
||||
PrivilegedUser privilegedUser = new PrivilegedUser(null, uuid, List.of());
|
||||
mapper.createPrivilegedUser(privilegedUser);
|
||||
privilegedUserCompletableFuture.complete(
|
||||
Optional.of(new PrivilegedUser(privilegedUserId, uuid, List.of())));
|
||||
Optional.of(privilegedUser));
|
||||
} else {
|
||||
privilegedUserCompletableFuture.complete(privilegedUser);
|
||||
privilegedUserCompletableFuture.complete(optionalPrivilegedUser);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("Failed to load user by uuid", e);
|
||||
|
||||
Reference in New Issue
Block a user