Merge branch 'patch/3.3.3'

elsa-workflows · Feb 7, 2025 · 484a126 · 484a126
2 parents 466f6e6 + 0dcc15c
commit 484a126
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 0 deletions.
diff --git a/src/modules/Elsa.Hangfire/Jobs/ExecuteBackgroundActivityJob.cs b/src/modules/Elsa.Hangfire/Jobs/ExecuteBackgroundActivityJob.cs
@@ -19,4 +19,14 @@ public async Task ExecuteAsync(ScheduledBackgroundActivity scheduledBackgroundAc
         using var scope = tenantAccessor.PushContext(tenant);
         await backgroundActivityInvoker.ExecuteAsync(scheduledBackgroundActivity, cancellationToken);
     }
+
+    /// <summary>
+    /// Executes the job.
+    /// </summary>
+    [Obsolete("Use the other overload.")]
+    [UsedImplicitly]
+    public async Task ExecuteAsync(ScheduledBackgroundActivity scheduledBackgroundActivity, CancellationToken cancellationToken = default)
+    {
+        await backgroundActivityInvoker.ExecuteAsync(scheduledBackgroundActivity, cancellationToken);
+    }
 }
diff --git a/src/modules/Elsa.Hangfire/Jobs/ResumeWorkflowJob.cs b/src/modules/Elsa.Hangfire/Jobs/ResumeWorkflowJob.cs
@@ -3,6 +3,7 @@
 using Elsa.Workflows.Runtime;
 using Elsa.Workflows.Runtime.Messages;
 using Hangfire;
+using JetBrains.Annotations;
 
 namespace Elsa.Hangfire.Jobs;
 
@@ -34,4 +35,19 @@ public async Task ExecuteAsync(string taskName, ScheduleExistingWorkflowInstance
         };
         await client.RunInstanceAsync(runRequest, cancellationToken);
     }
+
+    [Obsolete("Use the other overload.")]
+    [UsedImplicitly]
+    public async Task ExecuteAsync(string taskName, ScheduleExistingWorkflowInstanceRequest request, CancellationToken cancellationToken)
+    {
+        var client = await workflowRuntime.CreateClientAsync(request.WorkflowInstanceId, cancellationToken);
+        var runRequest = new RunWorkflowInstanceRequest
+        {
+            BookmarkId = request.BookmarkId,
+            ActivityHandle = request.ActivityHandle,
+            Input = request.Input,
+            Properties = request.Properties
+        };
+        await client.RunInstanceAsync(runRequest, cancellationToken);
+    }
 }
diff --git a/src/modules/Elsa.Hangfire/Jobs/RunWorkflowJob.cs b/src/modules/Elsa.Hangfire/Jobs/RunWorkflowJob.cs
@@ -3,6 +3,7 @@
 using Elsa.Workflows.Runtime;
 using Elsa.Workflows.Runtime.Messages;
 using Hangfire;
+using JetBrains.Annotations;
 
 namespace Elsa.Hangfire.Jobs;
 
@@ -36,4 +37,21 @@ public async Task ExecuteAsync(string taskName, ScheduleNewWorkflowInstanceReque
         };
         await client.CreateAndRunInstanceAsync(createAndRunRequest, cancellationToken);
     }
+
+    [Obsolete("Use the other overload.")]
+    [UsedImplicitly]
+    public async Task ExecuteAsync(string taskName, ScheduleNewWorkflowInstanceRequest request, CancellationToken cancellationToken)
+    {
+        var client = await workflowRuntime.CreateClientAsync(cancellationToken);
+        var createAndRunRequest = new CreateAndRunWorkflowInstanceRequest
+        {
+            WorkflowDefinitionHandle = request.WorkflowDefinitionHandle,
+            TriggerActivityId = request.TriggerActivityId,
+            CorrelationId = request.CorrelationId,
+            Input = request.Input,
+            Properties = request.Properties,
+            ParentId = request.ParentId
+        };
+        await client.CreateAndRunInstanceAsync(createAndRunRequest, cancellationToken);
+    }
 }