Deduplicate MassTransit routing slips, activities and consumers

2026-09-24 12:25:55 +02:00
parent 0cba32f776
commit 405df082cc
76 changed files with 922 additions and 1933 deletions
@@ -1,87 +0,0 @@
-using MassTransit;
-using MassTransit.Courier.Contracts;
-using Musify.Application.Events;
-using Musify.Application.Shared;
-using Musify.Infrastructure.MassTransit.Activities.Albums;
-using Musify.Infrastructure.MassTransit.Activities.Files;
-using Musify.Infrastructure.MassTransit.Activities.UploadIntents;
-using Musify.Infrastructure.MassTransit.Arguments;
-using Musify.Infrastructure.MassTransit.Consumers;
-
-namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
-
-public class AlbumPictureSourceRoutingSlipBuilder
-{
-    public RoutingSlipBuilder Build(CreateAlbumResourcesEvent message, Guid? correlationId)
-        => BuildSlip(
-            message.AlbumId,
-            message.PictureIntentId,
-            message.Bucket,
-            message.PictureSourceKey,
-            message.PictureDestinationKey,
-            message.Sizes,
-            correlationId,
-            RoutingSlipVariableNames.ProcessKinds.AlbumCreation);
-
-    public RoutingSlipBuilder Build(UpdateAlbumPictureSourceEvent message, Guid? correlationId)
-        => BuildSlip(
-            message.AlbumId,
-            message.PictureIntentId,
-            message.Bucket,
-            message.PictureSourceKey,
-            message.PictureDestinationKey,
-            message.Sizes,
-            correlationId,
-            RoutingSlipVariableNames.ProcessKinds.AlbumPicture);
-
-    private static RoutingSlipBuilder BuildSlip(
-        Guid albumId,
-        Guid pictureIntentId,
-        string bucket,
-        string pictureSourceKey,
-        string pictureDestinationKey,
-        ImageSizes sizes,
-        Guid? correlationId,
-        string processKind)
-    {
-        var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.CorrelationId, correlationId ?? Guid.Empty);
-
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
-            RoutingSlipEvents.Completed | RoutingSlipEvents.Faulted);
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.CopyPictureToFinal,
-            EndpointHelper.BuildExecuteActivityUri(CopyFileInBucketActivity.ExecuteEndpointName),
-            new CopyFileInBucketArguments(
-                bucket,
-                pictureSourceKey,
-                bucket,
-                pictureDestinationKey));
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.ConsumeUploadIntents,
-            EndpointHelper.BuildExecuteActivityUri(ConsumeUploadIntentsActivity.ExecuteEndpointName),
-            new ConsumeUploadIntentsArguments([pictureIntentId]));
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.PublishAlbumPictureProcessingEvent,
-            EndpointHelper.BuildExecuteActivityUri(PublishAlbumPictureProcessingEventActivity.ExecuteEndpointName),
-            new PublishAlbumPictureProcessingEventArguments(
-                albumId,
-                bucket,
-                pictureDestinationKey,
-                sizes));
-
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.SubjectId, albumId);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.ProcessKind, processKind);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.Bucket, bucket);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.PictureKey, pictureDestinationKey);
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(ProcessingSlipFaultConsumer.QueueName),
-            RoutingSlipEvents.Faulted);
-
-        return routingSlipBuilder;
-    }
-}
@@ -1,71 +1,44 @@
 using MassTransit;
-using MassTransit.Courier.Contracts;
 using Musify.Application.Events;
 using Musify.Infrastructure.Configuration;
 using Musify.Infrastructure.MassTransit.Activities.Audio;
 using Musify.Infrastructure.MassTransit.Activities.Files;
 using Musify.Infrastructure.MassTransit.Arguments;
-using Musify.Infrastructure.MassTransit.Consumers;

 namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders;

 public class AudioWorkflowRoutingSlipBuilder(WorkerConfiguration workerConfiguration)
 {
-    public RoutingSlipBuilder Build(UpdateTrackAudioEvent message, Guid? correlationId)
-    {
-        var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.CorrelationId, correlationId ?? Guid.Empty);
-
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
-            RoutingSlipEvents.Completed | RoutingSlipEvents.Faulted);
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.GenerateAudioWorkflowPaths,
-            EndpointHelper.BuildExecuteActivityUri(GenerateAudioWorkflowPathsActivity.ExecuteEndpointName),
-            new GenerateAudioWorkflowPathsArguments(
-                message.TrackId,
-                workerConfiguration.Routes.TemporaryFilesDirectory,
-                message.SourceKey));
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.DownloadFile,
-            EndpointHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
-            new DownloadFileFromBucketArguments(
-                message.SourceBucket,
-                message.SourceKey,
-                RoutingSlipVariableNames.Audio.SourceFilePath));
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.TranscodeAudio,
-            EndpointHelper.BuildExecuteActivityUri(TranscodeAudioActivity.ExecuteEndpointName),
-            new TranscodeAudioArguments(
-                message.TrackId,
-                RoutingSlipVariableNames.Audio.SourceFilePath,
-                RoutingSlipVariableNames.Workflow.TemporalDirectory));
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.TransferFiles,
-            EndpointHelper.BuildExecuteActivityUri(TransferFilesToBucketActivity.ExecuteEndpointName),
-            new TransferFilesToBucketArguments(
-                message.DestinationBucket,
-                RoutingSlipVariableNames.Audio.TranscodedDirectory,
-                message.DestinationFolderKey));
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.UpdateTrackAudio,
-            EndpointHelper.BuildExecuteActivityUri(UpdateTrackAudioActivity.ExecuteEndpointName),
-            new UpdateTrackAudioArguments(
-                message.TrackId,
-                message.DestinationFolderKey,
-                RoutingSlipVariableNames.Audio.DurationSeconds));
-
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.SubjectId, message.TrackId);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.ProcessKind, RoutingSlipVariableNames.ProcessKinds.TrackAudio);
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(ProcessingSlipFaultConsumer.QueueName),
-            RoutingSlipEvents.Faulted);
-
-        return routingSlipBuilder;
-    }
+    public RoutingSlipBuilder Build(UpdateTrackAudioEvent message, Guid? correlationId) =>
+        RoutingSlips.Create(correlationId)
+            .AddStep(
+                ActivityNames.GenerateAudioWorkflowPaths,
+                GenerateAudioWorkflowPathsActivity.ExecuteEndpointName,
+                new GenerateAudioWorkflowPathsArguments(
+                    message.TrackId, workerConfiguration.Routes.TemporaryFilesDirectory, message.SourceKey))
+            .AddStep(
+                ActivityNames.DownloadFile,
+                DownloadFileFromBucketActivity.ExecuteEndpointName,
+                new DownloadFileFromBucketArguments(
+                    message.SourceBucket, message.SourceKey, RoutingSlipVariableNames.Audio.SourceFilePath))
+            .AddStep(
+                ActivityNames.TranscodeAudio,
+                TranscodeAudioActivity.ExecuteEndpointName,
+                new TranscodeAudioArguments(
+                    message.TrackId,
+                    RoutingSlipVariableNames.Audio.SourceFilePath,
+                    RoutingSlipVariableNames.Workflow.TemporalDirectory))
+            .AddStep(
+                ActivityNames.TransferFiles,
+                TransferFilesToBucketActivity.ExecuteEndpointName,
+                new TransferFilesToBucketArguments(
+                    message.DestinationBucket,
+                    RoutingSlipVariableNames.Audio.TranscodedDirectory,
+                    message.DestinationFolderKey))
+            .AddStep(
+                ActivityNames.UpdateTrackAudio,
+                UpdateTrackAudioActivity.ExecuteEndpointName,
+                new UpdateTrackAudioArguments(
+                    message.TrackId, message.DestinationFolderKey, RoutingSlipVariableNames.Audio.DurationSeconds))
+            .TrackFaults(message.TrackId, RoutingSlipVariableNames.ProcessKinds.TrackAudio);
 }
@@ -1,11 +1,9 @@
 using MassTransit;
-using MassTransit.Courier.Contracts;
 using Musify.Application.Events;
 using Musify.Infrastructure.MassTransit.Activities.Files;
 using Musify.Infrastructure.MassTransit.Activities.Tracks;
 using Musify.Infrastructure.MassTransit.Activities.UploadIntents;
 using Musify.Infrastructure.MassTransit.Arguments;
-using Musify.Infrastructure.MassTransit.Consumers;

 namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders;

@@ -13,57 +11,35 @@ public class CreateTrackRoutingSlipBuilder
 {
    public RoutingSlipBuilder Build(CreateTrackResourcesEvent message, Guid? correlationId)
    {
-        var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.CorrelationId, correlationId ?? Guid.Empty);
+        var builder = RoutingSlips.Create(correlationId)
+            .AddStep(
+                ActivityNames.CopyPictureToFinal,
+                CopyFileInBucketActivity.ExecuteEndpointName,
+                new CopyFileInBucketArguments(message.Bucket, message.PictureSourceKey, message.Bucket, message.PictureDestinationKey))
+            .AddStep(
+                ActivityNames.CopyAudioToFinal,
+                CopyFileInBucketActivity.ExecuteEndpointName,
+                new CopyFileInBucketArguments(message.Bucket, message.AudioSourceKey, message.Bucket, message.AudioDestinationKey))
+            .AddStep(
+                ActivityNames.ConsumeUploadIntents,
+                ConsumeUploadIntentsActivity.ExecuteEndpointName,
+                new ConsumeUploadIntentsArguments([message.PictureIntentId, message.AudioIntentId]))
+            .AddStep(
+                ActivityNames.PublishTrackProcessingEvents,
+                PublishTrackProcessingEventsActivity.ExecuteEndpointName,
+                new PublishTrackProcessingEventsArguments(
+                    message.TrackId,
+                    message.Bucket,
+                    message.PictureDestinationKey,
+                    message.AudioDestinationKey,
+                    message.AudioProcessedFolderKey,
+                    message.Sizes))
+            .TrackFaults(message.TrackId, RoutingSlipVariableNames.ProcessKinds.TrackCreation);

-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
-            RoutingSlipEvents.Completed | RoutingSlipEvents.Faulted);
+        builder.AddVariable(RoutingSlipVariableNames.Workflow.Bucket, message.Bucket);
+        builder.AddVariable(RoutingSlipVariableNames.Workflow.PictureKey, message.PictureDestinationKey);
+        builder.AddVariable(RoutingSlipVariableNames.Workflow.AudioKey, message.AudioDestinationKey);

-        routingSlipBuilder.AddActivity(
-            ActivityNames.CopyPictureToFinal,
-            EndpointHelper.BuildExecuteActivityUri(CopyFileInBucketActivity.ExecuteEndpointName),
-            new CopyFileInBucketArguments(
-                message.Bucket,
-                message.PictureSourceKey,
-                message.Bucket,
-                message.PictureDestinationKey));
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.CopyAudioToFinal,
-            EndpointHelper.BuildExecuteActivityUri(CopyFileInBucketActivity.ExecuteEndpointName),
-            new CopyFileInBucketArguments(
-                message.Bucket,
-                message.AudioSourceKey,
-                message.Bucket,
-                message.AudioDestinationKey));
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.ConsumeUploadIntents,
-            EndpointHelper.BuildExecuteActivityUri(ConsumeUploadIntentsActivity.ExecuteEndpointName),
-            new ConsumeUploadIntentsArguments(
-                [message.PictureIntentId, message.AudioIntentId]));
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.PublishTrackProcessingEvents,
-            EndpointHelper.BuildExecuteActivityUri(PublishTrackProcessingEventsActivity.ExecuteEndpointName),
-            new PublishTrackProcessingEventsArguments(
-                message.TrackId,
-                message.Bucket,
-                message.PictureDestinationKey,
-                message.AudioDestinationKey,
-                message.AudioProcessedFolderKey,
-                message.Sizes));
-
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.SubjectId, message.TrackId);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.ProcessKind, RoutingSlipVariableNames.ProcessKinds.TrackCreation);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.Bucket, message.Bucket);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.PictureKey, message.PictureDestinationKey);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.AudioKey, message.AudioDestinationKey);
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(ProcessingSlipFaultConsumer.QueueName),
-            RoutingSlipEvents.Faulted);
-
-        return routingSlipBuilder;
+        return builder;
    }
 }
@@ -1,93 +0,0 @@
-using MassTransit;
-using MassTransit.Courier.Contracts;
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Configuration;
-using Musify.Application.Contracts;
-using Musify.Infrastructure.MassTransit.Activities.Files;
-using Musify.Infrastructure.MassTransit.Activities.Albums;
-using Musify.Infrastructure.MassTransit.Arguments;
-using Musify.Infrastructure.MassTransit.Consumers;
-
-namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
-
-public class DeleteAlbumRoutingSlipBuilder(
-    IDatabase database,
-    AlbumConfiguration albumConfiguration,
-    ApplicationStorageConfiguration storageConfiguration)
-{
-    public async Task<RoutingSlipBuilder> BuildAsync(
-        Guid albumId,
-        long userId,
-        Guid? correlationId,
-        CancellationToken cancellationToken)
-    {
-        var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.CorrelationId, correlationId ?? Guid.Empty);
-
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
-            RoutingSlipEvents.Completed | RoutingSlipEvents.Faulted);
-
-        var album = await database.Albums
-            .AsNoTracking()
-            .SingleOrDefaultAsync(p => p.Id == albumId, cancellationToken);
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.MarkAlbumAsRemoving,
-            EndpointHelper.BuildExecuteActivityUri(MarkAlbumAsRemovingActivity.ExecuteEndpointName),
-            new MarkAlbumAsRemovingArguments(albumId));
-
-        if (album?.Pictures != null)
-        {
-            var bucket = storageConfiguration.Bucket;
-            var routes = albumConfiguration.Routes;
-
-            if (album.Pictures.OriginalName is { } originalName)
-            {
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemoveAlbumOriginalPicture,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        routes.BuildOriginalPicturePath(userId, originalName)));
-            }
-
-            if (album.Pictures.SmallName is { } smallName)
-            {
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemoveAlbumSmallPicture,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        routes.BuildPicturePath(PictureSize.Small, smallName)));
-            }
-
-            if (album.Pictures.MediumName is { } mediumName)
-            {
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemoveAlbumMediumPicture,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        routes.BuildPicturePath(PictureSize.Medium, mediumName)));
-            }
-
-            if (album.Pictures.LargeName is { } largeName)
-            {
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemoveAlbumLargePicture,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        routes.BuildPicturePath(PictureSize.Large, largeName)));
-            }
-        }
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.DeleteAlbumFromDb,
-            EndpointHelper.BuildExecuteActivityUri(DeleteAlbumFromDbActivity.ExecuteEndpointName),
-            new DeleteAlbumFromDbArguments(albumId));
-
-        return routingSlipBuilder;
-    }
-}
@@ -1,93 +0,0 @@
-using MassTransit;
-using MassTransit.Courier.Contracts;
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Configuration;
-using Musify.Application.Contracts;
-using Musify.Infrastructure.MassTransit.Activities.Files;
-using Musify.Infrastructure.MassTransit.Activities.PlayLists;
-using Musify.Infrastructure.MassTransit.Arguments;
-using Musify.Infrastructure.MassTransit.Consumers;
-
-namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
-
-public class DeletePlayListRoutingSlipBuilder(
-    IDatabase database,
-    PlayListConfiguration playListConfiguration,
-    ApplicationStorageConfiguration storageConfiguration)
-{
-    public async Task<RoutingSlipBuilder> BuildAsync(
-        Guid playListId,
-        long userId,
-        Guid? correlationId,
-        CancellationToken cancellationToken)
-    {
-        var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.CorrelationId, correlationId ?? Guid.Empty);
-
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
-            RoutingSlipEvents.Completed | RoutingSlipEvents.Faulted);
-
-        var playList = await database.PlayLists
-            .AsNoTracking()
-            .SingleOrDefaultAsync(p => p.Id == playListId, cancellationToken);
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.MarkPlayListAsRemoving,
-            EndpointHelper.BuildExecuteActivityUri(MarkPlayListAsRemovingActivity.ExecuteEndpointName),
-            new MarkPlayListAsRemovingArguments(playListId));
-
-        if (playList?.Pictures != null)
-        {
-            var bucket = storageConfiguration.Bucket;
-            var routes = playListConfiguration.Routes;
-
-            if (playList.Pictures.OriginalName is { } originalName)
-            {
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemovePlayListOriginalPicture,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        routes.BuildOriginalPicturePath(userId, originalName)));
-            }
-
-            if (playList.Pictures.SmallName is { } smallName)
-            {
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemovePlayListSmallPicture,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        routes.BuildPicturePath(PictureSize.Small, smallName)));
-            }
-
-            if (playList.Pictures.MediumName is { } mediumName)
-            {
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemovePlayListMediumPicture,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        routes.BuildPicturePath(PictureSize.Medium, mediumName)));
-            }
-
-            if (playList.Pictures.LargeName is { } largeName)
-            {
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemovePlayListLargePicture,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        routes.BuildPicturePath(PictureSize.Large, largeName)));
-            }
-        }
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.DeletePlayListFromDb,
-            EndpointHelper.BuildExecuteActivityUri(DeletePlayListFromDbActivity.ExecuteEndpointName),
-            new DeletePlayListFromDbArguments(playListId));
-
-        return routingSlipBuilder;
-    }
-}
@@ -0,0 +1,135 @@
+using MassTransit;
+using Microsoft.EntityFrameworkCore;
+using Musify.Application.Configuration;
+using Musify.Application.Contracts;
+using Musify.Domain.ValueObjects;
+using Musify.Infrastructure.MassTransit.Arguments;
+using Musify.Infrastructure.MassTransit.Activities.LifeCycle;
+
+namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
+
+/// <summary>Marks an entity as removing, deletes its files from the bucket and finally deletes its row.</summary>
+public class DeleteRoutingSlipBuilder(
+    IDatabase database,
+    TrackConfiguration trackConfiguration,
+    AlbumConfiguration albumConfiguration,
+    PlayListConfiguration playListConfiguration,
+    ApplicationStorageConfiguration storageConfiguration)
+{
+    private sealed record PictureStepNames(string Original, string Small, string Medium, string Large);
+
+    private static readonly PictureStepNames AlbumSteps = new(
+        ActivityNames.RemoveAlbumOriginalPicture, ActivityNames.RemoveAlbumSmallPicture,
+        ActivityNames.RemoveAlbumMediumPicture, ActivityNames.RemoveAlbumLargePicture);
+
+    private static readonly PictureStepNames PlayListSteps = new(
+        ActivityNames.RemovePlayListOriginalPicture, ActivityNames.RemovePlayListSmallPicture,
+        ActivityNames.RemovePlayListMediumPicture, ActivityNames.RemovePlayListLargePicture);
+
+    public async Task<RoutingSlipBuilder> BuildTrackAsync(
+        Guid trackId, long userId, Guid? correlationId, CancellationToken cancellationToken)
+    {
+        var builder = RoutingSlips.Create(correlationId)
+            .AddStep(
+                ActivityNames.MarkTrackAsRemoving,
+                MarkTrackLifeCycleActivity.ExecuteEndpointName,
+                new MarkLifeCycleArguments(trackId, LifeCycleStatus.Removing));
+
+        var track = await database.Tracks.AsNoTracking().SingleOrDefaultAsync(t => t.Id == trackId, cancellationToken);
+        if (track != null)
+        {
+            var bucket = storageConfiguration.Bucket;
+            var routes = trackConfiguration.Routes;
+
+            if (!string.IsNullOrEmpty(track.Pictures.OriginalName))
+            {
+                builder.AddRemoveFile(
+                    ActivityNames.RemoveTrackOriginalPicture, bucket,
+                    routes.BuildOriginalPicturePath(userId, track.Pictures.OriginalName));
+            }
+
+            // Unprocessed tracks still point at the shared preset pictures, which must never be deleted.
+            if (track.Pictures.IsProcessed)
+            {
+                builder.AddRemoveFile(ActivityNames.RemoveTrackSmallPicture, bucket, routes.BuildPicturePath(PictureSize.Small, track.Pictures.SmallName));
+                builder.AddRemoveFile(ActivityNames.RemoveTrackMediumPicture, bucket, routes.BuildPicturePath(PictureSize.Medium, track.Pictures.MediumName));
+                builder.AddRemoveFile(ActivityNames.RemoveTrackLargePicture, bucket, routes.BuildPicturePath(PictureSize.Large, track.Pictures.LargeName));
+            }
+
+            if (!string.IsNullOrEmpty(track.Audio.OriginalName))
+            {
+                builder.AddRemoveFile(
+                    ActivityNames.RemoveTrackOriginalAudio, bucket,
+                    routes.BuildOriginalAudioPath(userId, track.Audio.OriginalName));
+            }
+
+            if (track.Audio.IsProcessed)
+            {
+                builder.AddRemoveFile(
+                    ActivityNames.RemoveTrackProcessedAudio, bucket,
+                    routes.BuildProcessedAudioPath(track.Audio.FolderName));
+            }
+        }
+
+        return builder.AddStep(
+            ActivityNames.DeleteTrackFromDb, DeleteTrackActivity.ExecuteEndpointName, new DeleteEntityArguments(trackId));
+    }
+
+    public async Task<RoutingSlipBuilder> BuildAlbumAsync(
+        Guid albumId, long userId, Guid? correlationId, CancellationToken cancellationToken)
+    {
+        var builder = RoutingSlips.Create(correlationId)
+            .AddStep(
+                ActivityNames.MarkAlbumAsRemoving,
+                MarkAlbumLifeCycleActivity.ExecuteEndpointName,
+                new MarkLifeCycleArguments(albumId, LifeCycleStatus.Removing));
+
+        var pictures = await database.Albums.AsNoTracking()
+            .Where(a => a.Id == albumId)
+            .Select(a => a.Pictures)
+            .SingleOrDefaultAsync(cancellationToken);
+
+        AddPictureRemovals(builder, AlbumSteps, albumConfiguration.Routes, userId, pictures);
+
+        return builder.AddStep(
+            ActivityNames.DeleteAlbumFromDb, DeleteAlbumActivity.ExecuteEndpointName, new DeleteEntityArguments(albumId));
+    }
+
+    public async Task<RoutingSlipBuilder> BuildPlayListAsync(
+        Guid playListId, long userId, Guid? correlationId, CancellationToken cancellationToken)
+    {
+        var builder = RoutingSlips.Create(correlationId)
+            .AddStep(
+                ActivityNames.MarkPlayListAsRemoving,
+                MarkPlayListLifeCycleActivity.ExecuteEndpointName,
+                new MarkLifeCycleArguments(playListId, LifeCycleStatus.Removing));
+
+        var pictures = await database.PlayLists.AsNoTracking()
+            .Where(p => p.Id == playListId)
+            .Select(p => p.Pictures)
+            .SingleOrDefaultAsync(cancellationToken);
+
+        AddPictureRemovals(builder, PlayListSteps, playListConfiguration.Routes, userId, pictures);
+
+        return builder.AddStep(
+            ActivityNames.DeletePlayListFromDb, DeletePlayListActivity.ExecuteEndpointName, new DeleteEntityArguments(playListId));
+    }
+
+    private void AddPictureRemovals(
+        RoutingSlipBuilder builder, PictureStepNames steps, PictureRoutes routes, long userId, EntityPictures? pictures)
+    {
+        if (pictures == null)
+            return;
+
+        var bucket = storageConfiguration.Bucket;
+
+        if (pictures.OriginalName is { } original)
+            builder.AddRemoveFile(steps.Original, bucket, routes.BuildOriginalPicturePath(userId, original));
+        if (pictures.SmallName is { } small)
+            builder.AddRemoveFile(steps.Small, bucket, routes.BuildPicturePath(PictureSize.Small, small));
+        if (pictures.MediumName is { } medium)
+            builder.AddRemoveFile(steps.Medium, bucket, routes.BuildPicturePath(PictureSize.Medium, medium));
+        if (pictures.LargeName is { } large)
+            builder.AddRemoveFile(steps.Large, bucket, routes.BuildPicturePath(PictureSize.Large, large));
+    }
+}
@@ -1,106 +0,0 @@
-using MassTransit;
-using MassTransit.Courier.Contracts;
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Configuration;
-using Musify.Application.Contracts;
-using Musify.Infrastructure.MassTransit.Activities.Files;
-using Musify.Infrastructure.MassTransit.Activities.Tracks;
-using Musify.Infrastructure.MassTransit.Arguments;
-using Musify.Infrastructure.MassTransit.Consumers;
-
-namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
-
-public class DeleteTrackRoutingSlipBuilder(
-    IDatabase database,
-    TrackConfiguration trackConfiguration,
-    ApplicationStorageConfiguration storageConfiguration)
-{
-    public async Task<RoutingSlipBuilder> BuildAsync(
-        Guid trackId,
-        long userId,
-        Guid? correlationId,
-        CancellationToken cancellationToken)
-    {
-        var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.CorrelationId, correlationId ?? Guid.Empty);
-
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
-            RoutingSlipEvents.Completed | RoutingSlipEvents.Faulted);
-
-        var track = await database.Tracks
-            .AsNoTracking()
-            .SingleOrDefaultAsync(t => t.Id == trackId, cancellationToken);
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.MarkTrackAsRemoving,
-            EndpointHelper.BuildExecuteActivityUri(MarkTrackAsRemovingActivity.ExecuteEndpointName),
-            new MarkTrackAsRemovingArguments(trackId));
-
-        if (track != null)
-        {
-            var bucket = storageConfiguration.Bucket;
-
-            if (!string.IsNullOrEmpty(track.Pictures.OriginalName))
-            {
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemoveTrackOriginalPicture,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        trackConfiguration.Routes.BuildOriginalPicturePath(userId, track.Pictures.OriginalName)));
-            }
-
-            if (track.Pictures.IsProcessed)
-            {
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemoveTrackSmallPicture,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        trackConfiguration.Routes.BuildPicturePath(PictureSize.Small, track.Pictures.SmallName)));
-
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemoveTrackMediumPicture,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        trackConfiguration.Routes.BuildPicturePath(PictureSize.Medium, track.Pictures.MediumName)));
-
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemoveTrackLargePicture,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        trackConfiguration.Routes.BuildPicturePath(PictureSize.Large, track.Pictures.LargeName)));
-            }
-
-            if (!string.IsNullOrEmpty(track.Audio.OriginalName))
-            {
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemoveTrackOriginalAudio,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        trackConfiguration.Routes.BuildOriginalAudioPath(userId, track.Audio.OriginalName)));
-            }
-
-            if (track.Audio.IsProcessed)
-            {
-                routingSlipBuilder.AddActivity(
-                    ActivityNames.RemoveTrackProcessedAudio,
-                    EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
-                    new RemoveFileFromBucketArguments(
-                        bucket,
-                        trackConfiguration.Routes.BuildProcessedAudioPath(track.Audio.FolderName)));
-            }
-        }
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.DeleteTrackFromDb,
-            EndpointHelper.BuildExecuteActivityUri(DeleteTrackFromDbActivity.ExecuteEndpointName),
-            new DeleteTrackFromDbArguments(trackId));
-
-        return routingSlipBuilder;
-    }
-}
@@ -0,0 +1,74 @@
+using MassTransit;
+using Musify.Application.Events;
+using Musify.Infrastructure.MassTransit.Activities.Albums;
+using Musify.Infrastructure.MassTransit.Activities.Files;
+using Musify.Infrastructure.MassTransit.Activities.PlayLists;
+using Musify.Infrastructure.MassTransit.Activities.UploadIntents;
+using Musify.Infrastructure.MassTransit.Arguments;
+
+namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
+
+/// <summary>
+/// Moves an uploaded album/playlist picture to its final key, consumes the upload intent and hands over to the picture workflow.
+/// Creation faults mark the whole entity as failed; update faults only report the picture as failed.
+/// </summary>
+public class PictureSourceRoutingSlipBuilder
+{
+    public RoutingSlipBuilder Build(CreateAlbumResourcesEvent message, Guid? correlationId) =>
+        BuildSlip(
+            message.AlbumId, message.PictureIntentId, message.Bucket, message.PictureSourceKey, message.PictureDestinationKey,
+            correlationId, RoutingSlipVariableNames.ProcessKinds.AlbumCreation,
+            ActivityNames.PublishAlbumPictureProcessingEvent, PublishAlbumPictureProcessingEventActivity.ExecuteEndpointName,
+            new PublishAlbumPictureProcessingEventArguments(message.AlbumId, message.Bucket, message.PictureDestinationKey, message.Sizes));
+
+    public RoutingSlipBuilder Build(UpdateAlbumPictureSourceEvent message, Guid? correlationId) =>
+        BuildSlip(
+            message.AlbumId, message.PictureIntentId, message.Bucket, message.PictureSourceKey, message.PictureDestinationKey,
+            correlationId, RoutingSlipVariableNames.ProcessKinds.AlbumPicture,
+            ActivityNames.PublishAlbumPictureProcessingEvent, PublishAlbumPictureProcessingEventActivity.ExecuteEndpointName,
+            new PublishAlbumPictureProcessingEventArguments(message.AlbumId, message.Bucket, message.PictureDestinationKey, message.Sizes));
+
+    public RoutingSlipBuilder Build(CreatePlayListResourcesEvent message, Guid? correlationId) =>
+        BuildSlip(
+            message.PlayListId, message.PictureIntentId, message.Bucket, message.PictureSourceKey, message.PictureDestinationKey,
+            correlationId, RoutingSlipVariableNames.ProcessKinds.PlayListCreation,
+            ActivityNames.PublishPlayListPictureProcessingEvent, PublishPlayListPictureProcessingEventActivity.ExecuteEndpointName,
+            new PublishPlayListPictureProcessingEventArguments(message.PlayListId, message.Bucket, message.PictureDestinationKey, message.Sizes));
+
+    public RoutingSlipBuilder Build(UpdatePlayListPictureSourceEvent message, Guid? correlationId) =>
+        BuildSlip(
+            message.PlayListId, message.PictureIntentId, message.Bucket, message.PictureSourceKey, message.PictureDestinationKey,
+            correlationId, RoutingSlipVariableNames.ProcessKinds.PlayListPicture,
+            ActivityNames.PublishPlayListPictureProcessingEvent, PublishPlayListPictureProcessingEventActivity.ExecuteEndpointName,
+            new PublishPlayListPictureProcessingEventArguments(message.PlayListId, message.Bucket, message.PictureDestinationKey, message.Sizes));
+
+    private static RoutingSlipBuilder BuildSlip(
+        Guid subjectId,
+        Guid pictureIntentId,
+        string bucket,
+        string pictureSourceKey,
+        string pictureDestinationKey,
+        Guid? correlationId,
+        string processKind,
+        string publishStepName,
+        string publishEndpointName,
+        object publishArguments)
+    {
+        var builder = RoutingSlips.Create(correlationId)
+            .AddStep(
+                ActivityNames.CopyPictureToFinal,
+                CopyFileInBucketActivity.ExecuteEndpointName,
+                new CopyFileInBucketArguments(bucket, pictureSourceKey, bucket, pictureDestinationKey))
+            .AddStep(
+                ActivityNames.ConsumeUploadIntents,
+                ConsumeUploadIntentsActivity.ExecuteEndpointName,
+                new ConsumeUploadIntentsArguments([pictureIntentId]))
+            .AddStep(publishStepName, publishEndpointName, publishArguments)
+            .TrackFaults(subjectId, processKind);
+
+        builder.AddVariable(RoutingSlipVariableNames.Workflow.Bucket, bucket);
+        builder.AddVariable(RoutingSlipVariableNames.Workflow.PictureKey, pictureDestinationKey);
+
+        return builder;
+    }
+}
@@ -1,176 +1,86 @@
 using MassTransit;
-using MassTransit.Courier.Contracts;
 using Musify.Application.Events;
 using Musify.Application.Shared;
 using Musify.Infrastructure.Configuration;
 using Musify.Infrastructure.MassTransit.Activities.Files;
 using Musify.Infrastructure.MassTransit.Activities.Pictures;
 using Musify.Infrastructure.MassTransit.Arguments;
-using Musify.Infrastructure.MassTransit.Consumers;

 namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders;

+/// <summary>Downloads a picture, resizes it to the three sizes, uploads them and records the result on the owner.</summary>
 public class PictureWorkflowRoutingSlipBuilder(WorkerConfiguration workerConfiguration)
 {
-    public RoutingSlipBuilder Build(UpdateTrackPictureEvent message, Guid? correlationId)
-    {
-        var routingSlipBuilder = BuildPictureWorkflow(
-            message.Bucket,
-            message.SourceKey,
-            message.Sizes,
-            correlationId);
+    public RoutingSlipBuilder Build(UpdateTrackPictureEvent message, Guid? correlationId) =>
+        BuildPictureWorkflow(
+            message.TrackId, message.Bucket, message.SourceKey, message.Sizes, correlationId,
+            ActivityNames.UpdateTrackPicture, UpdateTrackPictureActivity.ExecuteEndpointName,
+            RoutingSlipVariableNames.ProcessKinds.TrackPicture);

-        routingSlipBuilder.AddActivity(
-            ActivityNames.UpdateTrackPicture,
-            EndpointHelper.BuildExecuteActivityUri(UpdateTrackPictureActivity.ExecuteEndpointName),
-            new UpdateTrackPictureArguments(
-                message.TrackId,
-                message.SourceKey,
-                RoutingSlipVariableNames.Picture.SmallResizedFilePath,
-                RoutingSlipVariableNames.Picture.MediumResizedFilePath,
-                RoutingSlipVariableNames.Picture.LargeResizedFilePath));
+    public RoutingSlipBuilder Build(UpdatePlayListPictureEvent message, Guid? correlationId) =>
+        BuildPictureWorkflow(
+            message.PlayListId, message.Bucket, message.SourceKey, message.Sizes, correlationId,
+            ActivityNames.UpdatePlayListPicture, UpdatePlayListPictureActivity.ExecuteEndpointName,
+            RoutingSlipVariableNames.ProcessKinds.PlayListPicture);

-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.SubjectId, message.TrackId);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.ProcessKind, RoutingSlipVariableNames.ProcessKinds.TrackPicture);
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(ProcessingSlipFaultConsumer.QueueName),
-            RoutingSlipEvents.Faulted);
-
-        return routingSlipBuilder;
-    }
-
-    public RoutingSlipBuilder Build(UpdatePlayListPictureEvent message, Guid? correlationId)
-    {
-        var routingSlipBuilder = BuildPictureWorkflow(
-            message.Bucket,
-            message.SourceKey,
-            message.Sizes,
-            correlationId);
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.UpdatePlayListPicture,
-            EndpointHelper.BuildExecuteActivityUri(UpdatePlayListPictureActivity.ExecuteEndpointName),
-            new UpdatePlayListPictureArguments(
-                message.PlayListId,
-                message.SourceKey,
-                RoutingSlipVariableNames.Picture.SmallResizedFilePath,
-                RoutingSlipVariableNames.Picture.MediumResizedFilePath,
-                RoutingSlipVariableNames.Picture.LargeResizedFilePath));
-
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.SubjectId, message.PlayListId);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.ProcessKind, RoutingSlipVariableNames.ProcessKinds.PlayListPicture);
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(ProcessingSlipFaultConsumer.QueueName),
-            RoutingSlipEvents.Faulted);
-
-        return routingSlipBuilder;
-    }
-
-    public RoutingSlipBuilder Build(UpdateAlbumPictureEvent message, Guid? correlationId)
-    {
-        var routingSlipBuilder = BuildPictureWorkflow(
-            message.Bucket,
-            message.SourceKey,
-            message.Sizes,
-            correlationId);
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.UpdateAlbumPicture,
-            EndpointHelper.BuildExecuteActivityUri(UpdateAlbumPictureActivity.ExecuteEndpointName),
-            new UpdateAlbumPictureArguments(
-                message.AlbumId,
-                message.SourceKey,
-                RoutingSlipVariableNames.Picture.SmallResizedFilePath,
-                RoutingSlipVariableNames.Picture.MediumResizedFilePath,
-                RoutingSlipVariableNames.Picture.LargeResizedFilePath));
-
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.SubjectId, message.AlbumId);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.ProcessKind, RoutingSlipVariableNames.ProcessKinds.AlbumPicture);
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(ProcessingSlipFaultConsumer.QueueName),
-            RoutingSlipEvents.Faulted);
-
-        return routingSlipBuilder;
-    }
+    public RoutingSlipBuilder Build(UpdateAlbumPictureEvent message, Guid? correlationId) =>
+        BuildPictureWorkflow(
+            message.AlbumId, message.Bucket, message.SourceKey, message.Sizes, correlationId,
+            ActivityNames.UpdateAlbumPicture, UpdateAlbumPictureActivity.ExecuteEndpointName,
+            RoutingSlipVariableNames.ProcessKinds.AlbumPicture);

    private RoutingSlipBuilder BuildPictureWorkflow(
+        Guid subjectId,
        string bucket,
        string sourceKey,
        ImageSizes sizes,
-        Guid? correlationId)
+        Guid? correlationId,
+        string updateStepName,
+        string updateEndpointName,
+        string processKind)
    {
-        var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.CorrelationId, correlationId ?? Guid.Empty);
+        var builder = RoutingSlips.Create(correlationId)
+            .AddStep(
+                ActivityNames.GeneratePictureWorkflowPaths,
+                GeneratePictureWorkflowPathsActivity.ExecuteEndpointName,
+                new GeneratePictureWorkflowPathsArguments(workerConfiguration.Routes.TemporaryFilesDirectory, sourceKey))
+            .AddStep(
+                ActivityNames.DownloadFile,
+                DownloadFileFromBucketActivity.ExecuteEndpointName,
+                new DownloadFileFromBucketArguments(bucket, sourceKey, RoutingSlipVariableNames.Picture.OriginalFilePath));

-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
-            RoutingSlipEvents.Completed | RoutingSlipEvents.Faulted);
+        AddResize(builder, ActivityNames.ResizeSmall, ActivityNames.UploadSmall, bucket, RoutingSlipVariableNames.Picture.SmallResizedFilePath, sizes.Small);
+        AddResize(builder, ActivityNames.ResizeMedium, ActivityNames.UploadMedium, bucket, RoutingSlipVariableNames.Picture.MediumResizedFilePath, sizes.Medium);
+        AddResize(builder, ActivityNames.ResizeLarge, ActivityNames.UploadLarge, bucket, RoutingSlipVariableNames.Picture.LargeResizedFilePath, sizes.Large);

-        routingSlipBuilder.AddActivity(
-            ActivityNames.GeneratePictureWorkflowPaths,
-            EndpointHelper.BuildExecuteActivityUri(GeneratePictureWorkflowPathsActivity.ExecuteEndpointName),
-            new GeneratePictureWorkflowPathsArguments(
-                workerConfiguration.Routes.TemporaryFilesDirectory,
-                sourceKey));
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.DownloadFile,
-            EndpointHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
-            new DownloadFileFromBucketArguments(
-                bucket,
-                sourceKey,
-                RoutingSlipVariableNames.Picture.OriginalFilePath));
-
-        AddResizeActivity(
-            routingSlipBuilder,
-            ActivityNames.ResizeSmall,
-            ActivityNames.UploadSmall,
-            bucket,
-            RoutingSlipVariableNames.Picture.SmallResizedFilePath,
-            sizes.Small);
-
-        AddResizeActivity(
-            routingSlipBuilder,
-            ActivityNames.ResizeMedium,
-            ActivityNames.UploadMedium,
-            bucket,
-            RoutingSlipVariableNames.Picture.MediumResizedFilePath,
-            sizes.Medium);
-
-        AddResizeActivity(
-            routingSlipBuilder,
-            ActivityNames.ResizeLarge,
-            ActivityNames.UploadLarge,
-            bucket,
-            RoutingSlipVariableNames.Picture.LargeResizedFilePath,
-            sizes.Large);
-
-        return routingSlipBuilder;
+        return builder
+            .AddStep(
+                updateStepName,
+                updateEndpointName,
+                new UpdatePicturesArguments(
+                    subjectId,
+                    sourceKey,
+                    RoutingSlipVariableNames.Picture.SmallResizedFilePath,
+                    RoutingSlipVariableNames.Picture.MediumResizedFilePath,
+                    RoutingSlipVariableNames.Picture.LargeResizedFilePath))
+            .TrackFaults(subjectId, processKind);
    }

-    private static void AddResizeActivity(
-        RoutingSlipBuilder routingSlipBuilder,
-        string resizeActivityName,
-        string uploadActivityName,
-        string bucketName,
-        string destinationFilePathVariableName,
-        ImageSize imageSize)
-    {
-        routingSlipBuilder.AddActivity(
-            resizeActivityName,
-            EndpointHelper.BuildExecuteActivityUri(ResizePictureActivity.ExecuteEndpointName),
-            new ResizePictureLocalArguments(
-                RoutingSlipVariableNames.Picture.OriginalFilePath,
-                destinationFilePathVariableName,
-                imageSize.Width,
-                imageSize.Height));
-
-        routingSlipBuilder.AddActivity(
-            uploadActivityName,
-            EndpointHelper.BuildExecuteActivityUri(UploadFileToBucketActivity.ExecuteEndpointName),
-            new UploadFileToBucketArguments(
-                destinationFilePathVariableName,
-                bucketName,
-                imageSize.SavePath));
-    }
+    private static void AddResize(
+        RoutingSlipBuilder builder,
+        string resizeStepName,
+        string uploadStepName,
+        string bucket,
+        string resizedFileVariable,
+        ImageSize size) =>
+        builder
+            .AddStep(
+                resizeStepName,
+                ResizePictureActivity.ExecuteEndpointName,
+                new ResizePictureLocalArguments(
+                    RoutingSlipVariableNames.Picture.OriginalFilePath, resizedFileVariable, size.Width, size.Height))
+            .AddStep(
+                uploadStepName,
+                UploadFileToBucketActivity.ExecuteEndpointName,
+                new UploadFileToBucketArguments(resizedFileVariable, bucket, size.SavePath));
 }
@@ -1,87 +0,0 @@
-using MassTransit;
-using MassTransit.Courier.Contracts;
-using Musify.Application.Events;
-using Musify.Application.Shared;
-using Musify.Infrastructure.MassTransit.Activities.Files;
-using Musify.Infrastructure.MassTransit.Activities.PlayLists;
-using Musify.Infrastructure.MassTransit.Activities.UploadIntents;
-using Musify.Infrastructure.MassTransit.Arguments;
-using Musify.Infrastructure.MassTransit.Consumers;
-
-namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders;
-
-public class PlayListPictureSourceRoutingSlipBuilder
-{
-    public RoutingSlipBuilder Build(CreatePlayListResourcesEvent message, Guid? correlationId)
-        => BuildSlip(
-            message.PlayListId,
-            message.PictureIntentId,
-            message.Bucket,
-            message.PictureSourceKey,
-            message.PictureDestinationKey,
-            message.Sizes,
-            correlationId,
-            RoutingSlipVariableNames.ProcessKinds.PlayListCreation);
-
-    public RoutingSlipBuilder Build(UpdatePlayListPictureSourceEvent message, Guid? correlationId)
-        => BuildSlip(
-            message.PlayListId,
-            message.PictureIntentId,
-            message.Bucket,
-            message.PictureSourceKey,
-            message.PictureDestinationKey,
-            message.Sizes,
-            correlationId,
-            RoutingSlipVariableNames.ProcessKinds.PlayListPicture);
-
-    private static RoutingSlipBuilder BuildSlip(
-        Guid playListId,
-        Guid pictureIntentId,
-        string bucket,
-        string pictureSourceKey,
-        string pictureDestinationKey,
-        ImageSizes sizes,
-        Guid? correlationId,
-        string processKind)
-    {
-        var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.CorrelationId, correlationId ?? Guid.Empty);
-
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
-            RoutingSlipEvents.Completed | RoutingSlipEvents.Faulted);
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.CopyPictureToFinal,
-            EndpointHelper.BuildExecuteActivityUri(CopyFileInBucketActivity.ExecuteEndpointName),
-            new CopyFileInBucketArguments(
-                bucket,
-                pictureSourceKey,
-                bucket,
-                pictureDestinationKey));
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.ConsumeUploadIntents,
-            EndpointHelper.BuildExecuteActivityUri(ConsumeUploadIntentsActivity.ExecuteEndpointName),
-            new ConsumeUploadIntentsArguments([pictureIntentId]));
-
-        routingSlipBuilder.AddActivity(
-            ActivityNames.PublishPlayListPictureProcessingEvent,
-            EndpointHelper.BuildExecuteActivityUri(PublishPlayListPictureProcessingEventActivity.ExecuteEndpointName),
-            new PublishPlayListPictureProcessingEventArguments(
-                playListId,
-                bucket,
-                pictureDestinationKey,
-                sizes));
-
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.SubjectId, playListId);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.ProcessKind, processKind);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.Bucket, bucket);
-        routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.PictureKey, pictureDestinationKey);
-        routingSlipBuilder.AddSubscription(
-            EndpointHelper.BuildConsumerUri(ProcessingSlipFaultConsumer.QueueName),
-            RoutingSlipEvents.Faulted);
-
-        return routingSlipBuilder;
-    }
-}