Refactor CacheDb. replace tuple by private class

AsbCloudInfrastructure/Services/Cache/CacheDb.cs

@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 
@@ -9,25 +7,18 @@ namespace AsbCloudInfrastructure.Services.Cache
 
     public class CacheDb
     {
-        private readonly ConcurrentDictionary<string, (DateTime, IEnumerable)> cache = 
+        private readonly ConcurrentDictionary<string, CacheTableDataStore> cache = 
-            new ConcurrentDictionary<string, (DateTime, IEnumerable)>();
+            new ConcurrentDictionary<string, CacheTableDataStore>();
-
-        private readonly TimeSpan obsolesenceTime = TimeSpan.FromMinutes(15);
 
         public CacheTable<TEntity> GetCachedTable<TEntity>(DbContext context)
             where TEntity : class
         {
-            var entityTypeName = typeof(TEntity).FullName;
+            var nameOfTEntity = typeof(TEntity).FullName;
-
+            var cacheItem = cache.GetOrAdd(nameOfTEntity, (nameOfTEntity) => new CacheTableDataStore {
-            var cacheItem = cache.GetOrAdd(entityTypeName, (DateTime.Now, new List<TEntity>()));
+                NameOfTEntity = nameOfTEntity,
-
+                Entities = new List<TEntity>(),
-            bool isCachedDataObsolete = DateTime.Now - cacheItem.Item1 > obsolesenceTime;
+            });
-
             var tableCache = new CacheTable<TEntity>(context, cacheItem);
-
-            if (isCachedDataObsolete)
-                tableCache.Refresh(true);
-
             return tableCache;
         }
 

AsbCloudInfrastructure/Services/Cache/CacheTable.cs

@@ -14,21 +14,21 @@ namespace AsbCloudInfrastructure.Services.Cache
     {
         private const int semaphoreTimeout = 5_000;
         private static readonly SemaphoreSlim semaphore = new(1);
-        private static readonly TimeSpan minPeriodRefresh = TimeSpan.FromSeconds(5);
+        private static readonly TimeSpan minPeriodRefresh = TimeSpan.FromSeconds(5);        
         private static readonly string nameOfTEntity = typeof(TEntity).Name;
 
-        private readonly DbContext context;
+        private readonly CacheTableDataStore data;
-        private (DateTime refreshDate, IEnumerable entities) data;
         private readonly List<TEntity> cached;
+        private readonly DbContext context;
         private readonly DbSet<TEntity> dbSet;
 
-        internal CacheTable(DbContext context, (DateTime refreshDate, IEnumerable entities) data)
+        internal CacheTable(DbContext context, CacheTableDataStore data)
         {
             this.context = context;
             this.data = data;
             dbSet = context.Set<TEntity>();
-            cached = (List<TEntity>)data.entities;
+            cached = (List<TEntity>)data.Entities;
-            if (cached.Count == 0)
+            if ((cached.Count == 0)||data.IsObsolete)
                 Refresh(false);
         }
 
@@ -52,7 +52,7 @@ namespace AsbCloudInfrastructure.Services.Cache
             }
             catch (Exception ex)
             {
-                Trace.WriteLine($"{DateTime.Now:yyyy.MM.dd HH:mm:ss:fff} error in CacheTable<{typeof(TEntity).Name}>.Sync()");
+                Trace.WriteLine($"{DateTime.Now:yyyy.MM.dd HH:mm:ss:fff} error in CacheTable<{nameOfTEntity}>.Sync()");
                 Trace.WriteLine(ex.Message);
                 Trace.WriteLine(ex.StackTrace);
             }
@@ -81,7 +81,7 @@ namespace AsbCloudInfrastructure.Services.Cache
             }
             catch (Exception ex)
             {
-                Trace.WriteLine($"{DateTime.Now:yyyy.MM.dd HH:mm:ss:fff} error in CacheTable<{typeof(TEntity).Name}>.SyncAsync()");
+                Trace.WriteLine($"{DateTime.Now:yyyy.MM.dd HH:mm:ss:fff} error in CacheTable<{nameOfTEntity}>.SyncAsync()");
                 Trace.WriteLine(ex.Message);
                 Trace.WriteLine(ex.StackTrace);
             }
@@ -94,26 +94,26 @@ namespace AsbCloudInfrastructure.Services.Cache
 
         private void InternalRefresh(bool force)
         {
-            if (force || data.refreshDate + minPeriodRefresh > DateTime.Now)
+            if (force || data.LastResreshDate + minPeriodRefresh < DateTime.Now)
             {
                 cached.Clear();
                 var entities = dbSet.AsNoTracking().ToList();
                 Trace.WriteLine($"CacheTable<{nameOfTEntity}> refresh");
                 cached.AddRange(entities);
-                data.refreshDate = DateTime.Now;  
+                data.LastResreshDate = DateTime.Now;  
             }
         }
 
         private async Task InternalRefreshAsync(bool force, CancellationToken token = default)
         {
-            if (force || data.refreshDate + minPeriodRefresh > DateTime.Now)
+            if (force || data.LastResreshDate + minPeriodRefresh < DateTime.Now)
             {
                 cached.Clear();
                 var entities = await context.Set<TEntity>().AsNoTracking()
                     .ToListAsync(token).ConfigureAwait(false);
                 Trace.WriteLine($"CacheTable<{nameOfTEntity}> refreshAsync");
                 cached.AddRange(entities);
-                data.refreshDate = DateTime.Now;
+                data.LastResreshDate = DateTime.Now;
             }
         }
 

AsbCloudInfrastructure/Services/Cache/CacheTableDataStore.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections;
+
+namespace AsbCloudInfrastructure.Services.Cache
+{
+    class CacheTableDataStore
+    {
+        public string NameOfTEntity { get; set; }
+        public DateTime LastResreshDate { get; set; }
+        public IEnumerable Entities { get; set; }
+        public TimeSpan ObsolesenceTime  { get; set; } = TimeSpan.FromMinutes(15);
+        public bool IsObsolete => (DateTime.Now - LastResreshDate > ObsolesenceTime);
+
+    }
+}

AsbCloudInfrastructure/Services/TelemetryService.cs

@@ -143,7 +143,7 @@ namespace AsbCloudInfrastructure.Services
 
             var telemetriesSrcIdsSql = $"({string.Join(',', telemetriesSrcIds)})";
 
-            var telemetryInfoAndUid = telemetriesGrade
+            var (RemoteUid, Info) = telemetriesGrade
                 .Where(t => t.Info != null)
                 .OrderByDescending(t => t.Id)
                 .Select(t => (t.RemoteUid, t.Info))
@@ -164,8 +164,8 @@ namespace AsbCloudInfrastructure.Services
             try
             {
                 var telemetryDst = db.Telemetries.FirstOrDefault(t => t.Id == telemetryDestId);
-                telemetryDst.RemoteUid = telemetryInfoAndUid.RemoteUid;
+                telemetryDst.RemoteUid = RemoteUid;
-                telemetryDst.Info = telemetryInfoAndUid.Info;
+                telemetryDst.Info = Info;
 
                 if (wellId != default)
                 {

AsbCloudInfrastructure/Services/WellOperationService/WellOperationsStatService.cs

@@ -101,7 +101,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
             {
                 Id = well.Id,
                 Caption = well.Caption,
-                WellType = wellType.Caption,
+                WellType = wellType?.Caption ?? "",
                 IdState = well.IdState,
                 State = wellService.GetStateText(well.IdState),
                 LastTelemetryDate = wellService.GetLastTelemetryDate(well.Id),
@@ -384,7 +384,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
             return tvd;
         }
 
-        private List<Tuple<WellOperation, WellOperation>> MergeArraysBySections(
+        private static List<Tuple<WellOperation, WellOperation>> MergeArraysBySections(
             IEnumerable<int> sectionsIds,
             IOrderedEnumerable<WellOperation> wellOperationsPlan,
             IOrderedEnumerable<WellOperation> wellOperationsFact)