From bf9a1d50f44b98cb08fc6ea8f3b88e913865f06a Mon Sep 17 00:00:00 2001
From: ngfrolov <ng.frolov@autodrilling.ru>
Date: Fri, 26 May 2023 14:12:37 +0500
Subject: [PATCH] fix TelemetryService.GetTimezone(). Well.Timezone has higher
 priority then telemetry.TimeZone.

---
 .../Services/SAUB/TelemetryService.cs           | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs
index 1f841aad..8728cdaf 100644
--- a/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs
@@ -85,6 +85,15 @@ namespace AsbCloudInfrastructure.Services.SAUB
             if (telemetry is null)
                 throw new Exception($"Telemetry id: {idTelemetry} does not exist.");
 
+            if (telemetry.Well?.Timezone is not null)
+            {
+                telemetry.TimeZone = telemetry.Well.Timezone;
+                db.Telemetries.Upsert(telemetry);
+                db.SaveChanges();
+                DropTelemetryCache();
+                return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
+            }
+
             if (telemetry.TimeZone is not null)
                 return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
 
@@ -102,14 +111,6 @@ namespace AsbCloudInfrastructure.Services.SAUB
                 return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
             }
 
-            if (telemetry.Well?.Timezone is not null)
-            {
-                telemetry.TimeZone = telemetry.Well.Timezone;
-                db.Telemetries.Upsert(telemetry);
-                db.SaveChanges();
-                DropTelemetryCache();
-                return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
-            }
 
             throw new Exception($"Telemetry id: {idTelemetry} can't find timezone.");
         }