From 1a389afb81feffc4ae3446432a0efbef5837a174 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Thu, 13 Apr 2023 22:34:07 +0200
Subject: [PATCH] Fix Hangfire provider job cancellation cleanup

---
 .../Extensions/JobStorageExtensions.cs        | 33 ++++++++++++++++---
 .../Services/HangfireWorkflowScheduler.cs     | 17 ++++++++--
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/modules/Elsa.Hangfire/Extensions/JobStorageExtensions.cs b/src/modules/Elsa.Hangfire/Extensions/JobStorageExtensions.cs
index 4dce00947..64ed51057 100644
--- a/src/modules/Elsa.Hangfire/Extensions/JobStorageExtensions.cs
+++ b/src/modules/Elsa.Hangfire/Extensions/JobStorageExtensions.cs
@@ -1,3 +1,4 @@
+using Elsa.Hangfire.Jobs;
 using Hangfire;
 using Hangfire.Storage.Monitoring;
 
@@ -11,22 +12,44 @@ public static class JobStorageExtensions
     /// <summary>
     /// Enumerates all scheduled jobs of a given type.
     /// </summary>
-    public static IEnumerable<KeyValuePair<string, ScheduledJobDto>> EnumerateScheduledJobs<TJob>(this JobStorage storage, string name)
+    public static IEnumerable<KeyValuePair<string, ScheduledJobDto>> EnumerateScheduledJobs(this JobStorage storage, string name)
     {
         var api = storage.GetMonitoringApi();
         var skip = 0;
         const int take = 100;
-        JobList<ScheduledJobDto> jobList;
+        JobList<ScheduledJobDto> scheduledJobs;
 
         do
         {
-            jobList = api.ScheduledJobs(skip, take);
+            scheduledJobs = api.ScheduledJobs(skip, take);
 
-            var jobs = jobList.FindAll(x => x.Value.Job.Type == typeof(TJob));
+            var jobs = scheduledJobs.FindAll(x => x.Value.Job.Type == typeof(RunWorkflowJob) || x.Value.Job.Type == typeof(ResumeWorkflowJob));
             foreach (var job in jobs.Where(x => (string)x.Value.Job.Args[0] == name))
                 yield return job;
 
             skip += take;
-        } while (jobList.Count == take);
+        } while (scheduledJobs.Count == take);
+    }
+
+    /// <summary>
+    /// Enumerates all enqueued jobs of a given type.
+    /// </summary>
+    public static IEnumerable<KeyValuePair<string, EnqueuedJobDto>> EnumerateQueuedJobs(this JobStorage storage, string queueName, string taskName)
+    {
+        var api = storage.GetMonitoringApi();
+        var skip = 0;
+        const int take = 100;
+        JobList<EnqueuedJobDto> enqueuedJobs;
+
+        do
+        {
+            enqueuedJobs = api.EnqueuedJobs(queueName, skip, take);
+
+            var jobs = enqueuedJobs.FindAll(x => x.Value.Job.Type == typeof(RunWorkflowJob) || x.Value.Job.Type == typeof(ResumeWorkflowJob));
+            foreach (var job in jobs.Where(x => (string)x.Value.Job.Args[0] == taskName))
+                yield return job;
+
+            skip += take;
+        } while (enqueuedJobs.Count == take);
     }
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.Hangfire/Services/HangfireWorkflowScheduler.cs b/src/modules/Elsa.Hangfire/Services/HangfireWorkflowScheduler.cs
index 263a586fc..f249895e1 100644
--- a/src/modules/Elsa.Hangfire/Services/HangfireWorkflowScheduler.cs
+++ b/src/modules/Elsa.Hangfire/Services/HangfireWorkflowScheduler.cs
@@ -75,16 +75,27 @@ public class HangfireWorkflowScheduler : IWorkflowScheduler
 
     private void DeleteJobByTaskName(string taskName)
     {
-        var scheduledJobIds = GetScheduledJobIds<RunWorkflowJob>(taskName);
+        var scheduledJobIds = GetScheduledJobIds(taskName);
         foreach (var jobId in scheduledJobIds) _backgroundJobClient.Delete(jobId);
         
+        var queuedJobsIds = GetQueuedJobIds(taskName);
+        foreach (var jobId in queuedJobsIds) _backgroundJobClient.Delete(jobId);
+        
         var recurringJobIds = GetRecurringJobIds<RunWorkflowJob>(taskName);
         foreach (var jobId in recurringJobIds) _recurringJobManager.RemoveIfExists(jobId);
     }
     
-    private IEnumerable<string> GetScheduledJobIds<TJob>(string taskName)
+    private IEnumerable<string> GetScheduledJobIds(string taskName)
     {
-        return _jobStorage.EnumerateScheduledJobs<TJob>(taskName)
+        return _jobStorage.EnumerateScheduledJobs(taskName)
+            .Select(x => x.Key)
+            .Distinct()
+            .ToList();
+    }
+    
+    private IEnumerable<string> GetQueuedJobIds(string taskName)
+    {
+        return _jobStorage.EnumerateQueuedJobs("default", taskName)
             .Select(x => x.Key)
             .Distinct()
             .ToList();