From 74b640efe347455d5c843b8a6b4ace229cc813e3 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 14 Feb 2022 15:53:16 +0100
Subject: [PATCH 1/2] refresh DataService class

---
 LiMan.Transfer/Resources/ChangeLog.html |   2 +-
 LiMan.Transfer/Resources/VersNum.txt    |   2 +-
 LiMan.Transfer/Resources/manifest.xml   |   2 +-
 LiMan.UI/Data/LiManDataService.cs       | 202 ++++++++++++------------
 LiMan.UI/LiMan.UI.csproj                |   2 +-
 LiMan.UI/Resources/ChangeLog.html       |   2 +-
 LiMan.UI/Resources/VersNum.txt          |   2 +-
 LiMan.UI/Resources/manifest.xml         |   2 +-
 8 files changed, 104 insertions(+), 112 deletions(-)
diff --git a/LiMan.Transfer/Resources/ChangeLog.html b/LiMan.Transfer/Resources/ChangeLog.html
index c5c3cd9..9bf6dd8 100644
--- a/LiMan.Transfer/Resources/ChangeLog.html
+++ b/LiMan.Transfer/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>License Manager</i>
-    <h4>Versione: 1.1.2202.1114</h4>
+    <h4>Versione: 1.1.2202.1415</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/LiMan.Transfer/Resources/VersNum.txt b/LiMan.Transfer/Resources/VersNum.txt
index 95995d5..5f67f5f 100644
--- a/LiMan.Transfer/Resources/VersNum.txt
+++ b/LiMan.Transfer/Resources/VersNum.txt
@@ -1 +1 @@
-1.1.2202.1114
+1.1.2202.1415
diff --git a/LiMan.Transfer/Resources/manifest.xml b/LiMan.Transfer/Resources/manifest.xml
index 003aa03..f155c48 100644
--- a/LiMan.Transfer/Resources/manifest.xml
+++ b/LiMan.Transfer/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.1.2202.1114</version>
+  <version>1.1.2202.1415</version>
   <url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.Transfer.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/LiMan.UI/Data/LiManDataService.cs b/LiMan.UI/Data/LiManDataService.cs
index d8ea730..5d1b201 100644
--- a/LiMan.UI/Data/LiManDataService.cs
+++ b/LiMan.UI/Data/LiManDataService.cs
@@ -1,4 +1,8 @@
-﻿using Microsoft.Extensions.Caching.Distributed;
+﻿using Core;
+using Core.DTO;
+using LiMan.DB.DBModels;
+using Microsoft.AspNetCore.Identity.UI.Services;
+using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -7,13 +11,8 @@ using NLog;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity.UI.Services;
-using Core;
-using Core.DTO;
-using LiMan.DB.DBModels;
 
 namespace LiMan.UI.Data
 {
@@ -41,12 +40,6 @@ namespace LiMan.UI.Data
 
         #endregion Private Fields
 
-        #region Protected Fields
-
-        protected static string connStringBBM = "";
-
-        #endregion Protected Fields
-
         #region Public Fields
 
         public static GLS.Controllers.LicManController dbControllerGLS;
@@ -84,6 +77,16 @@ namespace LiMan.UI.Data
 
         #region Private Methods
 
+        /// <summary>
+        /// Hash Redis contenente i dati MP di una specifico TYPE (es StatusMacchina, StateMachineIngressi, ...)
+        /// </summary>
+        /// <param name="dataType"></param>
+        /// <returns></returns>
+        private static string mHash(string dataType)
+        {
+            return $"DATA:{dataType}";
+        }
+
         private DistributedCacheEntryOptions cacheOpt(bool fastCache)
         {
             var numSecAbsExp = fastCache ? chAbsExp : chAbsExp * 10;
@@ -105,17 +108,6 @@ namespace LiMan.UI.Data
 
         #region Internal Methods
 
-        /// <summary>
-        /// Effettua sblocco di una licenza impostando data veto a oggi
-        /// </summary>
-        /// <param name="idxSubLic"></param>
-        /// <returns></returns>
-        public async Task<bool> AttivazioneUnlock(int idxSubLic)
-        {
-            bool fatto = dbControllerNext.AttivazioniUnlock(idxSubLic);
-            await Task.Delay(1);
-            return fatto;
-        }
         /// <summary>
         /// Effettua sblocco di una licenza impostando data veto a oggi
         /// </summary>
@@ -132,16 +124,6 @@ namespace LiMan.UI.Data
 
         #region Public Methods
 
-        /// <summary>
-        /// Hash Redis contenente i dati MP di una specifico TYPE (es StatusMacchina, StateMachineIngressi, ...)
-        /// </summary>
-        /// <param name="dataType"></param>
-        /// <returns></returns>
-        public static string mHash(string dataType)
-        {
-            return $"DATA:{dataType}";
-        }
-
         public async Task<List<GLS.DatabaseModels.AnagApplicazioni>> ApplicazioniGLSGetAll()
         {
             List<GLS.DatabaseModels.AnagApplicazioni> dbResult = new List<GLS.DatabaseModels.AnagApplicazioni>();
@@ -224,6 +206,18 @@ namespace LiMan.UI.Data
             return await Task.FromResult(done);
         }
 
+        /// <summary>
+        /// Effettua sblocco di una licenza impostando data veto a oggi
+        /// </summary>
+        /// <param name="idxSubLic"></param>
+        /// <returns></returns>
+        public async Task<bool> AttivazioneUnlock(int idxSubLic)
+        {
+            bool fatto = dbControllerNext.AttivazioniUnlock(idxSubLic);
+            await Task.Delay(1);
+            return fatto;
+        }
+
         /// <summary>
         /// Recupera attivazioni data licenza
         /// </summary>
@@ -252,6 +246,23 @@ namespace LiMan.UI.Data
             dbControllerGLS.Dispose();
         }
 
+        /// <summary>
+        /// Elenco file registrati dato ticket id
+        /// </summary>
+        /// <param name="idxTicket">Identificativo del ticket</param>
+        /// <returns></returns>
+        public async Task<List<FileAttachModel>> FileGetFilt(int idxTicket)
+        {
+            List<FileAttachModel> dbResult = new List<FileAttachModel>();
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            dbResult = dbControllerNext.FileGetFilt(idxTicket);
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Trace($"Effettuata lettura da DB per FileGetFilt: {ts.TotalMilliseconds} ms");
+            return await Task.FromResult(dbResult);
+        }
+
         public async Task<List<GLS.DatabaseModels.AnagInstallazioni>> InstallazioniGLSGetAll()
         {
             List<GLS.DatabaseModels.AnagInstallazioni> dbResult = new List<GLS.DatabaseModels.AnagInstallazioni>();
@@ -540,24 +551,6 @@ namespace LiMan.UI.Data
             return await Task.FromResult(dbResult);
         }
 
-        /// <summary>
-        /// Elenco file registrati dato ticket id
-        /// </summary>
-        /// <param name="idxTicket">Identificativo del ticket</param>
-        /// <returns></returns>
-        public async Task<List<FileAttachModel>> FileGetFilt(int idxTicket)
-        {
-            List<FileAttachModel> dbResult = new List<FileAttachModel>();
-            Stopwatch stopWatch = new Stopwatch();
-            stopWatch.Start();
-            dbResult = dbControllerNext.FileGetFilt(idxTicket);
-            stopWatch.Stop();
-            TimeSpan ts = stopWatch.Elapsed;
-            Log.Trace($"Effettuata lettura da DB per FileGetFilt: {ts.TotalMilliseconds} ms");
-            return await Task.FromResult(dbResult);
-
-        }
-
         public async Task<bool> LicenzeNextUpdate(DB.DBModels.LicenzaModel currItem)
         {
             bool done = false;
@@ -594,6 +587,59 @@ namespace LiMan.UI.Data
             return answ;
         }
 
+        /// <summary>
+        /// Recupera elenco Tickets filtrato
+        /// </summary>
+        /// <param name="CurrFilter"></param>
+        /// <returns></returns>
+        public async Task<List<TicketDTO>> TicketsGetAll()
+        {
+            Stopwatch stopWatch = new Stopwatch();
+            List<TicketDTO> dbResult = new List<TicketDTO>();
+            stopWatch.Start();
+            dbResult = dbControllerNext.TicketGetAll(false, 1000);
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Trace($"Effettuata lettura da DB per TicketsGetAll: {ts.TotalMilliseconds} ms");
+            return await Task.FromResult(dbResult);
+        }
+
+        /// <summary>
+        /// Recupera elenco Tickets filtrato
+        /// </summary>
+        /// <param name="CurrFilter"></param>
+        /// <returns></returns>
+        public async Task<List<TicketDTO>> TicketsGetFilt(SelectNext CurrFilter)
+        {
+            Stopwatch stopWatch = new Stopwatch();
+            List<TicketDTO> dbResult = new List<TicketDTO>();
+            stopWatch.Start();
+            dbResult = dbControllerNext.TicketGetFiltAllLic(CurrFilter.OnlyActive, Core.TipologiaTicket.ND, CurrFilter.ApplicazioneSel, CurrFilter.InstallazioneSel, 1000);
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Trace($"Effettuata lettura da DB per TicketsGetFilt: {ts.TotalMilliseconds} ms");
+            return await Task.FromResult(dbResult);
+        }
+
+        /// <summary>
+        /// Ricerca ticket filtrati
+        /// </summary>
+        /// <param name="onlyOpen"></param>
+        /// <param name="CodApp"></param>
+        /// <param name="CodInst"></param>
+        /// <returns></returns>
+        public async Task<List<TicketDTO>> TicketsGetFilt(bool onlyOpen, string CodApp, string CodInst)
+        {
+            Stopwatch stopWatch = new Stopwatch();
+            List<TicketDTO> dbResult = new List<TicketDTO>();
+            stopWatch.Start();
+            dbResult = dbControllerNext.TicketGetFilt(onlyOpen, CodApp, CodInst);
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Trace($"Effettuata lettura da DB per TicketsGetFilt: {ts.TotalMilliseconds} ms");
+            return await Task.FromResult(dbResult);
+        }
+
         /// <summary>
         /// Aggiornamentos tato ticket
         /// </summary>
@@ -615,60 +661,6 @@ namespace LiMan.UI.Data
             return await Task.FromResult(fatto);
         }
 
-
-        /// <summary>
-        /// Recupera elenco Tickets filtrato
-        /// </summary>
-        /// <param name="CurrFilter"></param>
-        /// <returns></returns>
-        public async Task<List<TicketDTO>> TicketsGetFilt(SelectNext CurrFilter)
-        {
-            Stopwatch stopWatch = new Stopwatch();
-            List<TicketDTO> dbResult = new List<TicketDTO>();
-            stopWatch.Start();
-            dbResult = dbControllerNext.TicketGetFiltAllLic(CurrFilter.OnlyActive, Core.TipologiaTicket.ND, CurrFilter.ApplicazioneSel, CurrFilter.InstallazioneSel, 1000);
-            stopWatch.Stop();
-            TimeSpan ts = stopWatch.Elapsed;
-            Log.Trace($"Effettuata lettura da DB per TicketsGetFilt: {ts.TotalMilliseconds} ms");
-            return await Task.FromResult(dbResult);
-        }
-
-        /// <summary>
-        /// Recupera elenco Tickets filtrato
-        /// </summary>
-        /// <param name="CurrFilter"></param>
-        /// <returns></returns>
-        public async Task<List<TicketDTO>> TicketsGetAll()
-        {
-            Stopwatch stopWatch = new Stopwatch();
-            List<TicketDTO> dbResult = new List<TicketDTO>();
-            stopWatch.Start();
-            dbResult = dbControllerNext.TicketGetAll(false, 1000);
-            stopWatch.Stop();
-            TimeSpan ts = stopWatch.Elapsed;
-            Log.Trace($"Effettuata lettura da DB per TicketsGetAll: {ts.TotalMilliseconds} ms");
-            return await Task.FromResult(dbResult);
-        }
-
-       /// <summary>
-       /// Ricerca ticket filtrati
-       /// </summary>
-       /// <param name="onlyOpen"></param>
-       /// <param name="CodApp"></param>
-       /// <param name="CodInst"></param>
-       /// <returns></returns>
-        public async Task<List<TicketDTO>> TicketsGetFilt(bool onlyOpen,string CodApp, string CodInst)
-        {
-            Stopwatch stopWatch = new Stopwatch();
-            List<TicketDTO> dbResult = new List<TicketDTO>();
-            stopWatch.Start();
-            dbResult = dbControllerNext.TicketGetFilt(onlyOpen,CodApp,CodInst);
-            stopWatch.Stop();
-            TimeSpan ts = stopWatch.Elapsed;
-            Log.Trace($"Effettuata lettura da DB per TicketsGetFilt: {ts.TotalMilliseconds} ms");
-            return await Task.FromResult(dbResult);
-        }
-
         #endregion Public Methods
     }
 }
\ No newline at end of file
diff --git a/LiMan.UI/LiMan.UI.csproj b/LiMan.UI/LiMan.UI.csproj
index 5ef230a..36ae6f5 100644
--- a/LiMan.UI/LiMan.UI.csproj
+++ b/LiMan.UI/LiMan.UI.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>1.1.2202.1114</Version>
+        <Version>1.1.2202.1415</Version>
         <RootNamespace>LiMan.UI</RootNamespace>
         <AssemblyName>LiMan.UI</AssemblyName>
     </PropertyGroup>
diff --git a/LiMan.UI/Resources/ChangeLog.html b/LiMan.UI/Resources/ChangeLog.html
index 07ef8ff..5de798d 100644
--- a/LiMan.UI/Resources/ChangeLog.html
+++ b/LiMan.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>License Manager</i>
-    <h4>Versione: 1.1.2202.1114</h4>
+    <h4>Versione: 1.1.2202.1415</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/LiMan.UI/Resources/VersNum.txt b/LiMan.UI/Resources/VersNum.txt
index 95995d5..5f67f5f 100644
--- a/LiMan.UI/Resources/VersNum.txt
+++ b/LiMan.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.1.2202.1114
+1.1.2202.1415
diff --git a/LiMan.UI/Resources/manifest.xml b/LiMan.UI/Resources/manifest.xml
index 9f3569d..6bd3512 100644
--- a/LiMan.UI/Resources/manifest.xml
+++ b/LiMan.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.1.2202.1114</version>
+  <version>1.1.2202.1415</version>
   <url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 78da4b0922a87804a47c300ce4810085fec408b6 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 2 Mar 2022 19:00:25 +0100
Subject: [PATCH 2/2] Fix display swagger solo in development/staging

---
 LiMan.Api/Startup.cs                    | 21 +++++++++++----------
 LiMan.Transfer/Resources/ChangeLog.html |  2 +-
 LiMan.Transfer/Resources/VersNum.txt    |  2 +-
 LiMan.Transfer/Resources/manifest.xml   |  2 +-
 LiMan.UI/LiMan.UI.csproj                |  2 +-
 LiMan.UI/Resources/ChangeLog.html       |  2 +-
 LiMan.UI/Resources/VersNum.txt          |  2 +-
 LiMan.UI/Resources/manifest.xml         |  2 +-
 8 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/LiMan.Api/Startup.cs b/LiMan.Api/Startup.cs
index bdab739..8bd50b7 100644
--- a/LiMan.Api/Startup.cs
+++ b/LiMan.Api/Startup.cs
@@ -40,19 +40,20 @@ namespace LiMan.Serv
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
-            if (env.IsDevelopment())
+            if (env.IsDevelopment() || env.IsStaging())
             {
                 app.UseDeveloperExceptionPage();
-            }
 
-            app.UseSwagger(c =>
-            {
-                c.RouteTemplate = "/swagger/{documentName}/swagger.json";
-            });
-            app.UseSwaggerUI(c =>
-            {
-                c.SwaggerEndpoint("v1/swagger.json", "LiMan.Api");
-            });
+                // valido solo in sviluppo
+                app.UseSwagger(c =>
+                {
+                    c.RouteTemplate = "/swagger/{documentName}/swagger.json";
+                });
+                app.UseSwaggerUI(c =>
+                {
+                    c.SwaggerEndpoint("v1/swagger.json", "LiMan.Api");
+                });
+            }
 
             app.UseHttpsRedirection();
 
diff --git a/LiMan.Transfer/Resources/ChangeLog.html b/LiMan.Transfer/Resources/ChangeLog.html
index 9bf6dd8..9585749 100644
--- a/LiMan.Transfer/Resources/ChangeLog.html
+++ b/LiMan.Transfer/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>License Manager</i>
-    <h4>Versione: 1.1.2202.1415</h4>
+    <h4>Versione: 1.1.2203.0218</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/LiMan.Transfer/Resources/VersNum.txt b/LiMan.Transfer/Resources/VersNum.txt
index 5f67f5f..58cba93 100644
--- a/LiMan.Transfer/Resources/VersNum.txt
+++ b/LiMan.Transfer/Resources/VersNum.txt
@@ -1 +1 @@
-1.1.2202.1415
+1.1.2203.0218
diff --git a/LiMan.Transfer/Resources/manifest.xml b/LiMan.Transfer/Resources/manifest.xml
index f155c48..7b3f78e 100644
--- a/LiMan.Transfer/Resources/manifest.xml
+++ b/LiMan.Transfer/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.1.2202.1415</version>
+  <version>1.1.2203.0218</version>
   <url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.Transfer.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/LiMan.UI/LiMan.UI.csproj b/LiMan.UI/LiMan.UI.csproj
index 36ae6f5..4e06a52 100644
--- a/LiMan.UI/LiMan.UI.csproj
+++ b/LiMan.UI/LiMan.UI.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>1.1.2202.1415</Version>
+        <Version>1.1.2203.0218</Version>
         <RootNamespace>LiMan.UI</RootNamespace>
         <AssemblyName>LiMan.UI</AssemblyName>
     </PropertyGroup>
diff --git a/LiMan.UI/Resources/ChangeLog.html b/LiMan.UI/Resources/ChangeLog.html
index 5de798d..c9a6241 100644
--- a/LiMan.UI/Resources/ChangeLog.html
+++ b/LiMan.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>License Manager</i>
-    <h4>Versione: 1.1.2202.1415</h4>
+    <h4>Versione: 1.1.2203.0218</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/LiMan.UI/Resources/VersNum.txt b/LiMan.UI/Resources/VersNum.txt
index 5f67f5f..58cba93 100644
--- a/LiMan.UI/Resources/VersNum.txt
+++ b/LiMan.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.1.2202.1415
+1.1.2203.0218
diff --git a/LiMan.UI/Resources/manifest.xml b/LiMan.UI/Resources/manifest.xml
index 6bd3512..db19d56 100644
--- a/LiMan.UI/Resources/manifest.xml
+++ b/LiMan.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.1.2202.1415</version>
+  <version>1.1.2203.0218</version>
   <url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
