From 9ea076e51d3b243e7d0aeab75fcdf5fb76822d80 Mon Sep 17 00:00:00 2001 From: abist Date: Fri, 6 Mar 2020 14:15:36 -0800 Subject: [PATCH] fix correct run status for steps --- .../Agent/Common/AgentUtilities.cs | 27 ++++++++++++++++++- .../Agent/Jobs/JobHistoryItem.cs | 5 ++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/AgentUtilities.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/AgentUtilities.cs index 550566da..d8aa50fa 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/AgentUtilities.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Common/AgentUtilities.cs @@ -97,6 +97,31 @@ namespace Microsoft.SqlTools.ServiceLayer.Agent } + internal static Contracts.CompletionResult ConvertToCompletionResult(SeverityClass severity) + { + switch (severity) + { + case (SeverityClass.Cancelled): + return Contracts.CompletionResult.Cancelled; + case (SeverityClass.Error): + return Contracts.CompletionResult.Failed; + case (SeverityClass.FailureAudit): + return Contracts.CompletionResult.Failed; + case (SeverityClass.InProgress): + return Contracts.CompletionResult.InProgress; + case (SeverityClass.Retry): + return Contracts.CompletionResult.Retry; + case (SeverityClass.Success): + return Contracts.CompletionResult.Succeeded; + case (SeverityClass.SuccessAudit): + return Contracts.CompletionResult.Succeeded; + case (SeverityClass.Unknown): + return Contracts.CompletionResult.Unknown; + default: + return Contracts.CompletionResult.Unknown; + } + } + internal static AgentJobStep ConvertToAgentJobStep(JobStep step, LogSourceJobHistory.LogEntryJobHistory logEntry, string jobId) { AgentJobStepInfo stepInfo = new AgentJobStepInfo(); @@ -124,7 +149,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Agent jobStep.stepDetails = stepInfo; jobStep.message = logEntry.Message; jobStep.runDate = step.LastRunDate.ToString(); - jobStep.runStatus = (Contracts.CompletionResult) step.LastRunOutcome; + jobStep.runStatus = ConvertToCompletionResult(logEntry.Severity); return jobStep; } diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHistoryItem.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHistoryItem.cs index b78d6a15..11652608 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHistoryItem.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/JobHistoryItem.cs @@ -711,6 +711,11 @@ ORDER BY [InstanceID] ASC"; get { return m_serverName; } } + internal SeverityClass Severity + { + get { return m_severity; } + } + #endregion } #endregion