Push properties down into Model project

ethanhann · ethanhann · commit fe17db2bf7b3 · 2015-01-20T18:55:56.000-05:00
diff --git a/IntegrationEngine.Client/InEngineClient.cs b/IntegrationEngine.Client/InEngineClient.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using InEngineTimeZone = IntegrationEngine.Model.TimeZone;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using IntegrationEngine.Model;
@@ -107,11 +108,11 @@ public SimpleTrigger DeleteSimpleTrigger(string id)
         #endregion
 
         #region TimeZone
-        public IList<TimeZone> GetTimeZones()
+        public IList<InEngineTimeZone> GetTimeZones()
         {
             var request = new RestRequest(EndpointName.TimeZone, Method.GET);
             var result = RestClient.Execute(request);
-            return JsonConvert.DeserializeObject<IList<TimeZone>>(result.Content);
+            return JsonConvert.DeserializeObject<IList<InEngineTimeZone>>(result.Content);
         }
         #endregion
 
diff --git a/IntegrationEngine.Model.net40/IHasStateId.cs b/IntegrationEngine.Model.net40/IHasStateId.cs
diff --git a/IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj b/IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj
@@ -52,7 +52,6 @@
     <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>
@@ -63,6 +62,12 @@
     <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>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/IntegrationEngine.Model/CronTrigger.cs b/IntegrationEngine.Model/CronTrigger.cs
@@ -9,5 +9,9 @@ public class CronTrigger : ICronTrigger
         public string CronExpressionString { get; set; }
         public string TimeZoneId { get; set; }
         public int StateId { get; set; }
+
+        public string CronExpressionDescription { get { throw new NotImplementedException(); } }
+        public TimeZoneInfo TimeZoneInfo { get { throw new NotImplementedException(); } }
+        public string StateDescription { get { throw new NotImplementedException(); } }
     }
 }
diff --git a/IntegrationEngine.Model/ICronTrigger.cs b/IntegrationEngine.Model/ICronTrigger.cs
@@ -6,9 +6,11 @@
 
 namespace IntegrationEngine.Model
 {
-    public interface ICronTrigger : IHasStringId, IIntegrationJobTrigger
+    public interface ICronTrigger : IIntegrationJobTrigger
     {
         string CronExpressionString { get; set; }
+        string CronExpressionDescription { get; }
         string TimeZoneId { get; set; }
+        TimeZoneInfo TimeZoneInfo { get; }
     }
 }
diff --git a/IntegrationEngine.Model/IHasStateId.cs b/IntegrationEngine.Model/IHasStateId.cs
diff --git a/IntegrationEngine.Model/IIntegrationJobTrigger.cs b/IntegrationEngine.Model/IIntegrationJobTrigger.cs
@@ -2,8 +2,10 @@
 
 namespace IntegrationEngine.Model
 {
-    public interface IIntegrationJobTrigger : IHasStringId, IHasStateId
+    public interface IIntegrationJobTrigger : IHasStringId
     {
         string JobType { get; set; }
+        int StateId { get; set; }
+        string StateDescription { get; }
     }
 }
diff --git a/IntegrationEngine.Model/ISimpleTrigger.cs b/IntegrationEngine.Model/ISimpleTrigger.cs
@@ -6,7 +6,7 @@
 
 namespace IntegrationEngine.Model
 {
-    public interface ISimpleTrigger : IHasStringId, IIntegrationJobTrigger
+    public interface ISimpleTrigger : IIntegrationJobTrigger
     {
         int RepeatCount { get; set; }
         TimeSpan RepeatInterval { get; set; }
diff --git a/IntegrationEngine.Model/ITimeZone.cs b/IntegrationEngine.Model/ITimeZone.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace IntegrationEngine.Scheduler
+namespace IntegrationEngine.Model
 {
     public interface ITimeZone
     {
diff --git a/IntegrationEngine.Model/IntegrationEngine.Model.csproj b/IntegrationEngine.Model/IntegrationEngine.Model.csproj
@@ -46,13 +46,14 @@
       <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" />
     <Compile Include="CronTrigger.cs" />
     <Compile Include="SimpleTrigger.cs" />
     <Compile Include="IIntegrationJobTrigger.cs" />
+    <Compile Include="TimeZone.cs" />
+    <Compile Include="ITimeZone.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="package.nuspec">
diff --git a/IntegrationEngine.Model/SimpleTrigger.cs b/IntegrationEngine.Model/SimpleTrigger.cs
@@ -10,5 +10,6 @@ public class SimpleTrigger : ISimpleTrigger
         public TimeSpan RepeatInterval { get; set; }
         public DateTimeOffset StartTimeUtc { get; set; }
         public int StateId { get; set; }
+        public string StateDescription { get { throw new NotImplementedException(); } }
     }
 }
diff --git a/IntegrationEngine.Model/TimeZone.cs b/IntegrationEngine.Model/TimeZone.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace IntegrationEngine.Scheduler
+namespace IntegrationEngine.Model
 {
     public class TimeZone : ITimeZone
     {
diff --git a/IntegrationEngine/Api/Controllers/TimeZoneController.cs b/IntegrationEngine/Api/Controllers/TimeZoneController.cs
@@ -1,5 +1,6 @@
-﻿using IntegrationEngine.Scheduler;
-using InEngineTimeZone = IntegrationEngine.Scheduler.TimeZone;
+﻿using IntegrationEngine.Model;
+using IntegrationEngine.Scheduler;
+using InEngineTimeZone = IntegrationEngine.Model.TimeZone;
 using System;
 using System.Linq;
 using System.Collections.Generic;
diff --git a/IntegrationEngine/IntegrationEngine.csproj b/IntegrationEngine/IntegrationEngine.csproj
@@ -165,12 +165,8 @@
     <Compile Include="ContainerResolver.cs" />
     <Compile Include="Scheduler\CronTrigger.cs" />
     <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\TriggerPropertyExtension.cs" />
     <Compile Include="Api\Controllers\JobTypeController.cs" />
     <Compile Include="DataAnnotations\JobTypeAttribute.cs" />
diff --git a/IntegrationEngine/Scheduler/CronTrigger.cs b/IntegrationEngine/Scheduler/CronTrigger.cs
@@ -7,7 +7,7 @@
 
 namespace IntegrationEngine.Scheduler
 {
-    public class CronTrigger : ICronTrigger, ICronTriggerReadOnly, IHasStateDescription
+    public class CronTrigger : ICronTrigger
     {
         public string Id { get; set; }
         [Required]
@@ -22,7 +22,7 @@ public class CronTrigger : ICronTrigger, ICronTriggerReadOnly, IHasStateDescript
         [Range(0, 1)]
         public int StateId { get; set; }
         [ElasticProperty(OptOut = true)]
-        public string CronExpressionDescription { get { return ExpressionDescriptor.GetDescription(CronExpressionString); } }
+        public string CronExpressionDescription { get { return CronExpressionString.GetHumanReadableCronSchedule(); } }
         [ElasticProperty(OptOut = true)]
         public TimeZoneInfo TimeZoneInfo { get { return TimeZoneId.GetTimeZoneInfo(); } }
         [ElasticProperty(OptOut = true)]
diff --git a/IntegrationEngine/Scheduler/ICronTriggerReadOnly.cs b/IntegrationEngine/Scheduler/ICronTriggerReadOnly.cs
diff --git a/IntegrationEngine/Scheduler/IHasStateDescription.cs b/IntegrationEngine/Scheduler/IHasStateDescription.cs
diff --git a/IntegrationEngine/Scheduler/SimpleTrigger.cs b/IntegrationEngine/Scheduler/SimpleTrigger.cs
@@ -6,7 +6,7 @@
 
 namespace IntegrationEngine.Scheduler
 {
-    public class SimpleTrigger : ISimpleTrigger, IHasStateDescription
+    public class SimpleTrigger : ISimpleTrigger
     {
         public string Id { get; set; }
         [Required]
diff --git a/IntegrationEngine/Scheduler/TriggerPropertyExtension.cs b/IntegrationEngine/Scheduler/TriggerPropertyExtension.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using CronExpressionDescriptor;
 
 namespace IntegrationEngine.Scheduler
 {
@@ -13,7 +14,28 @@ public static TimeZoneInfo GetTimeZoneInfo(this string value)
         {
             if (value == null)
                 return TimeZoneInfo.Utc;
-            return TimeZoneInfo.FindSystemTimeZoneById(value);
+            try
+            {
+                return TimeZoneInfo.FindSystemTimeZoneById(value);
+            } 
+            catch
+            {
+                return TimeZoneInfo.Utc;
+            }
+        }
+
+        public static string GetHumanReadableCronSchedule(this string value)
+        {
+            if (value == null)
+                return string.Empty;
+            try
+            {
+                return ExpressionDescriptor.GetDescription(value);
+            }
+            catch 
+            {
+                return string.Empty;
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,9 @@ public class CronTrigger : ICronTrigger`
`9`	`9`	`public string CronExpressionString { get; set; }`
`10`	`10`	`public string TimeZoneId { get; set; }`
`11`	`11`	`public int StateId { get; set; }`
	`12`	`+`
	`13`	`+ public string CronExpressionDescription { get { throw new NotImplementedException(); } }`
	`14`	`+ public TimeZoneInfo TimeZoneInfo { get { throw new NotImplementedException(); } }`
	`15`	`+ public string StateDescription { get { throw new NotImplementedException(); } }`
`12`	`16`	`}`
`13`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,11 @@`
`6`	`6`
`7`	`7`	`namespace IntegrationEngine.Model`
`8`	`8`	`{`
`9`		`- public interface ICronTrigger : IHasStringId, IIntegrationJobTrigger`
	`9`	`+ public interface ICronTrigger : IIntegrationJobTrigger`
`10`	`10`	`{`
`11`	`11`	`string CronExpressionString { get; set; }`
	`12`	`+ string CronExpressionDescription { get; }`
`12`	`13`	`string TimeZoneId { get; set; }`
	`14`	`+ TimeZoneInfo TimeZoneInfo { get; }`
`13`	`15`	`}`
`14`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace IntegrationEngine.Model`
`4`	`4`	`{`
`5`		`- public interface IIntegrationJobTrigger : IHasStringId, IHasStateId`
	`5`	`+ public interface IIntegrationJobTrigger : IHasStringId`
`6`	`6`	`{`
`7`	`7`	`string JobType { get; set; }`
	`8`	`+ int StateId { get; set; }`
	`9`	`+ string StateDescription { get; }`
`8`	`10`	`}`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace IntegrationEngine.Model`
`8`	`8`	`{`
`9`		`- public interface ISimpleTrigger : IHasStringId, IIntegrationJobTrigger`
	`9`	`+ public interface ISimpleTrigger : IIntegrationJobTrigger`
`10`	`10`	`{`
`11`	`11`	`int RepeatCount { get; set; }`
`12`	`12`	`TimeSpan RepeatInterval { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Text;`
`5`	`5`	`using System.Threading.Tasks;`
`6`	`6`
`7`		`-namespace IntegrationEngine.Scheduler`
	`7`	`+namespace IntegrationEngine.Model`
`8`	`8`	`{`
`9`	`9`	`public interface ITimeZone`
`10`	`10`	`{`