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

refactor: replace Ardalis.Result with ErrorOr across the app

Browse Source 
Ardalis Result<T> carried incoherent success sub-statuses and a clunky
generic converter; ErrorOr models success-or-errors cleanly.

- Application: all commands/queries/handlers now return ErrorOr<T>
  (non-generic Result -> ErrorOr<Success>); errors via Error.NotFound/
  Conflict/Validation/Unauthorized/Failure; success via value or new Success()
- Drop ResultExtensions.As<>(): error propagation is now just return .Errors
- Rewrite HTTP mapping (ErrorOrHttpExtensions) off Error.Type; success maps
  to 200 (value) or 204 (Success); Created still built in the endpoints
- Endpoints/gateway middleware: !IsSuccess -> IsError
- Swap Ardalis.Result package for ErrorOr 2.1.1 (remove unused ref from Worker)

Build: 0 warnings, 0 errors.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Admin
2026-07-05 04:05:43 +02:00
co-authored by Claude Opus 4.8
parent a3bf796f17
commit 6e469dbb4a
56 changed files with 259 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/Musify.Application/PlayLists/Commands/AddTrackToPlayListCommand.cs
+2 -2
View File
@@ -1,8 +1,8 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
namespace Musify.Application.PlayLists.Commands
{
public record AddTrackToPlayListCommand(long UserId, Guid PlayListId, Guid TrackId)
: ICommand<Result>;
: ICommand<ErrorOr<Success>>;
}
backend/Musify.Application/PlayLists/Commands/CreatePlayListCommand.cs
+2 -2
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Musify.Application.PlayLists.Responses;
@@ -9,5 +9,5 @@ namespace Musify.Application.PlayLists.Commands
string Name,
string Description,
Guid? PictureIntentId)
: ICommand<Result<PlayListApplicationResponse>>;
: ICommand<ErrorOr<PlayListApplicationResponse>>;
}
backend/Musify.Application/PlayLists/Commands/DeletePlayListCommand.cs
+2 -2
View File
@@ -1,8 +1,8 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
namespace Musify.Application.PlayLists.Commands
{
public record DeletePlayListCommand(long UserId, Guid PlayListId)
: ICommand<Result>;
: ICommand<ErrorOr<Success>>;
}
backend/Musify.Application/PlayLists/Commands/RemoveTrackFromPlayListCommand.cs
+2 -2
View File
@@ -1,8 +1,8 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
namespace Musify.Application.PlayLists.Commands
{
public record RemoveTrackFromPlayListCommand(long UserId, Guid PlayListId, Guid TrackId)
: ICommand<Result>;
: ICommand<ErrorOr<Success>>;
}
backend/Musify.Application/PlayLists/Commands/RequestPlayListPictureUploadCommand.cs
+2 -2
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Musify.Application.PlayLists.Responses;
@@ -9,5 +9,5 @@ namespace Musify.Application.PlayLists.Commands
string FileType,
string ContentType,
long? ExpectedSizeBytes = null)
: ICommand<Result<PlayListPictureUploadResponse>>;
: ICommand<ErrorOr<PlayListPictureUploadResponse>>;
}
backend/Musify.Application/PlayLists/Commands/UpdatePlayListCommand.cs
+2 -2
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Musify.Application.PlayLists.Responses;
@@ -10,5 +10,5 @@ namespace Musify.Application.PlayLists.Commands
string? NewName,
string? NewDescription,
Guid? NewPictureIntentId)
: ICommand<Result<PlayListApplicationResponse>>;
: ICommand<ErrorOr<PlayListApplicationResponse>>;
}
backend/Musify.Application/PlayLists/Handlers/AddTrackToPlayListCommandHandler.cs
+8 -8
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
@@ -11,22 +11,22 @@ namespace Musify.Application.PlayLists.Handlers
public class AddTrackToPlayListCommandHandler(
IDatabase database,
ILogger<AddTrackToPlayListCommandHandler> logger)
: ICommandHandler<AddTrackToPlayListCommand, Result>
: ICommandHandler<AddTrackToPlayListCommand, ErrorOr<Success>>
{
public async ValueTask<Result> Handle(AddTrackToPlayListCommand request, CancellationToken cancellationToken)
public async ValueTask<ErrorOr<Success>> Handle(AddTrackToPlayListCommand request, CancellationToken cancellationToken)
{
var playList = await database.PlayLists
.SingleOrDefaultAsync(pl => pl.Id == request.PlayListId, cancellationToken);
if (playList is null)
{
logger.LogInformation("Playlist {PlayListId} not found", request.PlayListId);
return Result.NotFound();
return Error.NotFound();
}
if (playList.UserId != request.UserId)
{
logger.LogWarning("User {UserId} is not the owner of playlist {PlayListId}", request.UserId, request.PlayListId);
return Result.Unauthorized();
return Error.Unauthorized();
}
var trackExists = await database.Tracks
@@ -35,7 +35,7 @@ namespace Musify.Application.PlayLists.Handlers
if (!trackExists)
{
logger.LogInformation("Track {TrackId} not found", request.TrackId);
return Result.NotFound($"Track {request.TrackId} not found");
return Error.NotFound(description: $"Track {request.TrackId} not found");
}
var alreadyAdded = await database.PlayListHasTracks
@@ -44,7 +44,7 @@ namespace Musify.Application.PlayLists.Handlers
if (alreadyAdded)
{
logger.LogInformation("Track {TrackId} already in playlist {PlayListId}", request.TrackId, request.PlayListId);
return Result.Conflict("Track is already in the playlist.");
return Error.Conflict(description: "Track is already in the playlist.");
}
var nextPosition = await database.PlayListHasTracks
@@ -64,7 +64,7 @@ namespace Musify.Application.PlayLists.Handlers
logger.LogInformation("Added track {TrackId} to playlist {PlayListId} at position {Position}",
request.TrackId, request.PlayListId, nextPosition);
return Result.Success();
return new Success();
}
}
}
backend/Musify.Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs
+13 -14
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
@@ -7,7 +7,6 @@ using Musify.Application.Shared;
using Musify.Application.Events;
using Musify.Application.PlayLists.Commands;
using Musify.Application.PlayLists.Responses;
using Musify.Application.Extensions;
using Musify.Application.Services;
using Musify.Domain.Entities;
using Musify.Application.Contracts;
@@ -22,9 +21,9 @@ namespace Musify.Application.PlayLists.Handlers
ApplicationStorageConfiguration storageConfiguration,
PlayListConfiguration playListConfiguration,
UploadIntentConfiguration uploadIntentConfiguration)
: ICommandHandler<CreatePlayListCommand, Result<PlayListApplicationResponse>>
: ICommandHandler<CreatePlayListCommand, ErrorOr<PlayListApplicationResponse>>
{
public async ValueTask<Result<PlayListApplicationResponse>> Handle(CreatePlayListCommand request, CancellationToken cancellationToken)
public async ValueTask<ErrorOr<PlayListApplicationResponse>> Handle(CreatePlayListCommand request, CancellationToken cancellationToken)
{
var userExists = await database.Users
.AsNoTracking()
@@ -32,7 +31,7 @@ namespace Musify.Application.PlayLists.Handlers
if (!userExists)
{
logger.LogWarning("User {UserId} not found", request.UserId);
return Result.NotFound($"User {request.UserId} not found");
return Error.NotFound(description: $"User {request.UserId} not found");
}
UploadIntent? pictureIntent = null;
@@ -43,8 +42,8 @@ namespace Musify.Application.PlayLists.Handlers
var validation = await uploadIntentValidator.ValidateAndLoadAsync(
uploadIntentConfiguration,
request.PictureIntentId.Value, request.UserId, cancellationToken);
if (!validation.IsSuccess)
return validation.As<UploadIntent, PlayListApplicationResponse>();
if (validation.IsError)
return validation.Errors;
pictureIntent = validation.Value;
originalPictureName = pictureIntent.ObjectName;
@@ -73,8 +72,8 @@ namespace Musify.Application.PlayLists.Handlers
var finalPictureKey = playListConfiguration.Routes.BuildOriginalPicturePath(request.UserId, originalPictureName);
var publishResult = await PublishCreatePlayListEventAsync(
playList.Id, pictureIntent, finalPictureKey, cancellationToken);
if (!publishResult.IsSuccess)
return publishResult;
if (publishResult.IsError)
return publishResult.Errors;
}
try
@@ -84,14 +83,14 @@ namespace Musify.Application.PlayLists.Handlers
catch (Exception exception)
{
logger.LogError(exception, "Failed to save playlist for user {UserId}", request.UserId);
return Result.Error($"Failed to create playlist for user {request.UserId}");
return Error.Failure(description: $"Failed to create playlist for user {request.UserId}");
}
logger.LogInformation("Created playlist {PlayListId} for user {UserId}", playList.Id, request.UserId);
return Result.Created(PlayListApplicationResponse.FromEntity(playList));
return PlayListApplicationResponse.FromEntity(playList);
}
async Task<Result<PlayListApplicationResponse>> PublishCreatePlayListEventAsync(
async Task<ErrorOr<Success>> PublishCreatePlayListEventAsync(
Guid playListId,
UploadIntent pictureIntent,
string finalPictureKey,
@@ -119,12 +118,12 @@ namespace Musify.Application.PlayLists.Handlers
playListConfiguration.PicturesSizes.LargePictureWidth,
playListConfiguration.PicturesSizes.LargePictureHeight)),
cancellationToken);
return Result.Success();
return new Success();
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to publish create playlist event for playlist {PlayListId}", playListId);
return Result.Error($"Failed to publish create playlist event for playlist {playListId}");
return Error.Failure(description: $"Failed to publish create playlist event for playlist {playListId}");
}
}
}
backend/Musify.Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs
+8 -8
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
@@ -13,21 +13,21 @@ namespace Musify.Application.PlayLists.Handlers
IDatabase database,
IEventBus eventBus,
ILogger<DeletePlayListCommandHandler> logger)
: ICommandHandler<DeletePlayListCommand, Result>
: ICommandHandler<DeletePlayListCommand, ErrorOr<Success>>
{
public async ValueTask<Result> Handle(DeletePlayListCommand request, CancellationToken cancellationToken)
public async ValueTask<ErrorOr<Success>> Handle(DeletePlayListCommand request, CancellationToken cancellationToken)
{
var playList = await database.PlayLists.SingleOrDefaultAsync(p => p.Id == request.PlayListId, cancellationToken);
if (playList is null)
{
logger.LogDebug("Playlist {PlayListId} not found", request.PlayListId);
return Result.NotFound();
return Error.NotFound();
}
if (playList.UserId != request.UserId)
{
logger.LogWarning("Playlist {PlayListId} does not belong to user {UserId}", request.PlayListId, request.UserId);
return Result.Unauthorized();
return Error.Unauthorized();
}
playList.LifeCycleStatus = LifeCycleStatus.Removing;
@@ -41,7 +41,7 @@ namespace Musify.Application.PlayLists.Handlers
catch (Exception exception)
{
logger.LogError(exception, "Failed to publish delete playlist event for playlist {PlayListId}", request.PlayListId);
return Result.Error($"Failed to delete playlist {request.PlayListId}");
return Error.Failure(description: $"Failed to delete playlist {request.PlayListId}");
}
try
@@ -51,10 +51,10 @@ namespace Musify.Application.PlayLists.Handlers
catch (Exception exception)
{
logger.LogError(exception, "Failed to mark playlist {PlayListId} as removing", request.PlayListId);
return Result.Error($"Failed to delete playlist {request.PlayListId}");
return Error.Failure(description: $"Failed to delete playlist {request.PlayListId}");
}
return Result.NoContent();
return new Success();
}
}
}
backend/Musify.Application/PlayLists/Handlers/GetPlayListByIdQueryHandler.cs
+7 -6
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Microsoft.EntityFrameworkCore;
using Musify.Application.PlayLists.Responses;
using Musify.Application.PlayLists.Queries;
@@ -8,9 +8,9 @@ using Musify.Application.Contracts;
namespace Musify.Application.PlayLists.Handlers
{
public class GetPlayListByIdQueryHandler(IDatabase database)
: IQueryHandler<GetPlayListByIdQuery, Result<PlayListApplicationResponse>>
: IQueryHandler<GetPlayListByIdQuery, ErrorOr<PlayListApplicationResponse>>
{
public async ValueTask<Result<PlayListApplicationResponse>> Handle(GetPlayListByIdQuery request, CancellationToken cancellationToken)
public async ValueTask<ErrorOr<PlayListApplicationResponse>> Handle(GetPlayListByIdQuery request, CancellationToken cancellationToken)
{
var playList = await database.PlayLists
.AsNoTracking()
@@ -18,9 +18,10 @@ namespace Musify.Application.PlayLists.Handlers
.Select(p => PlayListApplicationResponse.FromEntity(p))
.SingleOrDefaultAsync(cancellationToken);
return playList is null
? Result<PlayListApplicationResponse>.NotFound()
: Result.Success(playList);
if (playList is null)
return Error.NotFound();
return playList;
}
}
}
backend/Musify.Application/PlayLists/Handlers/GetPlayListTracksQueryHandler.cs
+5 -5
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Microsoft.EntityFrameworkCore;
using Musify.Application.Contracts;
@@ -10,15 +10,15 @@ using X.PagedList.EF;
namespace Musify.Application.PlayLists.Handlers
{
public class GetPlayListTracksQueryHandler(IDatabase database)
: IQueryHandler<GetPlayListTracksQuery, Result<PaginatedResponse<TrackApplicationResponse>> >
: IQueryHandler<GetPlayListTracksQuery, ErrorOr<PaginatedResponse<TrackApplicationResponse>> >
{
public async ValueTask<Result<PaginatedResponse<TrackApplicationResponse> >> Handle(GetPlayListTracksQuery request, CancellationToken cancellationToken)
public async ValueTask<ErrorOr<PaginatedResponse<TrackApplicationResponse> >> Handle(GetPlayListTracksQuery request, CancellationToken cancellationToken)
{
var playListExists = await database.PlayLists
.AsNoTracking()
.AnyAsync(p => p.Id == request.PlayListId, cancellationToken);
if (!playListExists)
return Result<PaginatedResponse<TrackApplicationResponse>>.NotFound();
return Error.NotFound();
var tracksQuery = database.PlayListHasTracks
.AsNoTracking()
@@ -32,7 +32,7 @@ namespace Musify.Application.PlayLists.Handlers
.Select(plt => TrackApplicationResponse.FromEntity(plt.Track))
.ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
return Result.Success(PaginatedResponse<TrackApplicationResponse>.FromPagedList(pagedTracks));
return PaginatedResponse<TrackApplicationResponse>.FromPagedList(pagedTracks);
}
}
}
backend/Musify.Application/PlayLists/Handlers/GetPlayListsByUserIdQueryHandler.cs
+4 -4
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Microsoft.EntityFrameworkCore;
using Musify.Application.Pagination;
using Musify.Application.PlayLists.Responses;
@@ -10,9 +10,9 @@ using Musify.Application.Contracts;
namespace Musify.Application.PlayLists.Handlers
{
public class GetPlayListsByUserIdQueryHandler(IDatabase database)
: IQueryHandler<GetPlayListsByUserIdQuery, Result<PaginatedResponse<PlayListApplicationResponse> > >
: IQueryHandler<GetPlayListsByUserIdQuery, ErrorOr<PaginatedResponse<PlayListApplicationResponse> > >
{
public async ValueTask<Result<PaginatedResponse<PlayListApplicationResponse> >> Handle(GetPlayListsByUserIdQuery request, CancellationToken cancellationToken)
public async ValueTask<ErrorOr<PaginatedResponse<PlayListApplicationResponse> >> Handle(GetPlayListsByUserIdQuery request, CancellationToken cancellationToken)
{
var playListsQuery = database.PlayLists
.AsNoTracking()
@@ -31,7 +31,7 @@ namespace Musify.Application.PlayLists.Handlers
.Select(p => PlayListApplicationResponse.FromEntity(p))
.ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
return Result.Success(PaginatedResponse<PlayListApplicationResponse>.FromPagedList(pagedPlayLists));
return PaginatedResponse<PlayListApplicationResponse>.FromPagedList(pagedPlayLists);
}
}
}
backend/Musify.Application/PlayLists/Handlers/GetPlayListsQueryHandler.cs
+4 -4
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Microsoft.EntityFrameworkCore;
using Musify.Application.Pagination;
using Musify.Application.PlayLists.Responses;
@@ -10,9 +10,9 @@ using Musify.Application.Contracts;
namespace Musify.Application.PlayLists.Handlers
{
public class GetPlayListsQueryHandler(IDatabase database)
: IQueryHandler<GetPlayListsQuery, Result<PaginatedResponse<PlayListApplicationResponse> >>
: IQueryHandler<GetPlayListsQuery, ErrorOr<PaginatedResponse<PlayListApplicationResponse> >>
{
public async ValueTask<Result<PaginatedResponse<PlayListApplicationResponse> >> Handle(GetPlayListsQuery request, CancellationToken cancellationToken)
public async ValueTask<ErrorOr<PaginatedResponse<PlayListApplicationResponse> >> Handle(GetPlayListsQuery request, CancellationToken cancellationToken)
{
var totalCount = await database.PlayLists.CountAsync(cancellationToken);
@@ -22,7 +22,7 @@ namespace Musify.Application.PlayLists.Handlers
.Select(p => PlayListApplicationResponse.FromEntity(p))
.ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
return Result.Success(PaginatedResponse<PlayListApplicationResponse>.FromPagedList(pagedPlayLists));
return PaginatedResponse<PlayListApplicationResponse>.FromPagedList(pagedPlayLists);
}
}
}
backend/Musify.Application/PlayLists/Handlers/RemoveTrackFromPlayListCommandHandler.cs
+7 -7
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
@@ -10,22 +10,22 @@ namespace Musify.Application.PlayLists.Handlers
public class RemoveTrackFromPlayListCommandHandler(
IDatabase database,
ILogger<RemoveTrackFromPlayListCommandHandler> logger)
: ICommandHandler<RemoveTrackFromPlayListCommand, Result>
: ICommandHandler<RemoveTrackFromPlayListCommand, ErrorOr<Success>>
{
public async ValueTask<Result> Handle(RemoveTrackFromPlayListCommand request, CancellationToken cancellationToken)
public async ValueTask<ErrorOr<Success>> Handle(RemoveTrackFromPlayListCommand request, CancellationToken cancellationToken)
{
var playList = await database.PlayLists
.SingleOrDefaultAsync(pl => pl.Id == request.PlayListId, cancellationToken);
if (playList is null)
{
logger.LogInformation("Playlist {PlayListId} not found", request.PlayListId);
return Result.NotFound();
return Error.NotFound();
}
if (playList.UserId != request.UserId)
{
logger.LogWarning("User {UserId} is not the owner of playlist {PlayListId}", request.UserId, request.PlayListId);
return Result.Unauthorized();
return Error.Unauthorized();
}
var link = await database.PlayListHasTracks
@@ -33,7 +33,7 @@ namespace Musify.Application.PlayLists.Handlers
if (link is null)
{
logger.LogInformation("Track {TrackId} not in playlist {PlayListId}", request.TrackId, request.PlayListId);
return Result.NotFound("Track is not in the playlist.");
return Error.NotFound(description: "Track is not in the playlist.");
}
database.PlayListHasTracks.Remove(link);
@@ -41,7 +41,7 @@ namespace Musify.Application.PlayLists.Handlers
logger.LogInformation("Removed track {TrackId} from playlist {PlayListId}", request.TrackId, request.PlayListId);
return Result.Success();
return new Success();
}
}
}
backend/Musify.Application/PlayLists/Handlers/RequestPlayListPictureUploadCommandHandler.cs
+9 -9
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
@@ -20,9 +20,9 @@ namespace Musify.Application.PlayLists.Handlers
ApplicationStorageConfiguration storageConfiguration,
PlayListConfiguration playListConfiguration,
UploadIntentConfiguration uploadIntentConfiguration)
: ICommandHandler<RequestPlayListPictureUploadCommand, Result<PlayListPictureUploadResponse>>
: ICommandHandler<RequestPlayListPictureUploadCommand, ErrorOr<PlayListPictureUploadResponse>>
{
public async ValueTask<Result<PlayListPictureUploadResponse>> Handle(RequestPlayListPictureUploadCommand request, CancellationToken cancellationToken)
public async ValueTask<ErrorOr<PlayListPictureUploadResponse>> Handle(RequestPlayListPictureUploadCommand request, CancellationToken cancellationToken)
{
var userExists = await database.Users
.AsNoTracking()
@@ -30,7 +30,7 @@ namespace Musify.Application.PlayLists.Handlers
if (!userExists)
{
logger.LogWarning("User {UserId} not found", request.UserId);
return Result.NotFound($"User {request.UserId} not found");
return Error.NotFound(description: $"User {request.UserId} not found");
}
var effectiveSizeBytes = request.ExpectedSizeBytes
@@ -56,10 +56,10 @@ namespace Musify.Application.PlayLists.Handlers
var quotaCheck = await uploadIntentValidator.CheckQuotaAsync(
uploadIntentConfiguration,
request.UserId, effectiveSizeBytes, 1, cancellationToken);
if (!quotaCheck.IsSuccess)
if (quotaCheck.IsError)
{
logger.LogWarning("User {UserId} failed upload intent quota check", request.UserId);
return quotaCheck;
return quotaCheck.Errors;
}
var intent = new UploadIntent
@@ -80,19 +80,19 @@ namespace Musify.Application.PlayLists.Handlers
logger.LogInformation("Issued upload intent {IntentId} for user {UserId} (PlayListPicture, temp key: {Key})", intent.Id, request.UserId, tempKey);
return Result.Success(new PlayListPictureUploadResponse(
return new PlayListPictureUploadResponse(
intent.Id,
storageConfiguration.Bucket,
tempKey,
objectName,
request.ContentType,
uploadIntentConfiguration.UploadUrlExpiresInSeconds,
uploadUrl));
uploadUrl);
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to generate playlist picture upload URL for user {UserId}", request.UserId);
return Result.Error("Failed to generate upload URL");
return Error.Failure(description: "Failed to generate upload URL");
}
}
}
backend/Musify.Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs
+14 -15
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
@@ -7,7 +7,6 @@ using Musify.Application.Shared;
using Musify.Application.Events;
using Musify.Application.PlayLists.Commands;
using Musify.Application.PlayLists.Responses;
using Musify.Application.Extensions;
using Musify.Application.Services;
using Musify.Domain.Entities;
using Musify.Application.Contracts;
@@ -22,21 +21,21 @@ namespace Musify.Application.PlayLists.Handlers
ApplicationStorageConfiguration storageConfiguration,
PlayListConfiguration playListConfiguration,
UploadIntentConfiguration uploadIntentConfiguration)
: ICommandHandler<UpdatePlayListCommand, Result<PlayListApplicationResponse>>
: ICommandHandler<UpdatePlayListCommand, ErrorOr<PlayListApplicationResponse>>
{
public async ValueTask<Result<PlayListApplicationResponse>> Handle(UpdatePlayListCommand request, CancellationToken cancellationToken)
public async ValueTask<ErrorOr<PlayListApplicationResponse>> Handle(UpdatePlayListCommand request, CancellationToken cancellationToken)
{
var playListEntity = await database.PlayLists.SingleOrDefaultAsync(pl => pl.Id == request.PlayListId, cancellationToken);
if (playListEntity is null)
{
logger.LogInformation("Playlist {PlayListId} not found", request.PlayListId);
return Result.NotFound();
return Error.NotFound();
}
if (playListEntity.UserId != request.UserId)
{
logger.LogWarning("User {UserId} is not the owner of playlist {PlayListId}", request.UserId, request.PlayListId);
return Result.Unauthorized();
return Error.Unauthorized();
}
if (request.NewName is not null)
@@ -58,8 +57,8 @@ namespace Musify.Application.PlayLists.Handlers
var validation = await uploadIntentValidator.ValidateAndLoadAsync(
uploadIntentConfiguration,
request.NewPictureIntentId.Value, request.UserId, cancellationToken);
if (!validation.IsSuccess)
return validation.As<UploadIntent, PlayListApplicationResponse>();
if (validation.IsError)
return validation.Errors;
pictureIntent = validation.Value;
playListEntity.OriginalPictureName = pictureIntent.ObjectName;
@@ -72,8 +71,8 @@ namespace Musify.Application.PlayLists.Handlers
{
var publishResult = await PublishUpdatePlayListPictureSourceEventAsync(
playListEntity.Id, pictureIntent, finalPictureKey, cancellationToken);
if (!publishResult.IsSuccess)
return publishResult;
if (publishResult.IsError)
return publishResult.Errors;
}
try
@@ -83,14 +82,14 @@ namespace Musify.Application.PlayLists.Handlers
catch (Exception exception)
{
logger.LogError(exception, "Failed to update playlist {PlayListId}", playListEntity.Id);
return Result.Error($"Failed to update playlist {playListEntity.Id}");
return Error.Failure(description: $"Failed to update playlist {playListEntity.Id}");
}
logger.LogInformation("Updated playlist {PlayListId}", playListEntity.Id);
return Result.Success(PlayListApplicationResponse.FromEntity(playListEntity));
return PlayListApplicationResponse.FromEntity(playListEntity);
}
async Task<Result<PlayListApplicationResponse>> PublishUpdatePlayListPictureSourceEventAsync(
async Task<ErrorOr<Success>> PublishUpdatePlayListPictureSourceEventAsync(
Guid playListId,
UploadIntent pictureIntent,
string finalPictureKey,
@@ -118,12 +117,12 @@ namespace Musify.Application.PlayLists.Handlers
playListConfiguration.PicturesSizes.LargePictureWidth,
playListConfiguration.PicturesSizes.LargePictureHeight)),
cancellationToken);
return Result.Success();
return new Success();
}
catch (Exception exception)
{
logger.LogError(exception, "Failed to publish update playlist picture source event for playlist {PlayListId}", playListId);
return Result.Error($"Failed to publish update playlist picture source event for playlist {playListId}");
return Error.Failure(description: $"Failed to publish update playlist picture source event for playlist {playListId}");
}
}
}
backend/Musify.Application/PlayLists/Queries/GetPlayListByIdQuery.cs
+2 -2
View File
@@ -1,9 +1,9 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Musify.Application.PlayLists.Responses;
namespace Musify.Application.PlayLists.Queries
{
public record GetPlayListByIdQuery(Guid Id)
: IQuery<Result<PlayListApplicationResponse>>;
: IQuery<ErrorOr<PlayListApplicationResponse>>;
}
backend/Musify.Application/PlayLists/Queries/GetPlayListTracksQuery.cs
+2 -2
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Musify.Application.Pagination;
using Musify.Application.Tracks.Responses;
@@ -9,5 +9,5 @@ namespace Musify.Application.PlayLists.Queries
Guid PlayListId,
int PageNumber = 1,
int PageSize = 10)
: IQuery<Result<PaginatedResponse<TrackApplicationResponse>>>;
: IQuery<ErrorOr<PaginatedResponse<TrackApplicationResponse>>>;
}
backend/Musify.Application/PlayLists/Queries/GetPlayListsByUserIdQuery.cs
+2 -2
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Musify.Application.Pagination;
using Musify.Application.PlayLists.Responses;
@@ -10,5 +10,5 @@ namespace Musify.Application.PlayLists.Queries
string? Name,
int PageNumber = 1,
int PageSize = 10)
: IQuery<Result<PaginatedResponse<PlayListApplicationResponse>> >;
: IQuery<ErrorOr<PaginatedResponse<PlayListApplicationResponse>> >;
}
backend/Musify.Application/PlayLists/Queries/GetPlayListsQuery.cs
+2 -2
View File
@@ -1,4 +1,4 @@
using Ardalis.Result;
using ErrorOr;
using Mediator;
using Musify.Application.Pagination;
using Musify.Application.PlayLists.Responses;
@@ -6,5 +6,5 @@ using Musify.Application.PlayLists.Responses;
namespace Musify.Application.PlayLists.Queries
{
public record GetPlayListsQuery(int PageNumber = 1, int PageSize = 10)
: IQuery<Result<PaginatedResponse<PlayListApplicationResponse>> >;
: IQuery<ErrorOr<PaginatedResponse<PlayListApplicationResponse>> >;
}