From 9e4d5158e8fd590d1cf3beba883eb685f1108b52 Mon Sep 17 00:00:00 2001 From: XShine555 Date: Sun, 29 Mar 2026 19:10:24 +0200 Subject: [PATCH] Fixes --- .../Handlers/CreatePlayListCommandHandler.cs | 2 +- .../Handlers/UpdatePlayListCommandHandler.cs | 14 +++++++------- .../Tracks/Handler/CreateTrackCommandHandler.cs | 10 +++++----- .../Tracks/Handler/DeleteTrackCommandHandler.cs | 1 - 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs b/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs index e0268e7..bb0fb85 100644 --- a/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs +++ b/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs @@ -99,7 +99,7 @@ namespace Musify.Application.PlayLists.Handlers await eventBus.PublishAsync(new UpdatePlayListPictureEvent( playList.Id, storageConfiguration.BucketName, - playList.OriginalPictureName, + Path.Combine(playListConfiguration.Routes.OriginalPicturesPath, playList.OriginalPictureName), new ImageSize( playListConfiguration.Routes.SmallPicturesPath, playListConfiguration.PicturesSizes.SmallPictureWidth, diff --git a/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs b/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs index 5e05081..06182a6 100644 --- a/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs +++ b/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs @@ -37,18 +37,18 @@ namespace Musify.Application.PlayLists.Handlers UpdateDescription(playListEntity, request.NewDescription); var updatePictureResult = await UpdatePicture(playListEntity, request.NewPicture, cancellationToken); if (!updatePictureResult.IsSuccess) - return updatePictureResult.Map(_ => PlayListResponse.FromEntity(playListEntity)); + return updatePictureResult; try { database.PlayLists.Update(playListEntity); await database.SaveChangesAsync(cancellationToken); - await PublishPlayListPictureEvent(playListEntity, updatePictureResult.Value, cancellationToken); + await PublishPlayListPictureEvent(playListEntity, cancellationToken); await RemoveOldPictures(playListEntity, cancellationToken); } catch (Exception exception) { - await Rollback(updatePictureResult.Value, cancellationToken); + await Rollback(playListEntity.OriginalPictureName, cancellationToken); logger.LogError(exception, "Failed to update playlist {PlayListId}", playListEntity.Id); return Result.Error($"Failed to update playlist {playListEntity.Id}"); } @@ -72,7 +72,7 @@ namespace Musify.Application.PlayLists.Handlers playList.Description = newDescription; } - async Task> UpdatePicture(PlayList playList, IFileData? newPicture, CancellationToken cancellationToken) + async Task UpdatePicture(PlayList playList, IFileData? newPicture, CancellationToken cancellationToken) { if (newPicture is null) return Result.Success(); @@ -94,17 +94,17 @@ namespace Musify.Application.PlayLists.Handlers } playList.OriginalPictureName = pictureName; - return Result.Success(pictureKey); + return Result.Success(); } - async Task PublishPlayListPictureEvent(PlayList playList, string pictureKey, CancellationToken cancellationToken) + async Task PublishPlayListPictureEvent(PlayList playList, CancellationToken cancellationToken) { try { await eventBus.PublishAsync(new UpdatePlayListPictureEvent( playList.Id, storageConfiguration.BucketName, - pictureKey, + Path.Combine(playListConfiguration.Routes.OriginalPicturesPath, playList.OriginalPictureName), new ImageSize( playListConfiguration.Routes.SmallPicturesPath, playListConfiguration.PicturesSizes.SmallPictureWidth, diff --git a/Application/Tracks/Handler/CreateTrackCommandHandler.cs b/Application/Tracks/Handler/CreateTrackCommandHandler.cs index 3a16270..8274e0e 100644 --- a/Application/Tracks/Handler/CreateTrackCommandHandler.cs +++ b/Application/Tracks/Handler/CreateTrackCommandHandler.cs @@ -94,17 +94,17 @@ namespace Musify.Application.Tracks.Handler await eventBus.PublishAsync(new UpdateTrackPictureEvent( track.Id, storageConfiguration.BucketName, - track.OriginalPictureName, + Path.Combine(trackConfiguration.Routes.OriginalPicturesPath, track.OriginalPictureName), new ImageSize( - trackConfiguration.Routes.PresetSmallPicture, + trackConfiguration.Routes.SmallPicturesPath, trackConfiguration.PicturesSizes.SmallPictureWidth, trackConfiguration.PicturesSizes.SmallPictureHeight), new ImageSize( - trackConfiguration.Routes.PresetMediumPicture, + trackConfiguration.Routes.MediumPicturesPath, trackConfiguration.PicturesSizes.MediumPictureWidth, trackConfiguration.PicturesSizes.MediumPictureHeight), new ImageSize( - trackConfiguration.Routes.PresetLargePicture, + trackConfiguration.Routes.LargePicturesPath, trackConfiguration.PicturesSizes.LargePictureWidth, trackConfiguration.PicturesSizes.LargePictureHeight)), cancellationToken); } @@ -124,7 +124,7 @@ namespace Musify.Application.Tracks.Handler await eventBus.PublishAsync(new UpdateTrackAudioEvent( track.Id, storageConfiguration.BucketName, - track.OriginalAudioName, + Path.Combine(trackConfiguration.Routes.OriginalAudiosPath, track.OriginalAudioName), storageConfiguration.BucketName, destinationFolderAudio), cancellationToken); } diff --git a/Application/Tracks/Handler/DeleteTrackCommandHandler.cs b/Application/Tracks/Handler/DeleteTrackCommandHandler.cs index fd57090..599fa2a 100644 --- a/Application/Tracks/Handler/DeleteTrackCommandHandler.cs +++ b/Application/Tracks/Handler/DeleteTrackCommandHandler.cs @@ -54,7 +54,6 @@ namespace Musify.Application.Tracks.Handler { await RemoveFile(Path.Combine(trackConfiguration.Routes.OriginalAudiosPath, track.OriginalAudioName), cancellationToken); - await RemoveFile(Path.Combine(trackConfiguration.Routes.ProcessedAudiosPath, track.AudioFolderName), cancellationToken); }