diff --git a/TIAM.Services/AcSignalRTags.cs b/TIAM.Services/AcSignalRTags.cs deleted file mode 100644 index 6540239b..00000000 --- a/TIAM.Services/AcSignalRTags.cs +++ /dev/null @@ -1,10 +0,0 @@ -using AyCode.Services.SignalRs; - -namespace TIAM.Services; - -public class SignalRTags : AcSignalRTags -{ - public const int GetTransfersAsync = 5; - public const int GetPropertiesByOwnerIdAsync = 6; - public const int UpdateTransferAsync = 7; -} \ No newline at end of file diff --git a/TIAM.Services/SignalRTags.cs b/TIAM.Services/SignalRTags.cs new file mode 100644 index 00000000..fb09c24a --- /dev/null +++ b/TIAM.Services/SignalRTags.cs @@ -0,0 +1,15 @@ +using AyCode.Services.SignalRs; +using TIAM.Entities.Transfers; + +namespace TIAM.Services; + +public class SignalRTags : AcSignalRTags +{ + //[SignalMessageTag(null, typeof(SignalResponseMessage), null, null)] + public static readonly int GetTransfersAsync = 5; + + public static readonly int GetPropertiesByOwnerIdAsync = 6; + + [SignalMessageTag(typeof(SignalPostJsonDataMessage), typeof(SignalResponseMessage), null, null)] + public static readonly int UpdateTransferAsync = 7; +} \ No newline at end of file diff --git a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs index c7bb7926..6a1efa3f 100644 --- a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs +++ b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs @@ -71,11 +71,12 @@ public class DevAdminSignalRHub(AdminDal adminDal, ServiceProviderAPIController } else if (messageTag == SignalRTags.UpdateTransferAsync) { - //var jsonPostData = message!.MessagePackTo().PostData; + + //var jsonPostData = message!.MessagePackTo().PostDataJson; //_logger.DetailConditional($"PostData: [{jsonPostData}]"); //var transfer = jsonPostData.JsonTo()!; - var transfer = message!.MessagePackTo().PostData.JsonTo()!; + var transfer = message!.MessagePackTo>().PostData; await transferDataAPIController.UpdateTransfer(transfer); await ResponseToCaller(messageTag, new SignalResponseMessage(SignalResponseStatus.Success, transfer.ToJson()), requestId); diff --git a/TIAMWebApp/Shared/Services/AcSignalRClientBase.cs b/TIAMWebApp/Shared/Services/AcSignalRClientBase.cs index cb5311d1..588ac4b9 100644 --- a/TIAMWebApp/Shared/Services/AcSignalRClientBase.cs +++ b/TIAMWebApp/Shared/Services/AcSignalRClientBase.cs @@ -88,8 +88,9 @@ namespace TIAMWebApp.Shared.Application.Services Logger.DebugConditional($"Client SendMessageToServerAsync; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};"); await StartConnection(); - - HubConnection.SendAsync(nameof(IAcSignalRHubClient.OnReceiveMessage), messageTag, message?.ToMessagePack(ContractlessStandardResolver.Options), requestId).Forget(); + + var msgp = message?.ToMessagePack(ContractlessStandardResolver.Options); + HubConnection.SendAsync(nameof(IAcSignalRHubClient.OnReceiveMessage), messageTag, msgp, requestId).Forget(); } #region CRUD @@ -104,9 +105,9 @@ namespace TIAMWebApp.Shared.Application.Services => SendMessageToServerAsync(messageTag, null, responseCallback); public virtual Task UpdateAsync(int messageTag, TPostData postData) where TPostData : class - => SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage(postData), AcDomain.NextUniqueInt32); - public virtual Task UpdateAsync(int messageTag, TPostData postData, Action> responseCallback) - => SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage(postData!), responseCallback); + => SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage(postData), AcDomain.NextUniqueInt32); + public virtual Task UpdateAsync(int messageTag, TPostData postData, Action> responseCallback) where TPostData : class + => SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage(postData), responseCallback); #endregion CRUD