From badf940391e12f3f6b7f72ea5acf831b91464070 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 24 May 2023 17:58:59 +0200
Subject: [PATCH] Aggiunta gestione coda Processing con sblocco - veto
 configurabile (5sec) prima di sbloccare -gestione con chiamata REST

---
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  4 +-
 .../Controllers/QueueController.cs            | 15 ++-
 WebDoorCreator.API/appsettings.json           |  3 +
 .../Services/QueueDataService.cs              | 39 +++++++-
 .../Components/SvgComp/DoorSvgObj.razor       |  5 +-
 WebDoorCreator.UI/WebDoorCreator.UI.csproj    |  2 +-
 WebDoorCreator.UI/appsettings.json            | 91 ++++++++++---------
 9 files changed, 106 insertions(+), 57 deletions(-)
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 5b0454a..07c324c 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>WebDoorCreator - Egalware</i>
-    <h4>Version: 0.9.2305.2416</h4>
+    <h4>Version: 0.9.2305.2417</h4>
     <br /> Release note:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 23cadfc..d5439f6 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2305.2416
+0.9.2305.2417
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index f624d20..7168dae 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2305.2416</version>
-  <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
+  <version>0.9.2305.2417</version>
+  <url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.API.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
 </item>
diff --git a/WebDoorCreator.API/Controllers/QueueController.cs b/WebDoorCreator.API/Controllers/QueueController.cs
index b1c00dd..cab3dfe 100644
--- a/WebDoorCreator.API/Controllers/QueueController.cs
+++ b/WebDoorCreator.API/Controllers/QueueController.cs
@@ -81,6 +81,19 @@ namespace WebDoorCreator.API.Controllers
             return answ;
         }
 
+        /// <summary>
+        /// Reset della coda di processing x evitare condizioni di "stuck in calc"
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("ResetQueueProcessing")]
+        public async Task<string> ResetQueueProcessing()
+        {
+            string answ = "NA";
+            bool fatto = await QDataServ.ResetQueueProcessing();
+            answ = fatto ? "OK" : "NO";
+            return answ;
+        }
+
         /// <summary>
         /// Invio elenco risultati elaborazioni (modalità boolean di esecuzione corretta)
         /// </summary>
@@ -130,8 +143,6 @@ namespace WebDoorCreator.API.Controllers
             return actQueue;
         }
 
-       
-
         #endregion Public Methods
 
         #region Private Fields
diff --git a/WebDoorCreator.API/appsettings.json b/WebDoorCreator.API/appsettings.json
index e32a2b4..6e7fdde 100644
--- a/WebDoorCreator.API/appsettings.json
+++ b/WebDoorCreator.API/appsettings.json
@@ -26,5 +26,8 @@
     "Admin": "samuele@steamware.net",
     "ProjCheck": "samuele.locatelli@egalware.com,mara.baroni@egalware.com",
     "TimbCheck": "samuele.locatelli@egalware.com,mara.baroni@egalware.com"
+  },
+  "RumtimeOpt": {
+    "VetoRemoveProcessing": 5
   }
 }
diff --git a/WebDoorCreator.Data/Services/QueueDataService.cs b/WebDoorCreator.Data/Services/QueueDataService.cs
index 5567d82..3825650 100644
--- a/WebDoorCreator.Data/Services/QueueDataService.cs
+++ b/WebDoorCreator.Data/Services/QueueDataService.cs
@@ -13,6 +13,7 @@ namespace WebDoorCreator.Data.Services
     {
         #region Public Constructors
 
+        private int vetoRemoveProcSec { get; set; } = 10;
         /// <summary>
         /// Init classe
         /// </summary>
@@ -38,6 +39,8 @@ namespace WebDoorCreator.Data.Services
             // setup canali pub/sub
             CalcReqPipe = new MessagePipe(redisConn, Constants.CALC_REQ_QUEUE);
             CalcDonePipe = new MessagePipe(redisConn, Constants.CALC_DONE_QUEUE);
+            // leggo conf speciali
+            vetoRemoveProcSec = _configuration.GetValue<int>("RumtimeOpt:VetoRemoveProcessing");
         }
 
         #endregion Public Constructors
@@ -595,13 +598,16 @@ namespace WebDoorCreator.Data.Services
         }
 
         /// <summary>
-        /// Upsert for single hash record
+        /// Upsert for single hash record in processing
         /// </summary>
         /// <returns>Dictionary of DoorId, saveVersNumb</returns>
         public async Task<long> RequestProcessingUpsert(string doorId, string vers)
         {
             RedisKey currKey = new RedisKey(Constants.CALC_REQ_PROC);
             long numReq = await RedHashUpsert(currKey, doorId, vers);
+            // aggiungo cache veto rimozione da coda processing
+            RedisKey currVetoKey = new RedisKey($"{Constants.CALC_REQ_PROC}:{doorId}");
+            await redisDb.StringSetAsync(currVetoKey, vers, TimeSpan.FromSeconds(vetoRemoveProcSec));
             return numReq;
         }
 
@@ -706,6 +712,37 @@ namespace WebDoorCreator.Data.Services
             Log.Debug($"ResetQueue | REDIS EXEC in: {ts.TotalMilliseconds} ms");
             return fatto;
         }
+        /// <summary>
+        /// Reset to queue request all processing stuck data (veto check)
+        /// </summary>
+        /// <returns>Boolean, executed</returns>
+        public async Task<bool> ResetQueueProcessing()
+        {
+            bool fatto = false;
+            await Task.Delay(1);
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            // cerco le richieste processing
+            RedisKey currKey = new RedisKey(Constants.CALC_REQ_PROC);
+            RedisKey currVetoKey = new RedisKey($"{Constants.CALC_REQ_PROC}:0");
+            var rawData = await redisDb.HashGetAllAsync(currKey);
+            foreach (var item in rawData)
+            {
+                // verifico SE siano senza veto rimozione...
+                currVetoKey = new RedisKey($"{Constants.CALC_REQ_PROC}:{item.Name}");
+                var redisVal = await redisDb.StringGetAsync(currVetoKey);
+                if (!redisVal.HasValue)
+                {
+                    await RequestPendingUpsert(item.Name!, item.Value!);
+                    await RequestProcessingRemove(item.Name!);
+                    fatto = true;
+                }
+            }
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Debug($"ResetQueueProcessing | REDIS EXEC in: {ts.TotalMilliseconds} ms");
+            return fatto;
+        }
 
         /// <summary>
         /// Salvo elenco risultati elaborazioni (modalità boolean di esecuzione corretta)
diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor
index 248695b..245b229 100644
--- a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor
+++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor
@@ -1,5 +1,4 @@
 ﻿<svg viewBox="0 0 @ObjW @ObjH" width="100%" height="100%" xmlns="http://www.w3.org/2000/svg">
-    @*<rect x="0" y="0" width="100%" height="100%" fill="white" fill-opacity="0.1"></rect>*@
     <g transform="translate(0,@LineDist)">
         <foreignObject width="@TextAreaWidth" height="@TextAreaHeight">
             <div class="row" style="@StyleText">
@@ -9,13 +8,12 @@
                         @item.Key
                     </div>
                     <div class="@ClassRightText text-end">
-                        <b>@item.Value</b>
+                        <b>@item.Value</b> <sub>(@DoorId)</sub>
                     </div>
                 }
             </div>
         </foreignObject>
     </g>
-
     <line x1="@BaseLine.p1.px" y1="@BaseLine.p1.py" x2="@BaseLine.p2.px" y2="@BaseLine.p2.py" stroke="@ColorLine" stroke-width="@LineWidth" />
     <circle id="circleLine" cx="@CircleLine.cx" cy="@CircleLine.cy" r="@CircleLine.rad" stroke="@ColorLine" stroke-width="@LineWidth" fill="blue" />
     <defs>
@@ -31,7 +29,6 @@
     <circle id="circleCont" cx="@CircleImg.cx" cy="@CircleImg.cy" r="@CircleImg.rad" fill="url(#@($"contImg_{ObjId}"))" style="cursor: pointer;" @onclick="()=>execSelect()" />
     @if (ShowPlusMinus)
     {
-        @*<circle id="circleCont" cx="@CircleImg.cx" cy="@CircleImg.cy" r="@CircleImg.rad" fill="url(#@($"contImg_{ObjId}"))" />*@
         <g @onclick="()=>execPlus()" style="cursor: pointer;">
             <circle id="circleAdd" cx="@CirclePlus.cx" cy="@CirclePlus.cy" r="@CirclePlus.rad" stroke="@ColorLine" stroke-width="@LineWidth" fill="@ColorPlus" />
             <text x="@CirclePlus.cx" y="@CirclePlus.cy" text-anchor="middle" stroke="@ColorCircleTxt" fill="@ColorCircleTxt" stroke-width="2px" font-size="3em" font-weight="400" dy=".3em">+</text>
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index e86618a..a0ad21b 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-        <Version>0.9.2305.2416</Version>
+        <Version>0.9.2305.2417</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
   </PropertyGroup>
diff --git a/WebDoorCreator.UI/appsettings.json b/WebDoorCreator.UI/appsettings.json
index 5355d74..6de96b4 100644
--- a/WebDoorCreator.UI/appsettings.json
+++ b/WebDoorCreator.UI/appsettings.json
@@ -1,48 +1,49 @@
 {
-    "Logging": {
-        "LogLevel": {
-            "Default": "Information",
-            "Microsoft.AspNetCore": "Warning"
-        }
-    },
-    "AllowedHosts": "*",
-    "ConnectionStrings": {
-        "Identity.DB": "Server=SQL2016DEV;Database=WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;",
-        "Redis": "nkcredis.steamware.net:6379, DefaultDatabase=11, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG",
-        "WDC.DB": "Server=SQL2016DEV;Database=WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;"
-    },
-    "ExternalProviders": {
-        "MailKit": {
-            "SMTP": {
-                "Address": "smtp-mail.outlook.com",
-                "Port": "587",
-                "Account": "steamwarebot@outlook.it",
-                "Password": "siamoInViaNazionale93",
-                "SenderEmail": "steamwarebot@outlook.it",
-                "SenderName": "Steamware Email BOT"
-            }
-        }
-    },
-    "SetupOpt": {
-        "DisableIdentMigrate": true,
-        "DisableWDCMigrate": true
-    },
-    "RumtimeOpt": {
-        "MaxDayCalcCache": 7,
-        "BaseUrl": "/WDC/UI"
-    },
-    "ConfDDF": {
-        "Header": [
-            "#WEBDOORCREATOR",
-            "#Config: EgtCompoBase",
-            "#Door1",
-            ""
-        ],
-        "Footer": [
-            "",
-            "---"
-        ],
-        "VersNumber": "2",
-        "RemoveDoorOps": true
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
     }
+  },
+  "AllowedHosts": "*",
+  "ConnectionStrings": {
+    "Identity.DB": "Server=SQL2016DEV;Database=WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;",
+    "Redis": "nkcredis.steamware.net:6379, DefaultDatabase=11, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG",
+    "WDC.DB": "Server=SQL2016DEV;Database=WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;"
+  },
+  "ExternalProviders": {
+    "MailKit": {
+      "SMTP": {
+        "Address": "smtp-mail.outlook.com",
+        "Port": "587",
+        "Account": "steamwarebot@outlook.it",
+        "Password": "siamoInViaNazionale93",
+        "SenderEmail": "steamwarebot@outlook.it",
+        "SenderName": "Steamware Email BOT"
+      }
+    }
+  },
+  "SetupOpt": {
+    "DisableIdentMigrate": true,
+    "DisableWDCMigrate": true
+  },
+  "RumtimeOpt": {
+    "VetoRemoveProcessing": 5,
+    "MaxDayCalcCache": 7,
+    "BaseUrl": "/WDC/UI"
+  },
+  "ConfDDF": {
+    "Header": [
+      "#WEBDOORCREATOR",
+      "#Config: EgtCompoBase",
+      "#Door1",
+      ""
+    ],
+    "Footer": [
+      "",
+      "---"
+    ],
+    "VersNumber": "2",
+    "RemoveDoorOps": true
+  }
 }
\ No newline at end of file
