From 6bdb4e77a8baf0e7722a56e22b50a929a72ba9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9E=D0=BB=D1=8F=20=D0=91=D0=B8=D0=B7=D1=8E=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0?= <user2@kaidev.ru>
Date: Thu, 30 Jan 2025 17:09:34 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20FromDate=20=D0=B2=20TelemetryD?=
 =?UTF-8?q?ataCache?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...1080706_AddNewPropsToTelemetryDataWellWorkover.cs | 12 ++++++------
 .../Services/SAUB/TelemetryDataCache.cs              | 10 +++++++---
 AsbCloudInfrastructure/Startup.cs                    |  1 +
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/AsbCloudDb/Migrations/20250121080706_AddNewPropsToTelemetryDataWellWorkover.cs b/AsbCloudDb/Migrations/20250121080706_AddNewPropsToTelemetryDataWellWorkover.cs
index 3f119d26..d2e6e4bd 100644
--- a/AsbCloudDb/Migrations/20250121080706_AddNewPropsToTelemetryDataWellWorkover.cs
+++ b/AsbCloudDb/Migrations/20250121080706_AddNewPropsToTelemetryDataWellWorkover.cs
@@ -10,9 +10,9 @@ namespace AsbCloudDb.Migrations
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.AlterDatabase(
-                oldCollation: "Russian_Russia.1251")
-                .OldAnnotation("Npgsql:PostgresExtension:adminpack", ",,");
+            //migrationBuilder.AlterDatabase(
+            //    oldCollation: "Russian_Russia.1251")
+            //    .OldAnnotation("Npgsql:PostgresExtension:adminpack", ",,");
 
             migrationBuilder.AddColumn<short>(
                 name: "state",
@@ -54,9 +54,9 @@ namespace AsbCloudDb.Migrations
                 name: "well_depth",
                 table: "t_telemetry_data_well_workover");
 
-            migrationBuilder.AlterDatabase(
-                collation: "Russian_Russia.1251")
-                .Annotation("Npgsql:PostgresExtension:adminpack", ",,");
+            //migrationBuilder.AlterDatabase(
+            //    collation: "Russian_Russia.1251")
+            //    .Annotation("Npgsql:PostgresExtension:adminpack", ",,");
         }
     }
 }
diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs
index ddfeef7f..1ff8dad8 100644
--- a/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs
@@ -358,8 +358,12 @@ public class TelemetryDataCache<TDto> : ITelemetryDataCache<TDto> where TDto : A
 
     private static DateTimeOffset FromDate(DateTime dateTime, TimeSpan timezoneOffset)
     {
-        var dateTimeNoKind = DateTime.SpecifyKind(dateTime, DateTimeKind.Unspecified);
-        var dateTimeOffset = new DateTimeOffset(dateTimeNoKind, timezoneOffset);
-        return dateTimeOffset;
+        if (dateTime == default)
+        {
+            return default;
+        }
+
+        var dateTimeNoKind = DateTime.SpecifyKind(dateTime, DateTimeKind.Unspecified);       
+        return new DateTimeOffset(dateTimeNoKind, timezoneOffset);
     }
 }
diff --git a/AsbCloudInfrastructure/Startup.cs b/AsbCloudInfrastructure/Startup.cs
index 48ae8e26..023484b2 100644
--- a/AsbCloudInfrastructure/Startup.cs
+++ b/AsbCloudInfrastructure/Startup.cs
@@ -27,6 +27,7 @@ public class Startup
         // TODO: Сделать инициализацию кеша телеметрии более явной.
         _ = provider.GetRequiredService<ITelemetryDataCache<TelemetryDataSaubDto>>();
         _ = provider.GetRequiredService<ITelemetryDataCache<TelemetryDataSpinDto>>();
+        _ = provider.GetRequiredService<ITelemetryDataCache<TelemetryDataWellWorkoverDto>>();
 
         var backgroundWorker = provider.GetRequiredService<PeriodicBackgroundWorker>();
         backgroundWorker.Add<WorkToDeleteOldReports>(TimeSpan.FromDays(1));