diff --git a/TIAM.Database/DbLogWriter.cs b/TIAM.Database/DbLogWriter.cs index 23185e6a..fa582351 100644 --- a/TIAM.Database/DbLogWriter.cs +++ b/TIAM.Database/DbLogWriter.cs @@ -3,6 +3,7 @@ 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/TIAMSharedUI/Pages/Components/InputWizard.razor.cs b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs index 19a6f60f..161f6201 100644 --- a/TIAMSharedUI/Pages/Components/InputWizard.razor.cs +++ b/TIAMSharedUI/Pages/Components/InputWizard.razor.cs @@ -143,7 +143,7 @@ namespace TIAMSharedUI.Pages.Components if (!FormSteps.ContainsKey(k)) { _stepID = Guid.NewGuid(); - _logger.Info($"Adding step {k}, {_stepID}, for {property.Name}"); + _logger.Detail($"Adding step {k}, {_stepID}, for {property.Name}"); FormSteps.Add(k, _stepID); } else @@ -156,7 +156,7 @@ namespace TIAMSharedUI.Pages.Components //the following line creates a lambda expression that returns the value of the property var lambda = Expression.Lambda(typeof(Func<>).MakeGenericType(property.PropertyType), access); - _logger.Info(lambda.ToString()); + _logger.Detail(lambda.ToString()); layoutItemBuilder.OpenElement(i++, "div");//open div layoutItemBuilder.AddAttribute(i++, "id", _stepID.ToString()); @@ -169,7 +169,7 @@ namespace TIAMSharedUI.Pages.Components else { //this input should be focused, so we set a flag - _logger.Info($"Setting focus to {property.Name}"); + _logger.Detail($"Setting focus to {property.Name}"); } @@ -190,7 +190,7 @@ namespace TIAMSharedUI.Pages.Components case DataType.Text: { editor.OpenComponent(j++); - _logger.Info($"{property.Name}, {property.PropertyType}"); + _logger.Detail($"{property.Name}, {property.PropertyType}"); editor.AddAttribute(j++, "Text", property.GetValue(Data)); editor.AddAttribute(j++, "TextExpression", lambda); editor.AddAttribute(j++, "CssClass", "form-field"); @@ -365,9 +365,9 @@ namespace TIAMSharedUI.Pages.Components //editor.AddAttribute(j++, "TExpression", lambda); editor.AddAttribute(j++, "OnSliderChanged", EventCallback.Factory.Create(this, result => { - _logger.Info($"Slider changed to {result}"); + _logger.Detail($"Slider changed to {result}"); property.SetValue(Data, result); - _logger.Info($"bleh: {property.Name} = {property.GetValue(Data)}"); + _logger.Detail($"bleh: {property.Name} = {property.GetValue(Data)}"); StateHasChanged(); // Add this line to refresh the UI })); @@ -381,7 +381,7 @@ namespace TIAMSharedUI.Pages.Components editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); - _logger.Info($"bleh: {property.Name} = {property.GetValue(Data)}"); + _logger.Detail($"bleh: {property.Name} = {property.GetValue(Data)}"); })); editor.CloseComponent(); @@ -394,7 +394,7 @@ namespace TIAMSharedUI.Pages.Components editor.AddAttribute(j++, "NullText", "Please tell us your name."); editor.AddAttribute(j++, "FirstNameChanged", EventCallback.Factory.Create(this, result => { - _logger.Info($"FirstName changed to {result}"); + _logger.Detail($"FirstName changed to {result}"); //find property with name FirstName PropertyInfo firstNameProperty = propertyList.FirstOrDefault(p => p.Name == "FirstName"); @@ -413,7 +413,7 @@ namespace TIAMSharedUI.Pages.Components editor.AddAttribute(j++, "LastNameChanged", EventCallback.Factory.Create(this, result => { - _logger.Info($"LastName changed to {result}"); + _logger.Detail($"LastName changed to {result}"); //find property with name FirstName PropertyInfo firstNameProperty = propertyList.FirstOrDefault(p => p.Name == "FirstName"); @@ -428,7 +428,7 @@ namespace TIAMSharedUI.Pages.Components string fullName = $"{firstName} {lastName}"; property.SetValue(Data, fullName); } - _logger.Info($"bleh: {property.Name} = {property.GetValue(Data)}"); + _logger.Detail($"bleh: {property.Name} = {property.GetValue(Data)}"); StateHasChanged(); // Add this line to refresh the UI })); @@ -442,7 +442,7 @@ namespace TIAMSharedUI.Pages.Components editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); - _logger.Info($"bleh: {property.Name} = {property.GetValue(Data)}"); + _logger.Detail($"bleh: {property.Name} = {property.GetValue(Data)}"); })); editor.CloseComponent(); @@ -508,7 +508,7 @@ namespace TIAMSharedUI.Pages.Components layoutItemBuilder.CloseElement(); - _logger.Info($"loop {k}, length: {_length}, formSteps: {FormSteps.Count} "); + _logger.Detail($"loop {k}, length: {_length}, formSteps: {FormSteps.Count} "); k++; } @@ -517,7 +517,7 @@ namespace TIAMSharedUI.Pages.Components layoutItemBuilder.AddAttribute(i++, "CssClass", "full-width justify-content-center"); layoutItemBuilder.AddAttribute(i++, "Template", (RenderFragment)((context) => ((editor) => { - _logger.Info($"Submit button {CurrentStep}, {FormSteps.Count}"); + _logger.Detail($"Submit button {CurrentStep}, {FormSteps.Count}"); editor.OpenElement(i++, "button"); editor.AddAttribute(i++, "type", "submit"); diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs index 0978a602..a58d552c 100644 --- a/TIAMWebApp/Server/Controllers/UserAPIController.cs +++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs @@ -14,6 +14,7 @@ using TIAM.Database.DataLayers.Admins; using AyCode.Core.Enums; using AyCode.Core.Server.Loggers; using AyCode.Entities.LogItems; +using AyCode.Entities.Server.LogItems; using TIAM.Database; using TIAM.Entities.Profiles; using TIAM.Entities.Addresses; @@ -21,6 +22,7 @@ using TIAM.Services.Server.Logins; using TIAMWebApp.Shared.Application.Utility; using ILogger = TIAM.Core.Loggers.ILogger; using LogLevel = AyCode.Core.Loggers.LogLevel; +using TIAM.Core.Loggers; namespace TIAMWebApp.Server.Controllers { @@ -68,11 +70,13 @@ namespace TIAMWebApp.Server.Controllers _logger.Error("AddLogItem; LogItem == null"); //_logger.Writer().Detail(""); - //return BadRequest(); + return; } - _logger.Info(logItem.Text, logItem.CategoryName, logItem.CallerName); - //return Ok(); + //logItem.LogHeaderId = ??? + + _logger.Writer()?.Write(logItem.AppType, logItem.LogLevel, logItem.Text, logItem.CallerName, logItem.CategoryName, logItem.ErrorType, logItem.Exception); + _logger.Writer().WriteLogItemAsync(logItem); } diff --git a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj index 2f2061ad..9774fa78 100644 --- a/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj +++ b/TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj @@ -32,7 +32,6 @@ - @@ -48,15 +47,9 @@ ..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll - - ..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.Server.dll - ..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll - - ..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.Server.dll - ..\..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.dll diff --git a/TIAMWebApp/Shared/Utility/HttpClientLogItemWriter.cs b/TIAMWebApp/Shared/Utility/HttpClientLogItemWriter.cs index d3492b87..840f2ea1 100644 --- a/TIAMWebApp/Shared/Utility/HttpClientLogItemWriter.cs +++ b/TIAMWebApp/Shared/Utility/HttpClientLogItemWriter.cs @@ -8,18 +8,15 @@ using System.Net.Http.Json; namespace TIAMWebApp.Shared.Application.Utility; -public class HttpClientLogItemWriter : AcHttpClientLogItemWriter +public class HttpClientLogItemWriter : AcHttpClientLogItemWriter { public HttpClientLogItemWriter(HttpClient httpClient) : base(httpClient) { } - protected override void WriteLogItem(AcLogItem logItem, Action? callback = null) + protected override void WriteLogItemCallback(AcLogItemClient logItem) { - base.WriteLogItem(logItem, () => - { - var url = $"{Setting.ApiBaseUrl}/{APIUrls.Logger}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.Logger}"; - _httpClient.PostAsJsonAsync(url, logItem); - }); + _httpClient.PostAsJsonAsync(url, logItem); } } \ No newline at end of file