Remove keycloak and add missing functions

This commit is contained in:
2026-05-09 19:36:49 +02:00
parent b28edbbd3a
commit 57a5358701
22 changed files with 89 additions and 313 deletions
@@ -5,12 +5,12 @@ using Musify.Application.Contracts.Application;
using Musify.Application.Contracts.Infrastructure;
using Musify.Application.Users.Queries;
using Musify.Application.Users.Responses;
using X.PagedList;
using X.PagedList.EF;
using X.PagedList.Extensions;
namespace Musify.Application.Users.Handlers
{
public class GetUsersQueryHandler(IDatabase database, IKeycloakUserService keycloakUserClient)
public class GetUsersQueryHandler(IDatabase database)
: IQueryHandler<GetUsersQuery, Result<PaginatedResponse<UserResponse> > >
{
public async ValueTask<Result<PaginatedResponse<UserResponse> >> Handle(GetUsersQuery request, CancellationToken cancellationToken)
@@ -19,43 +19,21 @@ namespace Musify.Application.Users.Handlers
var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
var first = (pageNumber - 1) * pageSize;
var keycloakUsers = await keycloakUserClient.GetUsersAsync(
cancellationToken,
first: first,
max: pageSize,
search: request.UsernameSearch);
var user = database.Users
.AsNoTracking()
.AsQueryable();
if (!string.IsNullOrEmpty(request.UsernameSearch))
{
var normalizedUsername = request.UsernameSearch.Trim().ToUpperInvariant();
user = user.Where(u => u.NormalizedName.Contains(normalizedUsername));
}
var keycloakIds = keycloakUsers.Select(u => u.Id).ToList();
var totalCount = await user.CountAsync(cancellationToken);
var pagedUser = await user
.Select(u => UserResponse.FromEntity(u))
.ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
var databaseUsers = await database.Users
.Where(u => keycloakIds.Contains(u.Id))
.ToListAsync(cancellationToken);
var users = databaseUsers
.Join(keycloakUsers, db => db.Id, kc => kc.Id,
(databaseSource, keycloakSource) => new UserResponse(
keycloakSource.Id.ToString(),
keycloakSource.Name,
keycloakSource.FirstName,
keycloakSource.SecondName,
databaseSource.CreatedAt,
databaseSource.UpdatedAt))
.ToArray();
var totalItemCount = await keycloakUserClient.GetUsersCountAsync(cancellationToken, search: request.UsernameSearch);
var pagedUsers = new StaticPagedList<UserResponse>(users, pageNumber, pageSize, totalItemCount);
var response = new PaginatedResponse<UserResponse>(
pagedUsers.ToArray(),
pagedUsers.PageNumber,
pagedUsers.PageSize,
pagedUsers.PageCount,
pagedUsers.TotalItemCount,
pagedUsers.HasNextPage,
pagedUsers.HasPreviousPage);
return Result.Success(response);
return Result.Success(PaginatedResponse<UserResponse>.FromPagedList(pagedUser));
}
}
}