From bbab9e1a153839be4972af5c99a3da63002743aa Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Tue, 7 Jun 2022 12:29:11 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20EfCache[Dictionary]Extensions.=20?= =?UTF-8?q?=D0=A1=D0=B5=D0=BC=D0=B0=D1=84=D0=BE=D1=80=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D1=82=D0=B5=D0=B3=D0=B0=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D1=81?= =?UTF-8?q?=D1=83=D1=89=D0=B5=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=B1=D1=8B=D1=81=D1=82=D1=80=D0=B5=D0=B5,=20=D0=BB=D0=BE?= =?UTF-8?q?=D0=B3=D0=B8=D0=BA=D0=B0=20=D0=B7=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=BC?= =?UTF-8?q?=D0=B8=20=D0=B8=D0=B7=20=D0=91=D0=94=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=20?= =?UTF-8?q?=D1=81=D0=B5=D0=BC=D0=B0=D1=84=D0=BE=D1=80=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D0=BA=D1=80=D0=B5=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=B5?= =?UTF-8?q?=D1=88=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Data/ClusterDto.cs | 4 ++-- AsbCloudApp/Data/SimpleTimezoneDto.cs | 4 ++++ .../EfCache/EfCacheDictionaryExtensions.cs | 24 ------------------- .../EfCache/EfCacheExtensions.cs | 24 ------------------- 4 files changed, 6 insertions(+), 50 deletions(-) diff --git a/AsbCloudApp/Data/ClusterDto.cs b/AsbCloudApp/Data/ClusterDto.cs index 8a9a95e6..17a182ce 100644 --- a/AsbCloudApp/Data/ClusterDto.cs +++ b/AsbCloudApp/Data/ClusterDto.cs @@ -23,7 +23,7 @@ namespace AsbCloudApp.Data public double? Longitude { get; set; } /// - public SimpleTimezoneDto Timezone { get; set; } = null!; + public SimpleTimezoneDto? Timezone { get; set; } /// /// ИД месторождения, необязательный @@ -38,7 +38,7 @@ namespace AsbCloudApp.Data /// /// Список скважин куста /// - public IEnumerable Wells { get; set; } = null!; + public IEnumerable? Wells { get; set; } = null!; } #nullable disable } diff --git a/AsbCloudApp/Data/SimpleTimezoneDto.cs b/AsbCloudApp/Data/SimpleTimezoneDto.cs index 3d9dcc55..c2db8338 100644 --- a/AsbCloudApp/Data/SimpleTimezoneDto.cs +++ b/AsbCloudApp/Data/SimpleTimezoneDto.cs @@ -36,5 +36,9 @@ namespace AsbCloudApp.Data => Hours.GetHashCode() | TimezoneId.GetHashCode() | IsOverride.GetHashCode(); + + /// + public override string ToString() + => $"{TimezoneId} (UTC+{Hours:00.##})"; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/EfCache/EfCacheDictionaryExtensions.cs b/AsbCloudInfrastructure/EfCache/EfCacheDictionaryExtensions.cs index 9846f872..21a672f7 100644 --- a/AsbCloudInfrastructure/EfCache/EfCacheDictionaryExtensions.cs +++ b/AsbCloudInfrastructure/EfCache/EfCacheDictionaryExtensions.cs @@ -89,18 +89,6 @@ namespace AsbCloudInfrastructure.EfCache try { cache = new CacheItem(); - - var dateObsolete = DateTime.Now + obsolete; - var dateQueryStart = DateTime.Now; - var data = valueFactory(); - var queryTime = DateTime.Now - dateQueryStart; - - if (dateObsolete - DateTime.Now < minCacheTime) - dateObsolete = DateTime.Now + minCacheTime; - - cache.Data = data; - cache.DateObsolete = dateObsolete; - cache.DateObsoleteTotal = dateObsolete + queryTime + minCacheTime; caches.Add(tag, cache); } catch @@ -182,18 +170,6 @@ namespace AsbCloudInfrastructure.EfCache try { cache = new CacheItem(); - - var dateObsolete = DateTime.Now + obsolete; - var dateQueryStart = DateTime.Now; - var data = await valueFactoryAsync(token); - var queryTime = DateTime.Now - dateQueryStart; - - if (dateObsolete - DateTime.Now < minCacheTime) - dateObsolete = DateTime.Now + minCacheTime; - - cache.Data = data; - cache.DateObsolete = dateObsolete; - cache.DateObsoleteTotal = dateObsolete + queryTime + minCacheTime; caches.Add(tag, cache); } catch diff --git a/AsbCloudInfrastructure/EfCache/EfCacheExtensions.cs b/AsbCloudInfrastructure/EfCache/EfCacheExtensions.cs index e8c8a6e2..b1a9e382 100644 --- a/AsbCloudInfrastructure/EfCache/EfCacheExtensions.cs +++ b/AsbCloudInfrastructure/EfCache/EfCacheExtensions.cs @@ -85,18 +85,6 @@ namespace AsbCloudInfrastructure.EfCache { try { cache = new CacheItem(); - - var dateObsolete = DateTime.Now + obsolete; - var dateQueryStart = DateTime.Now; - var data = valueFactory(); - var queryTime = DateTime.Now - dateQueryStart; - - if (dateObsolete - DateTime.Now < minCacheTime) - dateObsolete = DateTime.Now + minCacheTime; - - cache.Data = data; - cache.DateObsolete = dateObsolete; - cache.DateObsoleteTotal = dateObsolete + queryTime + minCacheTime; caches.Add(tag, cache); } catch @@ -178,18 +166,6 @@ namespace AsbCloudInfrastructure.EfCache try { cache = new CacheItem(); - - var dateObsolete = DateTime.Now + obsolete; - var dateQueryStart = DateTime.Now; - var data = await valueFactoryAsync(token); - var queryTime = DateTime.Now - dateQueryStart; - - if (dateObsolete - DateTime.Now < minCacheTime) - dateObsolete = DateTime.Now + minCacheTime; - - cache.Data = data; - cache.DateObsolete = dateObsolete; - cache.DateObsoleteTotal = dateObsolete + queryTime + minCacheTime; caches.Add(tag, cache); } catch