From fc0b725bc139487b1bdd5c19fa14c1cd9207314d Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Sat, 18 May 2024 05:14:31 +0200 Subject: [PATCH] refactroing, improvements, fixes, etc... --- TIAM.Database.Test/TIAM.Database.Test.csproj | 8 +-- TIAM.Database/DbLogWriter.cs | 1 - TIAM.Database/TIAM.Database.csproj | 6 +-- TIAM.Entities/TIAM.Entities.csproj | 2 +- .../TIAM.Services.Server.Tests.csproj | 2 +- .../TIAM.Services.Server.csproj | 2 +- TIAMMobileApp/MauiProgram.cs | 5 +- TIAMMobileApp/TIAMMobileApp.csproj | 11 ++-- TIAMSharedUI/Pages/AppLaunchComponent.razor | 3 +- .../Pages/Components/InputWizard.razor.cs | 7 ++- .../Pages/Components/SettingsBasic.razor.cs | 3 +- TIAMSharedUI/Pages/Formula1.razor | 3 +- TIAMSharedUI/Pages/Index.razor | 3 +- TIAMSharedUI/Pages/LaunchAdmin.razor | 3 +- TIAMSharedUI/Pages/Login.razor.cs | 3 +- TIAMSharedUI/Pages/TestPage.razor | 3 +- TIAMSharedUI/Pages/TransferPage.razor | 3 +- TIAMSharedUI/Pages/User/Media.razor | 3 +- .../Pages/User/MyServiceProviders.razor | 3 +- ...asterDetail_NestedGrid_DetailContent.razor | 3 +- .../User/SysAdmins/ManageTransfers.razor | 3 +- .../Pages/User/SysAdmins/ManageUsers.razor | 3 +- .../User/SysAdmins/TransferDestinations.razor | 3 +- ...Detail_NestedGrid_UserProductMapping.razor | 3 +- .../Shared/Components/Navbar.razor.cs | 3 +- TIAMSharedUI/Shared/SliderItemSelector.razor | 3 +- TIAMSharedUI/TIAMSharedUI.csproj | 4 +- TIAMWebApp/Client/Program.cs | 18 +++++-- .../Client/Services/PermissionService.cs | 5 +- .../Client/Services/UserDataServiceWeb.cs | 3 +- TIAMWebApp/Client/TIAMWebApp.Client.csproj | 7 ++- .../Server/Controllers/LoggerApiController.cs | 52 +++++++++++++++++++ .../PopulationStructureAPIController.cs | 4 +- .../Server/Controllers/UserAPIController.cs | 51 ++++++++---------- TIAMWebApp/Server/Program.cs | 37 +++++++++---- .../Services/LoggerToLoggerApiController.cs | 7 +++ TIAMWebApp/Server/TIAMWebApp.Server.csproj | 18 +++---- TIAMWebApp/Shared/Models/APIUrls.cs | 8 +-- .../Shared/Services/TransferDataService.cs | 5 +- .../TIAMWebApp.Shared.Application.csproj | 4 +- .../Shared/Utility/BrowserConsoleLogWriter.cs | 3 +- .../Shared/Utility/HttpClientLogItemWriter.cs | 10 ++-- TIAMWebApp/Shared/Utility/LoggerClient.cs | 5 +- 43 files changed, 224 insertions(+), 112 deletions(-) create mode 100644 TIAMWebApp/Server/Controllers/LoggerApiController.cs create mode 100644 TIAMWebApp/Server/Services/LoggerToLoggerApiController.cs diff --git a/TIAM.Database.Test/TIAM.Database.Test.csproj b/TIAM.Database.Test/TIAM.Database.Test.csproj index de3e1978..02c95ad9 100644 --- a/TIAM.Database.Test/TIAM.Database.Test.csproj +++ b/TIAM.Database.Test/TIAM.Database.Test.csproj @@ -22,10 +22,10 @@ - - - - + + + + diff --git a/TIAM.Database/DbLogWriter.cs b/TIAM.Database/DbLogWriter.cs index fa582351..89c4e4d2 100644 --- a/TIAM.Database/DbLogWriter.cs +++ b/TIAM.Database/DbLogWriter.cs @@ -2,7 +2,6 @@ using AyCode.Core.Loggers; using AyCode.Database; using AyCode.Database.DbContexts.Loggers; -using AyCode.Entities.LogItems; using AyCode.Entities.Server.LogItems; namespace TIAM.Database; diff --git a/TIAM.Database/TIAM.Database.csproj b/TIAM.Database/TIAM.Database.csproj index bbccf781..b10b1334 100644 --- a/TIAM.Database/TIAM.Database.csproj +++ b/TIAM.Database/TIAM.Database.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/TIAM.Entities/TIAM.Entities.csproj b/TIAM.Entities/TIAM.Entities.csproj index 4d3fb02e..afc0a8ca 100644 --- a/TIAM.Entities/TIAM.Entities.csproj +++ b/TIAM.Entities/TIAM.Entities.csproj @@ -32,7 +32,7 @@ - + diff --git a/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj b/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj index 21d29539..4c7133b3 100644 --- a/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj +++ b/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj @@ -26,7 +26,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/TIAM.Services.Server/TIAM.Services.Server.csproj b/TIAM.Services.Server/TIAM.Services.Server.csproj index 511ad036..3194a785 100644 --- a/TIAM.Services.Server/TIAM.Services.Server.csproj +++ b/TIAM.Services.Server/TIAM.Services.Server.csproj @@ -7,7 +7,7 @@ - + diff --git a/TIAMMobileApp/MauiProgram.cs b/TIAMMobileApp/MauiProgram.cs index c442c2f9..a371fa65 100644 --- a/TIAMMobileApp/MauiProgram.cs +++ b/TIAMMobileApp/MauiProgram.cs @@ -8,6 +8,7 @@ using TIAMWebApp.Shared.Application.Utility; using TIAMWebApp.Shared.Application.Services; using BlazorAnimation; using AyCode.Core.Loggers; +using AyCode.Services.Loggers; namespace TIAMMobileApp { @@ -47,7 +48,9 @@ namespace TIAMMobileApp builder.Services.AddScoped(); builder.Services.AddScoped(); - builder.Services.AddScoped(); + //builder.Services.AddScoped(); + builder.Services.AddSingleton(); + builder.Services.AddSingleton(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/TIAMMobileApp/TIAMMobileApp.csproj b/TIAMMobileApp/TIAMMobileApp.csproj index 81be8f98..cb7919cd 100644 --- a/TIAMMobileApp/TIAMMobileApp.csproj +++ b/TIAMMobileApp/TIAMMobileApp.csproj @@ -62,6 +62,8 @@ + + @@ -80,18 +82,21 @@ ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.dll + + ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Services.dll + - + - + - + diff --git a/TIAMSharedUI/Pages/AppLaunchComponent.razor b/TIAMSharedUI/Pages/AppLaunchComponent.razor index ccb7aa7a..7907a499 100644 --- a/TIAMSharedUI/Pages/AppLaunchComponent.razor +++ b/TIAMSharedUI/Pages/AppLaunchComponent.razor @@ -9,10 +9,11 @@ @using System.Globalization; @using AyCode.Core.Enums @using AyCode.Core.Loggers +@using AyCode.Services.Loggers @using TIAM.Core.Loggers @inject NavigationManager NavManager @inject IJSRuntime JSRuntime -@inject IEnumerable LogWriters +@inject IEnumerable LogWriters @inject IUserDataService UserDataService @inject ISecureStorageHandler SecureStorageHandler @inject ISessionService sessionService; diff --git a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs index 161f6201..6a64fbe1 100644 --- a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs +++ b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs @@ -20,6 +20,7 @@ using System.Text.RegularExpressions; using AyCode.Core.Consts; using AyCode.Core.Loggers; using TIAM.Core.Loggers; +using AyCode.Services.Loggers; namespace TIAMSharedUI.Pages.Components @@ -27,7 +28,7 @@ namespace TIAMSharedUI.Pages.Components public partial class InputWizard : ComponentBase { [Inject] - public required IEnumerable LogWriters { get; set; } + public required IEnumerable LogWriters { get; set; } [Inject] IStringLocalizer localizer { get; set; } @@ -117,7 +118,9 @@ namespace TIAMSharedUI.Pages.Components { var _type = Data.GetType(); - _logger.Info("Hellooooo " + _type.AssemblyQualifiedName); + + //for (var i = 0; i < 1000; i++) + _logger.Info("Hellooooo " + _type.AssemblyQualifiedName); var propertyList = _type.GetProperties(); var _length = propertyList.Length - IgnoreReflection.Count; diff --git a/TIAMSharedUI/Pages/Components/SettingsBasic.razor.cs b/TIAMSharedUI/Pages/Components/SettingsBasic.razor.cs index 275d4770..cb31b53f 100644 --- a/TIAMSharedUI/Pages/Components/SettingsBasic.razor.cs +++ b/TIAMSharedUI/Pages/Components/SettingsBasic.razor.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using AyCode.Core.Loggers; +using AyCode.Services.Loggers; using TIAMSharedUI.Resources; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models; @@ -29,7 +30,7 @@ namespace TIAMSharedUI.Pages.Components [Inject] public NavigationManager navigationManager { get; set; } [Inject] - public IAcLogWriterBase BrowserConsoleLogWriter { get; set; } + public IAcLogWriterClientBase BrowserConsoleLogWriter { get; set; } [Inject] public IComponentUpdateService componentUpdateService { get; set; } diff --git a/TIAMSharedUI/Pages/Formula1.razor b/TIAMSharedUI/Pages/Formula1.razor index b228cb74..b722911d 100644 --- a/TIAMSharedUI/Pages/Formula1.razor +++ b/TIAMSharedUI/Pages/Formula1.razor @@ -13,6 +13,7 @@ @using TIAMWebApp.Shared.Application.Utility; @using System.IdentityModel.Tokens.Jwt; @using AyCode.Core.Loggers +@using AyCode.Services.Loggers @using TIAMSharedUI.Pages.Components; @using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @@ -23,7 +24,7 @@ @inject ISessionService sessionService; @inject IStringLocalizer localizer; @inject NavigationManager navManager -@inject IAcLogWriterBase BrowserConsoleLogWriter +@inject IAcLogWriterClientBase BrowserConsoleLogWriter @inject ITransferDataService transferDataService diff --git a/TIAMSharedUI/Pages/Index.razor b/TIAMSharedUI/Pages/Index.razor index 3a558d6b..29c53084 100644 --- a/TIAMSharedUI/Pages/Index.razor +++ b/TIAMSharedUI/Pages/Index.razor @@ -10,6 +10,7 @@ @using TIAMWebApp.Shared.Application.Utility; @using System.IdentityModel.Tokens.Jwt; @using AyCode.Core.Loggers +@using AyCode.Services.Loggers @using TIAMSharedUI.Pages.Components; @using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @@ -20,7 +21,7 @@ @inject ISessionService sessionService; @inject IStringLocalizer localizer; @inject NavigationManager navManager -@inject IAcLogWriterBase BrowserConsoleLogWriter +@inject IAcLogWriterClientBase BrowserConsoleLogWriter @inject IWizardProcessor WizardProcessor Index diff --git a/TIAMSharedUI/Pages/LaunchAdmin.razor b/TIAMSharedUI/Pages/LaunchAdmin.razor index bb53aa56..493685dd 100644 --- a/TIAMSharedUI/Pages/LaunchAdmin.razor +++ b/TIAMSharedUI/Pages/LaunchAdmin.razor @@ -7,13 +7,14 @@ @using AyCode.Core.Loggers @using TIAMWebApp.Shared.Application.Models.ClientSide @using AyCode.Interfaces.StorageHandlers; +@using AyCode.Services.Loggers @using TIAM.Core.Loggers @inject NavigationManager NavManager @inject IJSRuntime JSRuntime @inject IUserDataService UserDataService @inject ISecureStorageHandler SecureStorageHandler @inject HttpClient http; -@inject IEnumerable LogWriters +@inject IEnumerable LogWriters

AppLaunch

Loading.... diff --git a/TIAMSharedUI/Pages/Login.razor.cs b/TIAMSharedUI/Pages/Login.razor.cs index 9ee4095b..ce55e3b9 100644 --- a/TIAMSharedUI/Pages/Login.razor.cs +++ b/TIAMSharedUI/Pages/Login.razor.cs @@ -13,6 +13,7 @@ using System.Resources; using Microsoft.Extensions.Localization; using AyCode.Blazor.Components; using AyCode.Core.Loggers; +using AyCode.Services.Loggers; using Azure.Core; namespace TIAMSharedUI.Pages @@ -25,7 +26,7 @@ namespace TIAMSharedUI.Pages [Inject] public IUserDataService userDataService { get; set; } [Inject] - public IAcLogWriterBase BrowserConsoleLogWriter { get; set; } + public IAcLogWriterClientBase BrowserConsoleLogWriter { get; set; } [Inject] public IJSRuntime jsRuntime { get; set; } [Inject] diff --git a/TIAMSharedUI/Pages/TestPage.razor b/TIAMSharedUI/Pages/TestPage.razor index 811ed9b5..4daedbe0 100644 --- a/TIAMSharedUI/Pages/TestPage.razor +++ b/TIAMSharedUI/Pages/TestPage.razor @@ -5,7 +5,8 @@ @using TIAMWebApp.Shared.Application.Utility @using TIAM.Entities.Transfers @using AyCode.Core.Loggers -@inject IAcLogWriterBase BrowserConsoleLogWriter +@using AyCode.Services.Loggers +@inject IAcLogWriterClientBase BrowserConsoleLogWriter @inject IWizardProcessor WizardProcessor

TestPage

diff --git a/TIAMSharedUI/Pages/TransferPage.razor b/TIAMSharedUI/Pages/TransferPage.razor index a254a629..33a1d9cf 100644 --- a/TIAMSharedUI/Pages/TransferPage.razor +++ b/TIAMSharedUI/Pages/TransferPage.razor @@ -5,8 +5,9 @@ @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @using TIAMWebApp.Shared.Application.Utility @using AyCode.Core.Loggers +@using AyCode.Services.Loggers @inject NavigationManager navManager -@inject IAcLogWriterBase BrowserConsoleLogWriter +@inject IAcLogWriterClientBase BrowserConsoleLogWriter @inject IWizardProcessor WizardProcessor Transfer diff --git a/TIAMSharedUI/Pages/User/Media.razor b/TIAMSharedUI/Pages/User/Media.razor index de58dc0d..40565375 100644 --- a/TIAMSharedUI/Pages/User/Media.razor +++ b/TIAMSharedUI/Pages/User/Media.razor @@ -37,6 +37,7 @@ @page "/user/media" @using System.Net.Http.Headers @using AyCode.Core.Loggers +@using AyCode.Services.Loggers @using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Models @@ -44,7 +45,7 @@ @layout AdminLayout @inject IJSRuntime JSRuntime; @inject IImageDataService imageDataService; -@inject IAcLogWriterBase BrowserConsoleLogWriter; +@inject IAcLogWriterClientBase BrowserConsoleLogWriter; @implements IAsyncDisposable

File Upload

diff --git a/TIAMSharedUI/Pages/User/MyServiceProviders.razor b/TIAMSharedUI/Pages/User/MyServiceProviders.razor index f4c3b6ff..ed1bdad9 100644 --- a/TIAMSharedUI/Pages/User/MyServiceProviders.razor +++ b/TIAMSharedUI/Pages/User/MyServiceProviders.razor @@ -6,8 +6,9 @@ @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @using TIAMWebApp.Shared.Application.Utility @using AyCode.Core.Loggers +@using AyCode.Services.Loggers @layout AdminLayout -@inject IAcLogWriterBase BrowserConsoleLogWriter +@inject IAcLogWriterClientBase BrowserConsoleLogWriter @inject IStringLocalizer localizer

Properties

diff --git a/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor b/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor index d0e93ed9..3f911d52 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor @@ -5,8 +5,9 @@ @using TIAMWebApp.Shared.Application.Utility @using TIAM.Core.Loggers @using AyCode.Core.Loggers +@using AyCode.Services.Loggers @inject IUserDataService NwindDataService -@inject IEnumerable LogWriters +@inject IEnumerable LogWriters
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 73c6d048..8812537b 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -15,9 +15,10 @@ @using TIAMWebApp.Shared.Application.Models.PageModels @using TIAMWebApp.Shared.Application.Utility @using AyCode.Core.Loggers +@using AyCode.Services.Loggers @using TIAM.Core.Loggers @layout AdminLayout -@inject IEnumerable LogWriters +@inject IEnumerable LogWriters @inject IStringLocalizer localizer @inject IWizardProcessor wizardProcessor @inject ITransferDataService transferDataService diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor index 15534389..ef9d3b2f 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor @@ -18,9 +18,10 @@ @using TIAMWebApp.Shared.Application.Models.PageModels @using TIAMWebApp.Shared.Application.Utility @using AyCode.Core.Loggers +@using AyCode.Services.Loggers @using TIAM.Core.Loggers @layout AdminLayout -@inject IEnumerable LogWriters +@inject IEnumerable LogWriters @inject IStringLocalizer localizer @inject ISessionService sessionService @inject IWizardProcessor wizardProcessor diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor index 688a9b5e..a7b9ab20 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor @@ -9,8 +9,9 @@ @using TIAMWebApp.Shared.Application.Models.ClientSide.Messages @using TIAMWebApp.Shared.Application.Utility @using AyCode.Core.Loggers +@using AyCode.Services.Loggers @layout AdminLayout -@inject IEnumerable LogWriters +@inject IEnumerable LogWriters @inject IStringLocalizer localizer Transfers diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_UserProductMapping.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_UserProductMapping.razor index 7c0e2331..f3521cb9 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_UserProductMapping.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_UserProductMapping.razor @@ -7,9 +7,10 @@ @using TIAMWebApp.Shared.Application.Utility @using TIAM.Core.Loggers @using AyCode.Core.Loggers +@using AyCode.Services.Loggers @inject IUserDataService NwindDataService @inject IServiceProviderDataService serviceProviderDataService -@inject IEnumerable LogWriters +@inject IEnumerable LogWriters
UserProductMapping diff --git a/TIAMSharedUI/Shared/Components/Navbar.razor.cs b/TIAMSharedUI/Shared/Components/Navbar.razor.cs index 8f78ef7f..7a454f29 100644 --- a/TIAMSharedUI/Shared/Components/Navbar.razor.cs +++ b/TIAMSharedUI/Shared/Components/Navbar.razor.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using AyCode.Core.Loggers; +using AyCode.Services.Loggers; using TIAMSharedUI.Resources; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Utility; @@ -30,7 +31,7 @@ namespace TIAMSharedUI.Shared.Components public IComponentUpdateService componentUpdateService { get; set; } [Inject] - public IAcLogWriterBase BrowserConsoleLogWriter { get; set; } + public IAcLogWriterClientBase BrowserConsoleLogWriter { get; set; } private bool collapseNavMenu = true; private bool myUser = false; diff --git a/TIAMSharedUI/Shared/SliderItemSelector.razor b/TIAMSharedUI/Shared/SliderItemSelector.razor index 37c8d481..0adb753e 100644 --- a/TIAMSharedUI/Shared/SliderItemSelector.razor +++ b/TIAMSharedUI/Shared/SliderItemSelector.razor @@ -1,9 +1,10 @@ @using System.Linq.Expressions @using AyCode.Core.Loggers +@using AyCode.Services.Loggers @using TIAM.Entities.Transfers @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Utility -@inject IAcLogWriterBase BrowserConsoleLogWriter +@inject IAcLogWriterClientBase BrowserConsoleLogWriter