Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

merge

This commit is contained in:
Adam 2024-05-27 19:26:23 +02:00
parent e3c26ccd35 5f7df7ad9e
commit 80546ed2fb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
TIAMWebApp/Server/Services/DevAdminSignalRhub.cs
View File

@ -11,7 +11,9 @@ using System.ServiceModel.Channels;
using TIAM.Entities.Transfers; using TIAM.Entities.Transfers;
using TIAM.Services; using TIAM.Services;
using TIAMWebApp.Server.Controllers; using TIAMWebApp.Server.Controllers;
using TIAM.Entities.ServiceProviders; using System.Text.Json.Nodes;
using System.Text.RegularExpressions;
using System.Web;
namespace TIAMWebApp.Server.Services; namespace TIAMWebApp.Server.Services;
@ -69,17 +71,15 @@ public class DevAdminSignalRHub(AdminDal adminDal, ServiceProviderAPIController
} }
else if (messageTag == SignalRTags.UpdateTransferAsync) else if (messageTag == SignalRTags.UpdateTransferAsync)
{ {
var signalPostJsonDataMessage = message!.MessagePackTo<SignalPostJsonDataMessage>(); //var jsonPostData = message!.MessagePackTo<SignalPostJsonDataMessage>().PostData;
var transfer = signalPostJsonDataMessage.PostData.JsonTo<Transfer>()!; //_logger.DetailConditional($"PostData: [{jsonPostData}]");
//var transfer = jsonPostData.JsonTo<Transfer>()!;
var transfer = message!.MessagePackTo<SignalPostJsonDataMessage>().PostData.JsonTo<Transfer>()!;
await transferDataAPIController.UpdateTransfer(transfer); await transferDataAPIController.UpdateTransfer(transfer);
await ResponseToCaller(messageTag, new SignalResponseMessage<string>(SignalResponseStatus.Success, transfer.ToJson()), requestId); await ResponseToCaller(messageTag, new SignalResponseMessage<string>(SignalResponseStatus.Success, transfer.ToJson()), requestId);
} }
else if (messageTag == SignalRTags.GetCompaniesAsync)
{
await ResponseToCaller(messageTag, new SignalResponseMessage<string>(SignalResponseStatus.Success, await serviceProviderAPIController.GetServiceProviders()), requestId);
}
return; return;
} }
catch (Exception ex) catch (Exception ex)

4
TIAMWebApp/Shared/Services/AcSignalRClientBase.cs
View File

@ -130,7 +130,7 @@ namespace TIAMWebApp.Shared.Application.Services
{ {
if (responseMessage.Status == SignalResponseStatus.Error || responseMessage.ResponseData == null) if (responseMessage.Status == SignalResponseStatus.Error || responseMessage.ResponseData == null)
{ {
Logger.Error($"Client SendMessageToServerAsync<TResponseData> response error; await; tag: {messageTag}; Status: {responseMessage.Status}"); Logger.Error($"Client SendMessageToServerAsync<TResponseData> response error; await; tag: {messageTag}; Status: {responseMessage.Status}; requestId: {requestId};");
return default; return default;
} }
@ -161,7 +161,7 @@ namespace TIAMWebApp.Shared.Application.Services
{ {
responseData = string.IsNullOrEmpty(responseMessage.ResponseData) ? default : responseMessage.ResponseData.JsonTo<TResponseData?>(); responseData = string.IsNullOrEmpty(responseMessage.ResponseData) ? default : responseMessage.ResponseData.JsonTo<TResponseData?>();
} }
else Logger.Error($"Client SendMessageToServerAsync<TResponseData> response error; callback; tag: {messageTag}; Status: {responseMessage.Status}"); else Logger.Error($"Client SendMessageToServerAsync<TResponseData> response error; callback; tag: {messageTag}; Status: {responseMessage.Status}; requestId: {requestId};");
responseCallback(new SignalResponseMessage<TResponseData?>(responseMessage.Status, responseData)); responseCallback(new SignalResponseMessage<TResponseData?>(responseMessage.Status, responseData));
}); });