Merge branch 'develop'

Author: ethanhann

IntegrationEngine.Model.net40/IHasStateId.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Model
+{
+    public interface IHasStateId
+    {
+        int StateId { get; set; }
+    }
+}

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

@@ -43,9 +43,16 @@
     <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="IHasStateId.cs" />
     <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 int StateId { get; set; }
     }
 }

IntegrationEngine.Model/ICronTrigger.cs

@@ -0,0 +1,14 @@
+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; }
+    }
+}

IntegrationEngine.Model/IHasStateId.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IntegrationEngine.Model
+{
+    public interface IHasStateId
+    {
+        int StateId { get; set; }
+    }
+}

IntegrationEngine.Model/IIntegrationJobTrigger.cs

@@ -2,9 +2,8 @@
 
 namespace IntegrationEngine.Model
 {
-    public interface IIntegrationJobTrigger
+    public interface IIntegrationJobTrigger : IHasStringId, IHasStateId
     {
         string JobType { 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

@@ -12,6 +12,8 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,7 +45,10 @@
     <Compile Include="..\configuration\SharedAssemblyInfo.cs">
       <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" />
@@ -55,6 +60,7 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

IntegrationEngine.Model/SimpleTrigger.cs

@@ -2,12 +2,13 @@
 
 namespace IntegrationEngine.Model
 {
-    public class SimpleTrigger : IHasStringId, IIntegrationJobTrigger
+    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; }
+        public int StateId { get; set; }
     }
 }

IntegrationEngine.Tests/Api/Controllers/CronTriggerControllerTest.cs

@@ -1,6 +1,5 @@
 using IntegrationEngine.Api.Controllers;
 using IntegrationEngine.Core.Storage;
-using IntegrationEngine.Model;
 using IntegrationEngine.Scheduler;
 using Moq;
 using NUnit.Framework;
@@ -21,7 +20,6 @@ public void ShouldScheduleJobWhenCronTriggerIsCreatedWithValidCronExpression()
             };
             var engineScheduler = new Mock<IEngineScheduler>();
             engineScheduler.Setup(x => x.ScheduleJobWithCronTrigger(expected));
-            engineScheduler.Setup(x => x.IsJobTypeRegistered(expected.JobType)).Returns(true);
             subject.EngineScheduler = engineScheduler.Object;
             var esRepository = new Mock<ESRepository<CronTrigger>>();
             esRepository.Setup(x => x.Insert(expected)).Returns(expected);