Changes

backend/Musify.Infrastructure/MassTransit/Activities/Pictures/UpdatePlayListPictureActivity.cs

@@ -2,6 +2,7 @@ using MassTransit;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Contracts;
 using Musify.Application.Events;
+using Musify.Domain.ValueObjects;
 using Musify.Infrastructure.MassTransit.Arguments;
 using Musify.Infrastructure.MassTransit.Logs;
 
@@ -37,6 +38,13 @@ namespace Musify.Infrastructure.MassTransit.Activities.Pictures
                     throw new InvalidOperationException($"PlayList with id {executeContext.Arguments.PlayListId} not found");
                 }
 
+                if (playList.Pictures is null)
+                {
+                    logger.LogWarning("Playlist {PlayListId} has no pending picture upload",
+                        executeContext.Arguments.PlayListId);
+                    throw new InvalidOperationException($"PlayList with id {executeContext.Arguments.PlayListId} has no pending picture upload");
+                }
+
                 var log = new UpdatePlayListPictureLog(
                     playList.Id,
                     playList.Pictures.OriginalName,
@@ -82,10 +90,13 @@ namespace Musify.Infrastructure.MassTransit.Activities.Pictures
                     return compensateContext.Compensated();
                 }
 
-                playList.Pictures.OriginalName = compensateContext.Log.PreviousOriginalPictureKey;
-                playList.Pictures.SmallName = compensateContext.Log.PreviousSmallPictureKey;
-                playList.Pictures.MediumName = compensateContext.Log.PreviousMediumPictureKey;
-                playList.Pictures.LargeName = compensateContext.Log.PreviousLargePictureKey;
+                playList.Pictures = new PlayListPictures
+                {
+                    OriginalName = compensateContext.Log.PreviousOriginalPictureKey,
+                    SmallName = compensateContext.Log.PreviousSmallPictureKey,
+                    MediumName = compensateContext.Log.PreviousMediumPictureKey,
+                    LargeName = compensateContext.Log.PreviousLargePictureKey
+                };
 
                 database.PlayLists.Update(playList);
                 await database.SaveChangesAsync(compensateContext.CancellationToken);

backend/Musify.Infrastructure/MassTransit/Logs/UpdatePlayListPictureLog.cs

@@ -2,8 +2,8 @@ namespace Musify.Infrastructure.MassTransit.Logs
 {
     public record UpdatePlayListPictureLog(
         Guid PlayListId,
-        string PreviousOriginalPictureKey,
-        string PreviousSmallPictureKey,
-        string PreviousMediumPictureKey,
-        string PreviousLargePictureKey);
+        string? PreviousOriginalPictureKey,
+        string? PreviousSmallPictureKey,
+        string? PreviousMediumPictureKey,
+        string? PreviousLargePictureKey);
 }

backend/Musify.Infrastructure/MassTransit/RoutingSlip/Builders/DeletePlayListRoutingSlipBuilder.cs

@@ -37,49 +37,49 @@ namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
                 EndpointHelper.BuildExecuteActivityUri(MarkPlayListAsRemovingActivity.ExecuteEndpointName),
                 new MarkPlayListAsRemovingArguments(playListId));
 
-            if (playList is not null)
+            if (playList?.Pictures is not null)
             {
                 var bucket = storageConfiguration.Bucket;
                 var routes = playListConfiguration.Routes;
 
-                if (playList.Pictures.OriginalName != routes.PresetOriginalPicture)
+                if (playList.Pictures.OriginalName is { } originalName)
                 {
                     routingSlipBuilder.AddActivity(
                         ActivityNames.RemovePlayListOriginalPicture,
                         EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
                         new RemoveFileFromBucketArguments(
                             bucket,
-                            routes.BuildOriginalPicturePath(userId, playList.Pictures.OriginalName)));
+                            routes.BuildOriginalPicturePath(userId, originalName)));
                 }
 
-                if (playList.Pictures.SmallName != routes.PresetSmallPicture)
+                if (playList.Pictures.SmallName is { } smallName)
                 {
                     routingSlipBuilder.AddActivity(
                         ActivityNames.RemovePlayListSmallPicture,
                         EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
                         new RemoveFileFromBucketArguments(
                             bucket,
-                            routes.BuildSmallPicturePath(playList.Pictures.SmallName)));
+                            routes.BuildSmallPicturePath(smallName)));
                 }
 
-                if (playList.Pictures.MediumName != routes.PresetMediumPicture)
+                if (playList.Pictures.MediumName is { } mediumName)
                 {
                     routingSlipBuilder.AddActivity(
                         ActivityNames.RemovePlayListMediumPicture,
                         EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
                         new RemoveFileFromBucketArguments(
                             bucket,
-                            routes.BuildMediumPicturePath(playList.Pictures.MediumName)));
+                            routes.BuildMediumPicturePath(mediumName)));
                 }
 
-                if (playList.Pictures.LargeName != routes.PresetLargePicture)
+                if (playList.Pictures.LargeName is { } largeName)
                 {
                     routingSlipBuilder.AddActivity(
                         ActivityNames.RemovePlayListLargePicture,
                         EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
                         new RemoveFileFromBucketArguments(
                             bucket,
-                            routes.BuildLargePicturePath(playList.Pictures.LargeName)));
+                            routes.BuildLargePicturePath(largeName)));
                 }
             }