From 5f7df7ad9ebcf14a84f95a0a241a8dd52544d64b Mon Sep 17 00:00:00 2001 From: "jozsef.b@aycode.com" <9Rj@D}fVwBaN> Date: Mon, 27 May 2024 15:01:02 +0200 Subject: [PATCH] improvements, fixes, etc --- TIAMWebApp/Server/Services/DevAdminSignalRhub.cs | 11 ++++++++--- TIAMWebApp/Shared/Services/AcSignalRClientBase.cs | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs index f0139c6e..c7bb7926 100644 --- a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs +++ b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs @@ -11,6 +11,9 @@ using System.ServiceModel.Channels; using TIAM.Entities.Transfers; using TIAM.Services; using TIAMWebApp.Server.Controllers; +using System.Text.Json.Nodes; +using System.Text.RegularExpressions; +using System.Web; namespace TIAMWebApp.Server.Services; @@ -68,11 +71,13 @@ public class DevAdminSignalRHub(AdminDal adminDal, ServiceProviderAPIController } else if (messageTag == SignalRTags.UpdateTransferAsync) { - var signalPostJsonDataMessage = message!.MessagePackTo(); - var transfer = signalPostJsonDataMessage.PostData.JsonTo()!; + //var jsonPostData = message!.MessagePackTo().PostData; + //_logger.DetailConditional($"PostData: [{jsonPostData}]"); + //var transfer = jsonPostData.JsonTo()!; + + var transfer = message!.MessagePackTo().PostData.JsonTo()!; await transferDataAPIController.UpdateTransfer(transfer); - await ResponseToCaller(messageTag, new SignalResponseMessage(SignalResponseStatus.Success, transfer.ToJson()), requestId); } return; diff --git a/TIAMWebApp/Shared/Services/AcSignalRClientBase.cs b/TIAMWebApp/Shared/Services/AcSignalRClientBase.cs index 124c931a..cb5311d1 100644 --- a/TIAMWebApp/Shared/Services/AcSignalRClientBase.cs +++ b/TIAMWebApp/Shared/Services/AcSignalRClientBase.cs @@ -130,7 +130,7 @@ namespace TIAMWebApp.Shared.Application.Services { if (responseMessage.Status == SignalResponseStatus.Error || responseMessage.ResponseData == null) { - Logger.Error($"Client SendMessageToServerAsync response error; await; tag: {messageTag}; Status: {responseMessage.Status}"); + Logger.Error($"Client SendMessageToServerAsync response error; await; tag: {messageTag}; Status: {responseMessage.Status}; requestId: {requestId};"); return default; } @@ -161,7 +161,7 @@ namespace TIAMWebApp.Shared.Application.Services { responseData = string.IsNullOrEmpty(responseMessage.ResponseData) ? default : responseMessage.ResponseData.JsonTo(); } - else Logger.Error($"Client SendMessageToServerAsync response error; callback; tag: {messageTag}; Status: {responseMessage.Status}"); + else Logger.Error($"Client SendMessageToServerAsync response error; callback; tag: {messageTag}; Status: {responseMessage.Status}; requestId: {requestId};"); responseCallback(new SignalResponseMessage(responseMessage.Status, responseData)); });