From bff1753a649f29df1e75910d56f6c900c61f0329 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 13 Jan 2025 17:16:21 +0100
Subject: [PATCH] Fix condizione update sublicenze

---
 LiMan.Api/Controllers/ReleaseController.cs |  1 +
 LiMan.Api/Resources/ChangeLog.html         |  2 +-
 LiMan.Api/Resources/VersNum.txt            |  2 +-
 LiMan.Api/Resources/manifest.xml           |  2 +-
 LiMan.DB/Controllers/DbController.cs       | 38 ++++++++++++++++++++--
 LiMan.UI/LiMan.UI.csproj                   |  2 +-
 LiMan.UI/Resources/ChangeLog.html          |  2 +-
 LiMan.UI/Resources/VersNum.txt             |  2 +-
 LiMan.UI/Resources/manifest.xml            |  2 +-
 9 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/LiMan.Api/Controllers/ReleaseController.cs b/LiMan.Api/Controllers/ReleaseController.cs
index 88a2db7..ea08964 100644
--- a/LiMan.Api/Controllers/ReleaseController.cs
+++ b/LiMan.Api/Controllers/ReleaseController.cs
@@ -63,6 +63,7 @@ namespace LiMan.APi.Controllers
         public async Task<List<ReleaseDTO>> GetFilt(string id, string VersMin)
         {
             var result = await dataService.ReleaseGetByAppVers(id, VersMin);
+            Log.Warn($"Chiamato metodo legacy api/release/filt | id: {id} | vers: {VersMin}");
             await dataService.recordCall(id, id, $"GET:api/release/filt/{id}");
             return result;
         }
diff --git a/LiMan.Api/Resources/ChangeLog.html b/LiMan.Api/Resources/ChangeLog.html
index 1a3bffb..0c3991b 100644
--- a/LiMan.Api/Resources/ChangeLog.html
+++ b/LiMan.Api/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>License Manager</i>
-    <h4>Versione: 2.1.2501.1315</h4>
+    <h4>Versione: 2.1.2501.1316</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/LiMan.Api/Resources/VersNum.txt b/LiMan.Api/Resources/VersNum.txt
index e3831c9..87a5982 100644
--- a/LiMan.Api/Resources/VersNum.txt
+++ b/LiMan.Api/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2501.1315
+2.1.2501.1316
diff --git a/LiMan.Api/Resources/manifest.xml b/LiMan.Api/Resources/manifest.xml
index 3f6ac51..35ddafc 100644
--- a/LiMan.Api/Resources/manifest.xml
+++ b/LiMan.Api/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>2.1.2501.1315</version>
+  <version>2.1.2501.1316</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>
diff --git a/LiMan.DB/Controllers/DbController.cs b/LiMan.DB/Controllers/DbController.cs
index 6f4bd18..cef5ba0 100644
--- a/LiMan.DB/Controllers/DbController.cs
+++ b/LiMan.DB/Controllers/DbController.cs
@@ -6,6 +6,7 @@ using LiMan.DB.Migrations;
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
+using Newtonsoft.Json;
 using NLog;
 using Org.BouncyCastle.Asn1.Crmf;
 using System;
@@ -1426,13 +1427,13 @@ namespace LiMan.DB.Controllers
                                         .FirstOrDefault(x => x.Chiave == upRec.AppKey && x.CodImpiego == upRec.CodImp);
                         if (recIst != null)
                         {
-                            upRec.IdxSubLic = recIst.IdxSubLic;
-                            upRec.IdxLic = recIst.IdxLic;
+                            currRec.IdxSubLic = recIst.IdxSubLic;
+                            currRec.IdxLic = recIst.IdxLic;
                         }
                     }
                     // se trovo aggiorno...
                     currRec.DtCheck = upRec.DtCheck;
-                    currRec.IdxSubLic = upRec.IdxSubLic;
+                    //currRec.IdxSubLic = upRec.IdxSubLic;
                     currRec.MastKey = upRec.MastKey;
                     currRec.NumImp = upRec.NumImp;
                     currRec.VersNum = upRec.VersNum;
@@ -1562,6 +1563,17 @@ namespace LiMan.DB.Controllers
                                     .DbSetReleases
                                     .ToList();
 
+                // elenco subLic x verifica validità
+                var listSubLic = localDbCtx
+                                    .DbSetSubLicenze
+                                    .ToList();
+
+                // recupero list enroll x recuperare nomi PC...
+                var listEnroll = localDbCtx
+                                    .DbSetEnrollReq
+                                    .Where(x => x.IdxLic > 0)
+                                    .ToList();
+
                 // raggruppo x calcolare ultimo...
                 var lastRel = listAllVers
                                 .Where(i => i.IsReleased)
@@ -1572,6 +1584,8 @@ namespace LiMan.DB.Controllers
                                                     .First())
                                 .ToList();
 
+                string kMachName = "MachineName";
+
                 // aggiungo info cliente/installazione + vers corrente applicativi
                 foreach (var item in instRelList)
                 {
@@ -1581,6 +1595,24 @@ namespace LiMan.DB.Controllers
                         item.Cliente = recInst.CodInst;
                     }
 
+                    var recSubLic = listSubLic.FirstOrDefault(x => x.IdxSubLic == item.IdxSubLic);
+                    if (recSubLic != null)
+                    {
+                        // in questo caso controllo enroll x recuperare nome PC
+                        var recEnroll = listEnroll
+                                        .Where(x => x.IdxLic == item.IdxLic)
+                                        .FirstOrDefault(x => x.ReqPayload.Contains(recSubLic.CodImpiego));
+                        //var listCliEnroll = listEnroll.Where(x => x.IdxLic == item.IdxLic).ToList();
+                        //var recEnroll = listCliEnroll.FirstOrDefault(x => x.ReqPayload.Contains(recSubLic.CodImpiego));
+                        if (recEnroll != null && !string.IsNullOrEmpty(recEnroll.ReqPayload))
+                        {
+                            var dictPayload = JsonConvert.DeserializeObject<Dictionary<string, string>>(recEnroll.ReqPayload);
+                            if (dictPayload != null && dictPayload.ContainsKey(kMachName))
+                            {
+                                item.PcInst = dictPayload[kMachName];
+                            }
+                        }
+                    }
                     var recRel = lastRel.FirstOrDefault(x => x.CodApp == item.CodApp);
                     if (recRel != null)
                     {
diff --git a/LiMan.UI/LiMan.UI.csproj b/LiMan.UI/LiMan.UI.csproj
index 13aa410..ead1ba4 100644
--- a/LiMan.UI/LiMan.UI.csproj
+++ b/LiMan.UI/LiMan.UI.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <Version>2.1.2501.1315</Version>
+        <Version>2.1.2501.1316</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 1a3bffb..0c3991b 100644
--- a/LiMan.UI/Resources/ChangeLog.html
+++ b/LiMan.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>License Manager</i>
-    <h4>Versione: 2.1.2501.1315</h4>
+    <h4>Versione: 2.1.2501.1316</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/LiMan.UI/Resources/VersNum.txt b/LiMan.UI/Resources/VersNum.txt
index e3831c9..87a5982 100644
--- a/LiMan.UI/Resources/VersNum.txt
+++ b/LiMan.UI/Resources/VersNum.txt
@@ -1 +1 @@
-2.1.2501.1315
+2.1.2501.1316
diff --git a/LiMan.UI/Resources/manifest.xml b/LiMan.UI/Resources/manifest.xml
index 3f6ac51..35ddafc 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>2.1.2501.1315</version>
+  <version>2.1.2501.1316</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>
