diff --git a/EgwCoreLib.Lux.Data/DataServiceCollectionExtensions.cs b/EgwCoreLib.Lux.Data/DataServiceCollectionExtensions.cs index 8722207..f84c28c 100644 --- a/EgwCoreLib.Lux.Data/DataServiceCollectionExtensions.cs +++ b/EgwCoreLib.Lux.Data/DataServiceCollectionExtensions.cs @@ -9,6 +9,7 @@ using EgwCoreLib.Lux.Data.Repository.Utils; using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Config; using EgwCoreLib.Lux.Data.Services.Cost; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Items; using EgwCoreLib.Lux.Data.Services.Job; using EgwCoreLib.Lux.Data.Services.Production; @@ -99,6 +100,7 @@ namespace EgwCoreLib.Lux.Data // aggiunta servizi finali Singleton... //services.TryAddSingleton(); + services.AddSingleton(); return services; diff --git a/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj b/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj index fed9128..860c7ff 100644 --- a/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj +++ b/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj @@ -54,6 +54,7 @@ + diff --git a/EgwCoreLib.Lux.Data/Services/IImageCacheService.cs b/EgwCoreLib.Lux.Data/Services/General/IImageCacheService.cs similarity index 99% rename from EgwCoreLib.Lux.Data/Services/IImageCacheService.cs rename to EgwCoreLib.Lux.Data/Services/General/IImageCacheService.cs index 5445fd8..bb1e6ce 100644 --- a/EgwCoreLib.Lux.Data/Services/IImageCacheService.cs +++ b/EgwCoreLib.Lux.Data/Services/General/IImageCacheService.cs @@ -1,7 +1,7 @@ using EgwMultiEngineManager.Data; using StackExchange.Redis; -namespace EgwCoreLib.Lux.Data.Services +namespace EgwCoreLib.Lux.Data.Services.General { /// /// Interfaccia per ImageCacheService - caching e publishing immagini via Redis diff --git a/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs b/EgwCoreLib.Lux.Data/Services/General/ImageCacheService.cs similarity index 99% rename from EgwCoreLib.Lux.Data/Services/ImageCacheService.cs rename to EgwCoreLib.Lux.Data/Services/General/ImageCacheService.cs index a6f0b43..e05f8c1 100644 --- a/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs +++ b/EgwCoreLib.Lux.Data/Services/General/ImageCacheService.cs @@ -5,7 +5,7 @@ using NLog; using RestSharp; using StackExchange.Redis; -namespace EgwCoreLib.Lux.Data.Services +namespace EgwCoreLib.Lux.Data.Services.General { public class ImageCacheService : IImageCacheService { diff --git a/Lux.API/Controllers/FileController.cs b/Lux.API/Controllers/FileController.cs index b463360..379ad7c 100644 --- a/Lux.API/Controllers/FileController.cs +++ b/Lux.API/Controllers/FileController.cs @@ -1,4 +1,5 @@ using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Sales; using EgwMultiEngineManager.Data; using Microsoft.AspNetCore.Mvc; diff --git a/Lux.API/Controllers/GenericController.cs b/Lux.API/Controllers/GenericController.cs index eeb917e..8c213aa 100644 --- a/Lux.API/Controllers/GenericController.cs +++ b/Lux.API/Controllers/GenericController.cs @@ -1,6 +1,7 @@ using Egw.Window.Data; using EgwCoreLib.Lux.Core.RestPayload; using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwMultiEngineManager.Data; using Microsoft.AspNetCore.Mvc; using NLog; diff --git a/Lux.API/Controllers/ImageController.cs b/Lux.API/Controllers/ImageController.cs index 3fc2b8f..6cafcc2 100644 --- a/Lux.API/Controllers/ImageController.cs +++ b/Lux.API/Controllers/ImageController.cs @@ -1,4 +1,4 @@ -using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwMultiEngineManager.Data; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.StaticFiles; diff --git a/Lux.API/Controllers/WindowController.cs b/Lux.API/Controllers/WindowController.cs index 9eaff56..dcf321a 100644 --- a/Lux.API/Controllers/WindowController.cs +++ b/Lux.API/Controllers/WindowController.cs @@ -1,5 +1,6 @@ using EgwCoreLib.Lux.Data.DbModel.Config; using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwMultiEngineManager.Data; using Microsoft.AspNetCore.Mvc; using NLog; diff --git a/Lux.API/Program.cs b/Lux.API/Program.cs index 27f7453..04f3936 100644 --- a/Lux.API/Program.cs +++ b/Lux.API/Program.cs @@ -157,7 +157,6 @@ builder.Services.AddDbContextFactory(options => builder.Services.AddLuxData(connectionString); // servizi Singleton (no DB) -builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); diff --git a/Lux.API/Services/ExternalMessageProcessor.cs b/Lux.API/Services/ExternalMessageProcessor.cs index d25a4a5..6bdef13 100644 --- a/Lux.API/Services/ExternalMessageProcessor.cs +++ b/Lux.API/Services/ExternalMessageProcessor.cs @@ -1,8 +1,7 @@ using EgwCoreLib.Lux.Core.RestPayload; -using EgwCoreLib.Lux.Data; using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwMultiEngineManager.Data; -using Microsoft.EntityFrameworkCore.Query; using Newtonsoft.Json; using NLog; using StackExchange.Redis; diff --git a/Lux.UI/Components/Compo/FileMan/BtlPreview.razor.cs b/Lux.UI/Components/Compo/FileMan/BtlPreview.razor.cs index 28366ff..8bb4255 100644 --- a/Lux.UI/Components/Compo/FileMan/BtlPreview.razor.cs +++ b/Lux.UI/Components/Compo/FileMan/BtlPreview.razor.cs @@ -1,6 +1,7 @@ using EgwCoreLib.Lux.Core.RestPayload; using EgwCoreLib.Lux.Data.DbModel.Sales; using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Sales; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Forms; diff --git a/Lux.UI/Components/Compo/Item/SellingItemMan.razor.cs b/Lux.UI/Components/Compo/Item/SellingItemMan.razor.cs index ebcee08..dcbfb47 100644 --- a/Lux.UI/Components/Compo/Item/SellingItemMan.razor.cs +++ b/Lux.UI/Components/Compo/Item/SellingItemMan.razor.cs @@ -1,6 +1,7 @@ using EgwCoreLib.Lux.Core; using EgwCoreLib.Lux.Data.DbModel.Items; using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Items; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; diff --git a/Lux.UI/Components/Compo/Offer/AddFromTemplate.razor.cs b/Lux.UI/Components/Compo/Offer/AddFromTemplate.razor.cs index 8956691..0511391 100644 --- a/Lux.UI/Components/Compo/Offer/AddFromTemplate.razor.cs +++ b/Lux.UI/Components/Compo/Offer/AddFromTemplate.razor.cs @@ -1,6 +1,6 @@ using EgwCoreLib.Lux.Core; using EgwCoreLib.Lux.Data.DbModel.Catalog; -using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using Microsoft.AspNetCore.Components; namespace Lux.UI.Components.Compo.Offer diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor.cs b/Lux.UI/Components/Compo/OfferRowMan.razor.cs index 34aba0e..36be6b2 100644 --- a/Lux.UI/Components/Compo/OfferRowMan.razor.cs +++ b/Lux.UI/Components/Compo/OfferRowMan.razor.cs @@ -8,6 +8,7 @@ using EgwCoreLib.Lux.Data.DbModel.Utils; using EgwCoreLib.Lux.Data.Domains; using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Config; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Items; using EgwCoreLib.Lux.Data.Services.Sales; using EgwCoreLib.Lux.Data.Services.Utils; diff --git a/Lux.UI/Components/Compo/OrderRowMan.razor.cs b/Lux.UI/Components/Compo/OrderRowMan.razor.cs index 1cd0ea6..c362da0 100644 --- a/Lux.UI/Components/Compo/OrderRowMan.razor.cs +++ b/Lux.UI/Components/Compo/OrderRowMan.razor.cs @@ -9,6 +9,7 @@ using EgwCoreLib.Lux.Data.DbModel.Utils; using EgwCoreLib.Lux.Data.Domains; using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Config; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Items; using EgwCoreLib.Lux.Data.Services.Production; using EgwCoreLib.Lux.Data.Services.Sales; diff --git a/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs b/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs index ecf6803..4d40e9d 100644 --- a/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs +++ b/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs @@ -6,6 +6,7 @@ using EgwCoreLib.Lux.Data.DbModel.Items; using EgwCoreLib.Lux.Data.DbModel.Utils; using EgwCoreLib.Lux.Data.Services; using EgwCoreLib.Lux.Data.Services.Config; +using EgwCoreLib.Lux.Data.Services.General; using EgwCoreLib.Lux.Data.Services.Items; using EgwCoreLib.Lux.Data.Services.Utils; using Microsoft.AspNetCore.Components; diff --git a/Lux.UI/Components/Pages/Scratch.razor.cs b/Lux.UI/Components/Pages/Scratch.razor.cs index 5373e7d..87f61e7 100644 --- a/Lux.UI/Components/Pages/Scratch.razor.cs +++ b/Lux.UI/Components/Pages/Scratch.razor.cs @@ -1,6 +1,6 @@ using EgwCoreLib.Lux.Core; -using EgwCoreLib.Lux.Data; using EgwCoreLib.Lux.Data.Services; +using EgwCoreLib.Lux.Data.Services.General; using Microsoft.AspNetCore.Components; namespace Lux.UI.Components.Pages diff --git a/Lux.UI/Program.cs b/Lux.UI/Program.cs index 8f53699..d42a7b2 100644 --- a/Lux.UI/Program.cs +++ b/Lux.UI/Program.cs @@ -185,7 +185,6 @@ builder.Services.AddIdentityCore(options => options.SignIn.Requ builder.Services.AddSingleton, IdentityNoOpEmailSender>(); // Aggiunta servizi specifici -builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton();