Deduplicate picture flows: shared upload issuer, cover query and picture source change

backend/Core/Musify.Application/Albums/CreateAlbum.cs

@@ -5,9 +5,10 @@ using Microsoft.Extensions.Logging;
 using Musify.Application.Albums.Responses;
 using Musify.Application.Configuration;
 using Musify.Application.Contracts;
-using Musify.Application.Shared;
 using Musify.Application.Events;
+using Musify.Application.Pictures;
 using Musify.Application.Services;
+using Musify.Application.Shared;
 using Musify.Domain.Entities;
 using Musify.Domain.ValueObjects;
 
@@ -26,9 +27,7 @@ public class CreateAlbumCommandHandler(
     IDatabase database,
     UploadIntentValidator uploadIntentValidator,
     ILogger<CreateAlbumCommandHandler> logger,
-    ApplicationStorageConfiguration storageConfiguration,
-    AlbumConfiguration albumConfiguration,
-    UploadIntentConfiguration uploadIntentConfiguration)
+    AlbumConfiguration albumConfiguration)
     : ICommandHandler<CreateAlbumCommand, ErrorOr<AlbumApplicationResponse>>
 {
     public async ValueTask<ErrorOr<AlbumApplicationResponse>> Handle(CreateAlbumCommand request, CancellationToken cancellationToken)
@@ -37,17 +36,14 @@ public class CreateAlbumCommandHandler(
             .AsNoTracking()
             .AnyAsync(user => user.Id == request.UserId, cancellationToken);
         if (!userExists)
-        {
-            logger.LogWarning("User {UserId} not found", request.UserId);
-            return Error.NotFound(description: $"User {request.UserId} not found");
-        }
+            return AppErrors.NotFound("User", request.UserId);
 
-        var pictureIntent = await uploadIntentValidator.ValidateAndLoadAsync(
-            uploadIntentConfiguration, request.PictureIntentId, request.UserId, UploadIntentPurpose.AlbumPicture, cancellationToken);
-        if (pictureIntent.IsError)
-            return pictureIntent.Errors;
+        var prepared = await PictureSourceChange.PrepareAsync(
+            uploadIntentValidator, request.PictureIntentId, request.UserId, UploadIntentPurpose.AlbumPicture, albumConfiguration, cancellationToken);
+        if (prepared.IsError)
+            return prepared.Errors;
 
-        var intent = pictureIntent.Value;
+        var picture = prepared.Value;
         var title = request.Title.Trim();
 
         var album = new Album
@@ -57,57 +53,20 @@ public class CreateAlbumCommandHandler(
             NormalizedTitle = TextNormalizer.Normalize(title),
             Description = request.Description,
             ReleaseYear = request.ReleaseYear,
-            Pictures = EntityPictures.Pending(intent.ObjectName)
+            Pictures = picture.Pictures
         };
 
         await database.Albums.AddAsync(album, cancellationToken);
 
-        var finalPictureKey = albumConfiguration.Routes.BuildOriginalPicturePath(request.UserId, intent.ObjectName);
-        var publishResult = await PublishCreateAlbumEventAsync(album.Id, intent, finalPictureKey, cancellationToken);
-        if (publishResult.IsError)
-            return publishResult.Errors;
+        await eventBus.PublishAsync(
+            new CreateAlbumResourcesEvent(
+                album.Id, picture.Intent.Id, picture.Intent.Bucket, picture.Intent.Key, picture.FinalKey, picture.Sizes),
+            cancellationToken);
 
-        try
-        {
-            await database.SaveChangesAsync(cancellationToken);
-        }
-        catch (Exception exception)
-        {
-            logger.LogError(exception, "Failed to save album for user {UserId}", request.UserId);
-            return Error.Failure(description: $"Failed to create album for user {request.UserId}");
-        }
+        await database.SaveChangesAsync(cancellationToken);
 
         logger.LogInformation("Created album {AlbumId} for user {UserId}", album.Id, request.UserId);
 
         return AlbumApplicationResponse.FromEntity(album, trackCount: 0);
     }
-
-    private async Task<ErrorOr<Success>> PublishCreateAlbumEventAsync(
-        Guid albumId,
-        UploadIntent pictureIntent,
-        string finalPictureKey,
-        CancellationToken cancellationToken)
-    {
-        try
-        {
-            var sizes = albumConfiguration.PicturesSizes.ToImageSizes(albumConfiguration.Routes);
-            await eventBus.PublishAsync(
-                new CreateAlbumResourcesEvent(
-                    albumId,
-                    pictureIntent.Id,
-                    storageConfiguration.Bucket,
-                    pictureIntent.Key,
-                    finalPictureKey,
-                    sizes.Small,
-                    sizes.Medium,
-                    sizes.Large),
-                cancellationToken);
-            return Result.Success;
-        }
-        catch (Exception exception)
-        {
-            logger.LogError(exception, "Failed to publish create album event for album {AlbumId}", albumId);
-            return Error.Failure(description: $"Failed to publish create album event for album {albumId}");
-        }
-    }
 }