From ddf8f35214a67f45dab17711ecc5b5f997698061 Mon Sep 17 00:00:00 2001
From: KharchenkoVladimir <vv.kharchenko@autodrilling.ru>
Date: Mon, 18 Oct 2021 10:44:53 +0500
Subject: [PATCH] Fixed .DetLastTelemetryDate() in TelemetryService

---
 .../Services/TelemetryService.cs              | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/AsbCloudInfrastructure/Services/TelemetryService.cs b/AsbCloudInfrastructure/Services/TelemetryService.cs
index e6e1e140..4cc652df 100644
--- a/AsbCloudInfrastructure/Services/TelemetryService.cs
+++ b/AsbCloudInfrastructure/Services/TelemetryService.cs
@@ -55,19 +55,25 @@ namespace AsbCloudInfrastructure.Services
 
         public DateTime GetLastTelemetryDateByWellId(int idWell)
         {
-            try
-            {
-                var telemetryId = GetIdTelemetryByIdWell(idWell);
-                var uid = cacheTelemetry.FirstOrDefault(t => t.Id == telemetryId).RemoteUid;
-                var lastTelemetryDate = telemetryTracker.GetLastTelemetryDateByUid(uid);
+            var lastTelemetryDate = DateTime.MinValue;
+            
+            var telemetryId = GetIdTelemetryByIdWell(idWell);
+
+            if (telemetryId is null)
                 return lastTelemetryDate;
-            }
-            catch(Exception ex)
-            {
-                Trace.TraceError(ex.Message);
-                Console.WriteLine(ex.Message);
-                return DateTime.MinValue;
-            }
+
+            var telemetry = cacheTelemetry.FirstOrDefault(t => t.Id == telemetryId);
+
+            if (telemetry is null)
+                return lastTelemetryDate;
+
+            var uid = telemetry.RemoteUid;
+
+            if(!telemetryTracker.GetTransmittingTelemetryUids().Contains(uid))
+                return lastTelemetryDate;
+
+            lastTelemetryDate = telemetryTracker.GetLastTelemetryDateByUid(uid);
+            return lastTelemetryDate;
         }
 
         public int GetOrCreateTemetryIdByUid(string uid)