Adam
/
AyCode.Core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CollectionExtensions UpdateCollectionById<TId>

This commit is contained in:
Loretta 2025-11-07 14:10:30 +01:00
parent c1a707139c
commit bb3cc3c37c
3 changed files with 243 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AyCode.Core.targets
View File

@ -1,12 +1,17 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Name>AyCode.Core.targets</Name> <Name>AyCode.Core.targets</Name>
<_ProjectName>FruitBank</_ProjectName>
<!--<GitBranch>$([System.IO.File]::ReadAlltext('$(MsBuildThisFileDirectory)\.git\HEAD').Replace('ref: refs/heads/', '').Trim())</GitBranch>
<_ProjectName>$(GitBranch)</_ProjectName>-->
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Configurations>Debug;Release;Product</Configurations> <Configurations>Debug;Release;Product</Configurations>
<BaseOutputPath>bin\FruitBank</BaseOutputPath> <BaseOutputPath>bin\$(_ProjectName)</BaseOutputPath>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

12
AyCode.Core/Extensions/CollectionExtensions.cs
View File

@ -27,6 +27,18 @@ namespace AyCode.Core.Extensions
return source.UpdateCollectionByIndex(index, dataItem, isRemove); return source.UpdateCollectionByIndex(index, dataItem, isRemove);
} }
public static TrackingState UpdateCollectionById<TId>(this IList<IId<TId>> source, IId<TId> dataItem, bool isRemove) where TId : struct
{
if (source == null) throw new ArgumentNullException(nameof(source), $"source == null");
var equalityComparer = EqualityComparer<TId>.Default;
if (equalityComparer.Equals(dataItem.Id, default(TId))) throw new ArgumentNullException(nameof(dataItem), "UpdateCollection->dataItem.Id.IsNullOrEmpty()");
var index = source.FindIndex(x => equalityComparer.Equals(x.Id, dataItem.Id));
return source.UpdateCollectionByIndex(index, dataItem, isRemove);
}
public static TrackingState UpdateCollectionByIndex<TDataItem>(this IList<TDataItem> source, int index, TDataItem dataItem, bool isRemove) public static TrackingState UpdateCollectionByIndex<TDataItem>(this IList<TDataItem> source, int index, TDataItem dataItem, bool isRemove)
{ {
if (isRemove) if (isRemove)

340
AyCode.Services.Server/SignalRs/AcSignalRDataSource.cs
View File

@ -1,43 +1,87 @@
using System.Collections; using AyCode.Core.Enums;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
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 System.Collections;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
namespace AyCode.Services.Server.SignalRs namespace AyCode.Services.Server.SignalRs
{ {
public class TrackingItem<T>(TrackingState trackingState, T currentValue, T? originalValue = null) where T : class, IId<Guid> //public class TrackingItemGuid<TDataItem>(TrackingState trackingState, TDataItem currentValue, TDataItem? originalValue = null) : TrackingItem<TDataItem, Guid>(trackingState, currentValue, originalValue)
// where TDataItem : class, IId<Guid> { }
//public class TrackingItemInt<TDataItem>(TrackingState trackingState, TDataItem currentValue, TDataItem? originalValue = null) : TrackingItem<TDataItem, int>(trackingState, currentValue, originalValue)
// where TDataItem : class, IId<int> {}
public abstract class TrackingItem<TDataItem, TId>(TrackingState trackingState, TDataItem currentValue, TDataItem? originalValue = null) where TDataItem : class, IId<TId> where TId : struct
{ {
public TrackingState TrackingState { get; internal set; } = trackingState; public TrackingState TrackingState { get; internal set; } = trackingState;
public T CurrentValue { get; internal set; } = currentValue; public TDataItem CurrentValue { get; internal set; } = currentValue;
public T? OriginalValue { get; init; } = originalValue; public TDataItem? OriginalValue { get; init; } = originalValue;
internal TrackingItem<T> UpdateItem(TrackingState trackingState, T newValue) internal TrackingItem<TDataItem, TId> UpdateItem(TrackingState trackingState, TDataItem newValue) //where TTrackingItem : TrackingItem<TDataItem, TId>
{ {
CurrentValue = newValue; CurrentValue = newValue;
if (TrackingState != TrackingState.Add) if (TrackingState != TrackingState.Add)
TrackingState = trackingState; TrackingState = trackingState;
return this; return (TrackingItem<TDataItem, TId>)this;
} }
} }
//public class ChangeTrackingGuid<TDataItem> : ChangeTracking<TDataItem, Guid> /*: IEnumerable<TrackingItem<T>>*/ where TDataItem : class, IId<Guid>
//{
// protected override bool HasIdValue(TDataItem dataItem) => !dataItem.Id.IsNullOrEmpty();
public class ChangeTracking<T> /*: IEnumerable<TrackingItem<T>>*/ where T : class, IId<Guid> // protected override int FindIndex(TDataItem newValue) => TrackingItems.FindIndex(x => x.CurrentValue.Id == newValue.Id);
// public override bool TryGetTrackingItem(Guid id, [NotNullWhen(true)] out TrackingItem<TDataItem, Guid>? trackingItem)
// {
// trackingItem = TrackingItems.FirstOrDefault(x => x.CurrentValue.Id == id);
// return trackingItem != null;
// }
//}
//public class ChangeTrackingInt<TDataItem> : ChangeTracking<TDataItem, int> /*: IEnumerable<TrackingItem<T>>*/ where TDataItem : class, IId<int>
//{
// protected override bool HasIdValue(TDataItem dataItem) => true;//dataItem.Id.IsNullOrEmpty();
// protected override int FindIndex(TDataItem newValue) => TrackingItems.FindIndex(x => x.CurrentValue.Id == newValue.Id);
// public override bool TryGetTrackingItem(int id, [NotNullWhen(true)] out TrackingItem<TDataItem, int>? trackingItem)
// {
// trackingItem = TrackingItems.FirstOrDefault(x => x.CurrentValue.Id == id);
// return trackingItem != null;
// }
//}
public class ChangeTracking<TDataItem, TId> /*: IEnumerable<TrackingItem<T>>*/where TDataItem : class, IId<TId> where TId : struct
{ {
private readonly List<TrackingItem<T>> _trackingItems = []; //TODO: Dictionary... - J. private readonly EqualityComparer<TId> _equalityComparer = EqualityComparer<TId>.Default;
private readonly List<TrackingItem<TDataItem, TId>> _trackingItems = []; //TODO: Dictionary... - J.
internal TrackingItem<T>? AddTrackingItem(TrackingState trackingState, T newValue, T? originalValue = null) //protected abstract bool HasIdValue(TDataItem dataItem);
//protected abstract int FindIndex(TDataItem newValue);
//public abstract bool TryGetTrackingItem(TId id, [NotNullWhen(true)] out TrackingItem<TDataItem, TId>? trackingItem);
private bool HasIdValue(TDataItem dataItem) => _equalityComparer.Equals(dataItem.Id, default);//dataItem.Id.IsNullOrEmpty();
public int FindIndex(TDataItem newValue) => _trackingItems.FindIndex(x => _equalityComparer.Equals(x.CurrentValue.Id, newValue.Id));
public bool TryGetTrackingItem(TId id, [NotNullWhen(true)] out TrackingItem<TDataItem, TId>? trackingItem)
{ {
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), $@"currentValue.Id.IsNullOrEmpty()"); trackingItem = _trackingItems.FirstOrDefault(x => _equalityComparer.Equals(x.CurrentValue.Id, id));
return trackingItem != null;
}
var itemIndex = _trackingItems.FindIndex(x => x.CurrentValue.Id == newValue.Id); internal TrackingItem<TDataItem, TId>? AddTrackingItem(TrackingState trackingState, TDataItem newValue, TDataItem? originalValue = null)
TrackingItem<T>? trackingItem = null; {
if (!HasIdValue(newValue)) throw new ArgumentNullException(nameof(newValue), $@"currentValue.Id.IsNullOrEmpty()");
var itemIndex = FindIndex(newValue); //_trackingItems.FindIndex(x => x.CurrentValue.Id == newValue.Id);
TrackingItem<TDataItem, TId>? trackingItem = null;
if (itemIndex > -1) if (itemIndex > -1)
{ {
@ -50,13 +94,13 @@ namespace AyCode.Services.Server.SignalRs
} }
return trackingItem.UpdateItem(trackingState, newValue); return trackingItem.UpdateItem(trackingState, newValue);
} }
if (originalValue != null && Equals(newValue, originalValue)) if (originalValue != null && Equals(newValue, originalValue))
originalValue = TrackingItemHelpers.JsonClone(originalValue); originalValue = TrackingItemHelpers.JsonClone(originalValue);
trackingItem = new TrackingItem<T>(trackingState, newValue, originalValue); //trackingItem = new TrackingItem<TDataItem>(trackingState, newValue, originalValue);
trackingItem = (TrackingItem<TDataItem, TId>)Activator.CreateInstance(typeof(TrackingItem<TDataItem, TId>), trackingState, newValue, originalValue)!;
_trackingItems.Add(trackingItem); _trackingItems.Add(trackingItem);
return trackingItem; return trackingItem;
@ -64,15 +108,9 @@ namespace AyCode.Services.Server.SignalRs
public int Count => _trackingItems.Count; public int Count => _trackingItems.Count;
internal void Clear() => _trackingItems.Clear(); internal void Clear() => _trackingItems.Clear();
public List<TrackingItem<T>> ToList() => _trackingItems.ToList(); public List<TrackingItem<TDataItem, TId>> ToList() => _trackingItems.ToList();
public bool TryGetTrackingItem(Guid id, [NotNullWhen(true)] out TrackingItem<T>? trackingItem) internal void Remove(TrackingItem<TDataItem, TId> trackingItem) => _trackingItems.Remove(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() //public IEnumerator<TrackingItem<T>> GetEnumerator()
//{ //{
@ -85,16 +123,52 @@ namespace AyCode.Services.Server.SignalRs
//} //}
} }
//[Serializable]
//[DebuggerDisplay("Count = {Count}")]
//public abstract class AcSignalRDataSourceGuid<TDataItem, TIList> : AcSignalRDataSource<TDataItem, Guid, TIList>
// where TDataItem : class, IId<Guid> where TIList : class, IList<TDataItem>
//{
// public AcSignalRDataSourceGuid(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, object[]? contextIds = null)
// : base(signalRClient, signalRCrudTags, contextIds)
// {
// }
// protected override bool HasIdValue(TDataItem dataItem) => !dataItem.Id.IsNullOrEmpty();
// protected override bool IdEquals(Guid id1, Guid id2) => id1 == id2;
// protected override int FindIndexInnerList(Guid id) => InnerList.FindIndex(x => x.Id == id);
// protected override TDataItem? FirstOrDefaultInnerList(Guid id) => InnerList.FirstOrDefault(x => x.Id == id);
//}
//[Serializable]
//[DebuggerDisplay("Count = {Count}")]
//public abstract class AcSignalRDataSourceInt<TDataItem, TIList> : AcSignalRDataSource<TDataItem, int, TIList>
// where TDataItem : class, IId<int> where TIList : class, IList<TDataItem>
//{
// public AcSignalRDataSourceInt(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, object[]? contextIds = null)
// : base(signalRClient, signalRCrudTags, contextIds)
// {
// }
// protected override bool HasIdValue(TDataItem dataItem) => true;
// protected override bool IdEquals(int id1, int id2) => id1 == id2;
// protected override int FindIndexInnerList(int id) => InnerList.FindIndex(x => x.Id == id);
// protected override TDataItem? FirstOrDefaultInnerList(int id) => InnerList.FirstOrDefault(x => x.Id == id);
//}
[Serializable] [Serializable]
[DebuggerDisplay("Count = {Count}")] [DebuggerDisplay("Count = {Count}")]
public class AcSignalRDataSource<T> : IList<T>, IList, IReadOnlyList<T> where T : class, IId<Guid> public abstract class AcSignalRDataSource<TDataItem, TId, TIList> : IList<TDataItem>, IList, IReadOnlyList<TDataItem>
where TDataItem : class, IId<TId> where TId : struct
where TIList : class, IList<TDataItem>
{ {
private readonly object _syncRoot = new(); private readonly object _syncRoot = new();
private readonly EqualityComparer<TId> _equalityComparer = EqualityComparer<TId>.Default;
protected List<T> InnerList = []; //TODO: Dictionary??? - J. protected TIList InnerList = Activator.CreateInstance<TIList>();// []; //TODO: Dictionary??? - J.
protected readonly ChangeTracking<T> TrackingItems = new(); protected readonly ChangeTracking<TDataItem, TId> TrackingItems = Activator.CreateInstance<ChangeTracking<TDataItem, TId>>();
public object[]? ContextIds; public object[]? ContextIds;
public string? FilterText { get; set; } public string? FilterText { get; set; }
@ -102,9 +176,19 @@ namespace AyCode.Services.Server.SignalRs
public AcSignalRClientBase SignalRClient; public AcSignalRClientBase SignalRClient;
protected readonly SignalRCrudTags SignalRCrudTags; protected readonly SignalRCrudTags SignalRCrudTags;
public Func<ItemChangedEventArgs<T>, Task>? OnDataSourceItemChanged; public Func<ItemChangedEventArgs<TDataItem>, Task>? OnDataSourceItemChanged;
public Func<Task>? OnDataSourceLoaded; public Func<Task>? OnDataSourceLoaded;
//protected abstract bool HasIdValue(TDataItem dataItem);
//protected abstract bool IdEquals(TId id1, TId id2);
//protected abstract int FindIndexInnerList(TId id);
//protected abstract TDataItem? FirstOrDefaultInnerList(TId id);
protected bool HasIdValue(TDataItem dataItem) => _equalityComparer.Equals(dataItem.Id, default);//dataItem.Id.IsNullOrEmpty();
protected bool IdEquals(TId id1, TId id2) => _equalityComparer.Equals(id1, id2);
protected int FindIndexInnerList(TId id) => InnerList.FindIndex(x => IdEquals(x.Id, id));
protected TDataItem? FirstOrDefaultInnerList(TId id) => InnerList.FirstOrDefault(x => IdEquals(x.Id, id));
public AcSignalRDataSource(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, object[]? contextIds = null) public AcSignalRDataSource(AcSignalRClientBase signalRClient, SignalRCrudTags signalRCrudTags, object[]? contextIds = null)
{ {
//if (contextIds != null) (ContextIds = new List<object>()).AddRange(contextIds); //if (contextIds != null) (ContextIds = new List<object>()).AddRange(contextIds);
@ -120,21 +204,21 @@ namespace AyCode.Services.Server.SignalRs
public bool HasWorkingReferenceList { get; private set; } public bool HasWorkingReferenceList { get; private set; }
public void SetWorkingReferenceList(List<T> workingList) public void SetWorkingReferenceList(TIList workingIList)
{ {
if (workingList == null!) return; //throw new ArgumentNullException(nameof(workingList)); if (workingIList == null!) return; //throw new ArgumentNullException(nameof(workingList));
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
try try
{ {
HasWorkingReferenceList = true; HasWorkingReferenceList = true;
if (ReferenceEquals(InnerList, workingList)) return; if (ReferenceEquals(InnerList, workingIList)) return;
if (workingList.Count == 0) workingList.AddRange(InnerList); if (workingIList.Count == 0) AddRange(InnerList, workingIList);
Clear(true); Clear(true);
InnerList = workingList; InnerList = workingIList;
} }
finally finally
{ {
@ -161,7 +245,7 @@ namespace AyCode.Services.Server.SignalRs
{ {
if (SignalRCrudTags.GetAllMessageTag == AcSignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetAllMessageTag == SignalRTags.None"); if (SignalRCrudTags.GetAllMessageTag == AcSignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetAllMessageTag == SignalRTags.None");
var responseData = (await SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, GetContextParams())) ?? throw new NullReferenceException(); var responseData = (await SignalRClient.GetAllAsync<TIList>(SignalRCrudTags.GetAllMessageTag, GetContextParams())) ?? throw new NullReferenceException();
await LoadDataSource(responseData, false, false, clearChangeTracking); await LoadDataSource(responseData, false, false, clearChangeTracking);
} }
@ -170,7 +254,7 @@ namespace AyCode.Services.Server.SignalRs
{ {
if (SignalRCrudTags.GetAllMessageTag == AcSignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetAllMessageTag == SignalRTags.None"); if (SignalRCrudTags.GetAllMessageTag == AcSignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetAllMessageTag == SignalRTags.None");
return SignalRClient.GetAllAsync<List<T>>(SignalRCrudTags.GetAllMessageTag, result=> return SignalRClient.GetAllAsync<TIList>(SignalRCrudTags.GetAllMessageTag, result=>
{ {
if (result.Status != SignalResponseStatus.Success || result.ResponseData == null) if (result.Status != SignalResponseStatus.Success || result.ResponseData == null)
throw new NullReferenceException($"LoadDataSourceAsync; result.Status != SignalResponseStatus.Success || result.ResponseData == null; Status: {SignalResponseStatus.Success}"); throw new NullReferenceException($"LoadDataSourceAsync; result.Status != SignalResponseStatus.Success || result.ResponseData == null; Status: {SignalResponseStatus.Success}");
@ -179,7 +263,19 @@ namespace AyCode.Services.Server.SignalRs
}, GetContextParams()); }, GetContextParams());
} }
public async Task LoadDataSource(IList<T> fromSource, bool refreshDataFromDbAsync = false, bool setSourceToWorkingReferenceList = false, bool clearChangeTracking = true) protected void AddRange(IEnumerable<TDataItem> source, TIList destination)
{
if (destination is List<TDataItem> dest) dest.AddRange(source);
else
{
foreach (var dataItem in source)
destination.Add(dataItem);
}
}
public void AddRange(IEnumerable<TDataItem> source) => AddRange(source, InnerList);
public async Task LoadDataSource(TIList fromSource, bool refreshDataFromDbAsync = false, bool setSourceToWorkingReferenceList = false, bool clearChangeTracking = true)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -189,8 +285,8 @@ namespace AyCode.Services.Server.SignalRs
{ {
Clear(clearChangeTracking); Clear(clearChangeTracking);
if (setSourceToWorkingReferenceList && fromSource is List<T> fromSourceList) SetWorkingReferenceList(fromSourceList); if (setSourceToWorkingReferenceList) SetWorkingReferenceList(fromSource);
else InnerList.AddRange(fromSource); else AddRange(fromSource);
} }
else if (clearChangeTracking) TrackingItems.Clear(); else if (clearChangeTracking) TrackingItems.Clear();
@ -204,23 +300,23 @@ namespace AyCode.Services.Server.SignalRs
if (OnDataSourceLoaded != null) await OnDataSourceLoaded.Invoke(); if (OnDataSourceLoaded != null) await OnDataSourceLoaded.Invoke();
} }
public async Task<T?> LoadItem(Guid id) public async Task<TDataItem?> LoadItem(TId id)
{ {
if (SignalRCrudTags.GetItemMessageTag == AcSignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetItemMessageTag == SignalRTags.None"); if (SignalRCrudTags.GetItemMessageTag == AcSignalRTags.None) throw new ArgumentException($"SignalRCrudTags.GetItemMessageTag == SignalRTags.None");
T? resultitem = null; TDataItem? resultitem = null;
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
try try
{ {
resultitem = await SignalRClient.GetByIdAsync<T>(SignalRCrudTags.GetItemMessageTag, id); resultitem = await SignalRClient.GetByIdAsync<TDataItem>(SignalRCrudTags.GetItemMessageTag, id);
if (resultitem == null) return null; if (resultitem == null) return null;
if (TryGetIndex(id, out var index)) InnerList[index] = resultitem; if (TryGetIndex(id, out var index)) InnerList[index] = resultitem;
else InnerList.Add(resultitem); else InnerList.Add(resultitem);
var eventArgs = new ItemChangedEventArgs<T>(resultitem, TrackingState.Get); var eventArgs = new ItemChangedEventArgs<TDataItem>(resultitem, TrackingState.Get);
if (OnDataSourceItemChanged != null) await OnDataSourceItemChanged.Invoke(eventArgs); if (OnDataSourceItemChanged != null) await OnDataSourceItemChanged.Invoke(eventArgs);
} }
finally finally
@ -237,7 +333,7 @@ namespace AyCode.Services.Server.SignalRs
/// <param name="index"></param> /// <param name="index"></param>
/// <returns></returns> /// <returns></returns>
/// <exception cref="ArgumentOutOfRangeException"></exception> /// <exception cref="ArgumentOutOfRangeException"></exception>
public T this[int index] public TDataItem this[int index]
{ {
get get
{ {
@ -268,16 +364,16 @@ namespace AyCode.Services.Server.SignalRs
} }
} }
public void Add(T newValue) public void Add(TDataItem newValue)
{ {
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Add->newValue.Id.IsNullOrEmpty()"); if (!HasIdValue(newValue)) throw new ArgumentNullException(nameof(newValue), @"Add->newValue.Id.IsNullOrEmpty()");
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
try try
{ {
if (Contains(newValue)) if (Contains(newValue))
throw new ArgumentException($@"It already contains this Id! Id: {newValue.Id}", nameof(newValue)); throw new ArgumentException($@"It already contains this Id! {newValue}", nameof(newValue));
UnsafeAdd(newValue); UnsafeAdd(newValue);
} }
@ -293,7 +389,7 @@ namespace AyCode.Services.Server.SignalRs
/// <param name="newValue"></param> /// <param name="newValue"></param>
/// <param name="autoSave"></param> /// <param name="autoSave"></param>
/// <exception cref="ArgumentException"></exception> /// <exception cref="ArgumentException"></exception>
public async Task<T> Add(T newValue, bool autoSave) public async Task<TDataItem> Add(TDataItem newValue, bool autoSave)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -315,9 +411,9 @@ namespace AyCode.Services.Server.SignalRs
/// <param name="newValue"></param> /// <param name="newValue"></param>
/// <param name="autoSave"></param> /// <param name="autoSave"></param>
/// <returns></returns> /// <returns></returns>
public async Task<T> AddOrUpdate(T newValue, bool autoSave) public async Task<TDataItem> AddOrUpdate(TDataItem newValue, bool autoSave)
{ {
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"AddOrUpdate->newValue.Id.IsNullOrEmpty()"); if (!HasIdValue(newValue)) throw new ArgumentNullException(nameof(newValue), @"AddOrUpdate->newValue.Id.IsNullOrEmpty()");
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -342,7 +438,7 @@ namespace AyCode.Services.Server.SignalRs
// } // }
//} //}
protected void UnsafeAdd(T newValue) protected void UnsafeAdd(TDataItem newValue)
{ {
TrackingItems.AddTrackingItem(TrackingState.Add, newValue); TrackingItems.AddTrackingItem(TrackingState.Add, newValue);
InnerList.Add(newValue); InnerList.Add(newValue);
@ -356,16 +452,16 @@ namespace AyCode.Services.Server.SignalRs
/// <param name="autoSave"></param> /// <param name="autoSave"></param>
/// <exception cref="ArgumentException"></exception> /// <exception cref="ArgumentException"></exception>
/// <exception cref="NullReferenceException"></exception> /// <exception cref="NullReferenceException"></exception>
public void Insert(int index, T newValue) public void Insert(int index, TDataItem newValue)
{ {
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"Insert->newValue.Id.IsNullOrEmpty()"); if (!HasIdValue(newValue)) throw new ArgumentNullException(nameof(newValue), @"Insert->newValue.Id.IsNullOrEmpty()");
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
try try
{ {
if (Contains(newValue)) if (Contains(newValue))
throw new ArgumentException($@"Insert; It already contains this Id! Id: {newValue.Id}", nameof(newValue)); throw new ArgumentException($@"Insert; It already contains this Id! {newValue}", nameof(newValue));
TrackingItems.AddTrackingItem(TrackingState.Add, newValue); TrackingItems.AddTrackingItem(TrackingState.Add, newValue);
InnerList.Insert(index, newValue); InnerList.Insert(index, newValue);
@ -376,7 +472,7 @@ namespace AyCode.Services.Server.SignalRs
} }
} }
public async Task<T> Insert(int index, T newValue, bool autoSave) public async Task<TDataItem> Insert(int index, TDataItem newValue, bool autoSave)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -396,7 +492,7 @@ namespace AyCode.Services.Server.SignalRs
/// </summary> /// </summary>
/// <param name="newItem"></param> /// <param name="newItem"></param>
/// <param name="autoSave"></param> /// <param name="autoSave"></param>
public Task<T> Update(T newItem, bool autoSave) => Update(IndexOf(newItem), newItem, autoSave); public Task<TDataItem> Update(TDataItem newItem, bool autoSave) => Update(IndexOf(newItem), newItem, autoSave);
/// <summary> /// <summary>
/// UpdateMessageTag /// UpdateMessageTag
@ -408,7 +504,7 @@ namespace AyCode.Services.Server.SignalRs
/// /// <exception cref="NullReferenceException"></exception> /// /// <exception cref="NullReferenceException"></exception>
/// <exception cref="ArgumentNullException"></exception> /// <exception cref="ArgumentNullException"></exception>
/// <exception cref="ArgumentOutOfRangeException"></exception> /// <exception cref="ArgumentOutOfRangeException"></exception>
public async Task<T> Update(int index, T newValue, bool autoSave) public async Task<TDataItem> Update(int index, TDataItem newValue, bool autoSave)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -424,10 +520,10 @@ namespace AyCode.Services.Server.SignalRs
} }
} }
private void UpdateUnsafe(int index, T newValue) private void UpdateUnsafe(int index, TDataItem newValue)
{ {
if (default(T) != null && newValue == null) throw new NullReferenceException(nameof(newValue)); if (default(TDataItem) != null && newValue == null) throw new NullReferenceException(nameof(newValue));
if (newValue.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(newValue), @"UpdateUnsafe->newValue.Id.IsNullOrEmpty()"); if (!HasIdValue(newValue)) throw new ArgumentNullException(nameof(newValue), @"UpdateUnsafe->newValue.Id.IsNullOrEmpty()");
if ((uint)index >= (uint)Count) throw new ArgumentOutOfRangeException(nameof(index)); if ((uint)index >= (uint)Count) throw new ArgumentOutOfRangeException(nameof(index));
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -436,8 +532,8 @@ namespace AyCode.Services.Server.SignalRs
{ {
var currentItem = InnerList[index]; var currentItem = InnerList[index];
if (currentItem.Id != newValue.Id) if (!IdEquals(currentItem.Id, newValue.Id))
throw new ArgumentException($@"UpdateUnsafe; currentItem.Id != item.Id! Id: {newValue.Id}", nameof(newValue)); throw new ArgumentException($@"UpdateUnsafe; currentItem.Id != item.Id! {newValue}", nameof(newValue));
TrackingItems.AddTrackingItem(TrackingState.Update, newValue, currentItem); TrackingItems.AddTrackingItem(TrackingState.Update, newValue, currentItem);
InnerList[index] = newValue; InnerList[index] = newValue;
@ -454,7 +550,7 @@ namespace AyCode.Services.Server.SignalRs
/// </summary> /// </summary>
/// <param name="item"></param> /// <param name="item"></param>
/// <returns></returns> /// <returns></returns>
public bool Remove(T item) public bool Remove(TDataItem item)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -473,7 +569,22 @@ namespace AyCode.Services.Server.SignalRs
} }
} }
public async Task<bool> Remove(T item, bool autoSave) public async Task<bool> Remove(TId id, bool autoSave)
{
Monitor.Enter(_syncRoot);
try
{
var item = FirstOrDefaultInnerList(id);
return item == null || await Remove(item, autoSave);
}
finally
{
Monitor.Exit(_syncRoot);
}
}
public async Task<bool> Remove(TDataItem item, bool autoSave)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -497,7 +608,7 @@ namespace AyCode.Services.Server.SignalRs
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="item"></param> /// <param name="item"></param>
/// <returns></returns> /// <returns></returns>
public bool TryRemove(Guid id, out T? item) public bool TryRemove(TId id, out TDataItem? item)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -509,7 +620,6 @@ namespace AyCode.Services.Server.SignalRs
{ {
Monitor.Exit(_syncRoot); Monitor.Exit(_syncRoot);
} }
} }
/// <summary> /// <summary>
@ -526,7 +636,7 @@ namespace AyCode.Services.Server.SignalRs
try try
{ {
var currentItem = InnerList[index]; var currentItem = InnerList[index];
if (currentItem.Id.IsNullOrEmpty()) throw new ArgumentNullException(nameof(currentItem), $@"RemoveAt->item.Id.IsNullOrEmpty(); index: {index}"); if (!HasIdValue(currentItem)) throw new ArgumentNullException(nameof(currentItem), $@"RemoveAt->item.Id.IsNullOrEmpty(); index: {index}");
TrackingItems.AddTrackingItem(TrackingState.Remove, currentItem, currentItem); TrackingItems.AddTrackingItem(TrackingState.Remove, currentItem, currentItem);
InnerList.RemoveAt(index); InnerList.RemoveAt(index);
@ -560,7 +670,7 @@ namespace AyCode.Services.Server.SignalRs
/// ///
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public List<TrackingItem<T>> GetTrackingItems() public List<TrackingItem<TDataItem, TId>> GetTrackingItems()
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -574,7 +684,7 @@ namespace AyCode.Services.Server.SignalRs
} }
} }
public void SetTrackingStateToUpdate(T item) public void SetTrackingStateToUpdate(TDataItem item)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -603,7 +713,7 @@ namespace AyCode.Services.Server.SignalRs
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="trackingItem"></param> /// <param name="trackingItem"></param>
/// <returns></returns> /// <returns></returns>
public bool TryGetTrackingItem(Guid id, [NotNullWhen(true)] out TrackingItem<T>? trackingItem) public bool TryGetTrackingItem(TId id, [NotNullWhen(true)] out TrackingItem<TDataItem, TId>? trackingItem)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -622,7 +732,7 @@ namespace AyCode.Services.Server.SignalRs
/// ///
/// </summary> /// </summary>
/// <returns>Unsaved items</returns> /// <returns>Unsaved items</returns>
public async Task<List<TrackingItem<T>>> SaveChanges() public async Task<List<TrackingItem<TDataItem, TId>>> SaveChanges()
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
@ -677,13 +787,13 @@ namespace AyCode.Services.Server.SignalRs
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
public async Task<T> SaveItem(Guid id) public async Task<TDataItem> SaveItem(TId id)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
try try
{ {
T resultItem = null!; TDataItem resultItem = null!;
if (TryGetTrackingItem(id, out var trackingItem)) if (TryGetTrackingItem(id, out var trackingItem))
resultItem = await SaveTrackingItemUnsafe(trackingItem); resultItem = await SaveTrackingItemUnsafe(trackingItem);
@ -697,13 +807,13 @@ namespace AyCode.Services.Server.SignalRs
} }
} }
public async Task<T> SaveItem(Guid id, TrackingState trackingState) public async Task<TDataItem> SaveItem(TId id, TrackingState trackingState)
{ {
//Monitor.Enter(_syncRoot); //Monitor.Enter(_syncRoot);
try try
{ {
T resultItem = null!; TDataItem resultItem = null!;
if (TryGetValue(id, out var item)) if (TryGetValue(id, out var item))
resultItem = await SaveItem(item, trackingState); resultItem = await SaveItem(item, trackingState);
@ -717,15 +827,15 @@ namespace AyCode.Services.Server.SignalRs
} }
} }
public Task<T> SaveItem(T item, TrackingState trackingState) => SaveItemUnsafe(item, trackingState); public Task<TDataItem> SaveItem(TDataItem item, TrackingState trackingState) => SaveItemUnsafe(item, trackingState);
protected Task<T> SaveTrackingItemUnsafe(TrackingItem<T> trackingItem) protected Task<TDataItem> SaveTrackingItemUnsafe(TrackingItem<TDataItem, TId> trackingItem)
=> SaveItemUnsafe(trackingItem.CurrentValue, trackingItem.TrackingState); => SaveItemUnsafe(trackingItem.CurrentValue, trackingItem.TrackingState);
protected Task SaveTrackingItemUnsafeAsync(TrackingItem<T> trackingItem) protected Task SaveTrackingItemUnsafeAsync(TrackingItem<TDataItem, TId> trackingItem)
=> SaveItemUnsafeAsync(trackingItem.CurrentValue, trackingItem.TrackingState); => SaveItemUnsafeAsync(trackingItem.CurrentValue, trackingItem.TrackingState);
protected Task<T> SaveItemUnsafe(T item, TrackingState trackingState) protected Task<TDataItem> SaveItemUnsafe(TDataItem item, TrackingState trackingState)
{ {
var messageTag = SignalRCrudTags.GetMessageTagByTrackingState(trackingState); var messageTag = SignalRCrudTags.GetMessageTagByTrackingState(trackingState);
if (messageTag == AcSignalRTags.None) throw new ArgumentException($"SaveItemUnsafe; messageTag == SignalRTags.None"); if (messageTag == AcSignalRTags.None) throw new ArgumentException($"SaveItemUnsafe; messageTag == SignalRTags.None");
@ -744,7 +854,7 @@ namespace AyCode.Services.Server.SignalRs
}); });
} }
protected Task SaveItemUnsafeAsync(T item, TrackingState trackingState) protected Task SaveItemUnsafeAsync(TDataItem item, TrackingState trackingState)
{ {
var messageTag = SignalRCrudTags.GetMessageTagByTrackingState(trackingState); var messageTag = SignalRCrudTags.GetMessageTagByTrackingState(trackingState);
if (messageTag == AcSignalRTags.None) return Task.CompletedTask; if (messageTag == AcSignalRTags.None) return Task.CompletedTask;
@ -771,7 +881,7 @@ namespace AyCode.Services.Server.SignalRs
}); });
} }
private Task ProcessSavedResponseItem(T? resultItem, TrackingState trackingState) private Task ProcessSavedResponseItem(TDataItem? resultItem, TrackingState trackingState)
{ {
if (resultItem == null) return Task.CompletedTask; if (resultItem == null) return Task.CompletedTask;
@ -781,13 +891,13 @@ namespace AyCode.Services.Server.SignalRs
if (TryGetIndex(resultItem.Id, out var index)) if (TryGetIndex(resultItem.Id, out var index))
InnerList[index] = resultItem; InnerList[index] = resultItem;
var eventArgs = new ItemChangedEventArgs<T>(resultItem, trackingState); var eventArgs = new ItemChangedEventArgs<TDataItem>(resultItem, trackingState);
if (OnDataSourceItemChanged != null) return OnDataSourceItemChanged.Invoke(eventArgs); if (OnDataSourceItemChanged != null) return OnDataSourceItemChanged.Invoke(eventArgs);
return Task.CompletedTask; return Task.CompletedTask;
} }
protected void RollbackItemUnsafe(TrackingItem<T> trackingItem) protected void RollbackItemUnsafe(TrackingItem<TDataItem, TId> trackingItem)
{ {
if (TryGetIndex(trackingItem.CurrentValue.Id, out var index)) if (TryGetIndex(trackingItem.CurrentValue.Id, out var index))
{ {
@ -800,7 +910,7 @@ namespace AyCode.Services.Server.SignalRs
TrackingItems.Remove(trackingItem); TrackingItems.Remove(trackingItem);
} }
public bool TryRollbackItem(Guid id, out T? originalValue) public bool TryRollbackItem(TId id, out TDataItem? originalValue)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
try try
@ -869,12 +979,12 @@ namespace AyCode.Services.Server.SignalRs
} }
} }
public int IndexOf(Guid id) public int IndexOf(TId id)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
try try
{ {
return InnerList.FindIndex(x => x.Id == id); return FindIndexInnerList(id);
} }
finally finally
{ {
@ -883,17 +993,17 @@ namespace AyCode.Services.Server.SignalRs
} }
public int IndexOf(T item) => IndexOf(item.Id); public int IndexOf(TDataItem item) => IndexOf(item.Id);
public bool TryGetIndex(Guid id, out int index) => (index = IndexOf(id)) > -1; public bool TryGetIndex(TId id, out int index) => (index = IndexOf(id)) > -1;
public bool Contains(T item) => IndexOf(item) > -1; public bool Contains(TDataItem item) => IndexOf(item) > -1;
public bool TryGetValue(Guid id, [NotNullWhen(true)] out T? item) public bool TryGetValue(TId id, [NotNullWhen(true)] out TDataItem? item)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
try try
{ {
item = InnerList.FirstOrDefault(x => x.Id == id); item = FirstOrDefaultInnerList(id);//InnerList.FirstOrDefault(x => x.Id == id);
return item != null; return item != null;
} }
finally finally
@ -902,9 +1012,9 @@ namespace AyCode.Services.Server.SignalRs
} }
} }
public void CopyTo(T[] array) => CopyTo(array, 0); public void CopyTo(TDataItem[] array) => CopyTo(array, 0);
public void CopyTo(T[] array, int arrayIndex) public void CopyTo(TDataItem[] array, int arrayIndex)
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
try try
@ -918,7 +1028,7 @@ namespace AyCode.Services.Server.SignalRs
} }
public int BinarySearch(int index, int count, T item, IComparer<T>? comparer) public int BinarySearch(int index, int count, TDataItem item, IComparer<TDataItem>? comparer)
{ {
throw new NotImplementedException($"BinarySearch"); throw new NotImplementedException($"BinarySearch");
if (index < 0) if (index < 0)
@ -939,10 +1049,10 @@ namespace AyCode.Services.Server.SignalRs
//} //}
} }
public int BinarySearch(T item) => BinarySearch(0, Count, item, null); public int BinarySearch(TDataItem item) => BinarySearch(0, Count, item, null);
public int BinarySearch(T item, IComparer<T>? comparer) => BinarySearch(0, Count, item, comparer); public int BinarySearch(TDataItem item, IComparer<TDataItem>? comparer) => BinarySearch(0, Count, item, comparer);
public IEnumerator<T> GetEnumerator() public IEnumerator<TDataItem> GetEnumerator()
{ {
Monitor.Enter(_syncRoot); Monitor.Enter(_syncRoot);
try try
@ -957,8 +1067,8 @@ namespace AyCode.Services.Server.SignalRs
} }
public ReadOnlyCollection<T> AsReadOnly() => new(this); public ReadOnlyCollection<TDataItem> AsReadOnly() => new(this);
private static bool IsCompatibleObject(object? value) => (value is T) || (value == null && default(T) == null); private static bool IsCompatibleObject(object? value) => (value is TDataItem) || (value == null && default(TDataItem) == null);
#region IList, ICollection #region IList, ICollection
@ -970,11 +1080,11 @@ namespace AyCode.Services.Server.SignalRs
get => this[index]; get => this[index];
set set
{ {
if (default(T) != null && value == null) throw new NullReferenceException(nameof(value)); if (default(TDataItem) != null && value == null) throw new NullReferenceException(nameof(value));
try try
{ {
this[index] = (T)value!; this[index] = (TDataItem)value!;
} }
catch (InvalidCastException) catch (InvalidCastException)
{ {
@ -985,11 +1095,11 @@ namespace AyCode.Services.Server.SignalRs
int IList.Add(object? item) int IList.Add(object? item)
{ {
if (default(T) != null && item == null) throw new NullReferenceException(nameof(item)); if (default(TDataItem) != null && item == null) throw new NullReferenceException(nameof(item));
try try
{ {
Add((T)item!); Add((TDataItem)item!);
} }
catch (InvalidCastException) catch (InvalidCastException)
{ {
@ -1001,16 +1111,16 @@ namespace AyCode.Services.Server.SignalRs
void IList.Clear() => Clear(true); void IList.Clear() => Clear(true);
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
bool IList.Contains(object? item) => IsCompatibleObject(item) && Contains((T)item!); bool IList.Contains(object? item) => IsCompatibleObject(item) && Contains((TDataItem)item!);
int IList.IndexOf(object? item) => (IsCompatibleObject(item)) ? IndexOf((T)item!) : -1; int IList.IndexOf(object? item) => (IsCompatibleObject(item)) ? IndexOf((TDataItem)item!) : -1;
void IList.Insert(int index, object? item) void IList.Insert(int index, object? item)
{ {
if (default(T) != null && item == null) throw new NullReferenceException(nameof(item)); if (default(TDataItem) != null && item == null) throw new NullReferenceException(nameof(item));
try try
{ {
Insert(index, (T)item!); Insert(index, (TDataItem)item!);
} }
catch (InvalidCastException) catch (InvalidCastException)
{ {
@ -1020,10 +1130,10 @@ namespace AyCode.Services.Server.SignalRs
void IList.Remove(object? item) void IList.Remove(object? item)
{ {
if (IsCompatibleObject(item)) Remove((T)item!); if (IsCompatibleObject(item)) Remove((TDataItem)item!);
} }
void ICollection<T>.Clear() => Clear(true); void ICollection<TDataItem>.Clear() => Clear(true);
void ICollection.CopyTo(Array array, int arrayIndex) void ICollection.CopyTo(Array array, int arrayIndex)
{ {
@ -1053,15 +1163,15 @@ namespace AyCode.Services.Server.SignalRs
} }
int ICollection.Count => Count; int ICollection.Count => Count;
int ICollection<T>.Count => Count; int ICollection<TDataItem>.Count => Count;
bool ICollection<T>.IsReadOnly => false; bool ICollection<TDataItem>.IsReadOnly => false;
void IList<T>.RemoveAt(int index) => RemoveAt(index); void IList<TDataItem>.RemoveAt(int index) => RemoveAt(index);
int IReadOnlyCollection<T>.Count => Count; int IReadOnlyCollection<TDataItem>.Count => Count;
#endregion IList, ICollection #endregion IList, ICollection
} }
public class ItemChangedEventArgs<T> where T : IId<Guid> public class ItemChangedEventArgs<T> where T : class
{ {
internal ItemChangedEventArgs(T item, TrackingState trackingState) internal ItemChangedEventArgs(T item, TrackingState trackingState)
{ {