Add event listener, use proper dep in shutdown, tweak model

Author: ethanhann

IntegrationEngine/Api/Controllers/CronTriggerController.cs

@@ -49,7 +49,7 @@ public IHttpActionResult PutCronTrigger(string id, CronTrigger trigger)
                 BadRequest(ModelState);
             Repository.Update(trigger);
             EngineScheduler.ScheduleJobWithCronTrigger(trigger);
-            return StatusCode(HttpStatusCode.NoContent);
+            return Ok(Repository.SelectById(trigger.Id));
         }
 
         // POST api/CronTrigger

IntegrationEngine/Api/Controllers/SimpleTriggerController.cs

@@ -53,7 +53,7 @@ public IHttpActionResult PutSimpleTrigger(string id, SimpleTrigger trigger)
                 BadRequest(ModelState);
             Repository.Update(trigger);
             EngineScheduler.ScheduleJobWithSimpleTrigger(trigger);
-            return StatusCode(HttpStatusCode.NoContent);
+            return Ok(Repository.SelectById(trigger.Id));
         }
 
         // POST api/SimpleTrigger

IntegrationEngine/EngineHostConfiguration.cs

@@ -165,8 +165,8 @@ public void SetupElasticClient()
 
         public void Shutdown()
         {
-            var scheduler = Container.Resolve<IScheduler>();
-            scheduler.Shutdown();
+            var engineScheduler = Container.Resolve<IEngineScheduler>();
+            engineScheduler.Shutdown();
         }
     }
 }

IntegrationEngine/IntegrationEngine.csproj

@@ -147,6 +147,7 @@
     <Compile Include="Configuration\NLogAdapterConfiguration.cs" />
     <Compile Include="Configuration\MessageQueueConfiguration.cs" />
     <Compile Include="Configuration\WebApiConfiguration.cs" />
+    <Compile Include="Scheduler\TriggerListener.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MessageQueue\IMessageQueueClient.cs" />
     <Compile Include="MessageQueue\RabbitMQClient.cs" />
@@ -204,7 +205,5 @@
   </ItemGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <ItemGroup />
-  <ItemGroup>
-    <Folder Include="DataAnnotations\" />
-  </ItemGroup>
+  <ItemGroup />
 </Project>

IntegrationEngine/Scheduler/CronTrigger.cs

@@ -24,7 +24,7 @@ public class CronTrigger : ICronTrigger, ICronTriggerReadOnly, IHasStateDescript
         [ElasticProperty(OptOut = true)]
         public string CronExpressionDescription { get { return ExpressionDescriptor.GetDescription(CronExpressionString); } }
         [ElasticProperty(OptOut = true)]
-        public TimeZoneInfo TimeZoneInfo { get { return TimeZoneInfo.FindSystemTimeZoneById(TimeZoneId); } }
+        public TimeZoneInfo TimeZoneInfo { get { return TimeZoneId.GetTimeZoneInfo(); } }
         [ElasticProperty(OptOut = true)]
         public string StateDescription { get { return StateId.GetStateDescription(); } }
     }

IntegrationEngine/Scheduler/EngineScheduler.cs

@@ -5,6 +5,7 @@
 using IntegrationEngine.Model;
 using Quartz;
 using IntegrationEngine.MessageQueue;
+using Quartz.Impl.Matchers;
 
 namespace IntegrationEngine.Scheduler
 {
@@ -15,13 +16,23 @@ public class EngineScheduler : IEngineScheduler
         public IMessageQueueClient MessageQueueClient { get; set; }
 
         public EngineScheduler()
-        {}
+        {
+        }
 
         public void Start()
         {
+            var triggerListener = new TriggerListener();
+            var mgr = Scheduler.ListenerManager;
+            mgr.AddTriggerListener(triggerListener, GroupMatcher<TriggerKey>.AnyGroup());
             Scheduler.Start();
         }
 
+        public void Shutdown()
+        {
+         //   Scheduler.ListenerManager.RemoveTriggerListener();
+            Scheduler.Shutdown();
+        }
+
         public Type GetRegisteredJobTypeByName(string jobTypeName)
         {
             var jobTypes = IntegrationJobTypes.Where(x => x.FullName == jobTypeName);
@@ -41,6 +52,7 @@ public IJobDetail JobDetailFactory(Type jobType)
             jobDetailsDataMap.Put("IntegrationJob", integrationJob);
             return JobBuilder.Create<IntegrationJobDispatcherJob>()
                 .SetJobData(jobDetailsDataMap)
+                .StoreDurably(true)
                 .WithIdentity(jobType.Name, jobType.Namespace)
                 .Build();
         }

IntegrationEngine/Scheduler/IEngineScheduler.cs

@@ -12,5 +12,6 @@ public interface IEngineScheduler
         void ScheduleJobWithSimpleTrigger(SimpleTrigger triggerDefinition);
         bool IsJobTypeRegistered(string jobTypeName);
         Type GetRegisteredJobTypeByName(string jobTypeName);
+        void Shutdown();
     }
 }

IntegrationEngine/Scheduler/TriggerListener.cs

@@ -0,0 +1,28 @@
+using Quartz;
+
+namespace IntegrationEngine.Scheduler
+{
+    public class TriggerListener : ITriggerListener
+    {
+        public string Name { get { return this.GetType().FullName;} } 
+
+        public void TriggerComplete(ITrigger trigger, IJobExecutionContext context, SchedulerInstruction triggerInstructionCode)
+        {
+        }
+
+        public void TriggerFired(ITrigger trigger, IJobExecutionContext context)
+        {
+            
+        }
+
+        public void TriggerMisfired(ITrigger trigger)
+        {
+            
+        }
+
+        public bool VetoJobExecution(ITrigger trigger, IJobExecutionContext context)
+        {
+            return false;
+        }
+    }
+}

IntegrationEngine/Scheduler/TriggerPropertyExtension.cs

@@ -8,5 +8,12 @@ public static string GetStateDescription(this int value)
         {
             return ((Quartz.TriggerState)value).ToString();
         }
+
+        public static TimeZoneInfo GetTimeZoneInfo(this string value)
+        {
+            if (value == null)
+                return TimeZoneInfo.Utc;
+            return TimeZoneInfo.FindSystemTimeZoneById(value);
+        }
     }
 }