From 9966a8335c72ab3c7baabd13ed272e39e17dd4b9 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 7 Apr 2026 12:42:23 +0200
Subject: [PATCH] Correzione progetto STATS x nuova naming convention

---
 MP.SPEC/MP.SPEC.csproj            |  2 +-
 MP.SPEC/Resources/ChangeLog.html  |  2 +-
 MP.SPEC/Resources/VersNum.txt     |  2 +-
 MP.SPEC/Resources/manifest.xml    |  2 +-
 MP.Stats/Data/MpStatsService.cs   | 86 +++++++++++++++----------------
 MP.Stats/MP.Stats.csproj          |  2 +-
 MP.Stats/Resources/ChangeLog.html |  2 +-
 MP.Stats/Resources/VersNum.txt    |  2 +-
 MP.Stats/Resources/manifest.xml   |  2 +-
 9 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 47cbc7b3..d1845ee3 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.16.2603.2308</Version>
+    <Version>6.16.2604.712</Version>
     <UserSecretsId>1800a78a-6ff1-40f9-b490-87fb8bfc1394</UserSecretsId>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 26afcaa8..02e4d76c 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2603.2308</h4>
+    <h4>Versione: 6.16.2604.712</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 3d5acf67..e400f432 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2603.2308
+6.16.2604.712
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 924797a8..3207aa51 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2603.2308</version>
+  <version>6.16.2604.712</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs
index af77da86..ea91785f 100644
--- a/MP.Stats/Data/MpStatsService.cs
+++ b/MP.Stats/Data/MpStatsService.cs
@@ -66,7 +66,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = $"{redisBaseKey}:Cache:AZIONI_ALL";
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<AzioniUL>>($"{rawData}");
@@ -77,7 +77,7 @@ namespace MP.Stats.Data
                 result = dbController.ActionsGetAll();
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+                await _redisDb.StringSetAsync(currKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -98,7 +98,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = $"{redisBaseKey}:Cache:FLTrans";
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<AnagFLTransModel>>($"{rawData}");
@@ -109,7 +109,7 @@ namespace MP.Stats.Data
                 result = dbController.AnagFLTransGetAll();
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+                await _redisDb.StringSetAsync(currKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -171,7 +171,7 @@ namespace MP.Stats.Data
             List<ConfigModel>? result = new List<ConfigModel>();
             // cerco in redis...
             string currKey = $"{redisBaseKey}:Conf";
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             //if (!string.IsNullOrEmpty($"{rawData}"))
             if (rawData.HasValue)
             {
@@ -183,7 +183,7 @@ namespace MP.Stats.Data
                 result = dbController.ConfigGetAll();
                 // serializzo e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                redisDb.StringSet(currKey, rawData, LongCache);
+                _redisDb.StringSet(currKey, rawData, LongCache);
             }
             if (result == null)
             {
@@ -251,7 +251,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = getCacheKey($"{redisBaseKey}:FL_DATA:FT_{fluxType}", CurrFilter);
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<FLModel>>($"{rawData}");
@@ -262,7 +262,7 @@ namespace MP.Stats.Data
                 result = dbController.FluxLogRawData(CurrFilter.IdxMacchina, CurrFilter.DateStart, CurrFilter.DateEnd, fluxType);
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+                await _redisDb.StringSetAsync(currKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -287,7 +287,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = $"{redisBaseKey}:FTList";
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<string>>($"{rawData}");
@@ -298,7 +298,7 @@ namespace MP.Stats.Data
                 result = dbController.FluxTypeList();
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(currKey, rawData, UltraLongCache);
+                await _redisDb.StringSetAsync(currKey, rawData, UltraLongCache);
             }
             if (result == null)
             {
@@ -319,7 +319,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = $"{redisBaseKey}:Cache:MacchineEnergy";
-            RedisValue rawData = redisDb.StringGet(currKey);
+            RedisValue rawData = _redisDb.StringGet(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<MacchineStatModel>>($"{rawData}");
@@ -330,7 +330,7 @@ namespace MP.Stats.Data
                 result = dbController.MacchineEnergy();
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                redisDb.StringSet(currKey, rawData, FastCache);
+                _redisDb.StringSet(currKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -351,7 +351,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = $"{redisBaseKey}:Cache:Macchine";
-            RedisValue rawData = redisDb.StringGet(currKey);
+            RedisValue rawData = _redisDb.StringGet(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<MacchineModel>>($"{rawData}");
@@ -362,7 +362,7 @@ namespace MP.Stats.Data
                 result = dbController.MacchineGetAll().ToList();
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                redisDb.StringSet(currKey, rawData, FastCache);
+                _redisDb.StringSet(currKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -431,7 +431,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = getCacheKey($"{redisBaseKey}:CONTROLLI", CurrFilter);
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<ResControlli>>($"{rawData}");
@@ -442,7 +442,7 @@ namespace MP.Stats.Data
                 result = dbController.StatControlliGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo);
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+                await _redisDb.StringSetAsync(currKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -470,7 +470,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = getCacheKeyPaged($"{redisBaseKey}:DDBT", CurrFilter);
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<DdbTurni>>($"{rawData}");
@@ -481,7 +481,7 @@ namespace MP.Stats.Data
                 result = dbController.StatDdbGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo, CurrFilter.FirstRecord, CurrFilter.NumRecord);
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+                await _redisDb.StringSetAsync(currKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -521,7 +521,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = getCacheKey($"{redisBaseKey}:DDBT-COUNT", CurrFilter);
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
                 numRec = JsonConvert.DeserializeObject<int>($"{rawData}");
@@ -532,7 +532,7 @@ namespace MP.Stats.Data
                 numRec = dbController.StatDdbGetCount(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo);
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(numRec);
-                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+                await _redisDb.StringSetAsync(currKey, rawData, FastCache);
             }
             sw.Stop();
             Log.Debug($"StatDdbGetCount | {source} | {sw.Elapsed.TotalMilliseconds}ms");
@@ -555,7 +555,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = getCacheKey($"{redisBaseKey}:ODL_ENERGY", CurrFilter);
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<OdlEnergyModel>>($"{rawData}");
@@ -566,7 +566,7 @@ namespace MP.Stats.Data
                 result = dbController.StatOdlEnergyGetFilt(CurrFilter.IdxMacchina, CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo);
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+                await _redisDb.StringSetAsync(currKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -593,7 +593,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = getCacheKey($"{redisBaseKey}:ODL", CurrFilter);
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<StatsODL>>($"{rawData}");
@@ -604,7 +604,7 @@ namespace MP.Stats.Data
                 result = dbController.StatOdlGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo);
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+                await _redisDb.StringSetAsync(currKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -625,7 +625,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = getCacheKey($"{redisBaseKey}:SCARTI:RAW", CurrFilter);
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<ResScarti>>($"{rawData}");
@@ -636,7 +636,7 @@ namespace MP.Stats.Data
                 result = dbController.StatScartiGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo);
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+                await _redisDb.StringSetAsync(currKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -662,7 +662,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = getCacheKey($"{redisBaseKey}:OEE", CurrFilter);
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<TurniOee>>($"{rawData}");
@@ -673,7 +673,7 @@ namespace MP.Stats.Data
                 result = dbController.StatTurniOeeGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo);
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+                await _redisDb.StringSetAsync(currKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -694,7 +694,7 @@ namespace MP.Stats.Data
             // cerco in redis...
             DateTime adesso = DateTime.Now;
             string currKey = getCacheKey($"{redisBaseKey}:USRACTLOG", CurrFilter);
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             if (rawData.HasValue)
             {
                 result = JsonConvert.DeserializeObject<List<UserActionLog>>($"{rawData}");
@@ -710,7 +710,7 @@ namespace MP.Stats.Data
                 }
                 // serializzp e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                await redisDb.StringSetAsync(currKey, rawData, FastCache);
+                await _redisDb.StringSetAsync(currKey, rawData, FastCache);
             }
             if (result == null)
             {
@@ -733,7 +733,7 @@ namespace MP.Stats.Data
             List<VocabolarioModel> result = new List<VocabolarioModel>();
             // cerco in redis...
             string currKey = $"{redisBaseKey}:Vocabolario";
-            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            RedisValue rawData = await _redisDb.StringGetAsync(currKey);
             //if (!string.IsNullOrEmpty($"{rawData}"))
             if (rawData.HasValue)
             {
@@ -745,7 +745,7 @@ namespace MP.Stats.Data
                 result = dbController.VocabolarioGetAll();
                 // serializzo e salvo...
                 rawData = JsonConvert.SerializeObject(result);
-                redisDb.StringSet(currKey, rawData, LongCache);
+                _redisDb.StringSet(currKey, rawData, LongCache);
             }
             if (result == null)
             {
@@ -832,24 +832,24 @@ namespace MP.Stats.Data
         private async Task<bool> ExecFlushRedisPattern(RedisValue pat2Flush)
         {
             bool answ = false;
-            var masterEndpoint = redisConn.GetEndPoints()
-                                            .Where(ep => redisConn.GetServer(ep).IsConnected && !redisConn.GetServer(ep).IsReplica)
+            var masterEndpoint = _redisConn.GetEndPoints()
+                                            .Where(ep => _redisConn.GetServer(ep).IsConnected && !_redisConn.GetServer(ep).IsReplica)
                                             .FirstOrDefault();
 
             // sepattern è "*" elimino intero DB...
             if (masterEndpoint != null && (pat2Flush.Equals(new RedisValue("*")) || pat2Flush == RedisValue.Null))
             {
-                redisConn.GetServer(masterEndpoint).FlushDatabase(database: redisDb.Database);
+                _redisConn.GetServer(masterEndpoint).FlushDatabase(database: _redisDb.Database);
             }
             else
             {
-                var server = redisConn.GetServer(masterEndpoint);
-                var keys = server.Keys(database: redisDb.Database, pattern: pat2Flush, pageSize: 1000);
+                var server = _redisConn.GetServer(masterEndpoint);
+                var keys = server.Keys(database: _redisDb.Database, pattern: pat2Flush, pageSize: 1000);
 
                 var deleteTasks = new List<Task>();
                 foreach (var key in keys)
                 {
-                    deleteTasks.Add(redisDb.KeyDeleteAsync(key));
+                    deleteTasks.Add(_redisDb.KeyDeleteAsync(key));
                     if (deleteTasks.Count >= 1000)
                     {
                         await Task.WhenAll(deleteTasks);
@@ -863,17 +863,17 @@ namespace MP.Stats.Data
             }
             answ = true;
 #if false
-            var listEndpoints = redisConn.GetEndPoints();
+            var listEndpoints = _redisConn.GetEndPoints();
             foreach (var endPoint in listEndpoints)
             {
-                //var server = redisConnAdmin.GetServer(listEndpoints[0]);
-                var server = redisConn.GetServer(endPoint);
+                //var server = _redisConnAdmin.GetServer(listEndpoints[0]);
+                var server = _redisConn.GetServer(endPoint);
                 if (server != null)
                 {
-                    var keyList = server.Keys(redisDb.Database, pattern);
+                    var keyList = server.Keys(_redisDb.Database, pattern);
                     foreach (var item in keyList)
                     {
-                        await redisDb.KeyDeleteAsync(item);
+                        await _redisDb.KeyDeleteAsync(item);
                     }
                     answ = true;
                 }
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index cbaf21a5..ca324bce 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Stats</RootNamespace>
         <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.16.2601.1310</Version>
+        <Version>6.16.2604.0712</Version>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591</NoWarn>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index d7d90128..1f679d5e 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.16.2601.1310</h4>
+    <h4>Versione: 6.16.2604.0712</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 93295548..7fba712e 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2601.1310
+6.16.2604.0712
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 0c54652f..9808717c 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2601.1310</version>
+  <version>6.16.2604.0712</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
