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

improvements, fixes, etc...

This commit is contained in:
jozsef.b@aycode.com 2024-05-27 20:38:37 +02:00
parent 07a36c2329
commit d2f8819a6c
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TIAM.Database/DataLayers/Admins/AdminDal.cs
View File

@ -239,7 +239,7 @@ namespace TIAM.Database.DataLayers.Admins
return SessionAsync(ctx => ctx.ServiceProviders.ToList());
}
public Task<string> GetServiceProvidersAsyncJson()
public Task<string> GetServiceProvidersJsonAsync()
{
return SessionAsync(ctx => ctx.ServiceProviders.ToJson());
}

1
TIAM.Services/SignalRTags.cs
View File

@ -12,4 +12,5 @@ public class SignalRTags : AcSignalRTags
[SignalMessageTag(typeof(SignalPostJsonDataMessage<Transfer>), typeof(SignalResponseMessage<string>), null, null)]
public static readonly int UpdateTransferAsync = 7;
public static readonly int GetCompaniesAsync = 8;
}

10
TIAMWebApp/Client/Services/UserDataServiceWeb.cs
View File

@ -52,17 +52,17 @@ namespace TIAMWebApp.Client.Services
if (userModelDto != null)
{
Dictionary<Guid, string> userProperties = new Dictionary<Guid, string>();
var userProperties = new Dictionary<Guid, string>();
//get user's properties
bool hasProperties = userModelDto.ServiceProviders.Count > 0 ? true : userModelDto.ServiceProviders.Count == 0 ? false : false;
var hasProperties = userModelDto.ServiceProviders.Count > 0 ? true : (userModelDto.ServiceProviders.Count == 0 ? false : false);
if (hasProperties)
{
//var Properties = await serviceProviderDataService.GetPropertiesByOwnerIdAsync(userModelDto.Id);
var Properties = userModelDto.ServiceProviders;
var properties = userModelDto.ServiceProviders;
_logger.Info($"{Properties.Count} properties found");
foreach ( var property in Properties )
_logger.Info($"{properties.Count} properties found");
foreach ( var property in properties )
{
userProperties.Add(property.Id, property.Name);
}

2
TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs
View File

@ -81,7 +81,7 @@ namespace TIAMWebApp.Server.Controllers
[Route(APIUrls.GetServiceProvidersRouteName)]
public async Task<string> GetServiceProviders()
{
return await _adminDal.GetServiceProvidersAsyncJson();
return await _adminDal.GetServiceProvidersJsonAsync();
}
//18.

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

@ -60,14 +60,14 @@ public class DevAdminSignalRHub(AdminDal adminDal, ServiceProviderAPIController
{
if (messageTag == SignalRTags.GetTransfersAsync)
{
await ResponseToCaller(messageTag, new SignalResponseMessage<string>(SignalResponseStatus.Success, await transferDataAPIController.GetTransfers()), requestId);
await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, await transferDataAPIController.GetTransfers()), requestId);
}
else if (messageTag == SignalRTags.GetPropertiesByOwnerIdAsync)
{
var ownerId = message!.MessagePackTo<SignalRequestByIdMessage>().Id;
var json = (await serviceProviderAPIController.GetServiceProvidersByOwnerId(ownerId)).ToJson();
await ResponseToCaller(messageTag, new SignalResponseMessage<string>(SignalResponseStatus.Success, json), requestId);
await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, json), requestId);
}
else if (messageTag == SignalRTags.UpdateTransferAsync)
{
@ -79,11 +79,11 @@ public class DevAdminSignalRHub(AdminDal adminDal, ServiceProviderAPIController
var transfer = message!.MessagePackTo<SignalPostJsonDataMessage<Transfer>>().PostData;
await transferDataAPIController.UpdateTransfer(transfer);
await ResponseToCaller(messageTag, new SignalResponseMessage<string>(SignalResponseStatus.Success, transfer.ToJson()), requestId);
await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, transfer.ToJson()), requestId);
}
else if (messageTag == SignalRTags.GetCompaniesAsync)
{
await ResponseToCaller(messageTag, new SignalResponseMessage<string>(SignalResponseStatus.Success, await serviceProviderAPIController.GetServiceProviders()), requestId);
await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, await serviceProviderAPIController.GetServiceProviders()), requestId);
}
return;
}

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

@ -182,23 +182,24 @@ namespace TIAMWebApp.Shared.Application.Services
if (requestId.HasValue && _responseByRequestId.ContainsKey(requestId.Value))
{
var reqId = requestId.Value;
var responseMessage = message.MessagePackTo<SignalResponseJsonMessage>(ContractlessStandardResolver.Options);
switch (_responseByRequestId[reqId])
{
case null:
_responseByRequestId[reqId] = message.MessagePackTo<SignalResponseMessage<string>>();
_responseByRequestId[reqId] = responseMessage;
return Task.CompletedTask;
case Action<ISignalResponseMessage<string>> messagePackCallback:
_responseByRequestId.TryRemove(reqId, out _);
messagePackCallback.Invoke(message.MessagePackTo<SignalResponseMessage<string>>(ContractlessStandardResolver.Options));
messagePackCallback.Invoke(responseMessage);
return Task.CompletedTask;
//case Action<string> jsonCallback:
// _responseByRequestId.TryRemove(reqId, out _);
// jsonCallback.Invoke(message.MessagePackTo<string>());
// jsonCallback.Invoke(responseMessage);
// return Task.CompletedTask;
default: