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

multiple signalr param; improvements, fixes, etc..

This commit is contained in:
Loretta 2024-06-21 14:32:04 +02:00
parent 67c7db3a57
commit f6d7444958
25 changed files with 471 additions and 1521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,7 @@ namespace TIAM.Database.DataLayers.Admins
public Task<List<Transfer>> GetTransfersAsync() => SessionAsync(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToList()); public Task<List<Transfer>> GetTransfersAsync() => SessionAsync(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToList());
public Task<string> GetTransfersJsonAsync() => SessionAsync(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson()); public Task<string> GetTransfersJsonAsync() => SessionAsync(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson());
public Task<string> GetTransfersByUserIdJsonAsync(Guid userId) => SessionAsync(ctx => ctx.GetTransfers().Where(x => x.UserId == userId).OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson());
public string GetTransfersJson() => Session(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson()); public string GetTransfersJson() => Session(ctx => ctx.GetTransfers().OrderBy(x => x.TransferStatusType).ThenByDescending(x => x.OrderId).ToJson());
public Transfer? GetTransferById(Guid transferId) => Session(ctx => ctx.GetTransferById(transferId)); public Transfer? GetTransferById(Guid transferId) => Session(ctx => ctx.GetTransferById(transferId));
public string? GetTransferJsonById(Guid transferId) => Session(ctx => ctx.GetTransferById(transferId)?.ToJson()); public string? GetTransferJsonById(Guid transferId) => Session(ctx => ctx.GetTransferById(transferId)?.ToJson());

12
TIAM.Services/SignalRTags.cs
View File

@ -4,11 +4,13 @@ namespace TIAM.Services;
public class SignalRTags : AcSignalRTags public class SignalRTags : AcSignalRTags
{ {
public const int None = 0; public const int GetTransfer = 1;
public const int GetTransfers = 2;
public const int GetTransfer = 3; public const int GetTransfersByUserId = 3;
public const int GetTransfers = 4; public const int GetTransfersByDriverId = 4;
public const int GetTransfersByContextId = 5; public const int GetTransfersByProductId = 5;
public const int GetTransfersByCompanyId = 6;
public const int UpdateTransfer = 7; public const int UpdateTransfer = 7;
public const int AddTransfer = 8; public const int AddTransfer = 8;
public const int RemoveTransfer = 9; public const int RemoveTransfer = 9;

36
TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor
View File

@ -16,37 +16,37 @@
@using AyCode.Core @using AyCode.Core
@inject IServiceProviderDataService serviceProviderDataService @inject IServiceProviderDataService serviceProviderDataService
@inject IUserDataService userDataService @inject IUserDataService userDataService
@inject ITransferDataService transferDataService @inject ITransferDataService transferDataService
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject AdminSignalRClient AdminSignalRClient; @inject AdminSignalRClient AdminSignalRClient;
<AddressDetailGrid @ref="_addressGrid" <AddressDetailGrid @ref="_addressGrid"
ContextId="ParentData.AddressId" ContextIds="new[] {ParentData.AddressId}"
DataSource="DataSource" DataSource="DataSource"
Logger="_logger" Logger="_logger"
SignalRClient="AdminSignalRClient" SignalRClient="AdminSignalRClient"
OnGridEditModelSaving="DataItemSaving" OnGridEditModelSaving="DataItemSaving"
OnGridItemDeleting="DataItemDeleting" OnGridItemDeleting="DataItemDeleting"
OnGridItemChanged="DataItemChanged" OnGridItemChanged="DataItemChanged"
PageSize="5" PageSize="5"
AutoExpandAllGroupRows="true" AutoExpandAllGroupRows="true"
KeyboardNavigationEnabled="KeyboardNavigationEnabled" KeyboardNavigationEnabled="KeyboardNavigationEnabled"
KeyFieldName="Id" KeyFieldName="Id"
ValidationEnabled="false" ValidationEnabled="false"
EditMode="GridEditMode.EditForm" EditMode="GridEditMode.EditForm"
ColumnResizeMode="GridColumnResizeMode.NextColumn" ColumnResizeMode="GridColumnResizeMode.NextColumn"
ShowFilterRow="false"> ShowFilterRow="false">
<Columns> <Columns>
<DxGridCommandColumn NewButtonVisible="false" DeleteButtonVisible="false" Width="70" MinWidth="70" FixedPosition="GridColumnFixedPosition.Left" /> <DxGridCommandColumn NewButtonVisible="false" DeleteButtonVisible="false" Width="70" MinWidth="70" FixedPosition="GridColumnFixedPosition.Left" />
<DxGridDataColumn FieldName="Id" GroupIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" /> <DxGridDataColumn FieldName="Id" GroupIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
<DxGridDataColumn FieldName="AddressText" /> <DxGridDataColumn FieldName="AddressText" />
<DxGridDataColumn FieldName="IsValid" Width="40" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" /> <DxGridDataColumn FieldName="IsValid" Width="40" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
<DxGridDataColumn FieldName="IsHelper" Width="40" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" /> <DxGridDataColumn FieldName="IsHelper" Width="40" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
<DxGridDataColumn FieldName="Latitude" Width="40"/> <DxGridDataColumn FieldName="Latitude" Width="40" />
<DxGridDataColumn FieldName="Longitude" Width="40"/> <DxGridDataColumn FieldName="Longitude" Width="40" />
<DxGridDataColumn FieldName="Modified" DisplayFormat="g" Width="140" /> <DxGridDataColumn FieldName="Modified" DisplayFormat="g" Width="140" />
</Columns> </Columns>
<EditFormTemplate> <EditFormTemplate>
@{ @{
Address bleh = (Address)context.EditModel; Address bleh = (Address)context.EditModel;

2
TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
View File

@ -158,7 +158,7 @@
<MessageDetailGrid <MessageDetailGrid
Logger="_logger" Logger="_logger"
SignalRClient="AdminSignalRClient" SignalRClient="AdminSignalRClient"
ContextId="((Transfer)context.DataItem).Id"> ContextIds="new[] {((Transfer)context.DataItem).Id}">
<Columns> <Columns>
<DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" /> <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />

3
TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor
View File

@ -74,7 +74,8 @@
{ {
_logger = new LoggerClient<ServiceProviderGridComponent>(LogWriters.ToArray()); _logger = new LoggerClient<ServiceProviderGridComponent>(LogWriters.ToArray());
_detailGridData = UserModelDtoDetail.ServiceProviders ?? new List<Company>(); // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
_detailGridData = UserModelDtoDetail.ServiceProviders ?? [];
_availableServices = await ServiceProviderDataService.GetServiceProvidersAsync(); _availableServices = await ServiceProviderDataService.GetServiceProvidersAsync();
_logger.Info($"DetailGridData: {_detailGridData.Count}"); _logger.Info($"DetailGridData: {_detailGridData.Count}");

8
TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
View File

@ -1,4 +1,5 @@
using System.ComponentModel; using System.ComponentModel;
using AyCode.Blazor.Components.Services;
using AyCode.Core; using AyCode.Core;
using AyCode.Core.Enums; using AyCode.Core.Enums;
using AyCode.Core.Extensions; using AyCode.Core.Extensions;
@ -27,7 +28,7 @@ namespace TIAMSharedUI.Shared.Components.Grids
[Parameter] public LoggerClient Logger { get; set; } [Parameter] public LoggerClient Logger { get; set; }
[Parameter] public string GridName { get; set; } [Parameter] public string GridName { get; set; }
[Parameter] public Guid? ContextId { get; set; } [Parameter] public Guid[]? ContextIds { get; set; }
[Parameter] public AcSignalRClientBase SignalRClient { get; set; } [Parameter] public AcSignalRClientBase SignalRClient { get; set; }
[Parameter] public int GetAllMessageTag { get; set; } [Parameter] public int GetAllMessageTag { get; set; }
@ -80,8 +81,8 @@ namespace TIAMSharedUI.Shared.Components.Grids
throw new NullReferenceException($"[{GetType().Name}] SignalRClient == null"); throw new NullReferenceException($"[{GetType().Name}] SignalRClient == null");
} }
var crudTags = new SignalRCrudTags(GetAllMessageTag, SignalRTags.None, AddMessageTag, UpdateMessageTag, RemoveMessageTag); var crudTags = new SignalRCrudTags(GetAllMessageTag, GetItemMessageTag, AddMessageTag, UpdateMessageTag, RemoveMessageTag);
_dataSource = new SignalRDataSource<TDataItem>(SignalRClient, crudTags, ContextId); _dataSource = new SignalRDataSource<TDataItem>(SignalRClient, crudTags, ContextIds);
Data = _dataSource; Data = _dataSource;
@ -108,6 +109,7 @@ namespace TIAMSharedUI.Shared.Components.Grids
Logger.Debug($"{_gridLogName} OnDataSourceLoaded"); Logger.Debug($"{_gridLogName} OnDataSourceLoaded");
Reload(); Reload();
_dataSource.LoadItem(_dataSource.First().Id).Forget();
return OnDataSourceChanged.InvokeAsync(_dataSource); return OnDataSourceChanged.InvokeAsync(_dataSource);
} }

23
TIAMSharedUI/Shared/SignalRTransferCrudTags.cs Normal file
View File

@ -0,0 +1,23 @@
using AyCode.Services.SignalRs;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TIAM.Services;
namespace TIAMSharedUI.Shared
{
public static class SignalRTiamCrudTags
{
public static SignalRCrudTags CompanyCrudTags { get; } = new SignalRCrudTags(SignalRTags.GetCompanies, SignalRTags.GetCompany, SignalRTags.AddCompany, SignalRTags.UpdateCompany, SignalRTags.RemoveCompany);
#region Transfers
public static SignalRCrudTags TransferCrudTags { get; } = new SignalRCrudTags(SignalRTags.GetTransfers, SignalRTags.GetTransfer, SignalRTags.AddTransfer, SignalRTags.UpdateTransfer, SignalRTags.RemoveTransfer);
public static SignalRCrudTags TransferByUserCrudTags { get; } = new SignalRCrudTags(SignalRTags.GetTransfersByUserId, SignalRTags.GetTransfer, SignalRTags.AddTransfer, SignalRTags.UpdateTransfer, SignalRTags.RemoveTransfer);
public static SignalRCrudTags TransferByDriverCrudTags { get; } = new SignalRCrudTags(SignalRTags.GetTransfersByDriverId, SignalRTags.GetTransfer, SignalRTags.AddTransfer, SignalRTags.UpdateTransfer, SignalRTags.RemoveTransfer);
public static SignalRCrudTags TransferByProductCrudTags { get; } = new SignalRCrudTags(SignalRTags.GetTransfersByProductId, SignalRTags.GetTransfer, SignalRTags.AddTransfer, SignalRTags.UpdateTransfer, SignalRTags.RemoveTransfer);
public static SignalRCrudTags TransferByCompanyCrudTags { get; } = new SignalRCrudTags(SignalRTags.GetTransfersByCompanyId, SignalRTags.GetTransfer, SignalRTags.AddTransfer, SignalRTags.UpdateTransfer, SignalRTags.RemoveTransfer);
#endregion Transfers
}
}

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

@ -111,6 +111,7 @@ namespace TIAMWebApp.Server.Controllers
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [HttpPost]
[Route(APIUrls.GetServiceProviderByIdRouteName)] [Route(APIUrls.GetServiceProviderByIdRouteName)]
[SignalR(SignalRTags.GetCompany)]
public async Task<Company?> GetServiceProviderById([FromBody] Guid id) public async Task<Company?> GetServiceProviderById([FromBody] Guid id)
{ {
_logger.Info($@"GetServiceProviderById called with id: {id}"); _logger.Info($@"GetServiceProviderById called with id: {id}");

29
TIAMWebApp/Server/Controllers/TransferDataAPIController.cs
View File

@ -393,17 +393,36 @@ namespace TIAMWebApp.Server.Controllers
return result; return result;
} }
[Authorize]
[HttpGet]
[Route(APIUrls.GetTransfersByUserIdRouteName)]
[SignalR(SignalRTags.GetTransfersByUserId)]
public async Task<string> GetTransfersByUserId(Guid userId)
{
var result = await _adminDal.GetTransfersByUserIdJsonAsync(userId);
return result;
}
[Authorize]
[HttpGet]
[Route(APIUrls.GetTransfersByDriverRouteName)]
[SignalR(SignalRTags.GetTransfersByDriverId)]
public Task<string> GetDriverTransfers(Guid transferId, Guid userProductMappingId)
{
throw new NotImplementedException();
//var result = await _adminDal.GetTransfersByUserIdJsonAsync(userId);
//return result;
}
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [HttpPost]
[Route(APIUrls.GetTransferByIdRouteName)] [Route(APIUrls.GetTransferByIdRouteName)]
public async Task<IActionResult> GetTransferById([FromBody] Guid transferId) [SignalR(SignalRTags.GetTransfer)]
public string? GetTransferById([FromBody] Guid transferId)
{ {
_logger.Info($"Get transfer by id called; transferId: {transferId}"); _logger.Info($"Get transfer by id called; transferId: {transferId}");
var result = _adminDal.GetTransferById(transferId); return _adminDal.GetTransferJsonById(transferId);
//TODO: Implementálni a Logout-ot kliens és szerver oldalon is! - J.
return Ok(result);
} }
[AllowAnonymous] [AllowAnonymous]

78
TIAMWebApp/Server/Properties/launchSettings.json
View File

@ -1,40 +1,50 @@
{ {
"iisSettings": { "profiles": {
"windowsAuthentication": false, "http": {
"anonymousAuthentication": true, "commandName": "Project",
"iisExpress": { "launchBrowser": true,
"applicationUrl": "http://localhost:28749", "environmentVariables": {
"sslPort": 44368 "ASPNETCORE_ENVIRONMENT": "Development"
} },
"dotnetRunMessages": true,
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
"applicationUrl": "http://localhost:5175"
}, },
"profiles": { "https": {
"http": { "commandName": "Project",
"commandName": "Project", "launchBrowser": true,
"dotnetRunMessages": true, "environmentVariables": {
"launchBrowser": true, "ASPNETCORE_ENVIRONMENT": "Development"
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
"applicationUrl": "http://localhost:5175",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}, },
"https": { "dotnetRunMessages": true,
"commandName": "Project", "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
"dotnetRunMessages": true, "applicationUrl": "https://localhost:7116;http://localhost:5175"
"launchBrowser": true, },
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", "IIS Express": {
"applicationUrl": "https://localhost:7116;http://localhost:5175", "commandName": "IISExpress",
"environmentVariables": { "launchBrowser": true,
"ASPNETCORE_ENVIRONMENT": "Development" "environmentVariables": {
} "ASPNETCORE_ENVIRONMENT": "Development"
}, },
"IIS Express": { "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}"
"commandName": "IISExpress", },
"launchBrowser": true, "WSL": {
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", "commandName": "WSL2",
"environmentVariables": { "launchBrowser": true,
"ASPNETCORE_ENVIRONMENT": "Development" "launchUrl": "https://localhost:7116",
} "environmentVariables": {
} "ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_URLS": "https://localhost:7116;http://localhost:5175"
},
"distributionName": ""
}
},
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:28749",
"sslPort": 44368
} }
} }
}

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

@ -48,10 +48,10 @@ public class MethodInfoModel<TAttribute> where TAttribute : TagAttribute
var parameters = methodInfo.GetParameters(); var parameters = methodInfo.GetParameters();
if (parameters.Length > 1) //if (parameters.Length > 1)
throw new Exception("MethodInfoModel; parameters.Length > 1"); // throw new Exception("MethodInfoModel; parameters.Length > 1");
if (parameters.Length == 1) if (parameters.Length > 0)
ParameterType = parameters[0].ParameterType; ParameterType = parameters[0].ParameterType;
} }
} }
@ -63,10 +63,12 @@ public class DynamicMethodCallModel<TAttribute> where TAttribute : TagAttribute
public DynamicMethodCallModel(Type instanceObjectType) : this(instanceObjectType, null!) public DynamicMethodCallModel(Type instanceObjectType) : this(instanceObjectType, null!)
{ } {
}
public DynamicMethodCallModel(Type instanceObjectType, params object[] constructorParams) : this(Activator.CreateInstance(instanceObjectType, constructorParams)!) public DynamicMethodCallModel(Type instanceObjectType, params object[] constructorParams) : this(Activator.CreateInstance(instanceObjectType, constructorParams)!)
{ } {
}
public DynamicMethodCallModel(object instanceObject) public DynamicMethodCallModel(object instanceObject)
{ {
@ -76,6 +78,9 @@ public class DynamicMethodCallModel<TAttribute> where TAttribute : TagAttribute
{ {
if (methodInfo.GetCustomAttribute(typeof(TAttribute)) is not TAttribute attribute) continue; if (methodInfo.GetCustomAttribute(typeof(TAttribute)) is not TAttribute attribute) continue;
if (MethodsByMessageTag.ContainsKey(attribute.MessageTag))
throw new Exception($"Multiple SignaRMessageTag! messageTag: {attribute.MessageTag}; methodName: {methodInfo.Name}");
MethodsByMessageTag[attribute.MessageTag] = new MethodInfoModel<TAttribute>(attribute, methodInfo!); MethodsByMessageTag[attribute.MessageTag] = new MethodInfoModel<TAttribute>(attribute, methodInfo!);
} }
} }
@ -146,16 +151,23 @@ public class DevAdminSignalRHub : Hub<ISignalRHubItemServer>, IAcSignalRHubServe
{ {
_logger.Debug($"{logText}({methodInfoModel.ParameterType.Name})"); _logger.Debug($"{logText}({methodInfoModel.ParameterType.Name})");
paramValues = new object[1]; //paramValues = new object[1];
if (methodInfoModel.ParameterType == typeof(Guid) || methodInfoModel.ParameterType == typeof(Guid?)) if (methodInfoModel.ParameterType == typeof(Guid) || methodInfoModel.ParameterType == typeof(Guid?))
{ {
var msg = message!.MessagePackTo<SignalPostJsonDataMessage<IdMessage>>(); var msg = message!.MessagePackTo<SignalPostJsonDataMessage<IdMessage>>();
if (msg.PostData.Id.IsNullOrEmpty()) throw new NullReferenceException($"PostData.Id.IsNullOrEmpty(); Id: {msg.PostData.Id}");
paramValues[0] = msg.PostData.Id; paramValues = new object[msg.PostData.Ids.Count];
for (var i = 0; i < msg.PostData.Ids.Count; i++)
{
var id = msg.PostData.Ids[i];
if (id.IsNullOrEmpty()) throw new NullReferenceException($"PostData.Id.IsNullOrEmpty(); Ids: {msg.PostData.Ids}");
paramValues[i] = msg.PostData.Ids[i];
}
} }
else paramValues[0] = message!.MessagePackTo<SignalPostJsonDataMessage<object>>(MessagePackSerializerOptions.Standard).PostDataJson.JsonTo(methodInfoModel.ParameterType)!; else paramValues = [message!.MessagePackTo<SignalPostJsonDataMessage<object>>(MessagePackSerializerOptions.Standard).PostDataJson.JsonTo(methodInfoModel.ParameterType)!];
} }
else _logger.Debug($"{logText}()"); else _logger.Debug($"{logText}()");
@ -169,7 +181,7 @@ public class DevAdminSignalRHub : Hub<ISignalRHubItemServer>, IAcSignalRHubServe
switch (messageTag) switch (messageTag)
{ {
case SignalRTags.GetAddress: case SignalRTags.GetAddress:
var id = message!.MessagePackTo<SignalPostJsonDataMessage<IdMessage>>().PostData.Id; var id = message!.MessagePackTo<SignalPostJsonDataMessage<IdMessage>>().PostData.Ids[0];
var address = await _adminDal.GetAddressByIdAsync(id); var address = await _adminDal.GetAddressByIdAsync(id);
await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, address), requestId); await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, address), requestId);
@ -177,7 +189,7 @@ public class DevAdminSignalRHub : Hub<ISignalRHubItemServer>, IAcSignalRHubServe
return; return;
case SignalRTags.GetAddressesByContextId: case SignalRTags.GetAddressesByContextId:
id = message!.MessagePackTo<SignalPostJsonDataMessage<IdMessage>>().PostData.Id; id = message!.MessagePackTo<SignalPostJsonDataMessage<IdMessage>>().PostData.Ids[0];
address = await _adminDal.GetAddressByIdAsync(id); address = await _adminDal.GetAddressByIdAsync(id);
await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, new List<Address> { address! }), requestId); await ResponseToCaller(messageTag, new SignalResponseJsonMessage(SignalResponseStatus.Success, new List<Address> { address! }), requestId);

3
TIAMWebApp/Server/TIAMWebApp.Server.csproj.user
View File

@ -4,4 +4,7 @@
<ActiveDebugProfile>https</ActiveDebugProfile> <ActiveDebugProfile>https</ActiveDebugProfile>
<NameOfLastUsedPublishProfile>C:\REPOS\AYCODE\source\TourIAm\TIAMWebApp\Server\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\REPOS\AYCODE\source\TourIAm\TIAMWebApp\Server\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup>
</Project> </Project>

55
TIAMWebApp/Shared/Models/APIUrls.cs
View File

@ -75,41 +75,44 @@ namespace TIAMWebApp.Shared.Application.Models
public const string GetTransferDestinationByCoordinates = TransferDataAPI + GetTransferDestinationByCoordinatesRouteName; public const string GetTransferDestinationByCoordinates = TransferDataAPI + GetTransferDestinationByCoordinatesRouteName;
public const string GetTransferDestinationByAddressRouteName = "GetTransferDestinationByAddress"; public const string GetTransferDestinationByAddressRouteName = "GetTransferDestinationByAddress";
public const string GetTransferDestinationByAddress = TransferDataAPI+GetTransferDestinationByAddressRouteName; public const string GetTransferDestinationByAddress = TransferDataAPI + GetTransferDestinationByAddressRouteName;
public const string CreateTransferDestinationRouteName = "CreateTransferDestination"; public const string CreateTransferDestinationRouteName = "CreateTransferDestination";
public const string CreateTransferDestination = TransferDataAPI+CreateTransferDestinationRouteName; public const string CreateTransferDestination = TransferDataAPI + CreateTransferDestinationRouteName;
public const string GetTransfersRouteName = "GetTransfers"; public const string GetTransfersRouteName = "GetTransfers";
public const string GetTransfers = TransferDataAPI+GetTransfersRouteName; public const string GetTransfers = TransferDataAPI + GetTransfersRouteName;
public const string GetTransfersByUserIdRouteName = "GetTransfersByUserId"; public const string GetTransfersByUserIdRouteName = "GetTransfersByUserId";
public const string GetTransfersByUserId = TransferDataAPI+GetTransfersByUserIdRouteName; public const string GetTransfersByUserId = TransferDataAPI + GetTransfersByUserIdRouteName;
public const string GetTransfersByDriverRouteName = "GetTransfersByDriverId";
public const string GetTransfersByDriver = TransferDataAPI + GetTransfersByDriverRouteName;
public const string GetTransferByIdRouteName = "GetTransferById"; public const string GetTransferByIdRouteName = "GetTransferById";
public const string GetTransferById = TransferDataAPI+GetTransferByIdRouteName; public const string GetTransferById = TransferDataAPI + GetTransferByIdRouteName;
public const string CreateTransferRouteName = "CreateTransfer"; public const string CreateTransferRouteName = "CreateTransfer";
public const string CreateTransfer = TransferDataAPI+CreateTransferRouteName; public const string CreateTransfer = TransferDataAPI + CreateTransferRouteName;
public const string CreateTransfersRouteName = "CreateTransfers"; public const string CreateTransfersRouteName = "CreateTransfers";
public const string CreateTransfers = TransferDataAPI+CreateTransfersRouteName; public const string CreateTransfers = TransferDataAPI + CreateTransfersRouteName;
public const string UpdateTransferRouteName = "UpdateTransfer"; public const string UpdateTransferRouteName = "UpdateTransfer";
public const string UpdateTransfer = TransferDataAPI+UpdateTransferRouteName; public const string UpdateTransfer = TransferDataAPI + UpdateTransferRouteName;
public const string UpdateTransferDestinationRouteName = "UpdateTransferDestintion"; public const string UpdateTransferDestinationRouteName = "UpdateTransferDestintion";
public const string UpdateTransferDestination = TransferDataAPI + UpdateTransferDestinationRouteName; public const string UpdateTransferDestination = TransferDataAPI + UpdateTransferDestinationRouteName;
//serviceprovider //serviceprovider
public const string CreateServiceProviderRouteName = "CreateServiceProvider/"; public const string CreateServiceProviderRouteName = "CreateServiceProvider/";
public const string CreateServiceProvider = ServiceProviderAPI+CreateServiceProviderRouteName; public const string CreateServiceProvider = ServiceProviderAPI + CreateServiceProviderRouteName;
public const string GetServiceProviderByIdRouteName = "GetServiceProviderById"; public const string GetServiceProviderByIdRouteName = "GetServiceProviderById";
public const string GetServiceProviderById = ServiceProviderAPI+GetServiceProviderByIdRouteName; public const string GetServiceProviderById = ServiceProviderAPI + GetServiceProviderByIdRouteName;
public const string GetServiceProvidersByOwnerIdRouteName = "GetServiceProvidersByOwnerId"; public const string GetServiceProvidersByOwnerIdRouteName = "GetServiceProvidersByOwnerId";
public const string GetServiceProvidersByOwnerId = ServiceProviderAPI+GetServiceProvidersByOwnerIdRouteName; public const string GetServiceProvidersByOwnerId = ServiceProviderAPI + GetServiceProvidersByOwnerIdRouteName;
public const string UpdateServiceProviderRouteName = "UpdateServiceProvider"; public const string UpdateServiceProviderRouteName = "UpdateServiceProvider";
public const string UpdateServiceProviderUrl = ServiceProviderAPI + UpdateServiceProviderRouteName; public const string UpdateServiceProviderUrl = ServiceProviderAPI + UpdateServiceProviderRouteName;
@ -120,7 +123,7 @@ namespace TIAMWebApp.Shared.Application.Models
public const string GetQrCodeByProductIdRouteName = "GetQRCodeByProductId"; public const string GetQrCodeByProductIdRouteName = "GetQRCodeByProductId";
public const string GetQrCodeByProductId = ServiceProviderAPI+GetQrCodeByProductIdRouteName; public const string GetQrCodeByProductId = ServiceProviderAPI + GetQrCodeByProductIdRouteName;
public const string AddProductRouteName = "AddProduct"; public const string AddProductRouteName = "AddProduct";
public const string AddProductRouteUrl = ServiceProviderAPI + AddProductRouteName; public const string AddProductRouteUrl = ServiceProviderAPI + AddProductRouteName;
@ -167,31 +170,39 @@ namespace TIAMWebApp.Shared.Application.Models
//permissions //permissions
//1 //1
public const string GetPermissionsForContextByContextIdRouteName = "GetPermissionsForContextByContextId"; public const string GetPermissionsForContextByContextIdRouteName = "GetPermissionsForContextByContextId";
public const string GetPermissionsForContextByContextId = ServiceProviderAPI+GetPermissionsForContextByContextIdRouteName;
public const string GetPermissionsForContextByContextId = ServiceProviderAPI + GetPermissionsForContextByContextIdRouteName;
//2. get the contexts where the user has permission //2. get the contexts where the user has permission
public const string GetPermissionContextByUserIdRouteName = "GetPermissionContextByUserId"; public const string GetPermissionContextByUserIdRouteName = "GetPermissionContextByUserId";
public const string GetPermissionContextByUserId = ServiceProviderAPI+GetPermissionContextByUserIdRouteName;
public const string GetPermissionContextByUserId = ServiceProviderAPI + GetPermissionContextByUserIdRouteName;
//12 //12
public const string GetPermissionGroupsForContextByContextIdRouteName = "GetPermissionGroupsForContextByContextId"; public const string GetPermissionGroupsForContextByContextIdRouteName = "GetPermissionGroupsForContextByContextId";
public const string GetPermissionGroupsForContextByContextId = ServiceProviderAPI+GetPermissionGroupsForContextByContextIdRouteName; public const string GetPermissionGroupsForContextByContextId = ServiceProviderAPI + GetPermissionGroupsForContextByContextIdRouteName;
//file upload //file upload
public const string UploadImageRouteName = "UploadImage"; public const string UploadImageRouteName = "UploadImage";
public const string UploadImage = FileAPI+UploadImageRouteName;
public const string UploadImage = FileAPI + UploadImageRouteName;
//get images //get images
public const string GetImagesRouteName = "GetAllMedia"; public const string GetImagesRouteName = "GetAllMedia";
public const string GetImages = FileAPI+GetImagesRouteName;
public const string GetImages = FileAPI + GetImagesRouteName;
//get image by name //get image by name
public const string GetImageRouteName = "GetImage"; public const string GetImageRouteName = "GetImage";
public const string GetImage = FileAPI+GetImageRouteName; public const string GetImage = FileAPI + GetImageRouteName;
//email //email
public const string SendEmailRouteName = "SendEmail"; public const string SendEmailRouteName = "SendEmail";
public const string SendEmail = MessageAPI+SendEmailRouteName; public const string SendEmail = MessageAPI + SendEmailRouteName;
public const string GetAllMessagesRouteName = "GetAllMessages"; public const string GetAllMessagesRouteName = "GetAllMessages";
public const string GetAllMessages = MessageAPI+GetAllMessagesRouteName; public const string GetAllMessages = MessageAPI + GetAllMessagesRouteName;
public const string GetMessagesByContextIdRouteName = "GetMessagesByContextId"; public const string GetMessagesByContextIdRouteName = "GetMessagesByContextId";
public const string GetMessagesByContextId = MessageAPI+GetMessagesByContextIdRouteName; public const string GetMessagesByContextId = MessageAPI + GetMessagesByContextIdRouteName;
//payment //payment
public const string CreatePaymentRouteName = "CreatePayment"; public const string CreatePaymentRouteName = "CreatePayment";

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

@ -1,251 +0,0 @@
using System.Collections.Concurrent;
using AyCode.Core;
using AyCode.Core.Extensions;
using AyCode.Core.Helpers;
using AyCode.Core.Interfaces;
using AyCode.Services.Loggers;
using AyCode.Services.SignalRs;
using MessagePack.Resolvers;
using Microsoft.AspNetCore.SignalR.Client;
using TIAMWebApp.Shared.Application.Models.ClientSide;
using TIAMWebApp.Shared.Application.Utility;
namespace TIAMWebApp.Shared.Application.Services
{
public class AdminSignalRClient(IEnumerable<IAcLogWriterClientBase> logWriters) : AcSignalRClientBase("DevAdminHub", logWriters);
public abstract class AcSignalRClientBase : IAcSignalRHubClient
{
private readonly ConcurrentDictionary<int, object?> _responseByRequestId = new();
protected readonly HubConnection HubConnection;
protected readonly LoggerClient Logger;
public event Action<int, byte[], int?> OnMessageReceived;
//public event Action<int, int> OnMessageRequested;
public int Timeout = 10000;
protected AcSignalRClientBase(string hubName, IEnumerable<IAcLogWriterClientBase> logWriters)
{
Logger = new LoggerClient(GetType().Name, logWriters.ToArray());
HubConnection = new HubConnectionBuilder()
.WithUrl($"{Setting.BaseUrl}/{hubName}")
//.AddMessagePackProtocol(options => {
// options.SerializerOptions = MessagePackSerializerOptions.Standard
// .WithResolver(MessagePack.Resolvers.StandardResolver.Instance)
// .WithSecurity(MessagePackSecurity.UntrustedData)
// .WithCompression(MessagePackCompression.Lz4Block)
// .WithCompressionMinLength(256);})
.Build();
HubConnection.Closed += HubConnection_Closed;
_ = HubConnection.On<int, byte[], int?>(nameof(IAcSignalRHubClient.OnReceiveMessage), OnReceiveMessage);
//_ = HubConnection.On<int, int>(nameof(IAcSignalRHubClient.OnRequestMessage), OnRequestMessage);
HubConnection.StartAsync().Forget();
}
private Task HubConnection_Closed(Exception? arg)
{
if (_responseByRequestId.IsEmpty) Logger.DebugConditional($"Client HubConnection_Closed");
else Logger.Warning($"Client HubConnection_Closed; {nameof(_responseByRequestId)} count: {_responseByRequestId.Count}");
_responseByRequestId.Clear();
return Task.CompletedTask;
}
public async Task StartConnection()
{
if (HubConnection.State == HubConnectionState.Disconnected)
await HubConnection.StartAsync();
if (HubConnection.State != HubConnectionState.Connected)
await TaskHelper.WaitToAsync(() => HubConnection.State == HubConnectionState.Connected, Timeout, 25);
}
public async Task StopConnection()
{
await HubConnection.StopAsync();
await HubConnection.DisposeAsync();
}
public virtual Task SendMessageToServerAsync(int messageTag)
=> SendMessageToServerAsync(messageTag, null, AcDomain.NextUniqueInt32);
public virtual async Task SendMessageToServerAsync(int messageTag, ISignalRMessage? message, int? requestId)
{
Logger.DebugConditional($"Client SendMessageToServerAsync; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};");
await StartConnection();
var msgp = message?.ToMessagePack(ContractlessStandardResolver.Options);
HubConnection.SendAsync(nameof(IAcSignalRHubClient.OnReceiveMessage), messageTag, msgp, requestId).Forget();
}
#region CRUD
public virtual Task<TResponseData?> GetByIdAsync<TResponseData>(int messageTag, Guid id) where TResponseData : class
=> SendMessageToServerAsync<TResponseData>(messageTag, new SignalPostJsonDataMessage<IdMessage>(new IdMessage(id)), AcDomain.NextUniqueInt32);
public virtual Task GetByIdAsync<TResponseData>(int messageTag, Guid id, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
=> SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage<IdMessage>(new IdMessage(id)), responseCallback);
public virtual Task<TResponseData?> GetAllAsync<TResponseData>(int messageTag) where TResponseData : class
=> SendMessageToServerAsync<TResponseData>(messageTag);
public virtual Task GetAllAsync<TResponseData>(int messageTag, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
=> SendMessageToServerAsync(messageTag, null, responseCallback);
public virtual Task GetAllAsync<TResponseData>(int messageTag, Guid? contextId, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
=> SendMessageToServerAsync(messageTag, (contextId.IsNullOrEmpty() ? null : new SignalPostJsonDataMessage<IdMessage>(new IdMessage(contextId.Value))), responseCallback);
public virtual Task<TResponseData?> GetAllAsync<TResponseData>(int messageTag, Guid? contextId) where TResponseData : class
=> SendMessageToServerAsync<TResponseData>(messageTag, contextId.IsNullOrEmpty() ? null : new SignalPostJsonDataMessage<IdMessage>(new IdMessage(contextId.Value)), AcDomain.NextUniqueInt32);
public virtual Task<TPostData?> PostDataAsync<TPostData>(int messageTag, TPostData postData) where TPostData : class
=> SendMessageToServerAsync<TPostData>(messageTag, new SignalPostJsonDataMessage<TPostData>(postData), AcDomain.NextUniqueInt32);
public virtual Task PostDataAsync<TPostData>(int messageTag, TPostData postData, Action<ISignalResponseMessage<TPostData?>> responseCallback) where TPostData : class
=> SendMessageToServerAsync(messageTag, new SignalPostJsonDataMessage<TPostData>(postData), responseCallback);
#endregion CRUD
public virtual Task<TResponse?> SendMessageToServerAsync<TResponse>(int messageTag) where TResponse : class
=> SendMessageToServerAsync<TResponse>(messageTag, null, AcDomain.NextUniqueInt32);
public virtual Task<TResponse?> SendMessageToServerAsync<TResponse>(int messageTag, ISignalRMessage? message) where TResponse : class
=> SendMessageToServerAsync<TResponse>(messageTag, message, AcDomain.NextUniqueInt32);
protected virtual async Task<TResponse?> SendMessageToServerAsync<TResponse>(int messageTag, ISignalRMessage? message, int requestId) where TResponse : class
{
Logger.DebugConditional($"Client SendMessageToServerAsync<TResult>; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};");
_responseByRequestId[requestId] = null;
await SendMessageToServerAsync(messageTag, message, requestId);
try
{
if (await TaskHelper.WaitToAsync(() => _responseByRequestId[requestId] != null, Timeout, 25) &&
_responseByRequestId.TryRemove(requestId, out var obj) && obj is ISignalResponseMessage<string> responseMessage)
{
if (responseMessage.Status == SignalResponseStatus.Error || responseMessage.ResponseData == null)
{
var errorText = $"Client SendMessageToServerAsync<TResponseData> response error; await; tag: {messageTag}; Status: {responseMessage.Status}; requestId: {requestId};";
Logger.Error(errorText);
//TODO: Ideiglenes, majd a ResponseMessage-et kell visszaadni a Status miatt! - J.
throw new Exception(errorText);
//return default;
}
return responseMessage.ResponseData.JsonTo<TResponse>();
}
}
catch (Exception ex)
{
Logger.Error($"SendMessageToServerAsync; messageTag: {messageTag}; requestId: {requestId}; {ex.Message}", ex);
}
_responseByRequestId.TryRemove(requestId, out _);
return default;
}
public virtual Task SendMessageToServerAsync<TResponseData>(int messageTag, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
=> SendMessageToServerAsync(messageTag, null, responseCallback);
public virtual Task SendMessageToServerAsync<TResponseData>(int messageTag, ISignalRMessage? message, Action<ISignalResponseMessage<TResponseData?>> responseCallback)
{
if (messageTag == 0)
Logger.Error($"SendMessageToServerAsync; messageTag == 0");
var requestId = AcDomain.NextUniqueInt32;
_responseByRequestId[requestId] = new Action<ISignalResponseMessage<string>>(responseMessage =>
{
TResponseData? responseData = default;
if (responseMessage.Status == SignalResponseStatus.Success)
{
responseData = string.IsNullOrEmpty(responseMessage.ResponseData) ? default : responseMessage.ResponseData.JsonTo<TResponseData?>();
}
else Logger.Error($"Client SendMessageToServerAsync<TResponseData> response error; callback; tag: {messageTag}; Status: {responseMessage.Status}; requestId: {requestId};");
responseCallback(new SignalResponseMessage<TResponseData?>(responseMessage.Status, responseData));
});
return SendMessageToServerAsync(messageTag, message, requestId);
}
public virtual Task OnReceiveMessage(int messageTag, byte[] message, int? requestId)
{
var logText = $"Client OnReceiveMessage; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};";
if (message.Length == 0) Logger.Warning($"message.Length == 0! {logText}");
else Logger.Info(logText);
try
{
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] = responseMessage;
return Task.CompletedTask;
case Action<ISignalResponseMessage<string>> messagePackCallback:
_responseByRequestId.TryRemove(reqId, out _);
messagePackCallback.Invoke(responseMessage);
return Task.CompletedTask;
//case Action<string> jsonCallback:
// _responseByRequestId.TryRemove(reqId, out _);
// jsonCallback.Invoke(responseMessage);
// return Task.CompletedTask;
default:
Logger.Error($"Client OnReceiveMessage switch; unknown message type: {_responseByRequestId[reqId]?.GetType().Name}");
break;
}
_responseByRequestId.TryRemove(reqId, out _);
}
OnMessageReceived(messageTag, message, requestId);
}
catch(Exception ex)
{
if (requestId.HasValue)
_responseByRequestId.TryRemove(requestId.Value, out _);
Logger.Error($"Client OnReceiveMessage; messageTag: {messageTag}; requestId: {requestId}; {ex.Message}", ex);
throw;
}
return Task.CompletedTask;
}
//public virtual Task OnRequestMessage(int messageTag, int requestId)
//{
// Logger.DebugConditional($"Client OnRequestMessage; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId};");
// try
// {
// OnMessageRequested(messageTag, requestId);
// }
// catch(Exception ex)
// {
// Logger.Error($"Client OnReceiveMessage; {nameof(messageTag)}: {messageTag}; {nameof(requestId)}: {requestId}; {ex.Message}", ex);
// throw;
// }
// return Task.CompletedTask;
//}
}
}

17
TIAMWebApp/Shared/Services/AdminSignalRClient.cs Normal file
View File

@ -0,0 +1,17 @@
using System.Collections.Concurrent;
using AyCode.Blazor.Components.Services;
using AyCode.Core;
using AyCode.Core.Extensions;
using AyCode.Core.Helpers;
using AyCode.Core.Interfaces;
using AyCode.Services.Loggers;
using AyCode.Services.SignalRs;
using MessagePack.Resolvers;
using Microsoft.AspNetCore.SignalR.Client;
using TIAMWebApp.Shared.Application.Models.ClientSide;
using TIAMWebApp.Shared.Application.Utility;
namespace TIAMWebApp.Shared.Application.Services
{
public class AdminSignalRClient(IEnumerable<IAcLogWriterClientBase> logWriters) : AcSignalRClientBase($"{Setting.BaseUrl}/DevAdminHub", new LoggerClient(nameof(AdminSignalRClient), logWriters.ToArray()));
}

6
TIAMWebApp/Shared/Services/ServiceProviderDataService.cs
View File

@ -89,7 +89,7 @@ namespace TIAMWebApp.Shared.Application.Services
//17. //17.
public Task GetPropertiesByOwnerIdAsync(Guid id, Action<Dictionary<Guid, string>?> callback) public Task GetPropertiesByOwnerIdAsync(Guid id, Action<Dictionary<Guid, string>?> callback)
{ {
return _adminSignalRClient.GetByIdAsync<Dictionary<Guid, string>>(SignalRTags.GetPropertiesByOwnerId, id, response => return _adminSignalRClient.GetByIdAsync<Dictionary<Guid, string>>(SignalRTags.GetPropertiesByOwnerId, response =>
{ {
if (response.Status == SignalResponseStatus.Error) if (response.Status == SignalResponseStatus.Error)
callback.Invoke(null); callback.Invoke(null);
@ -97,7 +97,7 @@ namespace TIAMWebApp.Shared.Application.Services
_logger.DetailConditional($"companyPropertiesByOwner async: {string.Join("; ", response.ResponseData!.Values)}"); _logger.DetailConditional($"companyPropertiesByOwner async: {string.Join("; ", response.ResponseData!.Values)}");
callback.Invoke(response.ResponseData); callback.Invoke(response.ResponseData);
}); }, id);
} }
//17. //17.
@ -140,7 +140,7 @@ namespace TIAMWebApp.Shared.Application.Services
var companies = await _adminSignalRClient.GetAllAsync<List<Company>>(SignalRTags.GetCompanies); var companies = await _adminSignalRClient.GetAllAsync<List<Company>>(SignalRTags.GetCompanies);
if (companies != null) _logger.DetailConditional($"companies: {string.Join("; ", companies.Count)}"); if (companies != null) _logger.DetailConditional($"companies: {string.Join("; ", companies.Count)}");
return companies; return companies ?? [];
} }
//24. //24.

4
TIAMWebApp/Shared/TIAMWebApp.Shared.Application.csproj
View File

@ -33,6 +33,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\Aycode.Blazor\AyCode.Blazor.Components\AyCode.Blazor.Components.csproj" />
<ProjectReference Include="..\..\..\Aycode.Blazor\AyCode.Blazor.Models\AyCode.Blazor.Models.csproj" />
<ProjectReference Include="..\..\..\Aycode.Blazor\AyCode.Maui.Core\AyCode.Maui.Core.csproj" />
<ProjectReference Include="..\..\TIAM.Core\TIAM.Core.csproj" />
<ProjectReference Include="..\..\TIAM.Database\TIAM.Database.csproj" /> <ProjectReference Include="..\..\TIAM.Database\TIAM.Database.csproj" />
<ProjectReference Include="..\..\TIAM.Entities\TIAM.Entities.csproj" /> <ProjectReference Include="..\..\TIAM.Entities\TIAM.Entities.csproj" />
<ProjectReference Include="..\..\TIAM.Models\TIAM.Models.csproj" /> <ProjectReference Include="..\..\TIAM.Models\TIAM.Models.csproj" />

5
TIAMWebApp/Shared/Utility/SignaRClientLogItemWriter.cs
View File

@ -16,7 +16,10 @@ namespace TIAMWebApp.Shared.Application.Utility
//.AddMessagePackProtocol(options => options.SerializerOptions = MessagePackSerializerOptions.Standard.WithSecurity(MessagePackSecurity.UntrustedData)) //.AddMessagePackProtocol(options => options.SerializerOptions = MessagePackSerializerOptions.Standard.WithSecurity(MessagePackSecurity.UntrustedData))
.Build(); .Build();
public SignaRClientLogItemWriter() : base(AppType.Web, LogLevel.Detail) public SignaRClientLogItemWriter() : this(AppType.Web, LogLevel.Detail)
{ }
public SignaRClientLogItemWriter(AppType appType, LogLevel logLevel, string? categoryName = null) : base(appType, logLevel, categoryName)
{ {
_hubConnection.StartAsync().Forget(); _hubConnection.StartAsync().Forget();
} }

1018
TIAMWebApp/Shared/Utility/SignalRDataSource.cs
View File

@ -5,1030 +5,18 @@ using System.Diagnostics;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
using AyCode.Blazor.Components.Services;
using AyCode.Core.Enums; using AyCode.Core.Enums;
using AyCode.Core.Extensions; using AyCode.Core.Extensions;
using AyCode.Core.Helpers; using AyCode.Core.Helpers;
using AyCode.Core.Interfaces; using AyCode.Core.Interfaces;
using AyCode.Services.SignalRs; using AyCode.Services.SignalRs;
using TIAM.Services; using TIAM.Services;
using TIAMWebApp.Shared.Application.Services;
namespace TIAMWebApp.Shared.Application.Utility namespace TIAMWebApp.Shared.Application.Utility
{ {
public class TrackingItem<T>(TrackingState trackingState, T currentValue, T? originalValue = null) where T : class, IId<Guid>
{
public TrackingState TrackingState { get; internal set; } = trackingState;
public T CurrentValue { get; internal set; } = currentValue;
public T? OriginalValue { get; init; } = originalValue;
internal TrackingItem<T> UpdateItem(TrackingState trackingState, T newValue)
{
CurrentValue = newValue;
if (TrackingState != TrackingState.Add)
TrackingState = trackingState;
return this;
}
}
public class ChangeTracking<T> /*: IEnumerable<TrackingItem<T>>*/ where T : class, IId<Guid>
{
private readonly List<TrackingItem<T>> _trackingItems = []; //TODO: Dictionary... - J.
internal TrackingItem<T>? AddTrackingItem(TrackingState trackingState, T newValue, T? originalValue = null)
{
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), $@"currentValue.Id.IsNullOrEmpty()");
var itemIndex = _trackingItems.FindIndex(x => x.CurrentValue.Id == newValue.Id);
TrackingItem<T>? trackingItem = null;
if (itemIndex > -1)
{
trackingItem = _trackingItems[itemIndex];
if (trackingState == TrackingState.Remove && trackingItem.TrackingState == TrackingState.Add)
{
_trackingItems.RemoveAt(itemIndex);
return null;
}
return trackingItem.UpdateItem(trackingState, newValue);
}
if (originalValue != null && Equals(newValue, originalValue))
originalValue = TrackingItemHelpers.JsonClone(originalValue);
trackingItem = new TrackingItem<T>(trackingState, newValue, originalValue);
_trackingItems.Add(trackingItem);
return trackingItem;
}
public int Count => _trackingItems.Count;
internal void Clear() => _trackingItems.Clear();
public List<TrackingItem<T>> ToList() => _trackingItems.ToList();
public bool TryGetTrackingItem(Guid id, [NotNullWhen(true)] out TrackingItem<T>? trackingItem)
{
trackingItem = _trackingItems.FirstOrDefault(x => x.CurrentValue.Id == id);
return trackingItem != null;
}
internal void Remove(TrackingItem<T> trackingItem) => _trackingItems.Remove(trackingItem);
//public IEnumerator<TrackingItem<T>> GetEnumerator()
//{
// return _trackingItems.GetEnumerator();
//}
//IEnumerator IEnumerable.GetEnumerator()
//{
// return GetEnumerator();
//}
}
[Serializable] [Serializable]
[DebuggerDisplay("Count = {Count}")] [DebuggerDisplay("Count = {Count}")]
public class SignalRDataSource<T> : IList<T>, IList, IReadOnlyList<T> where T : class, IId<Guid> public class SignalRDataSource<T>(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, params Guid[]? contextIds)
{ : AcSignalRDataSource<T>(signalRClient, signalRCrudTags, contextIds) where T : class, IId<Guid>;
private readonly object _syncRoot = new();
protected readonly List<T> InnerList = []; //TODO: Dictionary??? - J.
protected readonly ChangeTracking<T> TrackingItems = new();
protected readonly Guid? ContextId;
public AcSignalRClientBase SignalRClient;
protected readonly SignalRCrudTags SignalRCrudTags;
public Func<ItemChangedEventArgs<T>, Task>? OnDataSourceItemChanged;
public Func<Task>? OnDataSourceLoaded;
public SignalRDataSource(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, Guid? contextId = null)
{
ContextId = contextId;
SignalRCrudTags = signalRCrudTags;
SignalRClient = signalRClient;
}
public bool IsSynchronized => true;
public object SyncRoot => _syncRoot;
public bool IsFixedSize => false;
/// <summary>
/// GetAllMessageTag
/// </summary>
/// <exception cref="ArgumentException"></exception>
/// <exception cref="NullReferenceException"></exception>
public async Task LoadDataSource(bool clearChangeTracking = true)
{
if (SignalRCrudTags.GetAllMessageTag == SignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetAllMessageTag == SignalRTags.None");
var resultList = (await SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, ContextId)) ?? throw new NullReferenceException();
await LoadDataSource(resultList);
}
public Task LoadDataSourceAsync(bool clearChangeTracking = true)
{
if (SignalRCrudTags.GetAllMessageTag == SignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetAllMessageTag == SignalRTags.None");
return SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, ContextId, result=>
{
if (result.Status != SignalResponseStatus.Success || result.ResponseData == null)
throw new NullReferenceException($"LoadDataSourceAsync; result.Status != SignalResponseStatus.Success || result.ResponseData == null; Status: {SignalResponseStatus.Success}");
LoadDataSource(result.ResponseData).Forget();
});
}
public async Task LoadDataSource(IList<T> fromSource, bool clearChangeTracking = true)
{
Monitor.Enter(_syncRoot);
try
{
Clear(clearChangeTracking);
foreach (var item in fromSource)
{
InnerList.Add(item);
var eventArgs = new ItemChangedEventArgs<T>(item, TrackingState.GetAll);
if (OnDataSourceItemChanged != null) await OnDataSourceItemChanged.Invoke(eventArgs);
}
}
finally
{
Monitor.Exit(_syncRoot);
}
if (OnDataSourceLoaded != null) await OnDataSourceLoaded.Invoke();
}
public async Task<T?> LoadItem(Guid id)
{
if (SignalRCrudTags.GetItemMessageTag == SignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetItemMessageTag == SignalRTags.None");
T? resultitem = null;
Monitor.Enter(_syncRoot);
try
{
resultitem = await SignalRClient.GetByIdAsync<T>(SignalRCrudTags.GetItemMessageTag, id);
if (resultitem == null) return null;
if (TryGetIndex(id, out var index)) InnerList[index] = resultitem;
else InnerList.Add(resultitem);
var eventArgs = new ItemChangedEventArgs<T>(resultitem, TrackingState.Get);
if (OnDataSourceItemChanged != null) await OnDataSourceItemChanged.Invoke(eventArgs);
}
finally
{
Monitor.Exit(_syncRoot);
}
return resultitem;
}
/// <summary>
/// set: UpdateMessageTag
/// </summary>
/// <param name="index"></param>
/// <returns></returns>
/// <exception cref="ArgumentOutOfRangeException"></exception>
public T this[int index]
{
get
{
if ((uint)index >= (uint)Count) throw new ArgumentOutOfRangeException(nameof(index));
Monitor.Enter(_syncRoot);
try
{
return InnerList[index];
}
finally
{
Monitor.Exit(_syncRoot);
}
}
set
{
Monitor.Enter(_syncRoot);
try
{
UpdateUnsafe(index, value);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
}
public void Add(T newValue)
{
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Add->newValue.Id.IsNullOrEmpty()");
Monitor.Enter(_syncRoot);
try
{
if (Contains(newValue))
throw new ArgumentException($@"It already contains this Id! Id: {newValue.Id}", nameof(newValue));
UnsafeAdd(newValue);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
/// AddMessageTag
/// </summary>
/// <param name="newValue"></param>
/// <param name="autoSave"></param>
/// <exception cref="ArgumentException"></exception>
public async Task<T> Add(T newValue, bool autoSave)
{
Monitor.Enter(_syncRoot);
try
{
Add(newValue);
return autoSave ? await SaveItem(newValue, TrackingState.Add) : newValue;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
/// AddMessageTag or UpdateMessageTag
/// </summary>
/// <param name="newValue"></param>
/// <param name="autoSave"></param>
/// <returns></returns>
public async Task<T> AddOrUpdate(T newValue, bool autoSave)
{
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"AddOrUpdate->newValue.Id.IsNullOrEmpty()");
Monitor.Enter(_syncRoot);
try
{
var index = IndexOf(newValue);
return index > -1 ? await Update(index, newValue, autoSave) : await Add(newValue, autoSave);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
//public void AddRange(IEnumerable<T> collection)
//{
// lock (_syncRoot)
// {
// }
//}
protected void UnsafeAdd(T newValue)
{
TrackingItems.AddTrackingItem(TrackingState.Add, newValue);
InnerList.Add(newValue);
}
/// <summary>
/// AddMessageTag
/// </summary>
/// <param name="index"></param>
/// <param name="newValue"></param>
/// <param name="autoSave"></param>
/// <exception cref="ArgumentException"></exception>
/// <exception cref="NullReferenceException"></exception>
public void Insert(int index, T newValue)
{
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Insert->newValue.Id.IsNullOrEmpty()");
Monitor.Enter(_syncRoot);
try
{
if (Contains(newValue))
throw new ArgumentException($@"Insert; It already contains this Id! Id: {newValue.Id}", nameof(newValue));
TrackingItems.AddTrackingItem(TrackingState.Add, newValue);
InnerList.Insert(index, newValue);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public async Task<T> Insert(int index, T newValue, bool autoSave)
{
Monitor.Enter(_syncRoot);
try
{
Insert(index, newValue);
return autoSave ? await SaveItem(newValue, TrackingState.Add) : newValue;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
/// UpdateMessageTag
/// </summary>
/// <param name="newItem"></param>
/// <param name="autoSave"></param>
public Task<T> Update(T newItem, bool autoSave) => Update(IndexOf(newItem), newItem, autoSave);
/// <summary>
/// UpdateMessageTag
/// </summary>
/// <param name="index"></param>
/// <param name="newValue"></param>
/// <param name="autoSave"></param>
/// /// <exception cref="ArgumentException"></exception>
/// /// <exception cref="NullReferenceException"></exception>
/// <exception cref="ArgumentNullException"></exception>
/// <exception cref="ArgumentOutOfRangeException"></exception>
public async Task<T> Update(int index, T newValue, bool autoSave)
{
Monitor.Enter(_syncRoot);
try
{
UpdateUnsafe(index, newValue);
return autoSave ? await SaveItem(newValue, TrackingState.Update) : newValue;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
private void UpdateUnsafe(int index, T newValue)
{
if (default(T) != null && newValue == null) throw new NullReferenceException(nameof(newValue));
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"UpdateUnsafe->newValue.Id.IsNullOrEmpty()");
if ((uint)index >= (uint)Count) throw new ArgumentOutOfRangeException(nameof(index));
Monitor.Enter(_syncRoot);
try
{
var currentItem = InnerList[index];
if (currentItem.Id != newValue.Id)
throw new ArgumentException($@"UpdateUnsafe; currentItem.Id != item.Id! Id: {newValue.Id}", nameof(newValue));
TrackingItems.AddTrackingItem(TrackingState.Update, newValue, currentItem);
InnerList[index] = newValue;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
/// RemoveMessageTag
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public bool Remove(T item)
{
Monitor.Enter(_syncRoot);
try
{
var index = IndexOf(item);
if (index < 0) return false;
RemoveAt(index);
return true;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public async Task<bool> Remove(T item, bool autoSave)
{
Monitor.Enter(_syncRoot);
try
{
var result = Remove(item);
if (!autoSave || !result) return result;
await SaveItem(item, TrackingState.Remove);
return true;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
///
/// </summary>
/// <param name="id"></param>
/// <param name="item"></param>
/// <returns></returns>
public bool TryRemove(Guid id, out T? item)
{
Monitor.Enter(_syncRoot);
try
{
return TryGetValue(id, out item) && Remove(item);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
/// RemoveMessageTag
/// </summary>
/// <param name="index"></param>
/// <exception cref="ArgumentException"></exception>
/// /// <exception cref="ArgumentNullException"></exception>
/// <exception cref="NullReferenceException"></exception>
public void RemoveAt(int index)
{
Monitor.Enter(_syncRoot);
try
{
var currentItem = InnerList[index];
if (currentItem.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(currentItem), $@"RemoveAt->item.Id.IsNullOrEmpty(); index: {index}");
TrackingItems.AddTrackingItem(TrackingState.Remove, currentItem, currentItem);
InnerList.RemoveAt(index);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public async Task RemoveAt(int index, bool autoSave)
{
Monitor.Enter(_syncRoot);
try
{
var currentItem = InnerList[index];
RemoveAt(index);
if (autoSave)
{
await SaveItem(currentItem, TrackingState.Remove);
}
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
///
/// </summary>
/// <returns></returns>
public List<TrackingItem<T>> GetTrackingItems()
{
Monitor.Enter(_syncRoot);
try
{
return TrackingItems.ToList();
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public void SetTrackingStateToUpdate(T item)
{
Monitor.Enter(_syncRoot);
try
{
if (TrackingItems.TryGetTrackingItem(item.Id, out var trackingItem))
{
if (trackingItem.TrackingState != TrackingState.Add)
trackingItem.TrackingState = TrackingState.Update;
return;
}
if (!TryGetValue(item.Id, out var originalItem)) return;
TrackingItems.AddTrackingItem(TrackingState.Update, item, originalItem);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
///
/// </summary>
/// <param name="id"></param>
/// <param name="trackingItem"></param>
/// <returns></returns>
public bool TryGetTrackingItem(Guid id, [NotNullWhen(true)] out TrackingItem<T>? trackingItem)
{
Monitor.Enter(_syncRoot);
try
{
return TrackingItems.TryGetTrackingItem(id, out trackingItem);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
///
/// </summary>
/// <returns>Unsaved items</returns>
public async Task<List<TrackingItem<T>>> SaveChanges()
{
Monitor.Enter(_syncRoot);
try
{
foreach (var trackingItem in TrackingItems.ToList())
{
try
{
await SaveTrackingItemUnsafe(trackingItem);
}
catch(Exception ex)
{
TryRollbackItem(trackingItem.CurrentValue.Id, out _);
}
}
return TrackingItems.ToList();
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public async Task SaveChangesAsync()
{
Monitor.Enter(_syncRoot);
try
{
foreach (var trackingItem in TrackingItems.ToList())
{
try
{
await SaveTrackingItemUnsafeAsync(trackingItem);
}
catch(Exception ex)
{
TryRollbackItem(trackingItem.CurrentValue.Id, out _);
}
}
}
finally
{
Monitor.Exit(_syncRoot);
}
}
/// <summary>
///
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<T> SaveItem(Guid id)
{
Monitor.Enter(_syncRoot);
try
{
T resultItem = null!;
if (TryGetTrackingItem(id, out var trackingItem))
resultItem = await SaveTrackingItemUnsafe(trackingItem);
if (resultItem == null) throw new NullReferenceException($"SaveItem; resultItem == null");
return resultItem;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public async Task<T> SaveItem(Guid id, TrackingState trackingState)
{
Monitor.Enter(_syncRoot);
try
{
T resultItem = null!;
if (TryGetValue(id, out var item))
resultItem = await SaveItem(item, trackingState);
if (resultItem == null) throw new NullReferenceException($"SaveItem; resultItem == null");
return resultItem;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public Task<T> SaveItem(T item, TrackingState trackingState) => SaveItemUnsafe(item, trackingState);
protected Task<T> SaveTrackingItemUnsafe(TrackingItem<T> trackingItem)
=> SaveItemUnsafe(trackingItem.CurrentValue, trackingItem.TrackingState);
protected Task SaveTrackingItemUnsafeAsync(TrackingItem<T> trackingItem)
=> SaveItemUnsafeAsync(trackingItem.CurrentValue, trackingItem.TrackingState);
protected async Task<T> SaveItemUnsafe(T item, TrackingState trackingState)
{
var messageTag = SignalRCrudTags.GetMessageTagByTrackingState(trackingState);
if (messageTag == SignalRTags.None) throw new ArgumentException($"SaveItemUnsafe; messageTag == SignalRTags.None");
var result = await SignalRClient.PostDataAsync(messageTag, item);
if (result == null) throw new NullReferenceException($"SaveItemUnsafe; result == null");
await ProcessSavedResponseItem(result, trackingState);
return result;
}
protected Task SaveItemUnsafeAsync(T item, TrackingState trackingState)
{
var messageTag = SignalRCrudTags.GetMessageTagByTrackingState(trackingState);
if (messageTag == SignalRTags.None) return Task.CompletedTask;
return SignalRClient.PostDataAsync(messageTag, item, response =>
{
Monitor.Enter(_syncRoot);
try
{
if (response.Status != SignalResponseStatus.Success || response.ResponseData == null)
{
if (TryRollbackItem(item.Id, out _)) return;
throw new NullReferenceException($"SaveItemUnsafeAsync; result.Status != SignalResponseStatus.Success || result.ResponseData == null; Status: {SignalResponseStatus.Success}");
}
ProcessSavedResponseItem(response.ResponseData, trackingState).Forget();
}
finally
{
Monitor.Exit(_syncRoot);
}
});
}
private async Task ProcessSavedResponseItem(T? resultItem, TrackingState trackingState)
{
if (resultItem == null) return;
if (TryGetTrackingItem(resultItem.Id, out var trackingItem))
TrackingItems.Remove(trackingItem);
if (TryGetIndex(resultItem.Id, out var index))
InnerList[index] = resultItem;
var eventArgs = new ItemChangedEventArgs<T>(resultItem, trackingState);
if (OnDataSourceItemChanged != null) await OnDataSourceItemChanged.Invoke(eventArgs);
}
protected void RollbackItemUnsafe(TrackingItem<T> trackingItem)
{
if (TryGetIndex(trackingItem.CurrentValue.Id, out var index))
{
if (trackingItem.TrackingState == TrackingState.Add) InnerList.RemoveAt(index);
else InnerList[index] = trackingItem.OriginalValue!;
}
else if (trackingItem.TrackingState != TrackingState.Add)
InnerList.Add(trackingItem.OriginalValue!);
TrackingItems.Remove(trackingItem);
}
public bool TryRollbackItem(Guid id, out T? originalValue)
{
Monitor.Enter(_syncRoot);
try
{
if (TryGetTrackingItem(id, out var trackingItem))
{
originalValue = trackingItem.OriginalValue;
RollbackItemUnsafe(trackingItem);
return true;
}
originalValue = null;
return false;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public void Rollback()
{
Monitor.Enter(_syncRoot);
try
{
foreach (var trackingItem in TrackingItems.ToList())
RollbackItemUnsafe(trackingItem);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public int Count
{
get
{
Monitor.Enter(_syncRoot);
try
{
return InnerList.Count;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
}
public void Clear() => Clear(true);
public void Clear(bool clearChangeTracking)
{
Monitor.Enter(_syncRoot);
try
{
if (clearChangeTracking) TrackingItems.Clear();
InnerList.Clear();
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public int IndexOf(Guid id)
{
Monitor.Enter(_syncRoot);
try
{
return InnerList.FindIndex(x => x.Id == id);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public int IndexOf(T item) => IndexOf(item.Id);
public bool TryGetIndex(Guid id, out int index) => (index = IndexOf(id)) > -1;
public bool Contains(T item) => IndexOf(item) > -1;
public bool TryGetValue(Guid id, [NotNullWhen(true)] out T? item)
{
Monitor.Enter(_syncRoot);
try
{
item = InnerList.FirstOrDefault(x => x.Id == id);
return item != null;
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public void CopyTo(T[] array) => CopyTo(array, 0);
public void CopyTo(T[] array, int arrayIndex)
{
Monitor.Enter(_syncRoot);
try
{
InnerList.CopyTo(array, arrayIndex);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public int BinarySearch(int index, int count, T item, IComparer<T>? comparer)
{
throw new NotImplementedException($"BinarySearch");
if (index < 0)
throw new ArgumentOutOfRangeException(nameof(index));
if (count < 0)
throw new ArgumentOutOfRangeException(nameof(count));
if (Count - index < count)
throw new ArgumentException("Invalid length");
//Monitor.Enter(_syncRoot);
//try
//{
// return InnerList.BinarySearch(index, count, item, comparer);
//}
//finally
//{
// Monitor.Exit(_syncRoot);
//}
}
public int BinarySearch(T item) => BinarySearch(0, Count, item, null);
public int BinarySearch(T item, IComparer<T>? comparer) => BinarySearch(0, Count, item, comparer);
public IEnumerator<T> GetEnumerator()
{
Monitor.Enter(_syncRoot);
try
{
//return InnerList.ToList().GetEnumerator();
return InnerList.GetEnumerator();
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public ReadOnlyCollection<T> AsReadOnly() => new(this);
private static bool IsCompatibleObject(object? value) => (value is T) || (value == null && default(T) == null);
#region IList, ICollection
bool IList.IsReadOnly => false;
object? IList.this[int index]
{
get => this[index];
set
{
if (default(T) != null && value == null) throw new NullReferenceException(nameof(value));
try
{
this[index] = (T)value!;
}
catch (InvalidCastException)
{
throw new InvalidCastException(nameof(value));
}
}
}
int IList.Add(object? item)
{
if (default(T) != null && item == null) throw new NullReferenceException(nameof(item));
try
{
Add((T)item!);
}
catch (InvalidCastException)
{
throw new InvalidCastException(nameof(item));
}
return Count - 1;
}
void IList.Clear() => Clear(true);
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
bool IList.Contains(object? item) => IsCompatibleObject(item) && Contains((T)item!);
int IList.IndexOf(object? item) => (IsCompatibleObject(item)) ? IndexOf((T)item!) : -1;
void IList.Insert(int index, object? item)
{
if (default(T) != null && item == null) throw new NullReferenceException(nameof(item));
try
{
Insert(index, (T)item!);
}
catch (InvalidCastException)
{
throw new InvalidCastException(nameof(item));
}
}
void IList.Remove(object? item)
{
if (IsCompatibleObject(item)) Remove((T)item!);
}
void ICollection<T>.Clear() => Clear(true);
void ICollection.CopyTo(Array array, int arrayIndex)
{
if ((array != null) && (array.Rank != 1))
{
throw new ArgumentException();
}
try
{
Monitor.Enter(_syncRoot);
try
{
//TODO: _list.ToArray() - ez nem az igazi... - J.
Array.Copy(InnerList.ToArray(), 0, array!, arrayIndex, InnerList.Count);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
catch (ArrayTypeMismatchException)
{
throw new ArrayTypeMismatchException();
}
}
int ICollection.Count => Count;
int ICollection<T>.Count => Count;
bool ICollection<T>.IsReadOnly => false;
void IList<T>.RemoveAt(int index) => RemoveAt(index);
int IReadOnlyCollection<T>.Count => Count;
#endregion IList, ICollection
}
public class ItemChangedEventArgs<T> where T : IId<Guid>
{
internal ItemChangedEventArgs(T item, TrackingState trackingState)
{
Item = item;
TrackingState = trackingState;
}
public T Item { get; }
public TrackingState TrackingState { get; }
}
} }

104
TIAMWebApp/Shared/Utility/SignalRDataSourceAsync.cs
View File

@ -1,104 +0,0 @@
using System.Diagnostics;
using AyCode.Core.Enums;
using AyCode.Core.Helpers;
using AyCode.Core.Interfaces;
using AyCode.Services.SignalRs;
using TIAM.Services;
using TIAMWebApp.Shared.Application.Services;
namespace TIAMWebApp.Shared.Application.Utility;
[Serializable]
[DebuggerDisplay("Count = {Count}")]
public class SignalRDataSourceAsync<T> : SignalRDataSource<T> where T : class, IId<Guid>
{
public Action<ItemChangedEventArgs<T>>? OnItemChanged;
public Action<SignalRDataSourceAsync<T>>? OnDataSourceLoaded;
public SignalRDataSourceAsync(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, Guid? contextId = null, Action<SignalRDataSourceAsync<T>>? onDataSourceLoaded = null, bool autoLoadDataSource = false)
: base(signalRClient, signalRCrudTags, contextId)
{
OnDataSourceLoaded = onDataSourceLoaded;
if (autoLoadDataSource) LoadDataSourceAsync();
}
public void LoadDataSourceAsync(bool clearChangeTracking = true)
{
if (SignalRCrudTags.GetAllMessageTag == SignalRTags.None) throw new ArgumentException($"_signalRCrudTags.GetAllMessageTag == SignalRTags.None;");
//Monitor.Exit(SyncRoot); //Exception test - J.
//Monitor.Enter(SyncRoot);
//try
//{
// SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, ContextId, response =>
// {
// try
// {
// if (response.Status == SignalResponseStatus.Error) throw new Exception($"LoadDataSourceAsync; response.Status == SignalResponseStatus.Error");
// if (response.ResponseData == null) throw new NullReferenceException($"response.ResponseData == null");
// Clear(clearChangeTracking);
// InnerList.AddRange(response.ResponseData);
// }
// finally
// {
// Monitor.Exit(SyncRoot);
// }
// OnDataSourceLoaded?.Invoke(this);
// }).Forget();
//}
//catch (Exception)
//{
// Monitor.Exit(SyncRoot);
// throw;
//}
}
//public T Add(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Add).GetAwaiter().GetResult();
//public Task AddAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Add);
//public Task UpdateAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Update);
//public Task RemoveAsync(T item, int messageTag) => PostDataToServerAsync(item, messageTag, TrackingState.Remove);
//public Task RemoveAsync(Guid id, int messageTag)
//{
// var item = _list.FirstOrDefault(x => x.Id == id);
// return item == null ? Task.CompletedTask : RemoveAsync(item, messageTag);
//}
//protected virtual Task PostDataToServerAsync(T item, int messageTag, TrackingState trackingState)
//{
// if (messageTag == 0) return Task.CompletedTask;
// logger.Info($"{_listLogName} PostDataToServerAsync called; transferId " + item.Id);
// if (item.Id.IsNullOrEmpty()) item.Id = Guid.NewGuid();
// _list.UpdateCollection(item, trackingState == TrackingState.Remove); //egyből látszódik a változás a grid-ben, nem csak a callback lefutásakor! felhasználóbarátabb... - J.
// await _signalRClient.PostDataAsync(messageTag, item, async repsonse =>
// {
// if (repsonse.Status != SignalResponseStatus.Success || repsonse.ResponseData == null)
// {
// RefreshDataSourceAsync().Forget();
// return;
// }
// _list.UpdateCollection(repsonse.ResponseData, trackingState == TrackingState.Remove);
// var eventArgs = new ItemChangedEventArgs<T>(repsonse.ResponseData, trackingState);
// OnItemChanged.Invoke(eventArgs);
// });
// //transfer = await devAdminSignalClient.PostDataAsync(SignalRTags.UpdateTransferAsync, transfer);
// return Task.CompletedTask;
//}
}

47
TIAMWebApp/Shared/Utility/TrackingItemHelpers.cs
View File

@ -1,47 +0,0 @@
using System.Reflection;
using System.Text.Json;
using AyCode.Core.Extensions;
namespace TIAMWebApp.Shared.Application.Utility;
public static class TrackingItemHelpers
{
public static T JsonClone<T>(T source) => source.ToJson().JsonTo<T>()!;
public static T ReflectionClone<T>(T source)
{
var type = source!.GetType();
if (type.IsPrimitive || typeof(string) == type)
return source;
if (type.IsArray)
{
var elementType = Type.GetType(type.FullName!.Replace("[]", string.Empty))!;
var array = (source as Array)!;
var cloned = Array.CreateInstance(elementType, array.Length);
for (var i = 0; i < array.Length; i++)
cloned.SetValue(ReflectionClone(array.GetValue(i)), i);
return (T)Convert.ChangeType(cloned, type);
}
var clone = Activator.CreateInstance(type);
while (type != null && type != typeof(object))
{
foreach (var field in type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance))
{
var fieldValue = field.GetValue(source);
if (fieldValue == null) continue;
field.SetValue(clone, ReflectionClone(fieldValue));
}
type = type.BaseType;
}
return (T)clone!;
}
}

88
Tiam.Services.Client.Tests/SignalRClientTest.cs Normal file
View File

@ -0,0 +1,88 @@
using AyCode.Core.Enums;
using AyCode.Core.Helpers;
using AyCode.Core.Loggers;
using AyCode.Services.Loggers;
using AyCode.Services.SignalRs;
using Azure;
using TIAM.Core.Loggers;
using TIAM.Entities.ServiceProviders;
using TIAM.Services;
using TIAMWebApp.Shared.Application.Services;
using TIAMWebApp.Shared.Application.Utility;
namespace Tiam.Services.Client.Tests
{
[TestClass]
public class SignalRClientTest //: TestModelBase
{
private const string CompanyIdString = "3587F169-683C-4EEE-BCB5-E8D57F8C6DCE";
private readonly AdminSignalRClient _signalRClient = new(new List<IAcLogWriterClientBase> { new SignaRClientLogItemWriter(AppType.TestUnit, LogLevel.Detail, nameof(SignalRClientTest)) });
[TestInitialize]
public void TestInitialize()
{ }
[TestCleanup]
public void TearDown()
{ }
[DataTestMethod]
[DataRow(CompanyIdString)]
public async Task GetCompanyTest_ReturnCompany_WhenHasCompany(string companyIdString)
{
var companyId = Guid.Parse(companyIdString);
var company = await _signalRClient.GetByIdAsync<Company>(SignalRTags.GetCompany, companyId);
Assert.IsNotNull(company);
}
[DataTestMethod]
[DataRow(CompanyIdString)]
public async Task GetCompanyAsyncTest_ReturnCompany_WhenHasCompany(string companyIdString)
{
Company? company = null;
var companyId = Guid.Parse(companyIdString);
await _signalRClient.GetByIdAsync<Company>(SignalRTags.GetCompany, response =>
{
Assert.IsNotNull(response.ResponseData);
Assert.IsTrue(response.Status == SignalResponseStatus.Success);
company = response.ResponseData;
}, companyId);
await TaskHelper.WaitToAsync(() => company != null, 5000, 50);
Assert.IsNotNull(company);
}
[TestMethod]
public async Task GetAllCompanyTest_ReturnCompanies_WhenHasCompanies()
{
var companies = await _signalRClient.GetAllAsync<List<Company>>(SignalRTags.GetCompanies);
Assert.IsNotNull(companies);
Assert.IsTrue(companies.Count > 0);
}
[TestMethod]
public async Task GetAllCompanyAsyncTest_ReturnCompanies_WhenHasCompanies()
{
List<Company>? companies = null;
await _signalRClient.GetAllAsync<List<Company>>(SignalRTags.GetCompanies, response =>
{
Assert.IsNotNull(response.ResponseData);
Assert.IsTrue(response.Status == SignalResponseStatus.Success);
companies = response.ResponseData;
});
await TaskHelper.WaitToAsync(() => companies != null, 5000, 50);
Assert.IsNotNull(companies);
Assert.IsTrue(companies.Count > 0);
}
}
}

104
Tiam.Services.Client.Tests/SignalRDataSourceTest.cs Normal file
View File

@ -0,0 +1,104 @@
using System.Linq.Expressions;
using AyCode.Core.Enums;
using AyCode.Core.Extensions;
using AyCode.Core.Helpers;
using AyCode.Core.Loggers;
using AyCode.Services.Loggers;
using AyCode.Services.SignalRs;
using Azure;
using DevExpress.DashboardBlazor;
using DevExpress.Data.Filtering;
using DevExpress.Data.Linq;
using DevExpress.Data.Linq.Helpers;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using TIAM.Core.Loggers;
using TIAM.Database.DataLayers.Admins;
using TIAM.Entities.ServiceProviders;
using TIAM.Entities.Transfers;
using TIAM.Services;
using TIAMSharedUI.Shared;
using TIAMWebApp.Shared.Application.Services;
using TIAMWebApp.Shared.Application.Utility;
namespace Tiam.Services.Client.Tests
{
[TestClass]
public class SignalRDataSourceTest //: TestModelBase
{
private const string UserIdString = "540271F6-C604-4C16-8160-D5A7CAFEDF00";
private const string CompanyIdString = "3587F169-683C-4EEE-BCB5-E8D57F8C6DCE";
private const string TransferIdString = "108E5A63-AA9E-47BE-ACFA-00306FFC5215";
private readonly SignalRDataSource<Transfer> _signalRDataSource = new(new AdminSignalRClient(new List<IAcLogWriterClientBase> { new SignaRClientLogItemWriter(AppType.TestUnit, LogLevel.Detail, nameof(SignalRDataSourceTest)) }),
SignalRTiamCrudTags.TransferByUserCrudTags, Guid.Parse(UserIdString));
[TestInitialize]
public async Task TestInitialize()
{
var userId = Guid.Parse(UserIdString);
await _signalRDataSource.LoadDataSource();
Assert.IsTrue(_signalRDataSource.Count > 0);
Assert.IsTrue(_signalRDataSource.All(x => x.UserId == userId));
}
[TestCleanup]
public void TearDown()
{
}
[DataTestMethod]
[DataRow(TransferIdString)]
public void GetTransferTest_ReturnTransfer_WhenHasTransfer(string transferIdString)
{
var transferId = Guid.Parse(transferIdString);
_signalRDataSource.TryGetValue(transferId, out var transfer);
Assert.IsNotNull(transfer);
}
[DataTestMethod]
[DataRow(TransferIdString)]
public async Task UpdateTransferLuggageTest_ReturnTransfer_WhenDbTransferEquals(string transferIdString)
{
var transferId = Guid.Parse(transferIdString);
_signalRDataSource.TryGetValue(transferId, out var transfer);
Assert.IsNotNull(transfer);
var luggageCount = (byte)(new Random().Next(0, 5));
transfer.LuggageCount = luggageCount;
await _signalRDataSource.SaveItem(transferId, TrackingState.Update);
Assert.IsTrue(transfer.LuggageCount == luggageCount);
var dbTransfer = await _signalRDataSource.SignalRClient.GetByIdAsync<Transfer>(SignalRTags.GetTransfer, transferId);
Assert.IsNotNull(dbTransfer);
Assert.IsTrue(dbTransfer.LuggageCount == luggageCount);
}
[DataTestMethod]
public void FilterExpressionTest_WhenTransfersFiletered()
{
var converter = new CriteriaToExpressionConverter();
//CriteriaOperator critOps = CriteriaOperator.Parse(tdashboard.EmployeeFilter);
var criteriaString = CriteriaOperator.FromLambda<Transfer>(x => x.LuggageCount == 1).ToString();
//var json = criteria.AsQueryable().Expression.ToJson();
//criteria = JsonConvert.DeserializeObject<Expression<Transfer>(json);
var criteria = CriteriaOperator.Parse(criteriaString);
//_signalRDataSource.AsQueryable().Expression.
var filteredData = _signalRDataSource.AsQueryable().AppendWhere(converter, criteria) as IQueryable<Transfer>;
Assert.IsNotNull(filteredData);
var filteredTransfers = _signalRDataSource.AsQueryable().Provider.CreateQuery<Transfer>(filteredData.Expression).ToList();
Assert.IsNotNull(filteredTransfers);
Assert.IsTrue(filteredTransfers.All(x => x.LuggageCount == 1));
}
}
}

57
Tiam.Services.Client.Tests/Tiam.Services.Client.Tests.csproj Normal file
View File

@ -0,0 +1,57 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Aycode.Blazor\AyCode.Blazor.Controllers\AyCode.Blazor.Controllers.csproj" />
<ProjectReference Include="..\..\Aycode.Blazor\AyCode.Blazor.Models\AyCode.Blazor.Models.csproj" />
<ProjectReference Include="..\..\Aycode.Blazor\AyCode.Maui.Core\AyCode.Maui.Core.csproj" />
<ProjectReference Include="..\TIAM.Core\TIAM.Core.csproj" />
<ProjectReference Include="..\TIAM.Entities\TIAM.Entities.csproj" />
<ProjectReference Include="..\TIAM.Models\TIAM.Models.csproj" />
<ProjectReference Include="..\TIAM.Services\TIAM.Services.csproj" />
<ProjectReference Include="..\TIAMResources\TIAM.Resources.csproj" />
<ProjectReference Include="..\TIAMWebApp\Client\TIAMWebApp.Client.csproj" />
<ProjectReference Include="..\TIAMWebApp\Shared\TIAMWebApp.Shared.Application.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="AyCode.Core">
<HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll</HintPath>
</Reference>
<Reference Include="AyCode.Entities">
<HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll</HintPath>
</Reference>
<Reference Include="AyCode.Interfaces">
<HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll</HintPath>
</Reference>
<Reference Include="AyCode.Models">
<HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.dll</HintPath>
</Reference>
<Reference Include="AyCode.Services">
<HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Services.dll</HintPath>
</Reference>
<Reference Include="AyCode.Utils">
<HintPath>..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
</ItemGroup>
</Project>

6
TourIAmProject.sln
View File

@ -50,6 +50,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TIAM.Services.Server.Tests"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TIAM.Models.Server", "TIAM.Models.Server\TIAM.Models.Server.csproj", "{D21032B0-B25F-495E-B784-1D3166FE720C}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TIAM.Models.Server", "TIAM.Models.Server\TIAM.Models.Server.csproj", "{D21032B0-B25F-495E-B784-1D3166FE720C}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tiam.Services.Client.Tests", "Tiam.Services.Client.Tests\Tiam.Services.Client.Tests.csproj", "{EF40BC68-945A-47ED-8739-2D0BCD415019}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -142,6 +144,10 @@ Global
{D21032B0-B25F-495E-B784-1D3166FE720C}.Debug|Any CPU.Build.0 = Debug|Any CPU {D21032B0-B25F-495E-B784-1D3166FE720C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D21032B0-B25F-495E-B784-1D3166FE720C}.Release|Any CPU.ActiveCfg = Release|Any CPU {D21032B0-B25F-495E-B784-1D3166FE720C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D21032B0-B25F-495E-B784-1D3166FE720C}.Release|Any CPU.Build.0 = Release|Any CPU {D21032B0-B25F-495E-B784-1D3166FE720C}.Release|Any CPU.Build.0 = Release|Any CPU
{EF40BC68-945A-47ED-8739-2D0BCD415019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF40BC68-945A-47ED-8739-2D0BCD415019}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF40BC68-945A-47ED-8739-2D0BCD415019}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF40BC68-945A-47ED-8739-2D0BCD415019}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE