From df18373ee5dbde7176822107f1a4b7f7fdd5dd4c Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Fri, 2 Sep 2022 15:11:06 +0800 Subject: [PATCH] AggregateRootRepository --- FreeSql.Repository/AggregateRootRepository.cs | 27 +++---- .../AggregateRootRepositorySync.cs | 72 +++++++++---------- FreeSql.Repository/AggregateRootUtils.cs | 26 +++---- 3 files changed, 63 insertions(+), 62 deletions(-) diff --git a/FreeSql.Repository/AggregateRootRepository.cs b/FreeSql.Repository/AggregateRootRepository.cs index 12e5f0a7..5d3e08f3 100644 --- a/FreeSql.Repository/AggregateRootRepository.cs +++ b/FreeSql.Repository/AggregateRootRepository.cs @@ -57,11 +57,11 @@ namespace FreeSql public Type EntityType => _repository.EntityType; public IDataFilter DataFilter => _repository.DataFilter; - public void Attach(TEntity entity) => AttachCascade(entity); + public void Attach(TEntity entity) => AttachAggregateRoot(entity); public void Attach(IEnumerable entity) { foreach (var item in entity) - AttachCascade(item); + AttachAggregateRoot(item); } public IBaseRepository AttachOnlyPrimary(TEntity data) => _repository.AttachOnlyPrimary(data); public Dictionary CompareState(TEntity newdata) => _repository.CompareState(newdata); @@ -120,7 +120,7 @@ namespace FreeSql if (data == null) throw new ArgumentNullException(nameof(data)); var key = Orm.GetEntityKeyString(EntityType, data, false); var state = new EntityState((TEntity)EntityType.CreateInstanceGetDefaultValue(), key); - AggregateRootUtils.MapEntityValueCascade(Orm, EntityType, data, state.Value); + AggregateRootUtils.MapEntityValue(Orm, EntityType, data, state.Value); return state; } bool? ExistsInStates(object data) @@ -130,7 +130,7 @@ namespace FreeSql if (string.IsNullOrEmpty(key)) return null; return _states.ContainsKey(key); } - void AttachCascade(TEntity entity) + void AttachAggregateRoot(TEntity entity) { var state = CreateEntityState(entity); if (_states.ContainsKey(state.Key)) _states[state.Key] = state; @@ -138,17 +138,18 @@ namespace FreeSql } #endregion - #region Select - public virtual ISelect Select + #region Selectoriginal + public virtual ISelect Select => SelectAggregateRoot; + ISelect SelectAggregateRoot { get { - var query = _repository.Select.TrackToList(SelectTrackingAggregateRootNavigate); - SelectFetchAggregateRootNavigate(query, EntityType, "", new Stack()); + var query = _repository.Select.TrackToList(SelectAggregateRootTracking); + SelectAggregateRootNavigateReader(query, EntityType, "", new Stack()); return query; } } - void SelectFetchAggregateRootNavigate(ISelect currentQuery, Type entityType, string navigatePath, Stack ignores) + void SelectAggregateRootNavigateReader(ISelect currentQuery, Type entityType, string navigatePath, Stack ignores) { if (ignores.Any(a => a == entityType)) return; ignores.Push(entityType); @@ -164,12 +165,12 @@ namespace FreeSql case TableRefType.OneToOne: if (ignores.Any(a => a == tbref.RefEntityType)) break; currentQuery.IncludeByPropertyName(navigateExpression); - SelectFetchAggregateRootNavigate(currentQuery, tbref.RefEntityType, navigateExpression, ignores); + SelectAggregateRootNavigateReader(currentQuery, tbref.RefEntityType, navigateExpression, ignores); break; case TableRefType.OneToMany: var ignoresCopy = new Stack(ignores.ToArray()); currentQuery.IncludeByPropertyName(navigateExpression, then => - SelectFetchAggregateRootNavigate(then, tbref.RefEntityType, "", ignoresCopy)); + SelectAggregateRootNavigateReader(then, tbref.RefEntityType, "", ignoresCopy)); break; case TableRefType.ManyToMany: currentQuery.IncludeByPropertyName(navigateExpression); @@ -181,7 +182,7 @@ namespace FreeSql } ignores.Pop(); } - void SelectTrackingAggregateRootNavigate(object list) + void SelectAggregateRootTracking(object list) { if (list == null) return; var ls = list as IEnumerable; @@ -202,7 +203,7 @@ namespace FreeSql if (Orm.CodeFirst.GetTableByEntity(itemType)?.Primarys.Any() != true) return; if (itemType.GetConstructor(Type.EmptyTypes) == null) return; } - AttachCascade(item as TEntity); + AttachAggregateRoot(item as TEntity); } return; } diff --git a/FreeSql.Repository/AggregateRootRepositorySync.cs b/FreeSql.Repository/AggregateRootRepositorySync.cs index 5d40f0ec..0826d3eb 100644 --- a/FreeSql.Repository/AggregateRootRepositorySync.cs +++ b/FreeSql.Repository/AggregateRootRepositorySync.cs @@ -15,28 +15,28 @@ namespace FreeSql { partial class AggregateRootRepository { - public TEntity Insert(TEntity entity) => InsertCascade(new[] { entity }).FirstOrDefault(); - public List Insert(IEnumerable entitys) => InsertCascade(entitys); - public TEntity InsertOrUpdate(TEntity entity) => InsertOrUpdateCascade(entity); - public int Update(TEntity entity) => UpdateCascade(new[] { entity }); - public int Update(IEnumerable entitys) => UpdateCascade(entitys); - public int Delete(TEntity entity) => DeleteCascade(new[] { entity }); - public int Delete(IEnumerable entitys) => DeleteCascade(entitys); - public int Delete(Expression> predicate) => DeleteCascade(Where(predicate).ToList()); + public TEntity Insert(TEntity entity) => InsertAggregateRoot(new[] { entity }).FirstOrDefault(); + public List Insert(IEnumerable entitys) => InsertAggregateRoot(entitys); + public TEntity InsertOrUpdate(TEntity entity) => InsertOrUpdateAggregateRoot(entity); + public int Update(TEntity entity) => UpdateAggregateRoot(new[] { entity }); + public int Update(IEnumerable entitys) => UpdateAggregateRoot(entitys); + public int Delete(TEntity entity) => DeleteAggregateRoot(new[] { entity }); + public int Delete(IEnumerable entitys) => DeleteAggregateRoot(entitys); + public int Delete(Expression> predicate) => DeleteAggregateRoot(SelectAggregateRoot.Where(predicate).ToList()); public List DeleteCascadeByDatabase(Expression> predicate) { var deletedOutput = new List(); - DeleteCascade(Where(predicate).ToList(), deletedOutput); + DeleteAggregateRoot(SelectAggregateRoot.Where(predicate).ToList(), deletedOutput); return deletedOutput; } - public void SaveMany(TEntity entity, string propertyName) => SaveManyCascade(entity, propertyName); + public void SaveMany(TEntity entity, string propertyName) => SaveManyAggregateRoot(entity, propertyName); - protected virtual List InsertCascade(IEnumerable entitys) + protected virtual List InsertAggregateRoot(IEnumerable entitys) { var repos = new Dictionary(); try { - return InsertCascadeStatic(_repository, GetChildRepository, entitys); + return InsertAggregateRootStatic(_repository, GetChildRepository, entitys); } finally { @@ -44,12 +44,12 @@ namespace FreeSql _repository.FlushState(); } } - protected static List InsertCascadeStatic(IBaseRepository rootRepository, Func> getChildRepository, IEnumerable rootEntitys) { + protected static List InsertAggregateRootStatic(IBaseRepository rootRepository, Func> getChildRepository, IEnumerable rootEntitys) { Dictionary> ignores = new Dictionary>(); Dictionary> repos = new Dictionary>(); - return LocalInsertCascade(rootRepository, rootEntitys); + return LocalInsertAggregateRoot(rootRepository, rootEntitys); - bool LocalCanCascade(Type entityType, object entity, bool isadd) + bool LocalCanAggregateRoot(Type entityType, object entity, bool isadd) { var stateKey = rootRepository.Orm.GetEntityKeyString(entityType, entity, false); if (stateKey == null) return true; @@ -69,10 +69,10 @@ namespace FreeSql } return false; } - List LocalInsertCascade(IBaseRepository repository, IEnumerable entitys) where T1 : class + List LocalInsertAggregateRoot(IBaseRepository repository, IEnumerable entitys) where T1 : class { var ret = repository.Insert(entitys); - foreach (var entity in entitys) LocalCanCascade(repository.EntityType, entity, true); + foreach (var entity in entitys) LocalCanAggregateRoot(repository.EntityType, entity, true); var table = repository.Orm.CodeFirst.GetTableByEntity(repository.EntityType); foreach (var prop in table.Properties.Values) @@ -85,14 +85,14 @@ namespace FreeSql var otoList = ret.Select(entity => { var otoItem = table.GetPropertyValue(entity, prop.Name); - if (LocalCanCascade(tbref.RefEntityType, otoItem, false) == false) return null; + if (LocalCanAggregateRoot(tbref.RefEntityType, otoItem, false) == false) return null; AggregateRootUtils.SetNavigateRelationshipValue(repository.Orm, tbref, table.Type, entity, otoItem); return otoItem; }).Where(entity => entity != null).ToArray(); if (otoList.Any()) { var repo = getChildRepository(tbref.RefEntityType); - LocalInsertCascade(repo, otoList); + LocalInsertAggregateRoot(repo, otoList); } break; case TableRefType.OneToMany: @@ -103,7 +103,7 @@ namespace FreeSql var otmItems = new List(); foreach (var otmItem in otmEach) { - if (LocalCanCascade(tbref.RefEntityType, otmItem, false) == false) continue; + if (LocalCanAggregateRoot(tbref.RefEntityType, otmItem, false) == false) continue; otmItems.Add(otmItem); } AggregateRootUtils.SetNavigateRelationshipValue(repository.Orm, tbref, table.Type, entity, otmItems); @@ -112,7 +112,7 @@ namespace FreeSql if (otmList.Any()) { var repo = getChildRepository(tbref.RefEntityType); - LocalInsertCascade(repo, otmList); + LocalInsertAggregateRoot(repo, otmList); } break; case TableRefType.ManyToMany: @@ -125,7 +125,7 @@ namespace FreeSql if (mtmMidList.Any()) { var repo = getChildRepository(tbref.RefMiddleEntityType); - LocalInsertCascade(repo, mtmMidList); + LocalInsertAggregateRoot(repo, mtmMidList); } break; case TableRefType.PgArrayToMany: @@ -136,7 +136,7 @@ namespace FreeSql } } - protected virtual TEntity InsertOrUpdateCascade(TEntity entity) + protected virtual TEntity InsertOrUpdateAggregateRoot(TEntity entity) { var stateKey = Orm.GetEntityKeyString(EntityType, entity, false); if (entity == null) throw new ArgumentNullException(nameof(entity)); @@ -150,13 +150,13 @@ namespace FreeSql } if (flagExists == true) { - var affrows = UpdateCascade(new[] { entity }); + var affrows = UpdateAggregateRoot(new[] { entity }); if (affrows > 0) return entity; } Orm.ClearEntityPrimaryValueWithIdentity(EntityType, entity); - return InsertCascade(new[] { entity }).FirstOrDefault(); + return InsertAggregateRoot(new[] { entity }).FirstOrDefault(); } - protected virtual int UpdateCascade(IEnumerable entitys) + protected virtual int UpdateAggregateRoot(IEnumerable entitys) { List> insertLog = new List>(); List>> updateLog = new List>>(); @@ -165,12 +165,12 @@ namespace FreeSql { var stateKey = Orm.GetEntityKeyString(EntityType, entity, false); if (_states.TryGetValue(stateKey, out var state) == false) throw new Exception($"AggregateRootRepository 使用仓储对象查询后，才可以更新数据 {Orm.GetEntityString(EntityType, entity)}"); - AggregateRootUtils.CompareEntityValueCascade(Orm, EntityType, state.Value, entity, null, insertLog, updateLog, deleteLog); - AttachCascade(entity); + AggregateRootUtils.CompareEntityValue(Orm, EntityType, state.Value, entity, null, insertLog, updateLog, deleteLog); + AttachAggregateRoot(entity); } return insertLog.Count + updateLog.Count + deleteLog.Count; } - protected virtual int DeleteCascade(IEnumerable entitys, List deletedOutput = null) + protected virtual int DeleteAggregateRoot(IEnumerable entitys, List deletedOutput = null) { List> insertLog = new List>(); List>> updateLog = new List>>(); @@ -178,22 +178,22 @@ namespace FreeSql foreach (var entity in entitys) { var stateKey = Orm.GetEntityKeyString(EntityType, entity, false); - AggregateRootUtils.CompareEntityValueCascade(Orm, EntityType, entity, null, null, insertLog, updateLog, deleteLog); + AggregateRootUtils.CompareEntityValue(Orm, EntityType, entity, null, null, insertLog, updateLog, deleteLog); _states.Remove(stateKey); } if (deletedOutput != null) deletedOutput.AddRange(deleteLog.Select(a => a.Item2)); return deleteLog.Count; } - protected virtual void SaveManyCascade(TEntity entity, string propertyName) + protected virtual void SaveManyAggregateRoot(TEntity entity, string propertyName) { List> insertLog = new List>(); List>> updateLog = new List>>(); List> deleteLog = new List>(); var stateKey = Orm.GetEntityKeyString(EntityType, entity, false); if (_states.TryGetValue(stateKey, out var state) == false) throw new Exception($"AggregateRootRepository 使用仓储对象查询后，才可以保存数据 {Orm.GetEntityString(EntityType, entity)}"); - AggregateRootUtils.CompareEntityValueCascade(Orm, EntityType, state.Value, entity, propertyName, insertLog, updateLog, deleteLog); - AttachCascade(entity); + AggregateRootUtils.CompareEntityValue(Orm, EntityType, state.Value, entity, propertyName, insertLog, updateLog, deleteLog); + AttachAggregateRoot(entity); } protected List _dataEditing; @@ -212,7 +212,7 @@ namespace FreeSql _statesEditing.AddOrUpdate(key, k => CreateEntityState(item), (k, ov) => { - AggregateRootUtils.MapEntityValueCascade(Orm, EntityType, item, ov.Value); + AggregateRootUtils.MapEntityValue(Orm, EntityType, item, ov.Value); ov.Time = DateTime.Now; return ov; }); @@ -238,11 +238,11 @@ namespace FreeSql continue; } _states[key] = state; - AggregateRootUtils.CompareEntityValueCascade(Orm, EntityType, state.Value, item, null, insertLog, updateLog, deleteLog); + AggregateRootUtils.CompareEntityValue(Orm, EntityType, state.Value, item, null, insertLog, updateLog, deleteLog); } foreach (var item in _statesEditing.Values.OrderBy(a => a.Time)) { - AggregateRootUtils.CompareEntityValueCascade(Orm, EntityType, item, null, null, insertLog, updateLog, deleteLog); + AggregateRootUtils.CompareEntityValue(Orm, EntityType, item, null, null, insertLog, updateLog, deleteLog); } } finally diff --git a/FreeSql.Repository/AggregateRootUtils.cs b/FreeSql.Repository/AggregateRootUtils.cs index a391b71e..890fc7e3 100644 --- a/FreeSql.Repository/AggregateRootUtils.cs +++ b/FreeSql.Repository/AggregateRootUtils.cs @@ -12,7 +12,7 @@ using System.Reflection; static class AggregateRootUtils { - public static void CompareEntityValueCascade(IFreeSql fsql, Type entityType, object entityBefore, object entityAfter, string navigatePropertyName, + public static void CompareEntityValue(IFreeSql fsql, Type entityType, object entityBefore, object entityAfter, string navigatePropertyName, List> insertLog, List>> updateLog, List> deleteLog) @@ -28,7 +28,7 @@ static class AggregateRootUtils if (entityBefore != null && entityAfter == null) { deleteLog.Add(NativeTuple.Create(entityType, entityBefore)); - EachNavigateCascade(fsql, entityType, entityBefore, (path, tr, ct, stackvs) => + NavigateReader(fsql, entityType, entityBefore, (path, tr, ct, stackvs) => { deleteLog.Add(NativeTuple.Create(ct, stackvs.First())); }); @@ -60,7 +60,7 @@ static class AggregateRootUtils switch (tbref.RefType) { case TableRefType.OneToOne: - CompareEntityValueCascade(fsql, tbref.RefEntityType, propvalBefore, propvalAfter, null, insertLog, updateLog, deleteLog); + CompareEntityValue(fsql, tbref.RefEntityType, propvalBefore, propvalAfter, null, insertLog, updateLog, deleteLog); break; case TableRefType.OneToMany: LocalCompareEntityValueCollection(tbref, propvalBefore as IEnumerable, propvalAfter as IEnumerable); @@ -91,7 +91,7 @@ static class AggregateRootUtils foreach (var item in collectionBefore as IEnumerable) { deleteLog.Add(NativeTuple.Create(elementType, item)); - EachNavigateCascade(fsql, elementType, item, (path, tr, ct, stackvs) => + NavigateReader(fsql, elementType, item, (path, tr, ct, stackvs) => { deleteLog.Add(NativeTuple.Create(ct, stackvs.First())); }); @@ -117,7 +117,7 @@ static class AggregateRootUtils { var value = dictBefore[key]; deleteLog.Add(NativeTuple.Create(elementType, value)); - EachNavigateCascade(fsql, elementType, value, (path, tr, ct, stackvs) => + NavigateReader(fsql, elementType, value, (path, tr, ct, stackvs) => { deleteLog.Add(NativeTuple.Create(ct, stackvs.First())); }); @@ -133,20 +133,21 @@ static class AggregateRootUtils } } foreach (var key in dictBefore.Keys) - CompareEntityValueCascade(fsql, elementType, dictBefore[key], dictAfter[key], null, insertLog, updateLog, deleteLog); + CompareEntityValue(fsql, elementType, dictBefore[key], dictAfter[key], null, insertLog, updateLog, deleteLog); } } - public static void EachNavigateCascade(IFreeSql fsql, Type rootType, object rootEntity, Action> callback) + + public static void NavigateReader(IFreeSql fsql, Type rootType, object rootEntity, Action> callback) { Dictionary> ignores = new Dictionary>(); var statckPath = new Stack(); var stackValues = new List(); statckPath.Push("_"); stackValues.Add(rootEntity); - LocalEachNavigate(rootType, rootEntity); + LocalNavigateReader(rootType, rootEntity); ignores.Clear(); - void LocalEachNavigate(Type entityType, object entity) + void LocalNavigateReader(Type entityType, object entity) { if (entity == null) return; if (entityType == null) entityType = entity.GetType(); @@ -170,7 +171,7 @@ static class AggregateRootUtils statckPath.Push(prop.Name); stackValues.Add(propval); callback?.Invoke(string.Join(".", statckPath), tbref, tbref.RefEntityType, stackValues); - LocalEachNavigate(tbref.RefEntityType, propval); + LocalNavigateReader(tbref.RefEntityType, propval); stackValues.RemoveAt(stackValues.Count - 1); statckPath.Pop(); break; @@ -180,7 +181,7 @@ static class AggregateRootUtils statckPath.Push($"{prop.Name[idx++]}"); stackValues.Add(val); callback?.Invoke(string.Join(".", statckPath), tbref, tbref.RefEntityType, stackValues); - LocalEachNavigate(tbref.RefEntityType, val); + LocalNavigateReader(tbref.RefEntityType, val); stackValues.RemoveAt(stackValues.Count - 1); statckPath.Pop(); } @@ -204,8 +205,7 @@ static class AggregateRootUtils } } - static ConcurrentDictionary> _dicMapEntityValueCascade = new ConcurrentDictionary>(); - public static void MapEntityValueCascade(this IFreeSql fsql, Type rootEntityType, object rootEntityFrom, object rootEntityTo) + public static void MapEntityValue(IFreeSql fsql, Type rootEntityType, object rootEntityFrom, object rootEntityTo) { Dictionary> ignores = new Dictionary>(); LocalMapEntityValue(rootEntityType, rootEntityFrom, rootEntityTo);