From 7a219e4dea5c96945a22324607a037b46d428c9d Mon Sep 17 00:00:00 2001 From: XShine555 Date: Mon, 30 Mar 2026 10:12:51 +0200 Subject: [PATCH] Rename --- .../ApplicationStorageConfiguration.cs | 2 +- Application/Configuration/PlayListConfiguration.cs | 2 +- Application/Configuration/TrackConfiguration.cs | 2 +- .../Handlers/CreatePlayListCommandHandler.cs | 6 +++--- .../Handlers/DeletePlayListCommandHandler.cs | 2 +- .../Handlers/UpdatePlayListCommandHandler.cs | 8 ++++---- .../Tracks/Handler/CreateTrackCommandHandler.cs | 14 +++++++------- .../Tracks/Handler/DeleteTrackCommandHandler.cs | 2 +- .../Configuration/MassTransitConfiguration.cs | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Application/Configuration/ApplicationStorageConfiguration.cs b/Application/Configuration/ApplicationStorageConfiguration.cs index 2439621..4ac0723 100644 --- a/Application/Configuration/ApplicationStorageConfiguration.cs +++ b/Application/Configuration/ApplicationStorageConfiguration.cs @@ -9,6 +9,6 @@ namespace Musify.Application.Configuration [Required] [MinLength(3)] [MaxLength(63)] - public required string BucketName { get; set; } + public required string Bucket { get; set; } } } diff --git a/Application/Configuration/PlayListConfiguration.cs b/Application/Configuration/PlayListConfiguration.cs index d887fd3..ca6d7ff 100644 --- a/Application/Configuration/PlayListConfiguration.cs +++ b/Application/Configuration/PlayListConfiguration.cs @@ -4,7 +4,7 @@ namespace Musify.Application.Configuration { public class PlayListConfiguration { - public const string SectionName = "PlayListConfiguration"; + public const string SectionName = "PlayList"; [Required] public PlayListRoutes Routes { get; set; } = new PlayListRoutes(); diff --git a/Application/Configuration/TrackConfiguration.cs b/Application/Configuration/TrackConfiguration.cs index 58cf2ce..5928fac 100644 --- a/Application/Configuration/TrackConfiguration.cs +++ b/Application/Configuration/TrackConfiguration.cs @@ -4,7 +4,7 @@ namespace Musify.Application.Configuration { public class TrackConfiguration { - public const string SectionName = "TrackConfiguration"; + public const string SectionName = "Track"; [Required] public TrackRoutes Routes { get; set; } = new TrackRoutes(); diff --git a/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs b/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs index 51e37d9..924dd7f 100644 --- a/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs +++ b/Application/PlayLists/Handlers/CreatePlayListCommandHandler.cs @@ -65,7 +65,7 @@ namespace Musify.Application.PlayLists.Handlers { try { - await storageHandler.RemoveFileAsync(storageConfiguration.BucketName, + await storageHandler.RemoveFileAsync(storageConfiguration.Bucket, Path.Combine(playListConfiguration.Routes.OriginalPicturesPath, playList.OriginalPictureName), cancellationToken); } catch (Exception exception) @@ -81,7 +81,7 @@ namespace Musify.Application.PlayLists.Handlers try { - await storageHandler.UploadFileAsync(picture.FileStream, picture.ContentType, storageConfiguration.BucketName, pictureKey, cancellationToken); + await storageHandler.UploadFileAsync(picture.FileStream, picture.ContentType, storageConfiguration.Bucket, pictureKey, cancellationToken); } catch { @@ -98,7 +98,7 @@ namespace Musify.Application.PlayLists.Handlers { await eventBus.PublishAsync(new UpdatePlayListPictureEvent( playList.Id, - storageConfiguration.BucketName, + storageConfiguration.Bucket, Path.Combine(playListConfiguration.Routes.OriginalPicturesPath, playList.OriginalPictureName), new ImageSize( playListConfiguration.Routes.SmallPicturesPath, diff --git a/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs b/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs index 48e634a..c2ca6ba 100644 --- a/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs +++ b/Application/PlayLists/Handlers/DeletePlayListCommandHandler.cs @@ -50,7 +50,7 @@ namespace Musify.Application.PlayLists.Handlers try { await eventBus.PublishAsync(new RemoveFileEvent( - storageConfiguration.BucketName, + storageConfiguration.Bucket, key), cancellationToken); return Result.Success(); } diff --git a/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs b/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs index 70bfa21..a882b5b 100644 --- a/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs +++ b/Application/PlayLists/Handlers/UpdatePlayListCommandHandler.cs @@ -84,7 +84,7 @@ namespace Musify.Application.PlayLists.Handlers await storageHandler.UploadFileAsync( newPicture.FileStream, newPicture.ContentType, - storageConfiguration.BucketName, + storageConfiguration.Bucket, pictureKey, cancellationToken); } @@ -103,7 +103,7 @@ namespace Musify.Application.PlayLists.Handlers { await eventBus.PublishAsync(new UpdatePlayListPictureEvent( playList.Id, - storageConfiguration.BucketName, + storageConfiguration.Bucket, Path.Combine(playListConfiguration.Routes.OriginalPicturesPath, playList.OriginalPictureName), new ImageSize( playListConfiguration.Routes.SmallPicturesPath, @@ -149,7 +149,7 @@ namespace Musify.Application.PlayLists.Handlers async Task Rollback(string pictureKey, CancellationToken cancellationToken) { await storageHandler.RemoveFileAsync( - storageConfiguration.BucketName, + storageConfiguration.Bucket, pictureKey, cancellationToken); logger.LogInformation("Rolled back uploaded picture {PictureKey} from storage", pictureKey); @@ -160,7 +160,7 @@ namespace Musify.Application.PlayLists.Handlers try { await eventBus.PublishAsync(new RemoveFileEvent( - storageConfiguration.BucketName, + storageConfiguration.Bucket, key), cancellationToken); return Result.NoContent(); } diff --git a/Application/Tracks/Handler/CreateTrackCommandHandler.cs b/Application/Tracks/Handler/CreateTrackCommandHandler.cs index 1a3a86f..a197ad5 100644 --- a/Application/Tracks/Handler/CreateTrackCommandHandler.cs +++ b/Application/Tracks/Handler/CreateTrackCommandHandler.cs @@ -54,7 +54,7 @@ namespace Musify.Application.Tracks.Handler await storageHandler.UploadFileAsync( request.Picture.FileStream, request.Picture.ContentType, - storageConfiguration.BucketName, + storageConfiguration.Bucket, pictureKey, cancellationToken); } @@ -68,7 +68,7 @@ namespace Musify.Application.Tracks.Handler await storageHandler.UploadFileAsync( request.Audio.FileStream, request.Audio.ContentType, - storageConfiguration.BucketName, + storageConfiguration.Bucket, audioKey, cancellationToken); } @@ -82,8 +82,8 @@ namespace Musify.Application.Tracks.Handler async Task RollbackFilesAsync(string pictureKey, string audioKey, CancellationToken cancellationToken) { - await storageHandler.RemoveFileAsync(storageConfiguration.BucketName, pictureKey, cancellationToken); - await storageHandler.RemoveFileAsync(storageConfiguration.BucketName, audioKey, cancellationToken); + await storageHandler.RemoveFileAsync(storageConfiguration.Bucket, pictureKey, cancellationToken); + await storageHandler.RemoveFileAsync(storageConfiguration.Bucket, audioKey, cancellationToken); logger.LogInformation("Rolled back uploaded files {PictureKey}, {AudioKey}", pictureKey, audioKey); } @@ -93,7 +93,7 @@ namespace Musify.Application.Tracks.Handler { await eventBus.PublishAsync(new UpdateTrackPictureEvent( track.Id, - storageConfiguration.BucketName, + storageConfiguration.Bucket, Path.Combine(trackConfiguration.Routes.OriginalPicturesPath, track.OriginalPictureName), new ImageSize( trackConfiguration.Routes.SmallPicturesPath, @@ -123,9 +123,9 @@ namespace Musify.Application.Tracks.Handler { await eventBus.PublishAsync(new UpdateTrackAudioEvent( track.Id, - storageConfiguration.BucketName, + storageConfiguration.Bucket, Path.Combine(trackConfiguration.Routes.OriginalAudiosPath, track.OriginalAudioName), - storageConfiguration.BucketName, + storageConfiguration.Bucket, destinationFolderAudio), cancellationToken); } catch (Exception exception) diff --git a/Application/Tracks/Handler/DeleteTrackCommandHandler.cs b/Application/Tracks/Handler/DeleteTrackCommandHandler.cs index 5cc943e..8736249 100644 --- a/Application/Tracks/Handler/DeleteTrackCommandHandler.cs +++ b/Application/Tracks/Handler/DeleteTrackCommandHandler.cs @@ -60,7 +60,7 @@ namespace Musify.Application.Tracks.Handler async Task RemoveFile(string path, CancellationToken cancellationToken) { - await storageHandler.RemoveFileAsync(storageConfiguration.BucketName, path, cancellationToken); + await storageHandler.RemoveFileAsync(storageConfiguration.Bucket, path, cancellationToken); logger.LogDebug("Removed file {Path} from storage", path); } } diff --git a/Infrastructure/Configuration/MassTransitConfiguration.cs b/Infrastructure/Configuration/MassTransitConfiguration.cs index 35f9666..df216ee 100644 --- a/Infrastructure/Configuration/MassTransitConfiguration.cs +++ b/Infrastructure/Configuration/MassTransitConfiguration.cs @@ -4,7 +4,7 @@ namespace Musify.Infrastructure.Configuration { public class MassTransitConfiguration { - public const string SectionName = "Messaging"; + public const string SectionName = "MassTransit"; [Required] public required string Address { get; set; }