This commit is contained in:
2026-03-30 10:12:51 +02:00
parent b83206252a
commit e6c68581f6
9 changed files with 20 additions and 20 deletions
@@ -9,6 +9,6 @@ namespace Musify.Application.Configuration
[Required] [Required]
[MinLength(3)] [MinLength(3)]
[MaxLength(63)] [MaxLength(63)]
public required string BucketName { get; set; } public required string Bucket { get; set; }
} }
} }
@@ -4,7 +4,7 @@ namespace Musify.Application.Configuration
{ {
public class PlayListConfiguration public class PlayListConfiguration
{ {
public const string SectionName = "PlayListConfiguration"; public const string SectionName = "PlayList";
[Required] [Required]
public PlayListRoutes Routes { get; set; } = new PlayListRoutes(); public PlayListRoutes Routes { get; set; } = new PlayListRoutes();
@@ -4,7 +4,7 @@ namespace Musify.Application.Configuration
{ {
public class TrackConfiguration public class TrackConfiguration
{ {
public const string SectionName = "TrackConfiguration"; public const string SectionName = "Track";
[Required] [Required]
public TrackRoutes Routes { get; set; } = new TrackRoutes(); public TrackRoutes Routes { get; set; } = new TrackRoutes();
@@ -65,7 +65,7 @@ namespace Musify.Application.PlayLists.Handlers
{ {
try try
{ {
await storageHandler.RemoveFileAsync(storageConfiguration.BucketName, await storageHandler.RemoveFileAsync(storageConfiguration.Bucket,
Path.Combine(playListConfiguration.Routes.OriginalPicturesPath, playList.OriginalPictureName), cancellationToken); Path.Combine(playListConfiguration.Routes.OriginalPicturesPath, playList.OriginalPictureName), cancellationToken);
} }
catch (Exception exception) catch (Exception exception)
@@ -81,7 +81,7 @@ namespace Musify.Application.PlayLists.Handlers
try try
{ {
await storageHandler.UploadFileAsync(picture.FileStream, picture.ContentType, storageConfiguration.BucketName, pictureKey, cancellationToken); await storageHandler.UploadFileAsync(picture.FileStream, picture.ContentType, storageConfiguration.Bucket, pictureKey, cancellationToken);
} }
catch catch
{ {
@@ -98,7 +98,7 @@ namespace Musify.Application.PlayLists.Handlers
{ {
await eventBus.PublishAsync(new UpdatePlayListPictureEvent( await eventBus.PublishAsync(new UpdatePlayListPictureEvent(
playList.Id, playList.Id,
storageConfiguration.BucketName, storageConfiguration.Bucket,
Path.Combine(playListConfiguration.Routes.OriginalPicturesPath, playList.OriginalPictureName), Path.Combine(playListConfiguration.Routes.OriginalPicturesPath, playList.OriginalPictureName),
new ImageSize( new ImageSize(
playListConfiguration.Routes.SmallPicturesPath, playListConfiguration.Routes.SmallPicturesPath,
@@ -50,7 +50,7 @@ namespace Musify.Application.PlayLists.Handlers
try try
{ {
await eventBus.PublishAsync(new RemoveFileEvent( await eventBus.PublishAsync(new RemoveFileEvent(
storageConfiguration.BucketName, storageConfiguration.Bucket,
key), cancellationToken); key), cancellationToken);
return Result.Success(); return Result.Success();
} }
@@ -84,7 +84,7 @@ namespace Musify.Application.PlayLists.Handlers
await storageHandler.UploadFileAsync( await storageHandler.UploadFileAsync(
newPicture.FileStream, newPicture.FileStream,
newPicture.ContentType, newPicture.ContentType,
storageConfiguration.BucketName, storageConfiguration.Bucket,
pictureKey, pictureKey,
cancellationToken); cancellationToken);
} }
@@ -103,7 +103,7 @@ namespace Musify.Application.PlayLists.Handlers
{ {
await eventBus.PublishAsync(new UpdatePlayListPictureEvent( await eventBus.PublishAsync(new UpdatePlayListPictureEvent(
playList.Id, playList.Id,
storageConfiguration.BucketName, storageConfiguration.Bucket,
Path.Combine(playListConfiguration.Routes.OriginalPicturesPath, playList.OriginalPictureName), Path.Combine(playListConfiguration.Routes.OriginalPicturesPath, playList.OriginalPictureName),
new ImageSize( new ImageSize(
playListConfiguration.Routes.SmallPicturesPath, playListConfiguration.Routes.SmallPicturesPath,
@@ -149,7 +149,7 @@ namespace Musify.Application.PlayLists.Handlers
async Task Rollback(string pictureKey, CancellationToken cancellationToken) async Task Rollback(string pictureKey, CancellationToken cancellationToken)
{ {
await storageHandler.RemoveFileAsync( await storageHandler.RemoveFileAsync(
storageConfiguration.BucketName, storageConfiguration.Bucket,
pictureKey, pictureKey,
cancellationToken); cancellationToken);
logger.LogInformation("Rolled back uploaded picture {PictureKey} from storage", pictureKey); logger.LogInformation("Rolled back uploaded picture {PictureKey} from storage", pictureKey);
@@ -160,7 +160,7 @@ namespace Musify.Application.PlayLists.Handlers
try try
{ {
await eventBus.PublishAsync(new RemoveFileEvent( await eventBus.PublishAsync(new RemoveFileEvent(
storageConfiguration.BucketName, storageConfiguration.Bucket,
key), cancellationToken); key), cancellationToken);
return Result.NoContent(); return Result.NoContent();
} }
@@ -54,7 +54,7 @@ namespace Musify.Application.Tracks.Handler
await storageHandler.UploadFileAsync( await storageHandler.UploadFileAsync(
request.Picture.FileStream, request.Picture.FileStream,
request.Picture.ContentType, request.Picture.ContentType,
storageConfiguration.BucketName, storageConfiguration.Bucket,
pictureKey, pictureKey,
cancellationToken); cancellationToken);
} }
@@ -68,7 +68,7 @@ namespace Musify.Application.Tracks.Handler
await storageHandler.UploadFileAsync( await storageHandler.UploadFileAsync(
request.Audio.FileStream, request.Audio.FileStream,
request.Audio.ContentType, request.Audio.ContentType,
storageConfiguration.BucketName, storageConfiguration.Bucket,
audioKey, audioKey,
cancellationToken); cancellationToken);
} }
@@ -82,8 +82,8 @@ namespace Musify.Application.Tracks.Handler
async Task RollbackFilesAsync(string pictureKey, string audioKey, CancellationToken cancellationToken) async Task RollbackFilesAsync(string pictureKey, string audioKey, CancellationToken cancellationToken)
{ {
await storageHandler.RemoveFileAsync(storageConfiguration.BucketName, pictureKey, cancellationToken); await storageHandler.RemoveFileAsync(storageConfiguration.Bucket, pictureKey, cancellationToken);
await storageHandler.RemoveFileAsync(storageConfiguration.BucketName, audioKey, cancellationToken); await storageHandler.RemoveFileAsync(storageConfiguration.Bucket, audioKey, cancellationToken);
logger.LogInformation("Rolled back uploaded files {PictureKey}, {AudioKey}", pictureKey, audioKey); logger.LogInformation("Rolled back uploaded files {PictureKey}, {AudioKey}", pictureKey, audioKey);
} }
@@ -93,7 +93,7 @@ namespace Musify.Application.Tracks.Handler
{ {
await eventBus.PublishAsync(new UpdateTrackPictureEvent( await eventBus.PublishAsync(new UpdateTrackPictureEvent(
track.Id, track.Id,
storageConfiguration.BucketName, storageConfiguration.Bucket,
Path.Combine(trackConfiguration.Routes.OriginalPicturesPath, track.OriginalPictureName), Path.Combine(trackConfiguration.Routes.OriginalPicturesPath, track.OriginalPictureName),
new ImageSize( new ImageSize(
trackConfiguration.Routes.SmallPicturesPath, trackConfiguration.Routes.SmallPicturesPath,
@@ -123,9 +123,9 @@ namespace Musify.Application.Tracks.Handler
{ {
await eventBus.PublishAsync(new UpdateTrackAudioEvent( await eventBus.PublishAsync(new UpdateTrackAudioEvent(
track.Id, track.Id,
storageConfiguration.BucketName, storageConfiguration.Bucket,
Path.Combine(trackConfiguration.Routes.OriginalAudiosPath, track.OriginalAudioName), Path.Combine(trackConfiguration.Routes.OriginalAudiosPath, track.OriginalAudioName),
storageConfiguration.BucketName, storageConfiguration.Bucket,
destinationFolderAudio), cancellationToken); destinationFolderAudio), cancellationToken);
} }
catch (Exception exception) catch (Exception exception)
@@ -60,7 +60,7 @@ namespace Musify.Application.Tracks.Handler
async Task RemoveFile(string path, CancellationToken cancellationToken) 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); logger.LogDebug("Removed file {Path} from storage", path);
} }
} }
@@ -4,7 +4,7 @@ namespace Musify.Infrastructure.Configuration
{ {
public class MassTransitConfiguration public class MassTransitConfiguration
{ {
public const string SectionName = "Messaging"; public const string SectionName = "MassTransit";
[Required] [Required]
public required string Address { get; set; } public required string Address { get; set; }