Merge pull request aspnetboilerplate#5083 from RobertHajbok/quartz-scheduler

Add reschedule/unschedule to Quartz Schedule Job Manager

Author: ismcagdas

src/Abp.Quartz/Quartz/IQuartzScheduleJobManager.cs

@@ -18,5 +18,20 @@ public interface IQuartzScheduleJobManager : IBackgroundWorker
         /// <param name="configureTrigger">Job specific trigger options which means calendar or time interval.</param>
         /// <returns></returns>
         Task ScheduleAsync<TJob>(Action<JobBuilder> configureJob, Action<TriggerBuilder> configureTrigger) where TJob : IJob;
+
+        /// <summary>
+        /// Reschedules a job.
+        /// </summary>
+        /// <param name="triggerKey">Key that identifies job's previous trigger.</param>
+        /// <param name="configureTrigger">Job specific trigger options which means calendar or time interval.</param>
+        /// <returns></returns>
+        Task RescheduleAsync(TriggerKey triggerKey, Action<TriggerBuilder> configureTrigger);
+
+        /// <summary>
+        /// Unschedules a job.
+        /// </summary>
+        /// <param name="triggerKey">Key that identifies job's trigger.</param>
+        /// <returns></returns>
+        Task UnscheduleAsync(TriggerKey triggerKey);
     }
 }

src/Abp.Quartz/Quartz/QuartzScheduleJobManager.cs

@@ -35,6 +35,20 @@ public async Task ScheduleAsync<TJob>(Action<JobBuilder> configureJob, Action<Tr
             await _quartzConfiguration.Scheduler.ScheduleJob(job, trigger);
         }
 
+        public async Task RescheduleAsync(TriggerKey triggerKey, Action<TriggerBuilder> configureTrigger)
+        {
+            var triggerToBuild = TriggerBuilder.Create();
+            configureTrigger(triggerToBuild);
+            var trigger = triggerToBuild.Build();
+
+            await _quartzConfiguration.Scheduler.RescheduleJob(triggerKey, trigger);
+        }
+
+        public async Task UnscheduleAsync(TriggerKey triggerKey)
+        {
+            await _quartzConfiguration.Scheduler.UnscheduleJob(triggerKey);
+        }
+
         public override void Start()
         {
             base.Start();

test/Abp.Quartz.Tests/QuartzTests.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 using Abp.Dependency;
 using Abp.Quartz.Configuration;
@@ -33,7 +32,7 @@ await _quartzScheduleJobManager.ScheduleAsync<HelloJob>(
                 {
                     trigger.WithIdentity("HelloJobTrigger")
                            .WithDescription("HelloJobTriggerDescription")
-                           .WithSimpleSchedule(schedule => schedule.WithRepeatCount(5).WithInterval(TimeSpan.FromSeconds(1)))
+                           .WithSimpleSchedule(schedule => schedule.WithRepeatCount(50).WithInterval(TimeSpan.FromSeconds(1)))
                            .StartNow();
                 });
 
@@ -47,11 +46,27 @@ await _quartzScheduleJobManager.ScheduleAsync<GoodByeJob>(
                 {
                     trigger.WithIdentity("GoodByeJobTrigger")
                            .WithDescription("GoodByeJobTriggerDescription")
-                           .WithSimpleSchedule(schedule => schedule.WithRepeatCount(5).WithInterval(TimeSpan.FromSeconds(1)))
+                           .WithSimpleSchedule(schedule => schedule.WithRepeatCount(50).WithInterval(TimeSpan.FromSeconds(1)))
                            .StartNow();
                 });
         }
 
+        private async Task RescheduleJob()
+        {
+            await _quartzScheduleJobManager.RescheduleAsync(new TriggerKey("HelloJobTrigger"),
+                trigger =>
+                {
+                    trigger.WithIdentity("HelloJobRescheduleTrigger")
+                           .WithSimpleSchedule(schedule => schedule.WithRepeatCount(50).WithInterval(TimeSpan.FromSeconds(1)))
+                           .StartNow();
+                });
+        }
+
+        private async Task UnscheduleJob()
+        {
+            await _quartzScheduleJobManager.UnscheduleAsync(new TriggerKey("GoodByeJobTrigger"));
+        }
+
         [Fact]
         public async Task QuartzScheduler_Jobs_ShouldBe_Registered_And_Executed_With_SingletonDependency()
         {
@@ -71,6 +86,13 @@ public async Task QuartzScheduler_Jobs_ShouldBe_Registered_And_Executed_With_Sin
 
             helloDependency.ExecutionCount.ShouldBeGreaterThan(0);
             goodByeDependency.ExecutionCount.ShouldBeGreaterThan(0);
+
+            await RescheduleJob();
+            (await _abpQuartzConfiguration.Scheduler.CheckExists(new TriggerKey("HelloJobTrigger"))).ShouldBe(false);
+            (await _abpQuartzConfiguration.Scheduler.CheckExists(new TriggerKey("HelloJobRescheduleTrigger"))).ShouldBe(true);
+
+            await UnscheduleJob();
+            (await _abpQuartzConfiguration.Scheduler.CheckExists(new TriggerKey("GoodByeJobTrigger"))).ShouldBe(false);
         }
     }
 
@@ -101,7 +123,7 @@ public GoodByeJob(IGoodByeDependency goodByeDependency)
         {
             _goodByeDependency = goodByeDependency;
         }
-        
+
         public override Task Execute(IJobExecutionContext context)
         {
             _goodByeDependency.ExecutionCount++;