20-12-2022

ECM.JobRunner.Web/Data/DashboardResponse.cs

@@ -5,14 +5,32 @@ namespace ECM.JobRunner.Web.Data
     public class DashboardResponse
     {
         public DateTime heartbeat = DateTime.MinValue;
-        public List<HistoryItem> jobHistory = new();
         public List<StatusItem> jobStatus = new();
 
-        public List<HistoryItem> GetHistoryForLastMinutes(int pMinutes)
+        public class JobHistory
         {
-            return jobHistory.
-                Where(h => (DateTime.Now - h.CreatedAt) < new TimeSpan(0, pMinutes, 0)).
+            public List<StatusItem> items;
+            public int total;
+            public int success;
+            public int failed;
+            public int waiting;
+        }
+
+        public JobHistory GetHistoryForLastMinutes(int pMinutes)
+        {
+            var items = jobStatus.
+                Where(s => (DateTime.Now - s.CompleteTime) < new TimeSpan(0, pMinutes, 0)).
+                Where(s => s.Executing == false).
                 ToList();
+
+            return new JobHistory()
+            {
+                items = items,
+                total = items.Count,
+                success = items.Where(i => i.Successful && i.Waiting == false).Count(),
+                failed = items.Where(i => i.Successful == false).Count(),
+                waiting = items.Where(i => i.Successful && i.Waiting == true).Count()
+            };
         }
     }
 }