Remove TimeZone and use UTC when scheduling jobs

ethanhann · ethanhann · commit 8c62b76258af · 2015-02-02T23:20:56.000-05:00
* Also, add LogEvent to Client/ConsoleClient
diff --git a/IntegrationEngine.Client/Endpoint.cs b/IntegrationEngine.Client/Endpoint.cs
@@ -7,7 +7,7 @@ public enum Endpoint
         CronTrigger,
         SimpleTrigger,
         JobType,
-        TimeZone,
+        LogEvent,
         HealthStatus,
     }
 }
diff --git a/IntegrationEngine.Client/IInEngineClient.cs b/IntegrationEngine.Client/IInEngineClient.cs
@@ -1,5 +1,4 @@
-﻿using InEngineTimeZone = IntegrationEngine.Model.TimeZone;
-using IntegrationEngine.Model;
+﻿using IntegrationEngine.Model;
 using System;
 using System.Collections.Generic;
 using System.Net;
@@ -25,7 +24,7 @@ public interface IInEngineClient
         SimpleTrigger CreateSimpleTrigger(SimpleTrigger simpleTrigger);
         SimpleTrigger UpdateSimpleTrigger(SimpleTrigger simpleTrigger);
         SimpleTrigger DeleteSimpleTrigger(string id);
-        IList<InEngineTimeZone> GetTimeZones();
+        IList<LogEvent> GetLogEvents();
         IList<JobType> GetJobTypes();
         HealthStatus GetHealthStatus();
     }
diff --git a/IntegrationEngine.Client/InEngineClient.cs b/IntegrationEngine.Client/InEngineClient.cs
@@ -1,4 +1,4 @@
-﻿using InEngineTimeZone = IntegrationEngine.Model.TimeZone;
+﻿using InEngineLogEvent = IntegrationEngine.Model.LogEvent;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -205,14 +205,14 @@ public SimpleTrigger DeleteSimpleTrigger(string id)
         }
         #endregion
 
-        #region TimeZone
+        #region LogEvent
         /// <summary>
-        /// Gets the time zones.
+        /// Gets the log events.
         /// </summary>
-        /// <returns>The time zones.</returns>
-        public IList<InEngineTimeZone> GetTimeZones()
+        /// <returns>The log events.</returns>
+        public IList<LogEvent> GetLogEvents()
         {
-            return GetCollection<InEngineTimeZone>();
+            return GetCollection<LogEvent>();
         }
         #endregion
 
diff --git a/IntegrationEngine.ConsoleClient/Program.cs b/IntegrationEngine.ConsoleClient/Program.cs
@@ -56,8 +56,8 @@ static void Main(string[] args)
                     case Endpoint.JobType:
                         ResolveResult(client.GetCollection<JobType>());
                         break;
-                    case Endpoint.TimeZone:
-                        ResolveResult(client.GetCollection<IntegrationEngine.Model.TimeZone>());
+                    case Endpoint.LogEvent:
+                        ResolveResult(client.GetCollection<LogEvent>());
                         break;
                     case Endpoint.HealthStatus:
                         ResolveResult(client.GetHealthStatus());
diff --git a/IntegrationEngine.Model.Tests/TriggerPropertyExtensionTest.cs b/IntegrationEngine.Model.Tests/TriggerPropertyExtensionTest.cs
@@ -30,36 +30,6 @@ public void ShouldGetPausedDescriptionForStateIdOne()
             Assert.That(result, Is.EqualTo("Paused"));
         }
 
-        [Test]
-        public void ShouldGetTimeZoneFromTimeZoneId()
-        {
-            string timeZoneId = "New York Standard Time";
-
-            var result = timeZoneId.GetTimeZoneInfo();
-
-            Assert.That(result, Is.EqualTo(TimeZoneInfo.Utc));
-        }
-
-        [Test]
-        public void ShouldReturnUtcTimeZoneIfTimeZoneIdIsNull()
-        {
-            string timeZoneId = null;
-
-            var result = timeZoneId.GetTimeZoneInfo();
-
-            Assert.That(result, Is.EqualTo(TimeZoneInfo.Utc));
-        }
-
-        [Test]
-        public void ShouldReturnUtcTimeZoneIfTimeZoneIdDoesNotExist()
-        {
-            string timeZoneId = "foo";
-
-            var result = timeZoneId.GetTimeZoneInfo();
-
-            Assert.That(result, Is.EqualTo(TimeZoneInfo.Utc));
-        }
-
         [Test]
         public void ShouldReturnHumanReadableCronSchedule()
         {
@@ -80,15 +50,5 @@ public void ShouldReturnEmptyStringIfCronExpressionIsNull()
 
             Assert.That(result, Is.EqualTo(String.Empty));
         }
-
-        [Test]
-        public void ShouldReturnEmptyStringIfCronExpressionIsInvalidString()
-        {
-            string cronExpression = "foo";
-
-            var result = cronExpression.GetTimeZoneInfo();
-
-            Assert.That(result, Is.EqualTo(TimeZoneInfo.Utc));
-        }
     }
 }
diff --git a/IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj b/IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj
@@ -91,12 +91,6 @@
     <Compile Include="..\IntegrationEngine.Model\IIntegrationJobTrigger.cs">
       <Link>IIntegrationJobTrigger.cs</Link>
     </Compile>
-    <Compile Include="..\IntegrationEngine.Model\ITimeZone.cs">
-      <Link>ITimeZone.cs</Link>
-    </Compile>
-    <Compile Include="..\IntegrationEngine.Model\TimeZone.cs">
-      <Link>TimeZone.cs</Link>
-    </Compile>
     <Compile Include="..\IntegrationEngine.Model\HealthStatus.cs">
       <Link>HealthStatus.cs</Link>
     </Compile>
diff --git a/IntegrationEngine.Model/CronTrigger.cs b/IntegrationEngine.Model/CronTrigger.cs
@@ -9,19 +9,16 @@ public class CronTrigger : ICronTrigger
         public virtual string Id { get; set; }
         public virtual string JobType { get; set; }
         public virtual string CronExpressionString { get; set; }
-        public virtual string TimeZoneId { get; set; }
         public virtual int StateId { get; set; }
         public virtual IDictionary<string, string> Parameters { get; set; }
         [ElasticProperty(OptOut = true)]
         public virtual string CronExpressionDescription { get { return CronExpressionString.GetHumanReadableCronSchedule(); } }
         [ElasticProperty(OptOut = true)]
-        public virtual TimeZoneInfo TimeZoneInfo { get { return TimeZoneId.GetTimeZoneInfo(); } }
-        [ElasticProperty(OptOut = true)]
         public virtual string StateDescription { get { return StateId.GetStateDescription(); } }
 
         public override string ToString()
         {
-            return string.Format("[CronTrigger: Id={0}, JobType={1}, CronExpressionString={2}, TimeZoneId={3}, StateId={4}, CronExpressionDescription={5}, TimeZoneInfo={6}, StateDescription={7}]", Id, JobType, CronExpressionString, TimeZoneId, StateId, CronExpressionDescription, TimeZoneInfo, StateDescription);
+            return string.Format("[CronTrigger: Id={0}, JobType={1}, CronExpressionString={2}, StateId={3}, Parameters={4}, CronExpressionDescription={5}, StateDescription={6}]", Id, JobType, CronExpressionString, StateId, Parameters, CronExpressionDescription, StateDescription);
         }
     }
 }
diff --git a/IntegrationEngine.Model/ICronTrigger.cs b/IntegrationEngine.Model/ICronTrigger.cs
@@ -10,7 +10,5 @@ public interface ICronTrigger : IIntegrationJobTrigger
     {
         string CronExpressionString { get; set; }
         string CronExpressionDescription { get; }
-        string TimeZoneId { get; set; }
-        TimeZoneInfo TimeZoneInfo { get; }
     }
 }
diff --git a/IntegrationEngine.Model/ITimeZone.cs b/IntegrationEngine.Model/ITimeZone.cs
diff --git a/IntegrationEngine.Model/IntegrationEngine.Model.csproj b/IntegrationEngine.Model/IntegrationEngine.Model.csproj
@@ -67,8 +67,6 @@
     <Compile Include="CronTrigger.cs" />
     <Compile Include="SimpleTrigger.cs" />
     <Compile Include="IIntegrationJobTrigger.cs" />
-    <Compile Include="TimeZone.cs" />
-    <Compile Include="ITimeZone.cs" />
     <Compile Include="HealthStatus.cs" />
     <Compile Include="IHealthStatus.cs" />
     <Compile Include="TriggerPropertyExtension.cs" />
diff --git a/IntegrationEngine.Model/TimeZone.cs b/IntegrationEngine.Model/TimeZone.cs
diff --git a/IntegrationEngine.Model/TriggerPropertyExtension.cs b/IntegrationEngine.Model/TriggerPropertyExtension.cs
@@ -10,20 +10,6 @@ public static string GetStateDescription(this int value)
             return ((TriggerStateDescription)value).ToString();
         }
 
-        public static TimeZoneInfo GetTimeZoneInfo(this string value)
-        {
-            if (value == null)
-                return TimeZoneInfo.Utc;
-            try
-            {
-                return TimeZoneInfo.FindSystemTimeZoneById(value);
-            } 
-            catch
-            {
-                return TimeZoneInfo.Utc;
-            }
-        }
-
         public static string GetHumanReadableCronSchedule(this string value)
         {
             if (value == null)
diff --git a/IntegrationEngine.Tests/Api/Controllers/TimeZoneControllerTest.cs b/IntegrationEngine.Tests/Api/Controllers/TimeZoneControllerTest.cs
diff --git a/IntegrationEngine.Tests/IntegrationEngine.Tests.csproj b/IntegrationEngine.Tests/IntegrationEngine.Tests.csproj
@@ -89,7 +89,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Scheduler\EngineSchedulerTest.cs" />
     <Compile Include="Api\Controllers\JobTypeControllerTest.cs" />
-    <Compile Include="Api\Controllers\TimeZoneControllerTest.cs" />
     <Compile Include="IntegrationJobStub.cs" />
     <Compile Include="Api\TriggerControllerBaseTest.cs" />
     <Compile Include="Api\TriggerStub.cs" />
diff --git a/IntegrationEngine/Api/Controllers/TimeZoneController.cs b/IntegrationEngine/Api/Controllers/TimeZoneController.cs
diff --git a/IntegrationEngine/IntegrationEngine.csproj b/IntegrationEngine/IntegrationEngine.csproj
@@ -145,7 +145,6 @@
     <Compile Include="..\configuration\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Api\Controllers\TimeZoneController.cs" />
     <Compile Include="Api\IntegrationEngineApi.cs" />
     <Compile Include="Api\Startup.cs" />
     <Compile Include="Configuration\NLogAdapterConfiguration.cs" />
diff --git a/IntegrationEngine/Scheduler/CronTrigger.cs b/IntegrationEngine/Scheduler/CronTrigger.cs
@@ -11,9 +11,6 @@ public class CronTrigger : IntegrationEngine.Model.CronTrigger
         [Required]
         [CronExpressionString]
         public override string CronExpressionString { get; set; }
-        [Required]
-        [TimeZoneId]
-        public override string TimeZoneId { get; set; }
         [Range(0, 1)]
         public override int StateId { get; set; }
     }
diff --git a/IntegrationEngine/Scheduler/EngineScheduler.cs b/IntegrationEngine/Scheduler/EngineScheduler.cs
@@ -131,7 +131,7 @@ public ITrigger TriggerFactory<T>(T item, Type jobType, IJobDetail jobDetail)
             var triggerBuilder = TriggerBuilderFactory(item.Id, jobType, jobDetail);
             if (item is CronTrigger) {
                 var cronTrigger = item as CronTrigger;
-                triggerBuilder.WithCronSchedule(cronTrigger.CronExpressionString, x => x.InTimeZone(cronTrigger.TimeZoneInfo));
+                triggerBuilder.WithCronSchedule(cronTrigger.CronExpressionString, x => x.InTimeZone(TimeZoneInfo.Utc));
             }
             else if (item is SimpleTrigger) {
                 var simpleTrigger = item as SimpleTrigger;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public enum Endpoint`
`7`	`7`	`CronTrigger,`
`8`	`8`	`SimpleTrigger,`
`9`	`9`	`JobType,`
`10`		`- TimeZone,`
	`10`	`+ LogEvent,`
`11`	`11`	`HealthStatus,`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,19 +9,16 @@ public class CronTrigger : ICronTrigger`
`9`	`9`	`public virtual string Id { get; set; }`
`10`	`10`	`public virtual string JobType { get; set; }`
`11`	`11`	`public virtual string CronExpressionString { get; set; }`
`12`		`- public virtual string TimeZoneId { get; set; }`
`13`	`12`	`public virtual int StateId { get; set; }`
`14`	`13`	`public virtual IDictionary<string, string> Parameters { get; set; }`
`15`	`14`	`[ElasticProperty(OptOut = true)]`
`16`	`15`	`public virtual string CronExpressionDescription { get { return CronExpressionString.GetHumanReadableCronSchedule(); } }`
`17`	`16`	`[ElasticProperty(OptOut = true)]`
`18`		`- public virtual TimeZoneInfo TimeZoneInfo { get { return TimeZoneId.GetTimeZoneInfo(); } }`
`19`		`- [ElasticProperty(OptOut = true)]`
`20`	`17`	`public virtual string StateDescription { get { return StateId.GetStateDescription(); } }`
`21`	`18`
`22`	`19`	`public override string ToString()`
`23`	`20`	`{`
`24`		`- return string.Format("[CronTrigger: Id={0}, JobType={1}, CronExpressionString={2}, TimeZoneId={3}, StateId={4}, CronExpressionDescription={5}, TimeZoneInfo={6}, StateDescription={7}]", Id, JobType, CronExpressionString, TimeZoneId, StateId, CronExpressionDescription, TimeZoneInfo, StateDescription);`
	`21`	`+ return string.Format("[CronTrigger: Id={0}, JobType={1}, CronExpressionString={2}, StateId={3}, Parameters={4}, CronExpressionDescription={5}, StateDescription={6}]", Id, JobType, CronExpressionString, StateId, Parameters, CronExpressionDescription, StateDescription);`
`25`	`22`	`}`
`26`	`23`	`}`
`27`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,5 @@ public interface ICronTrigger : IIntegrationJobTrigger`
`10`	`10`	`{`
`11`	`11`	`string CronExpressionString { get; set; }`
`12`	`12`	`string CronExpressionDescription { get; }`
`13`		`- string TimeZoneId { get; set; }`
`14`		`- TimeZoneInfo TimeZoneInfo { get; }`
`15`	`13`	`}`
`16`	`14`	`}`