Allow triggers to be paused and resumed

ethanhann · ethanhann · commit 117eee6f9de1 · 2015-01-18T13:43:50.000-05:00
diff --git a/IntegrationEngine.Model.net40/IHasStateId.cs b/IntegrationEngine.Model.net40/IHasStateId.cs
@@ -0,0 +1,13 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Model
+{
+    public interface IHasStateId
+    {
+        int StateId { get; set; }
+    }
+}
diff --git a/IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj b/IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj
@@ -52,6 +52,7 @@
     <Compile Include="..\IntegrationEngine.Model\ISimpleTrigger.cs">
       <Link>ISimpleTrigger.cs</Link>
     </Compile>
+    <Compile Include="IHasStateId.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\IntegrationEngine.Model\SimpleTrigger.cs">
       <Link>SimpleTrigger.cs</Link>
diff --git a/IntegrationEngine.Model/CronTrigger.cs b/IntegrationEngine.Model/CronTrigger.cs
@@ -8,5 +8,6 @@ public class CronTrigger : ICronTrigger
         public string JobType { get; set; }
         public string CronExpressionString { get; set; }
         public string TimeZoneId { get; set; }
+        public int StateId { get; set; }
     }
 }
diff --git a/IntegrationEngine.Model/IHasStateId.cs b/IntegrationEngine.Model/IHasStateId.cs
@@ -0,0 +1,13 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Model
+{
+    public interface IHasStateId
+    {
+        int StateId { get; set; }
+    }
+}
diff --git a/IntegrationEngine.Model/IIntegrationJobTrigger.cs b/IntegrationEngine.Model/IIntegrationJobTrigger.cs
@@ -2,9 +2,8 @@
 
 namespace IntegrationEngine.Model
 {
-    public interface IIntegrationJobTrigger
+    public interface IIntegrationJobTrigger : IHasStringId, IHasStateId
     {
         string JobType { get; set; }
     }
 }
-
diff --git a/IntegrationEngine.Model/IntegrationEngine.Model.csproj b/IntegrationEngine.Model/IntegrationEngine.Model.csproj
@@ -46,6 +46,7 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="ICronTrigger.cs" />
+    <Compile Include="IHasStateId.cs" />
     <Compile Include="IHasStringId.cs" />
     <Compile Include="ISimpleTrigger.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/IntegrationEngine.Model/SimpleTrigger.cs b/IntegrationEngine.Model/SimpleTrigger.cs
@@ -9,5 +9,6 @@ public class SimpleTrigger : ISimpleTrigger
         public int RepeatCount { get; set; }
         public TimeSpan RepeatInterval { get; set; }
         public DateTimeOffset StartTimeUtc { get; set; }
+        public int StateId { get; set; }
     }
 }
diff --git a/IntegrationEngine/IntegrationEngine.csproj b/IntegrationEngine/IntegrationEngine.csproj
@@ -171,10 +171,12 @@
     <Compile Include="Scheduler\EngineScheduler.cs" />
     <Compile Include="Scheduler\ICronTriggerReadOnly.cs" />
     <Compile Include="Scheduler\IEngineScheduler.cs" />
+    <Compile Include="Scheduler\IHasStateDescription.cs" />
     <Compile Include="Scheduler\ITimeZone.cs" />
     <Compile Include="Scheduler\SimpleTrigger.cs" />
     <Compile Include="Scheduler\TimeZone.cs" />
-    <Compile Include="Scheduler\TriggerStringExtension.cs" />
+    <Compile Include="Scheduler\TriggerCronExpressionExtension.cs" />
+    <Compile Include="Scheduler\TriggerStateIdExtension.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/IntegrationEngine/Scheduler/CronTrigger.cs b/IntegrationEngine/Scheduler/CronTrigger.cs
@@ -2,19 +2,22 @@
 using IntegrationEngine.Model;
 using Nest;
 using System;
+using QuartzTriggerState = Quartz.TriggerState;
 
 namespace IntegrationEngine.Scheduler
 {
-    public class CronTrigger : ICronTrigger, ICronTriggerReadOnly
+    public class CronTrigger : ICronTrigger, ICronTriggerReadOnly, IHasStateDescription
     {
         public string Id { get; set; }
         public string JobType { get; set; }
         public string CronExpressionString { get; set; }
         public string TimeZoneId { get; set; }
-
+        public int StateId { get; set; }
         [ElasticProperty(OptOut = true)]
         public string CronExpressionDescription { get { return ExpressionDescriptor.GetDescription(CronExpressionString); } }
         [ElasticProperty(OptOut = true)]
         public TimeZoneInfo TimeZoneInfo { get { return TimeZoneInfo.FindSystemTimeZoneById(TimeZoneId); } }
+        [ElasticProperty(OptOut = true)]
+        public string StateDescription { get { return StateId.GetStateDescription(); } }
     }
 }
diff --git a/IntegrationEngine/Scheduler/EngineScheduler.cs b/IntegrationEngine/Scheduler/EngineScheduler.cs
@@ -50,23 +50,37 @@ public virtual void ScheduleJobWithCronTrigger(CronTrigger triggerDefinition)
             var jobType = GetRegisteredJobTypeByName(triggerDefinition.JobType);
             var jobDetail = JobDetailFactory(jobType);
             var trigger = CronTriggerFactory(triggerDefinition, jobType, jobDetail);
-            TryScheduleJobWithTrigger(trigger, jobType, jobDetail);
+            TryScheduleJobWithTrigger(trigger, jobType, jobDetail, triggerDefinition.StateId);
         }
 
         public void ScheduleJobWithSimpleTrigger(SimpleTrigger triggerDefinition)
         {
             var jobType = GetRegisteredJobTypeByName(triggerDefinition.JobType);
             var jobDetail = JobDetailFactory(jobType);
             var trigger = SimpleTriggerFactory(triggerDefinition, jobType, jobDetail);
-            TryScheduleJobWithTrigger(trigger, jobType, jobDetail);
+            TryScheduleJobWithTrigger(trigger, jobType, jobDetail, triggerDefinition.StateId);
         }
 
-        public void TryScheduleJobWithTrigger(ITrigger trigger, Type jobType, IJobDetail jobDetail)
+        public void TryScheduleJobWithTrigger(ITrigger trigger, Type jobType, IJobDetail jobDetail, int stateId)
         {
             if (Scheduler.CheckExists(jobDetail.Key))
                 Scheduler.RescheduleJob(trigger.Key, trigger);
             else
                 Scheduler.ScheduleJob(jobDetail, trigger);
+            SetTriggerState(trigger.Key, stateId);
+        }
+
+        public void SetTriggerState(TriggerKey triggerKey, int triggerState)
+        {
+            switch ((TriggerState)triggerState)
+            {
+                case TriggerState.Paused:
+                    Scheduler.PauseTrigger(triggerKey);
+                    break;
+                case TriggerState.Normal:
+                    Scheduler.ResumeTrigger(triggerKey);
+                    break;
+            }
         }
 
         public void ScheduleJobsWithTriggers(IEnumerable<IIntegrationJobTrigger> triggerDefs, Type jobType, IJobDetail jobDetail)
@@ -82,16 +96,23 @@ public void ScheduleJobsWithTriggers(IEnumerable<IIntegrationJobTrigger> trigger
                     triggersForJobs.Add(SimpleTriggerFactory(triggerDef as SimpleTrigger, jobType, jobDetail));
             }
             Scheduler.ScheduleJob(jobDetail, triggersForJobs, true);
+            foreach (var triggerDef in triggerDefs)
+                SetTriggerState(TriggerKeyFactory(triggerDef, jobType), triggerDef.StateId);
+        }
+
+        TriggerKey TriggerKeyFactory(IIntegrationJobTrigger integrationJobTrigger, Type jobType)
+        {
+            return new TriggerKey(integrationJobTrigger.Id, jobType.FullName);
         }
 
-        TriggerBuilder TriggerBuilderFactory(string triggerName, string triggerGroup)
+        TriggerBuilder TriggerBuilderFactory(IIntegrationJobTrigger integrationJobTrigger, Type jobType)
         {
-            return TriggerBuilder.Create().WithIdentity(new TriggerKey(triggerName, triggerGroup));
+            return TriggerBuilder.Create().WithIdentity(TriggerKeyFactory(integrationJobTrigger, jobType));
         }
 
         public ITrigger SimpleTriggerFactory(SimpleTrigger triggerDefinition, Type jobType, IJobDetail jobDetail)
         {
-            var triggerBuilder = TriggerBuilderFactory(triggerDefinition.Id, jobType.FullName);
+            var triggerBuilder = TriggerBuilderFactory(triggerDefinition, jobType);
             Action<SimpleScheduleBuilder> simpleScheduleBuilderAction;
             if (triggerDefinition.RepeatCount > 0)
                 simpleScheduleBuilderAction = x => x.WithInterval(triggerDefinition.RepeatInterval).WithRepeatCount(triggerDefinition.RepeatCount);
@@ -107,7 +128,7 @@ public ITrigger SimpleTriggerFactory(SimpleTrigger triggerDefinition, Type jobTy
 
         public ITrigger CronTriggerFactory(CronTrigger triggerDefinition, Type jobType, IJobDetail jobDetail)
         {
-            var triggerBuilder = TriggerBuilderFactory(triggerDefinition.Id, jobType.FullName);
+            var triggerBuilder = TriggerBuilderFactory(triggerDefinition, jobType);
             triggerBuilder.WithCronSchedule(triggerDefinition.CronExpressionString, x => x.InTimeZone(triggerDefinition.TimeZoneInfo));
             return triggerBuilder.Build();
         }
diff --git a/IntegrationEngine/Scheduler/IHasStateDescription.cs b/IntegrationEngine/Scheduler/IHasStateDescription.cs
@@ -0,0 +1,14 @@
+﻿using IntegrationEngine.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Scheduler
+{
+    public interface IHasStateDescription : IHasStateId
+    {
+        string StateDescription { get; }
+    }
+}
diff --git a/IntegrationEngine/Scheduler/SimpleTrigger.cs b/IntegrationEngine/Scheduler/SimpleTrigger.cs
@@ -1,14 +1,19 @@
 ﻿using IntegrationEngine.Model;
+using Nest;
 using System;
+using QuartzTriggerState = Quartz.TriggerState;
 
 namespace IntegrationEngine.Scheduler
 {
-    public class SimpleTrigger : ISimpleTrigger
+    public class SimpleTrigger : ISimpleTrigger, IHasStateDescription
     {
         public string Id { get; set; }
         public string JobType { get; set; }
         public int RepeatCount { get; set; }
         public TimeSpan RepeatInterval { get; set; }
         public DateTimeOffset StartTimeUtc { get; set; }
+        public int StateId { get; set; }
+        [ElasticProperty(OptOut = true)]
+        public string StateDescription { get { return StateId.GetStateDescription(); } }
     }
 }
diff --git a/IntegrationEngine/Scheduler/TriggerCronExpressionExtension.cs b/IntegrationEngine/Scheduler/TriggerCronExpressionExtension.cs
@@ -2,7 +2,7 @@
 
 namespace IntegrationEngine.Scheduler
 {
-    public static class TriggerStringExtension
+    public static class TriggerCronExpressionExtension
     {
         public static bool IsValidCronExpression(this string value)
         {
diff --git a/IntegrationEngine/Scheduler/TriggerStateIdExtension.cs b/IntegrationEngine/Scheduler/TriggerStateIdExtension.cs
@@ -0,0 +1,14 @@
+﻿using Quartz;
+using System;
+
+namespace IntegrationEngine.Scheduler
+{
+    public static class TriggerStateIdExtension
+    {
+        public static string GetStateDescription(this int value)
+        {
+            return ((TriggerState)value).ToString();
+        }
+    }
+}
+

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@ public class CronTrigger : ICronTrigger`
`8`	`8`	`public string JobType { get; set; }`
`9`	`9`	`public string CronExpressionString { get; set; }`
`10`	`10`	`public string TimeZoneId { get; set; }`
	`11`	`+ public int StateId { get; set; }`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace IntegrationEngine.Model`
`4`	`4`	`{`
`5`		`- public interface IIntegrationJobTrigger`
	`5`	`+ public interface IIntegrationJobTrigger : IHasStringId, IHasStateId`
`6`	`6`	`{`
`7`	`7`	`string JobType { get; set; }`
`8`	`8`	`}`
`9`	`9`	`}`
`10`		`-`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@ public class SimpleTrigger : ISimpleTrigger`
`9`	`9`	`public int RepeatCount { get; set; }`
`10`	`10`	`public TimeSpan RepeatInterval { get; set; }`
`11`	`11`	`public DateTimeOffset StartTimeUtc { get; set; }`
	`12`	`+ public int StateId { get; set; }`
`12`	`13`	`}`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,19 +2,22 @@`
`2`	`2`	`using IntegrationEngine.Model;`
`3`	`3`	`using Nest;`
`4`	`4`	`using System;`
	`5`	`+using QuartzTriggerState = Quartz.TriggerState;`
`5`	`6`
`6`	`7`	`namespace IntegrationEngine.Scheduler`
`7`	`8`	`{`
`8`		`- public class CronTrigger : ICronTrigger, ICronTriggerReadOnly`
	`9`	`+ public class CronTrigger : ICronTrigger, ICronTriggerReadOnly, IHasStateDescription`
`9`	`10`	`{`
`10`	`11`	`public string Id { get; set; }`
`11`	`12`	`public string JobType { get; set; }`
`12`	`13`	`public string CronExpressionString { get; set; }`
`13`	`14`	`public string TimeZoneId { get; set; }`
`14`		`-`
	`15`	`+ public int StateId { get; set; }`
`15`	`16`	`[ElasticProperty(OptOut = true)]`
`16`	`17`	`public string CronExpressionDescription { get { return ExpressionDescriptor.GetDescription(CronExpressionString); } }`
`17`	`18`	`[ElasticProperty(OptOut = true)]`
`18`	`19`	`public TimeZoneInfo TimeZoneInfo { get { return TimeZoneInfo.FindSystemTimeZoneById(TimeZoneId); } }`
	`20`	`+ [ElasticProperty(OptOut = true)]`
	`21`	`+ public string StateDescription { get { return StateId.GetStateDescription(); } }`
`19`	`22`	`}`
`20`	`23`	`}`