Telemetry JobRuns.

3 files changed, 88 insertions, 18 deletions

diff --git a/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryDiagnosticsSource.cs b/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryDiagnosticsSource.cs
index 5a2735131..37a8d224d 100644
--- a/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryDiagnosticsSource.cs
+++ b/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryDiagnosticsSource.cs
@@ -19,7 +19,6 @@ namespace Tango.Telemetry.Sources
         public const int MIN_SAMPLING_INTERVAL_SECONDS = 1;
 
         private IMachineOperator _machineOperator;
-        private bool _isStarted;
 
         private Timer _diagnosticsSamplingTimer;
         private List<StartDiagnosticsResponse> _diagnosticsQueue;
@@ -31,6 +30,7 @@ namespace Tango.Telemetry.Sources
         public string Name { get; private set; } = "Diagnostics";
 
         public bool RequiresTelemetryDuplicationTracking { get => false; }
+        public bool IsStarted { get; private set; }
 
         private TelemetryDiagnosticsSource() : base()
         {
@@ -45,7 +45,7 @@ namespace Tango.Telemetry.Sources
 
         private void DiagnosticsDataAvailable(object sender, StartDiagnosticsResponse diagnostics)
         {
-            if (_isStarted && diagnostics.Monitors != null)
+            if (IsStarted && diagnostics.Monitors != null)
             {
                 _diagnosticsQueue.Add(diagnostics);
             }
@@ -53,7 +53,7 @@ namespace Tango.Telemetry.Sources
 
         public void Start()
         {
-            _isStarted = true;
+            IsStarted = true;
 
             if (Config.DiagnosticsSamplingInterval.TotalSeconds < MIN_SAMPLING_INTERVAL_SECONDS)
             {
@@ -76,12 +76,12 @@ namespace Tango.Telemetry.Sources
 
         public void Stop()
         {
-            _isStarted = false;
+            IsStarted = false;
         }
 
         private void DiagnosticsSamplingTimer_Elapsed(object sender, ElapsedEventArgs e)
         {
-            if (!_isStarted || _writing) return;
+            if (!IsStarted || _writing) return;
 
             try
             {
@@ -103,7 +103,7 @@ namespace Tango.Telemetry.Sources
                     frame.Time = DateTime.UtcNow.Subtract(Config.DiagnosticsSamplingInterval);
 
 
-                    TelemetryAvailable?.Invoke(this, new TelemetryAvailableEventArgs(frame, TelemetrySourceTypes.Streaming));
+                    TelemetryAvailable?.Invoke(this, new TelemetryAvailableEventArgs() { TelemetryObject = frame });
                 }
                 else
                 {
@@ -112,7 +112,7 @@ namespace Tango.Telemetry.Sources
                         TelemetryDiagnosticsFrame frame = new TelemetryDiagnosticsFrame();
                         frame.Monitors = new InsightsMonitors();
                         frame.Time = DateTime.UtcNow.Subtract(Config.DiagnosticsSamplingInterval);
-                        TelemetryAvailable?.Invoke(this, new TelemetryAvailableEventArgs(frame, TelemetrySourceTypes.Streaming));
+                        TelemetryAvailable?.Invoke(this, new TelemetryAvailableEventArgs() { TelemetryObject = frame });
                         _emptyWritten = true;
                     }
                 }
diff --git a/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryJobRunsHistorySource.cs b/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryJobRunsHistorySource.cs
index e3934d832..b13402831 100644
--- a/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryJobRunsHistorySource.cs
+++ b/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryJobRunsHistorySource.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.BL;
+using Tango.Telemetry.Mappers;
 using Tango.Telemetry.Telemetries;
 
 namespace Tango.Telemetry.Sources
@@ -13,13 +14,23 @@ namespace Tango.Telemetry.Sources
     {
         private bool _isBusy;
 
-        public string Name { get; private set; } = "JobRuns History";
-
+        public string Name { get;} = "JobRuns History";
         public bool RequiresTelemetryDuplicationTracking { get => true; }
+        public TelemetryHistorySourceDirection Direction { get => TelemetryHistorySourceDirection.Descending; }
 
-        public Task<bool> CanRequestHistory(DateTime from)
+        public async Task<bool> CanRequestHistory(DateTime from)
         {
-            return Task.FromResult(!_isBusy);
+            if (_isBusy)
+            {
+                return false;
+            }
+            else
+            {
+                using (ObservablesContext db = ObservablesContext.CreateDefault())
+                {
+                    return await db.JobRuns.CountAsync(x => x.LastUpdated < from) > 0;
+                }
+            }
         }
 
         public async Task<IEnumerable<ITelemetry>> RequestHistory(DateTime from)
@@ -31,8 +42,8 @@ namespace Tango.Telemetry.Sources
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
                     var runs = await db.JobRuns
-                        .Where(x => x.LastUpdated > from)
-                        .OrderBy(x => x.LastUpdated)
+                        .OrderByDescending(x => x.LastUpdated)
+                        .Where(x => x.LastUpdated < from)
                         .Take(Config.MaxJobRunsPerRequest)
                         .ToListAsync();
 
@@ -40,11 +51,7 @@ namespace Tango.Telemetry.Sources
 
                     foreach (var run in runs)
                     {
-                        TelemetryJobRun tRun = new TelemetryJobRun();
-                        tRun.ID = run.Guid;
-                        tRun.Time = run.LastUpdated;
-                        tRun.Name = run.JobName;
-                        //Fill the object..
+                        var tRun = JobRunMapper.MapJobRun(run);
                         tRuns.Add(tRun);
                     }
 
diff --git a/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryJobRunsStreamingSource.cs b/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryJobRunsStreamingSource.cs
new file mode 100644
index 000000000..b3199eb36
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryJobRunsStreamingSource.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+using Tango.Integration.Operation;
+using Tango.Telemetry.Mappers;
+
+namespace Tango.Telemetry.Sources
+{
+    public class TelemetryJobRunsStreamingSource : ExtendedObject, ITelemetryStreamingSource
+    {
+        private IMachineOperator _machineOperator;
+
+        public string Name { get; } = "JobRuns Streaming";
+
+        public bool RequiresTelemetryDuplicationTracking { get; } = true;
+        public bool IsStarted { get; private set; }
+
+        public event EventHandler<TelemetryAvailableEventArgs> TelemetryAvailable;
+
+        public TelemetryJobRunsStreamingSource(IMachineOperator machineOperator)
+        {
+            _machineOperator = machineOperator;
+        }
+
+        private void JobRunsLogger_JobRunAvailable(object sender, Integration.JobRuns.JobRunAvailableEventArgs e)
+        {
+            Task.Factory.StartNew(() =>
+            {
+                if (IsStarted)
+                {
+                    var tRun = JobRunMapper.MapJobRun(e.JobRun);
+                    TelemetryAvailable?.Invoke(this, new TelemetryAvailableEventArgs() { TelemetryObject = tRun });
+                }
+            });
+        }
+
+        public void Dispose()
+        {
+            Stop();
+        }
+
+        public void Start()
+        {
+            if (!IsStarted)
+            {
+                _machineOperator.JobRunsLogger.JobRunAvailable += JobRunsLogger_JobRunAvailable;
+                IsStarted = true;
+            }
+        }
+
+        public void Stop()
+        {
+            if (IsStarted)
+            {
+                _machineOperator.JobRunsLogger.JobRunAvailable -= JobRunsLogger_JobRunAvailable;
+                IsStarted = false;
+            }
+        }
+    }
+}