Fix when writing job execution status.

createitpt · Jul 13, 2016 · f7a5baa · f7a5baa
1 parent 8bf207e
commit f7a5baa
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/DatabaseModel/App.Config b/DatabaseModel/App.Config
@@ -5,7 +5,7 @@
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
   <connectionStrings>
-    <add name="CSPDatabaseModelEntities" connectionString="metadata=res://*/CSPDatabaseModelEntities.csdl|res://*/CSPDatabaseModelEntities.ssdl|res://*/CSPDatabaseModelEntities.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=maps-pc\sqlexpress;initial catalog=Create.CSP.Reporting;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="CSPDatabaseModelEntities" connectionString="metadata=res://*/CSPDatabaseModelEntities.csdl|res://*/CSPDatabaseModelEntities.ssdl|res://*/CSPDatabaseModelEntities.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=localhost\sqlexpress;initial catalog=Create.CSP.Reporting;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />

diff --git a/DatabaseModel/Managers/CorrelationIdsManager.cs b/DatabaseModel/Managers/CorrelationIdsManager.cs
@@ -16,16 +16,13 @@ public CorrelationIdsManager(DbContext dbContext = null)
         }
 
         #region Create
-              
+
         private async Task<CorrelationId> AddAsync(CorrelationId correlationId)
         {
-            using (var dbContext = new CSPDatabaseModelEntities())
-            {
-                CorrelationId newCorrelationId = dbContext.CorrelationIds.Add(correlationId);
-                await dbContext.SaveChangesAsync();
+            CorrelationId newCorrelationId = _dbContext.CorrelationIds.Add(correlationId);
+            await _dbContext.SaveChangesAsync();
 
-                return newCorrelationId;
-            }
+            return newCorrelationId;
         }
 
         public Task<CorrelationId> AddNewRunAsync()
@@ -35,7 +32,7 @@ public Task<CorrelationId> AddNewRunAsync()
                 Id = Guid.NewGuid(),
                 StartDateTime = DateTime.UtcNow,
                 Status = "RUNNING",
-                EndDateTime = null                
+                EndDateTime = null
             });
         }
 
@@ -45,25 +42,28 @@ public Task<CorrelationId> AddNewRunAsync()
 
         private async Task<CorrelationId> UpdateAsync(CorrelationId correlationId)
         {
-            using (var dbContext = new CSPDatabaseModelEntities())
-            {
-                dbContext.Entry(correlationId).State = EntityState.Modified;
-                await dbContext.SaveChangesAsync();
 
-                return correlationId;
-            }
+            _dbContext.Entry(correlationId).State = EntityState.Modified;
+            await _dbContext.SaveChangesAsync();
+            return correlationId;
         }
 
         public Task<CorrelationId> UpdateEndStatusAsync(Guid correlationId, string endStatus)
         {
-            CorrelationId databaseCorrelationId = new CorrelationId()
+
+            // Get object to update
+            var existentCorrelation = _dbContext.CorrelationIds.FirstOrDefault(c => c.Id == correlationId);
+            if (existentCorrelation == null)
             {
-                Id = correlationId,
-                EndDateTime = DateTime.UtcNow,
-                Status = endStatus
-            };
+                throw new ArgumentException("Could not find existent correlation id: " + correlationId);
+            }
+
+            // else. Update
+            existentCorrelation.EndDateTime = DateTime.UtcNow;
+            existentCorrelation.Status = endStatus;
+
+            return this.UpdateAsync(existentCorrelation);
 
-            return this.UpdateAsync(databaseCorrelationId);
         }
 
         #endregion

diff --git a/Job/Processors/ActivationReportProcessor.cs b/Job/Processors/ActivationReportProcessor.cs
@@ -625,6 +625,10 @@ protected override async Task OutputToDatabaseBatchAsync(BlockingCollection<Repo
             }
             finally
             {
+                //if (capturedException != null)
+                //{
+                //    capturedException.Throw();
+                //}
             }
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 finally
                 {
+                    //if (capturedException != null)
+                    //{
+                    //    capturedException.Throw();
+                    //}
                 }
             }
@@ Expand Down @@