NotS1mp/Musify
0
0
Fork 0
Code Issues 23 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove keycloak and add missing functions

Browse Source
This commit is contained in:
Admin
2026-05-09 19:36:49 +02:00
parent b28edbbd3a
commit 57a5358701
22 changed files with 89 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Application/Contracts/Application/PaginatedResponse.cs
+17 -2
View File
@@ -1,4 +1,6 @@
namespace Musify.Application.Contracts.Application
using X.PagedList;
namespace Musify.Application.Contracts.Application
{
public record PaginatedResponse<T>(
IReadOnlyCollection<T> Items,
@@ -7,5 +9,18 @@
int PageCount,
int TotalItemCount,
bool HasNextPage,
bool HasPreviousPage);
bool HasPreviousPage)
{
public static PaginatedResponse<T> FromPagedList(IPagedList<T> pagedList)
{
return new PaginatedResponse<T>(
pagedList.ToArray(),
pagedList.PageNumber,
pagedList.PageSize,
pagedList.PageCount,
pagedList.TotalItemCount,
pagedList.HasNextPage,
pagedList.HasPreviousPage);
}
}
}
Application/Contracts/Infrastructure/IKeycloakUserService.cs
-21
View File
@@ -1,21 +0,0 @@
using Musify.Application.Users.Responses;
namespace Musify.Application.Contracts.Infrastructure
{
public interface IKeycloakUserService
{
Task<KeycloakUserResponse> GetUserByIdAsync(string keycloakId, CancellationToken cancellationToken);
Task<IReadOnlyCollection<KeycloakUserResponse>> GetUsersAsync(
CancellationToken cancellationToken,
string search = "",
int first = 0,
int max = 20,
string username = "");
Task<int> GetUsersCountAsync(
CancellationToken cancellationToken,
string search = "",
string username = "");
}
}
Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs
+1 -10
View File
@@ -32,16 +32,7 @@ namespace Musify.Application.PlayLists.Handlers
.Select(p => PlayListResponse.FromEntity(p))
.ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
var response = new PaginatedResponse<PlayListResponse>(
pagedPlayLists.ToArray(),
pagedPlayLists.PageNumber,
pagedPlayLists.PageSize,
pagedPlayLists.PageCount,
pagedPlayLists.TotalItemCount,
pagedPlayLists.HasNextPage,
pagedPlayLists.HasPreviousPage);
return Result.Success(response);
return Result.Success(PaginatedResponse<PlayListResponse>.FromPagedList(pagedPlayLists));
}
}
}
Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs
+1 -10
View File
@@ -25,16 +25,7 @@ namespace Musify.Application.PlayLists.Handlers
.Select(p => PlayListResponse.FromEntity(p))
.ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
var response = new PaginatedResponse<PlayListResponse>(
pagedPlayLists.ToArray(),
pagedPlayLists.PageNumber,
pagedPlayLists.PageSize,
pagedPlayLists.PageCount,
pagedPlayLists.TotalItemCount,
pagedPlayLists.HasNextPage,
pagedPlayLists.HasPreviousPage);
return Result.Success(response);
return Result.Success(PaginatedResponse<PlayListResponse>.FromPagedList(pagedPlayLists));
}
}
}
Application/Tracks/Handler/CreateTrackCommandHandler.cs
+1 -1
View File
@@ -42,7 +42,7 @@ namespace Musify.Application.Tracks.Handler
await database.Tracks.AddAsync(trackEntity, cancellationToken);
await database.SaveChangesAsync(cancellationToken);
return Result.Success();
return Result.Created(TrackResponse.FromEntity(trackEntity));
}
async Task<Result> UploadFilesAsync(
Application/Tracks/Handler/GetTracksByUserIdQueryHandler.cs
+1 -10
View File
@@ -33,16 +33,7 @@ namespace Musify.Application.Tracks.Handler
.Select(t => TrackResponse.FromEntity(t.Track))
.ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
var response = new PaginatedResponse<TrackResponse>(
pagedTracks.ToArray(),
pagedTracks.PageNumber,
pagedTracks.PageSize,
pagedTracks.PageCount,
pagedTracks.TotalItemCount,
pagedTracks.HasNextPage,
pagedTracks.HasPreviousPage);
return Result.Success(response);
return Result.Success(PaginatedResponse<TrackResponse>.FromPagedList(pagedTracks));
}
}
}
Application/Tracks/Handler/GetTracksQueryHandler.cs
+1 -11
View File
@@ -18,7 +18,6 @@ namespace Musify.Application.Tracks.Handler
var pageSize = request.PageSize < 1 ? 10 : request.PageSize;
var totalCount = await database.PlayLists.CountAsync(cancellationToken);
var pagedPlayLists = await database.UserHasTracks
.AsNoTracking()
.OrderBy(t => t.Id)
@@ -26,16 +25,7 @@ namespace Musify.Application.Tracks.Handler
.Select(t => TrackResponse.FromEntity(t.Track))
.ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
var response = new PaginatedResponse<TrackResponse>(
pagedPlayLists.ToArray(),
pagedPlayLists.PageNumber,
pagedPlayLists.PageSize,
pagedPlayLists.PageCount,
pagedPlayLists.TotalItemCount,
pagedPlayLists.HasNextPage,
pagedPlayLists.HasPreviousPage);
return Result.Success(response);
return Result.Success(PaginatedResponse<TrackResponse>.FromPagedList(pagedPlayLists));
}
}
}
Application/Users/Commands/CreateUserCommand.cs
+9 -2
View File
@@ -5,14 +5,21 @@ using Musify.Domain.Entities;
namespace Musify.Application.Users.Commands
{
public record CreateUserCommand(Guid Id)
public record CreateUserCommand(Guid Id,
string Name,
string? FirstName,
string? SecondName)
: ICommand<Result<UserResponse>>
{
public static User ToEntity(CreateUserCommand command)
{
return new User
{
Id = command.Id
Id = command.Id,
Name = command.Name,
NormalizedName = command.Name.ToUpperInvariant(),
FirstName = command.FirstName,
SecondName = command.SecondName
};
}
}
Application/Users/Commands/DeleteUserCommand.cs
-8
View File
@@ -1,8 +0,0 @@
using Ardalis.Result;
using Mediator;
namespace Musify.Application.Users.Commands
{
public record DeleteUserCommand(Guid Id)
: ICommand<Result>;
}
Application/Users/Handlers/CreateUserCommandHandler.cs
+2 -18
View File
@@ -8,7 +8,7 @@ using Musify.Application.Users.Responses;
namespace Musify.Application.Users.Handlers
{
public class CreateUserCommandHandler(IDatabase database, IKeycloakUserService keycloakUserClient, ILogger<CreateUserCommandHandler> logger)
public class CreateUserCommandHandler(IDatabase database, ILogger<CreateUserCommandHandler> logger)
: ICommandHandler<CreateUserCommand, Result<UserResponse> >
{
public async ValueTask<Result<UserResponse>> Handle(CreateUserCommand request, CancellationToken cancellationToken)
@@ -20,28 +20,12 @@ namespace Musify.Application.Users.Handlers
return Result<UserResponse>.Conflict($"User {request.Id} already exists");
}
KeycloakUserResponse keycloakUser;
try
{
keycloakUser = await keycloakUserClient.GetUserByIdAsync(request.Id.ToString(), cancellationToken);
}
catch
{
return Result.NotFound("Keycloak user not found");
}
var newUser = CreateUserCommand.ToEntity(request);
await database.Users.AddAsync(newUser, cancellationToken);
await database.SaveChangesAsync(cancellationToken);
logger.LogInformation("Created user {UserId}", newUser.Id);
return Result.Created(new UserResponse(
newUser.Id.ToString(),
keycloakUser.Name,
keycloakUser.FirstName,
keycloakUser.SecondName,
newUser.CreatedAt,
newUser.UpdatedAt));
return Result.Created(UserResponse.FromEntity(newUser));
}
}
}
Application/Users/Handlers/DeleteUserCommandHandler.cs
-22
View File
@@ -1,22 +0,0 @@
using Ardalis.Result;
using Mediator;
using Musify.Application.Contracts.Infrastructure;
namespace Musify.Application.Users.Commands
{
public class DeleteUserCommandHandler(IDatabase database)
: ICommandHandler<DeleteUserCommand, Result>
{
public async ValueTask<Result> Handle(DeleteUserCommand request, CancellationToken cancellationToken)
{
var existingUser = await database.Users.FindAsync(request.Id, cancellationToken);
if (existingUser is null)
return Result.NotFound();
database.Users.Remove(existingUser);
await database.SaveChangesAsync(cancellationToken);
return Result.NoContent();
}
}
}
Application/Users/Handlers/GetUserByIdQueryHandler.cs
+3 -20
View File
@@ -7,34 +7,17 @@ using Musify.Application.Users.Responses;
namespace Musify.Application.Users.Handlers
{
public class GetUserByIdQueryHandler(IDatabase database, IKeycloakUserService keycloakUserClient)
public class GetUserByIdQueryHandler(IDatabase database)
: IQueryHandler<GetUserByIdQuery, Result<UserResponse> >
{
public async ValueTask<Result<UserResponse>> Handle(GetUserByIdQuery request, CancellationToken cancellationToken)
{
var user = await database.Users
.AsNoTracking()
.Select(u => UserResponse.FromEntity(u))
.SingleOrDefaultAsync(u => u.Id == request.Id, cancellationToken);
if (user is null)
return Result.NotFound("User not found");
KeycloakUserResponse keycloakUser;
try
{
keycloakUser = await keycloakUserClient.GetUserByIdAsync(user.Id.ToString(), cancellationToken);
}
catch
{
return Result.Error("Keycloak user not found");
}
return Result.Success(new UserResponse(
user.Id.ToString(),
keycloakUser.Name,
keycloakUser.FirstName,
keycloakUser.SecondName,
user.CreatedAt,
user.UpdatedAt));
return user ?? Result<UserResponse>.NotFound();
}
}
}
Application/Users/Handlers/GetUserByKeycloakQueryHandler.cs
+3 -20
View File
@@ -7,34 +7,17 @@ using Musify.Application.Users.Responses;
namespace Musify.Application.Users.Handlers
{
public class GetUserByKeycloakQueryHandler(IDatabase database, IKeycloakUserService keycloakUserClient)
public class GetUserByKeycloakQueryHandler(IDatabase database)
: IQueryHandler<GetUserByKeycloakQuery, Result<UserResponse> >
{
public async ValueTask<Result<UserResponse>> Handle(GetUserByKeycloakQuery request, CancellationToken cancellationToken)
{
var user = await database.Users
.AsNoTracking()
.Select(u => UserResponse.FromEntity(u))
.SingleOrDefaultAsync(u => u.Id == request.Id, cancellationToken);
if (user is null)
return Result.NotFound("User not found");
KeycloakUserResponse keycloakUser;
try
{
keycloakUser = await keycloakUserClient.GetUserByIdAsync(user.Id.ToString(), cancellationToken);
}
catch
{
return Result.NotFound("Keycloak user not found");
}
return Result.Success(new UserResponse(
user.Id.ToString(),
keycloakUser.Name,
keycloakUser.FirstName,
keycloakUser.SecondName,
user.CreatedAt,
user.UpdatedAt));
return user ?? Result<UserResponse>.NotFound();
}
}
}
Application/Users/Handlers/GetUsersQueryHandler.cs
+15 -37
View File
@@ -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));
}
}
}
Application/Users/Responses/UserResponse.cs
+19 -5
View File
@@ -1,10 +1,24 @@
namespace Musify.Application.Users.Responses
using Musify.Domain.Entities;
namespace Musify.Application.Users.Responses
{
public record UserResponse(
string Id,
Guid Id,
string Name,
string FirstName,
string SecondName,
string? FirstName,
string? SecondName,
DateTime CreatedAt,
DateTime UpdatedAt);
DateTime UpdatedAt)
{
public static UserResponse FromEntity(User user)
{
return new UserResponse(
user.Id,
user.Name,
user.FirstName,
user.SecondName,
user.CreatedAt,
user.UpdatedAt);
}
}
}