Reworks

Infrastructure/MassTransit/Activities/Files/DownloadFileFromBucketActivity.cs

@@ -5,9 +5,9 @@ using Musify.Domain.Entities;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 using Musify.Infrastructure.MassTransit.Activities.Logs;
 
-namespace Musify.Infrastructure.MassTransit.Activities
+namespace Musify.Infrastructure.MassTransit.Activities.Files
 {
-    public class DownloadFileFromBucketActivity(
+    internal class DownloadFileFromBucketActivity(
         IStorageService storageHandler,
         ILogger<DownloadFileFromBucketActivity> logger,
         IProcessTrackingStore processTrackingStore)

Infrastructure/MassTransit/Activities/Files/RemoveFileFromBucketActivity.cs

@@ -1,43 +1,25 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Contracts.Infrastructure;
-using Musify.Domain.Entities;
 using Musify.Infrastructure.MassTransit.Activities.Arguments;
 
-namespace Musify.Infrastructure.MassTransit.Activities
+namespace Musify.Infrastructure.MassTransit.Activities.Files
 {
-    public class RemoveFileFromBucketActivity(
+    internal class RemoveFileFromBucketActivity(
         IStorageService storageHandler,
-        ILogger<RemoveFileFromBucketActivity> logger,
-        IProcessTrackingStore processTrackingStore)
+        ILogger<RemoveFileFromBucketActivity> logger)
         : IExecuteActivity<RemoveFileFromBucketArguments>
     {
         public const string ExecuteEndpointName = "remove-file-from-bucket";
 
         public async Task<ExecutionResult> Execute(ExecuteContext<RemoveFileFromBucketArguments> executeContext)
         {
-            var processId = await processTrackingStore.GetOrCreateProcessAsync(
-                "RoutingSlip",
-                executeContext.CorrelationId ?? executeContext.TrackingNumber,
-                executeContext.ConversationId,
-                executeContext.MessageId,
-                executeContext.CancellationToken);
-
-            var stepId = await processTrackingStore.StartStepAsync(
-                processId,
-                nameof(RemoveFileFromBucketActivity),
-                ProcessStepComponentType.Activity,
-                0,
-                executeContext.CancellationToken);
-
             try
             {
                 await storageHandler.RemoveFileAsync(
                     executeContext.Arguments.Bucket,
                     executeContext.Arguments.Key,
                     executeContext.CancellationToken);
-
-                await processTrackingStore.CompleteStepAsync(processId, stepId, executeContext.CancellationToken);
                 return executeContext.Completed();
             }
             catch (Exception exception)
@@ -45,7 +27,6 @@ namespace Musify.Infrastructure.MassTransit.Activities
                 logger.LogError(exception, "Failed to remove {Key} from bucket {Bucket}",
                     executeContext.Arguments.Key,
                     executeContext.Arguments.Bucket);
-                await processTrackingStore.FailStepAsync(processId, stepId, exception.Message, executeContext.CancellationToken);
                 throw;
             }
         }

Infrastructure/MassTransit/Activities/Files/RemoveFolderFromBucketActivity.cs

@@ -0,0 +1,42 @@
+using MassTransit;
+using Microsoft.Extensions.Logging;
+using Musify.Application.Contracts.Infrastructure;
+using Musify.Infrastructure.MassTransit.Arguments;
+
+namespace Musify.Infrastructure.MassTransit.Activities.Files
+{
+    internal class RemoveFolderFromBucketActivity(
+        IStorageService storageHandler,
+        ILogger<RemoveFolderFromBucketActivity> logger)
+        : IExecuteActivity<RemoveFolderFromBucketArguments>
+    {
+        public const string ExecuteEndpointName = "remove-folder-from-bucket";
+
+        public async Task<ExecutionResult> Execute(ExecuteContext<RemoveFolderFromBucketArguments> executeContext)
+        {
+            var folderKey = executeContext.GetVariable<string>(executeContext.Arguments.FolderKeyVariable);
+            ArgumentException.ThrowIfNullOrEmpty(folderKey, nameof(folderKey));
+
+            try
+            {
+                await storageHandler.RemoveFolderAsync(
+                    executeContext.Arguments.Bucket,
+                    folderKey,
+                    executeContext.CancellationToken);
+
+                logger.LogInformation("Removed folder {FolderKey} from bucket {Bucket}",
+                    folderKey,
+                    executeContext.Arguments.Bucket);
+
+                return executeContext.Completed();
+            }
+            catch (Exception exception)
+            {
+                logger.LogError(exception, "Failed to remove folder {FolderKey} from bucket {Bucket}",
+                    folderKey,
+                    executeContext.Arguments.Bucket);
+                throw;
+            }
+        }
+    }
+}