Add read-only cron description to CronTrigger

Author: ethanhann

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>
@@ -55,6 +57,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.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;

IntegrationEngine/Api/Controllers/CronTriggerController.cs

@@ -3,7 +3,6 @@
 using System.Web.Http;
 using System.Web.Http.Description;
 using IntegrationEngine.Core.Storage;
-using IntegrationEngine.Model;
 using IntegrationEngine.Scheduler;
 using System.Web.Http.Cors;
 

IntegrationEngine/Api/Controllers/SimpleTriggerController.cs

@@ -9,7 +9,6 @@
 using System.Web.Http;
 using System.Web.Http.Description;
 using IntegrationEngine.Core.Storage;
-using IntegrationEngine.Model;
 using IntegrationEngine.Scheduler;
 
 namespace IntegrationEngine.Api.Controllers

IntegrationEngine/EngineHostConfiguration.cs

@@ -8,7 +8,6 @@
 using IntegrationEngine.Core.R;
 using IntegrationEngine.Core.Storage;
 using IntegrationEngine.MessageQueue;
-using IntegrationEngine.Model;
 using IntegrationEngine.Scheduler;
 using Microsoft.Practices.Unity;
 using Nest;

IntegrationEngine/IntegrationEngine.csproj

@@ -63,6 +63,9 @@
     <Reference Include="Common.Logging.NLog31">
       <HintPath>..\packages\Common.Logging.NLog31.3.0.0\lib\net40\Common.Logging.NLog31.dll</HintPath>
     </Reference>
+    <Reference Include="CronExpressionDescriptor">
+      <HintPath>..\packages\CronExpressionDescriptor.1.12.0\lib\net35\CronExpressionDescriptor.dll</HintPath>
+    </Reference>
     <Reference Include="EntityFramework">
       <HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
@@ -163,8 +166,10 @@
     <Compile Include="Api\Controllers\SimpleTriggerController.cs" />
     <Compile Include="Api\Controllers\CronTriggerController.cs" />
     <Compile Include="ContainerResolver.cs" />
+    <Compile Include="Scheduler\CronTrigger.cs" />
     <Compile Include="Scheduler\EngineScheduler.cs" />
     <Compile Include="Scheduler\IEngineScheduler.cs" />
+    <Compile Include="Scheduler\SimpleTrigger.cs" />
     <Compile Include="Scheduler\TriggerStringExtension.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

IntegrationEngine/Scheduler/CronTrigger.cs

@@ -0,0 +1,12 @@
+using CronExpressionDescriptor;
+using Nest;
+using CronTriggerModel = IntegrationEngine.Model.CronTrigger;
+
+namespace IntegrationEngine.Scheduler
+{
+    public class CronTrigger : CronTriggerModel
+    {
+         [ElasticProperty(OptOut = true)]
+        public string CronExpressionDescription { get { return ExpressionDescriptor.GetDescription(CronExpressionString); } }
+    }
+}

IntegrationEngine/Scheduler/SimpleTrigger.cs

@@ -0,0 +1,8 @@
+using SimpleTriggerModel = IntegrationEngine.Model.SimpleTrigger;
+
+namespace IntegrationEngine.Scheduler
+{
+    public class SimpleTrigger : SimpleTriggerModel
+    {
+    }
+}

IntegrationEngine/package.nuspec

@@ -18,6 +18,7 @@
     </references>
     <dependencies>
       <dependency id="Common.Logging" version="2.3.1" />
+      <dependency id="CronExpressionDescriptor" version="1.12.0" />
       <dependency id="Elasticsearch.Net" version="1.3.1"/>
       <dependency id="EntityFramework" version="6.1.2" />
       <dependency id="fx.configuration" version="0.4.0" />

IntegrationEngine/packages.config

@@ -3,6 +3,7 @@
   <package id="Common.Logging" version="3.0.0" targetFramework="net45" />
   <package id="Common.Logging.Core" version="3.0.0" targetFramework="net45" />
   <package id="Common.Logging.NLog31" version="3.0.0" targetFramework="net45" />
+  <package id="CronExpressionDescriptor" version="1.12.0" targetFramework="net45" />
   <package id="Elasticsearch.Net" version="1.3.1" targetFramework="net45" />
   <package id="EntityFramework" version="6.1.2" targetFramework="net45" />
   <package id="fx.configuration" version="0.4.0" targetFramework="net45" />