Switch to TimeZoneId in CronTrigger (rather than full TimeZoneInfo)

Author: ethanhann

IntegrationEngine.Model/CronTrigger.cs

@@ -8,6 +8,5 @@ public class CronTrigger : ICronTrigger
         public string JobType { get; set; }
         public string CronExpressionString { get; set; }
         public string TimeZoneId { get; set; }
-        public TimeZoneInfo TimeZone { get; set; }
     }
 }

IntegrationEngine.Model/ICronTrigger.cs

@@ -10,6 +10,5 @@ public interface ICronTrigger : IHasStringId, IIntegrationJobTrigger
     {
         string CronExpressionString { get; set; }
         string TimeZoneId { get; set; }
-        TimeZoneInfo TimeZone { get; set; }
     }
 }

IntegrationEngine/Api/Controllers/TimeZoneController.cs

@@ -0,0 +1,23 @@
+using IntegrationEngine.Scheduler;
+using InEngineTimeZone = IntegrationEngine.Scheduler.TimeZone;
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Web.Http;
+using System.Web.Http.Description;
+
+namespace IntegrationEngine.Api.Controllers
+{
+    public class TimeZoneController : ApiController
+    {
+        public TimeZoneController()
+        {}
+
+        [ResponseType(typeof(ITimeZone))]
+        public IHttpActionResult GetTimeZones()
+        {
+            var timeZones = TimeZoneInfo.GetSystemTimeZones().Select(x => new InEngineTimeZone(x)).ToList();
+            return Ok(timeZones);
+        }
+    }
+}

IntegrationEngine/IntegrationEngine.csproj

@@ -145,6 +145,7 @@
     <Compile Include="..\configuration\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Api\Controllers\TimeZoneController.cs" />
     <Compile Include="Api\Controllers\JobController.cs" />
     <Compile Include="Api\IntegrationEngineApi.cs" />
     <Compile Include="Api\Startup.cs" />
@@ -170,7 +171,9 @@
     <Compile Include="Scheduler\EngineScheduler.cs" />
     <Compile Include="Scheduler\ICronTriggerReadOnly.cs" />
     <Compile Include="Scheduler\IEngineScheduler.cs" />
+    <Compile Include="Scheduler\ITimeZone.cs" />
     <Compile Include="Scheduler\SimpleTrigger.cs" />
+    <Compile Include="Scheduler\TimeZone.cs" />
     <Compile Include="Scheduler\TriggerStringExtension.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

IntegrationEngine/Scheduler/CronTrigger.cs

@@ -11,9 +11,10 @@ public class CronTrigger : ICronTrigger, ICronTriggerReadOnly
         public string JobType { get; set; }
         public string CronExpressionString { get; set; }
         public string TimeZoneId { get; set; }
-        public TimeZoneInfo TimeZone { get; set; }
 
         [ElasticProperty(OptOut = true)]
         public string CronExpressionDescription { get { return ExpressionDescriptor.GetDescription(CronExpressionString); } }
+        [ElasticProperty(OptOut = true)]
+        public TimeZoneInfo TimeZoneInfo { get { return TimeZoneInfo.FindSystemTimeZoneById(TimeZoneId); } }
     }
 }

IntegrationEngine/Scheduler/EngineScheduler.cs

@@ -108,7 +108,7 @@ public ITrigger SimpleTriggerFactory(SimpleTrigger triggerDefinition, Type jobTy
         public ITrigger CronTriggerFactory(CronTrigger triggerDefinition, Type jobType, IJobDetail jobDetail)
         {
             var triggerBuilder = TriggerBuilderFactory(triggerDefinition.Id, jobType.FullName);
-            triggerBuilder.WithCronSchedule(triggerDefinition.CronExpressionString, x => x.InTimeZone(triggerDefinition.TimeZone));
+            triggerBuilder.WithCronSchedule(triggerDefinition.CronExpressionString, x => x.InTimeZone(triggerDefinition.TimeZoneInfo));
             return triggerBuilder.Build();
         }
     }

IntegrationEngine/Scheduler/ICronTriggerReadOnly.cs

@@ -10,5 +10,6 @@ namespace IntegrationEngine.Scheduler
     interface ICronTriggerReadOnly
     {
         string CronExpressionDescription { get; }
+        TimeZoneInfo TimeZoneInfo { get; }
     }
 }

IntegrationEngine/Scheduler/ITimeZone.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Scheduler
+{
+    public interface ITimeZone
+    {
+        string Id { get; set; }
+        string DisplayName { get; set; }
+    }
+}

IntegrationEngine/Scheduler/TimeZone.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Scheduler
+{
+    public class TimeZone : ITimeZone
+    {
+        public string Id { get; set; }
+        public string DisplayName { get; set; }
+
+        public TimeZone()
+        {}
+
+        public TimeZone(TimeZoneInfo timeZoneInfo) 
+            : this()
+        {
+            Id = timeZoneInfo.Id;
+            DisplayName = timeZoneInfo.DisplayName;
+        }
+    }
+}