Fix issues where es repo update and delete

* The mothods were not calling SelectById with an Id.

Author: ethanhann

IntegrationEngine.Client.Tests/IntegrationEngine.Client.Tests.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,6 +8,8 @@
     <RootNamespace>IntegrationEngine.Client.Tests</RootNamespace>
     <AssemblyName>IntegrationEngine.Client.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -59,4 +61,14 @@
       <Name>IntegrationEngine.Client</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
 </Project>

IntegrationEngine.Core/Storage/ElasticsearchRepository.cs

@@ -40,21 +40,22 @@ public TItem SelectById<TItem>(object id) where TItem : class, IHasStringId
 
         public TItem Insert<TItem>(TItem item) where TItem : class, IHasStringId
         {
-            return SelectById<TItem>(ElasticClient.Index<TItem>(item));
+            var indexResponse = ElasticClient.Index<TItem>(item);
+            return SelectById<TItem>(indexResponse.Id);
         }
 
         public TItem Update<TItem>(TItem item) where TItem : class, IHasStringId
         {
-            return SelectById<TItem>(ElasticClient.Update<TItem>(x => x
+            var updateResponse = ElasticClient.Update<TItem>(x => x
                 .Id(item.Id)
                 .Doc(item)
-            ));
+            );
+            return SelectById<TItem>(updateResponse.Id);
         }
 
         public void Delete<TItem>(object id) where TItem : class
         {
             ElasticClient.Delete<TItem>(x => x.Id(id.ToString()));
-
         }
 
         public bool Exists<TItem>(object id) where TItem : class

IntegrationEngine.Tests/Api/TriggerControllerBaseTest.cs

@@ -87,16 +87,19 @@ public void ShouldReturnBadRequestIfIdsDoNotMatchWhenUpdatingTrigger()
         public void ShouldScheduleJobWhenTriggerIsCreated()
         {
             var jobType = "MyProject.MyIntegrationJob";
+            var triggerWithoutId = new TriggerStub() { JobType = jobType };
             var expected = new TriggerStub() {
-                JobType = jobType
+                JobType = jobType,
+                Id = TriggerDocumentId,
             };
+            MockElasticRepo.Setup(x => x.Insert(triggerWithoutId)).Returns(expected);
             MockEngineScheduler.Setup(x => x.ScheduleJobWithTrigger(expected));
-            MockElasticRepo.Setup(x => x.Insert(expected)).Returns(expected);
 
-            Subject.Post(expected);
+            Subject.Post(triggerWithoutId);
 
+            MockElasticRepo.Verify(x => x.Insert(triggerWithoutId), Times.Once);
             MockEngineScheduler.Verify(x => x
-                .ScheduleJobWithTrigger(It.Is<TriggerStub>(y => y.JobType == jobType)), Times.Once);
+                .ScheduleJobWithTrigger(It.Is<TriggerStub>(y => y.JobType == jobType && y.Id == TriggerDocumentId)), Times.Once);
         }
 
         [Test]

IntegrationEngine/Api/TriggerControllerBase.cs

@@ -55,7 +55,7 @@ public IHttpActionResult Post(T trigger)
             if (!ModelState.IsValid)
                 BadRequest(ModelState);
             var triggerWithId = Repository.Insert(trigger);
-            EngineScheduler.ScheduleJobWithTrigger(trigger);
+            EngineScheduler.ScheduleJobWithTrigger(triggerWithId);
             return CreatedAtRoute("DefaultApi", new { id = triggerWithId.Id }, triggerWithId);
         }