From d1cdb62e64a14cbd96de002a16932d1fa751408d Mon Sep 17 00:00:00 2001 From: Loretta Date: Tue, 3 Dec 2024 10:34:40 +0100 Subject: [PATCH] remove logs; fixes; --- .../Components/AuctionAdminViewComponent.cs | 20 +++++---- .../Components/AuctionViewComponent.cs | 2 +- .../Controllers/AuctionController.cs | 2 +- .../Hubs/AuctionHub.cs | 41 +++++++++++-------- .../Hubs/SignalRMessageHandler.cs | 2 +- 5 files changed, 39 insertions(+), 28 deletions(-) diff --git a/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Components/AuctionAdminViewComponent.cs b/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Components/AuctionAdminViewComponent.cs index 2bc7e76..31b5062 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Components/AuctionAdminViewComponent.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Components/AuctionAdminViewComponent.cs @@ -70,7 +70,8 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Areas.Admin.Components { //await base.InvokeAsync(widgetZone, additionalData); - await _logger.InformationAsync($"Admin auction widget called from {widgetZone}!"); + //await _logger.InformationAsync($"AuctionAdminViewComponent.InvokeAsync(); Admin auction widget called from {widgetZone}!"); + if (!await _widgetPluginManager.IsPluginActiveAsync(AuctionDefaults.SystemName)) return Content(string.Empty); @@ -83,14 +84,19 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Areas.Admin.Components var productId = 0; if (!widgetZone.Equals(AdminWidgetZones.ProductDetailsButtons)) { - await _logger.InformationAsync($"Admin auction widget not in the right widgetzone {widgetZone}!"); + await _logger.InformationAsync($"AuctionAdminViewComponent.InvokeAsync(); Admin auction widget not in the right widgetzone {widgetZone}!"); return Content(string.Empty); } - var product = (additionalData as ProductModel); //ProductDetailsModel detailsModel = await _productModelFactory.PrepareProductDetailsModelAsync(product.Price); - productId = product.Id; + if (additionalData is not ProductModel productModel) + { + await _logger.ErrorAsync($"AuctionAdminViewComponent.InvokeAsync(); (productModel == null); widgetZone: {widgetZone};"); + return Content(string.Empty); + } + + productId = productModel.Id; var auctions = await _auctionService.GetAllAuctionsAsync() ?? new List(); @@ -98,12 +104,12 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Areas.Admin.Components ViewBag.Auctions = auctions; ProductAssignToAuctionViewModel viewModel = new ProductAssignToAuctionViewModel(); viewModel.ProductId = productId; - viewModel.StartingPrice = product.OldPrice; - viewModel.BidPrice = product.OldPrice; + viewModel.StartingPrice = productModel.OldPrice; + viewModel.BidPrice = productModel.OldPrice; //viewModel.InAuctions = await _auctionService.GetAllAuctionsAsync() viewModel.InAuctions = []; - await _logger.InformationAsync($"Admin auction widget called from {widgetZone}! II. "); + //await _logger.InformationAsync($"AuctionAdminViewComponent.InvokeAsync(); Admin auction widget called from {widgetZone}! II. "); return View("~/Plugins/Misc.AuctionPlugin/Areas/Admin/Views/AdminProductAuctionSettingsBox.cshtml", viewModel); } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionViewComponent.cs b/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionViewComponent.cs index aacbe72..9d3e18f 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionViewComponent.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionViewComponent.cs @@ -54,7 +54,7 @@ public class AuctionViewComponent : NopViewComponent /// public async Task InvokeAsync(string widgetZone, object additionalData) { - await _logger.InformationAsync("Auction widget called"); + //await _logger.InformationAsync("Auction widget called"); //ensure that a widget is active and enabled var customer = await _workContext.GetCurrentCustomerAsync(); diff --git a/Nop.Plugin.Misc.AuctionPlugin/Controllers/AuctionController.cs b/Nop.Plugin.Misc.AuctionPlugin/Controllers/AuctionController.cs index a22304c..59d1b62 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Controllers/AuctionController.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Controllers/AuctionController.cs @@ -48,7 +48,7 @@ public class AuctionController(AuctionService auctionService, ILogger logger, IP [HttpPost] public async Task RefreshAuctionWidget([FromBody] RefreshWidgetRequest request) { - await logger.InformationAsync($"Refresh auction widget called from {request.WidgetZone} with data of {request.ProductId}"); + //await logger.InformationAsync($"Refresh auction widget called from {request.WidgetZone} with data of {request.ProductId}"); var product = await productService.GetProductByIdAsync(request.ProductId); var detailsModel = await productModelFactory.PrepareProductDetailsModelAsync(product); diff --git a/Nop.Plugin.Misc.AuctionPlugin/Hubs/AuctionHub.cs b/Nop.Plugin.Misc.AuctionPlugin/Hubs/AuctionHub.cs index 14a2624..18df2ec 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Hubs/AuctionHub.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Hubs/AuctionHub.cs @@ -29,38 +29,43 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Hubs _signalRMessageHandler = signalRMessageHandler; } - public override async Task OnConnectedAsync() + public override async Task OnConnectedAsync() { - - //await _logger.InformationAsync($"Caller connected: id{_hubCallerContext.ConnectionId}"); - var userId = Context.ConnectionId; - await _logger.InformationAsync($"Caller connected with id: {userId}"); - var userName = Context.GetHttpContext().Request.Query["ConnectionId"]; - if (!string.IsNullOrEmpty(userName)) - { - await _logger.InformationAsync($"Caller connected with name: {userName}"); - } - await base.OnConnectedAsync(); + var connectionId = Context.ConnectionId; + //await _logger.InformationAsync($"AuctionHub.OnConnectedAsync(); Caller connected with id: {connectionId}"); + + var httpContext = Context.GetHttpContext(); + if (httpContext == null) + { + await _logger.WarningAsync($"AuctionHub.OnConnectedAsync(); (httpContext == null); connectionId: {connectionId}"); + } + else + { + var userName = httpContext.Request.Query["ConnectionId"]; + if (!string.IsNullOrEmpty(userName)) + { + await _logger.InformationAsync($"AuctionHub.OnConnectedAsync(); Caller connected with name: {userName}; connectionId: {connectionId}"); + } + } + + await base.OnConnectedAsync(); } public async Task ReceiveRegularMessageFromClient(string message) { - await _logger.InformationAsync(message); - // Broadcast the message received from the client to all clients + //await _logger.InformationAsync($"AuctionHub.OnConnectedAsync(); message: {message}"); + Console.Write($"Received message: {message}"); await Clients.All.SendAsync("Send", message); - //await _signalRservice.TestHub(); } public async Task ReceiveMessageFromClient(MessageWrapper message) { // Log the message type and data - await _logger.InformationAsync($"Received message of type: {message.MessageType}"); + //await _logger.InformationAsync($"AuctionHub.OnConnectedAsync(); Received message of type: {message.MessageType}"); + await _signalRMessageHandler.HandleMessage(message); - } - } - } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Hubs/SignalRMessageHandler.cs b/Nop.Plugin.Misc.AuctionPlugin/Hubs/SignalRMessageHandler.cs index abd9d27..82fbe49 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Hubs/SignalRMessageHandler.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Hubs/SignalRMessageHandler.cs @@ -204,7 +204,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Hubs await auctionService.UpdateProductToAuctionMappingAsync(productToAuction); } - var bidsCount = await auctionService.GetBidsCountByProductToAuctionIdAsync(productToAuction.Id); + var bidsCount = productToAuction.BidsCount;//await auctionService.GetBidsCountByProductToAuctionIdAsync(productToAuction.Id); var productToauctionChangedNotification = new MessageWrapper { MessageType = nameof(ProductToAuctionStatusNotification),