Refactor

Application/Tracks/Handler/CreateTrackCommandHandler.cs

@@ -2,6 +2,7 @@
 using DispatchR.Abstractions.Send;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Configuration;
+using Musify.Application.Contracts.Application;
 using Musify.Application.Contracts.Infrastructure;
 using Musify.Application.Events;
 using Musify.Application.Tracks.Commands;
@@ -34,19 +35,43 @@ namespace Musify.Application.Tracks.Handler
                 LargePictureKeyName = trackConfiguration.Routes.PresetLargePicture,
             };
 
-            var pictureUploadResult = await storageHandler.UploadFileAsync(
-                request.Picture.FileStream,
-                request.Picture.ContentType,
-                storageConfiguration.BucketName,
-                originalPictureKeyName,
-                cancellationToken);
-
+            var pictureUploadResult = await UploadFile(request.Picture, originalPictureKeyName, cancellationToken);
             if (!pictureUploadResult.IsSuccess)
             {
                 logger.LogError("Failed to upload picture for track {TrackTitle}", request.Title);
                 return Result.Error($"Failed to upload picture for track {request.Title}");
             }
 
+            try
+            {
+                await PublishUpdateEvent(originalPictureKeyName, track, cancellationToken);
+            }
+            catch (Exception exception)
+            {
+                logger.LogError(exception, "Failed to publish resize picture event for Track with id={TrackId}.", track.Id);
+                return Result.Error($"Failed to publish resize picture event for Track with id {track.Id}.");
+            }
+
+            await database.Tracks.AddAsync(track, cancellationToken);
+            await database.SaveChangesAsync(cancellationToken);
+
+            return Result.Success();
+        }
+
+        async Task<Result<string>> UploadFile(IFileData fileData, string originalPictureKeyName, CancellationToken cancellationToken)
+        {
+            var uploadFile = await storageHandler.UploadFileAsync(
+                fileData.FileStream,
+                fileData.ContentType,
+                storageConfiguration.BucketName,
+                originalPictureKeyName,
+                cancellationToken);
+
+            return uploadFile;
+        }
+
+        async Task PublishUpdateEvent(string originalPictureKeyName, Track track, CancellationToken cancellationToken)
+        {
             var smallPictureKeyName = Path.Combine(
                 trackConfiguration.Routes.SmallPictures,
                 $"{track.Id}.{pictureHandler.FileExtension}");
@@ -57,8 +82,6 @@ namespace Musify.Application.Tracks.Handler
                 trackConfiguration.Routes.LargePictures,
                 $"{track.Id}.{pictureHandler.FileExtension}");
 
-            try
-            {
             await eventBus.PublishAsync(new UpdatePlayListPictureEvent(
                 track.Id,
                 storageConfiguration.BucketName,
@@ -73,16 +96,5 @@ namespace Musify.Application.Tracks.Handler
                 trackConfiguration.PicturesSizes.LargePictureWidth,
                 trackConfiguration.PicturesSizes.LargePictureHeight), cancellationToken);
         }
-            catch (Exception exception)
-            {
-                logger.LogError(exception, "Failed to publish resize picture event for Track with id={TrackId}.", track.Id);
-                return Result.Error($"Failed to publish resize picture event for Track with id {track.Id}.");
-            }
-
-            await database.Tracks.AddAsync(track, cancellationToken);
-            await database.SaveChangesAsync(cancellationToken);
-
-            return Result.Success();
-        }
     }
 }