User interfaces instead of concrete classes for extending model

Author: ethanhann

IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj

@@ -43,9 +43,15 @@
     <Compile Include="..\configuration\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\IntegrationEngine.Model\ICronTrigger.cs">
+      <Link>ICronTrigger.cs</Link>
+    </Compile>
     <Compile Include="..\IntegrationEngine.Model\IHasStringId.cs">
       <Link>IHasStringId.cs</Link>
     </Compile>
+    <Compile Include="..\IntegrationEngine.Model\ISimpleTrigger.cs">
+      <Link>ISimpleTrigger.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\IntegrationEngine.Model\SimpleTrigger.cs">
       <Link>SimpleTrigger.cs</Link>

IntegrationEngine.Model/CronTrigger.cs

@@ -2,12 +2,12 @@
 
 namespace IntegrationEngine.Model
 {
-    public class CronTrigger : IHasStringId, IIntegrationJobTrigger
+    public class CronTrigger : ICronTrigger
     {
         public string Id { get; set; }
         public string JobType { get; set; }
         public string CronExpressionString { get; set; }
-        TimeZoneInfo _timeZone { get; set; }
-        public TimeZoneInfo TimeZone { get { return _timeZone ?? TimeZoneInfo.Utc; } set { _timeZone = value; } }
+        public string TimeZoneId { get; set; }
+        public TimeZoneInfo TimeZone { get; set; }
     }
 }

IntegrationEngine.Model/ICronTrigger.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Model
+{
+    public interface ICronTrigger : IHasStringId, IIntegrationJobTrigger
+    {
+        string CronExpressionString { get; set; }
+        string TimeZoneId { get; set; }
+        TimeZoneInfo TimeZone { get; set; }
+    }
+}

IntegrationEngine.Model/ISimpleTrigger.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Model
+{
+    public interface ISimpleTrigger : IHasStringId, IIntegrationJobTrigger
+    {
+        int RepeatCount { get; set; }
+        TimeSpan RepeatInterval { get; set; }
+        DateTimeOffset StartTimeUtc { get; set; }
+    }
+}

IntegrationEngine.Model/IntegrationEngine.Model.csproj

@@ -45,7 +45,9 @@
     <Compile Include="..\configuration\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="ICronTrigger.cs" />
     <Compile Include="IHasStringId.cs" />
+    <Compile Include="ISimpleTrigger.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="CronTrigger.cs" />
     <Compile Include="SimpleTrigger.cs" />

IntegrationEngine.Model/SimpleTrigger.cs

@@ -2,7 +2,7 @@
 
 namespace IntegrationEngine.Model
 {
-    public class SimpleTrigger : IHasStringId, IIntegrationJobTrigger
+    public class SimpleTrigger : ISimpleTrigger
     {
         public string Id { get; set; }
         public string JobType { get; set; }

IntegrationEngine/IntegrationEngine.csproj

@@ -168,6 +168,7 @@
     <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\SimpleTrigger.cs" />
     <Compile Include="Scheduler\TriggerStringExtension.cs" />

IntegrationEngine/Scheduler/CronTrigger.cs

@@ -1,12 +1,19 @@
 using CronExpressionDescriptor;
+using IntegrationEngine.Model;
 using Nest;
-using CronTriggerModel = IntegrationEngine.Model.CronTrigger;
+using System;
 
 namespace IntegrationEngine.Scheduler
 {
-    public class CronTrigger : CronTriggerModel
+    public class CronTrigger : ICronTrigger, ICronTriggerReadOnly
     {
-         [ElasticProperty(OptOut = true)]
+        public string Id { get; set; }
+        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); } }
     }
 }

IntegrationEngine/Scheduler/ICronTriggerReadOnly.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
+{
+    interface ICronTriggerReadOnly
+    {
+        string CronExpressionDescription { get; }
+    }
+}

IntegrationEngine/Scheduler/SimpleTrigger.cs

@@ -1,8 +1,14 @@
-using SimpleTriggerModel = IntegrationEngine.Model.SimpleTrigger;
+using IntegrationEngine.Model;
+using System;
 
 namespace IntegrationEngine.Scheduler
 {
-    public class SimpleTrigger : SimpleTriggerModel
+    public class SimpleTrigger : ISimpleTrigger
     {
+        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; }
     }
 }