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