- 增加 DbContextOptions.AuditValue 基于 Ioc Scoped 审计值；

dotnetcore · Jan 29, 2024 · 096ecdf · 096ecdf
1 parent c74b202
commit 096ecdf
Show file tree

Hide file tree

Showing 9 changed files with 417 additions and 9 deletions.
diff --git a/.../FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositoryAsync.cs b/.../FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositoryAsync.cs
@@ -263,7 +263,28 @@ async Task<int> SaveTrackingChangeAsync(AggregateRootTrackingChangeInfo tracking
                     }));
             }
 
-            var updateLogDict = tracking.UpdateLog.GroupBy(a => a.Item1).ToDictionary(a => a.Key, a => tracking.UpdateLog.Where(b => b.Item1 == a.Key).Select(b => new
+            if (_repository.DbContextOptions.AuditValueHandler != null)
+            {
+                foreach (var log in tracking.UpdateLog)
+                {
+                    var table = Orm.CodeFirst.GetTableByEntity(log.Item1);
+                    _repository.DbContextOptions.AuditValueHandler(this, new DbContextAuditValueEventArgs(Aop.AuditValueType.Update, log.Item1, log.Item3));
+                    log.Item4.Clear();
+                    foreach (var col in table.ColumnsByCs.Values)
+                    {
+                        if (table.ColumnsByCsIgnore.ContainsKey(col.CsName)) continue;
+                        if (table.ColumnsByCs.ContainsKey(col.CsName))
+                        {
+                            if (col.Attribute.IsVersion) continue;
+                            var propvalBefore = table.GetPropertyValue(log.Item2, col.CsName);
+                            var propvalAfter = table.GetPropertyValue(log.Item3, col.CsName);
+                            if (AggregateRootUtils.CompareEntityPropertyValue(col.CsType, propvalBefore, propvalAfter) == false) log.Item4.Add(col.CsName);
+                            continue;
+                        }
+                    }
+                }
+            }
+            var updateLogDict = tracking.UpdateLog.GroupBy(a => a.Item1).ToDictionary(a => a.Key, a => tracking.UpdateLog.Where(b => b.Item1 == a.Key && b.Item4.Any()).Select(b => new
             {
                 BeforeObject = b.Item2,
                 AfterObject = b.Item3,

diff --git a/...s/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositorySync.cs b/...s/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositorySync.cs
@@ -314,7 +314,28 @@ int SaveTrackingChange(AggregateRootTrackingChangeInfo tracking)
                     }));
             }
 
-            var updateLogDict = tracking.UpdateLog.GroupBy(a => a.Item1).ToDictionary(a => a.Key, a => tracking.UpdateLog.Where(b => b.Item1 == a.Key).Select(b => new
+            if (_repository.DbContextOptions.AuditValueHandler != null)
+            {
+                foreach (var log in tracking.UpdateLog)
+                {
+                    var table = Orm.CodeFirst.GetTableByEntity(log.Item1);
+                    _repository.DbContextOptions.AuditValueHandler(this, new DbContextAuditValueEventArgs(Aop.AuditValueType.Update, log.Item1, log.Item3));
+                    log.Item4.Clear();
+                    foreach (var col in table.ColumnsByCs.Values)
+                    {
+                        if (table.ColumnsByCsIgnore.ContainsKey(col.CsName)) continue;
+                        if (table.ColumnsByCs.ContainsKey(col.CsName))
+                        {
+                            if (col.Attribute.IsVersion) continue;
+                            var propvalBefore = table.GetPropertyValue(log.Item2, col.CsName);
+                            var propvalAfter = table.GetPropertyValue(log.Item3, col.CsName);
+                            if (AggregateRootUtils.CompareEntityPropertyValue(col.CsType, propvalBefore, propvalAfter) == false) log.Item4.Add(col.CsName);
+                            continue;
+                        }
+                    }
+                }
+            }
+            var updateLogDict = tracking.UpdateLog.GroupBy(a => a.Item1).ToDictionary(a => a.Key, a => tracking.UpdateLog.Where(b => b.Item1 == a.Key && b.Item4.Any()).Select(b => new
             {
                 BeforeObject = b.Item2,
                 AfterObject = b.Item3,

diff --git a/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj b/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj
@@ -23,12 +23,12 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<None Include="../../readme.md" Pack="true" PackagePath="\"/>
+		<None Include="../../readme.md" Pack="true" PackagePath="\" />
 		<None Include="../../logo.png" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FreeSql.DbContext" Version="3.2.811-preview20240125" />
+	  <ProjectReference Include="..\..\FreeSql.DbContext\FreeSql.DbContext.csproj" />
 	</ItemGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">

diff --git a/FreeSql.DbContext/DbContext/DbContextOptions.cs b/FreeSql.DbContext/DbContext/DbContextOptions.cs
@@ -1,4 +1,5 @@
 
+using FreeSql.Internal.Model;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -47,5 +48,34 @@ public bool EnableAddOrUpdateNavigateList
         /// 实体变化事件
         /// </summary>
         public Action<List<DbContext.EntityChangeReport.ChangeInfo>> OnEntityChange { get; set; }
+
+        /// <summary>
+        /// DbContext/Repository 审计值事件，适合 Scoped IOC 中获取登陆信息
+        /// </summary>
+        public event EventHandler<DbContextAuditValueEventArgs> AuditValue;
+        public EventHandler<DbContextAuditValueEventArgs> AuditValueHandler => AuditValue;
+    }
+
+    public class DbContextAuditValueEventArgs : EventArgs
+    {
+        public DbContextAuditValueEventArgs(Aop.AuditValueType auditValueType, Type entityType, object obj)
+        {
+            this.AuditValueType = auditValueType;
+            this.EntityType = entityType;
+            this.Object = obj;
+        }
+
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public Aop.AuditValueType AuditValueType { get; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public Type EntityType { get; }
+        /// <summary>
+        /// 实体对象
+        /// </summary>
+        public object Object { get; }
     }
 }
diff --git a/FreeSql.DbContext/DbSet/DbSet.cs b/FreeSql.DbContext/DbSet/DbSet.cs
@@ -66,16 +66,27 @@ protected virtual IInsert<TEntity> OrmInsert()
             if (_db.Options.NoneParameter != null) insert.NoneParameter(_db.Options.NoneParameter.Value);
             return insert;
         }
-        protected virtual IInsert<TEntity> OrmInsert(TEntity data)
+        protected virtual IInsert<TEntity> OrmInsert(TEntity entity)
         {
             var insert = OrmInsert();
-            if (data != null) (insert as InsertProvider<TEntity>)._source.Add(data); //防止 Aop.AuditValue 触发两次
+            if (entity != null)
+            {
+                (insert as InsertProvider<TEntity>)._source.Add(entity); //防止 Aop.AuditValue 触发两次
+                if (_db.Options.AuditValueHandler != null) 
+                    _db.Options.AuditValueHandler(_db, new DbContextAuditValueEventArgs(Aop.AuditValueType.Insert, _table.Type, entity));
+            }
             return insert;
         }
-        protected virtual IInsert<TEntity> OrmInsert(IEnumerable<TEntity> data)
+        protected virtual IInsert<TEntity> OrmInsert(IEnumerable<TEntity> entitys)
         {
             var insert = OrmInsert();
-            if (data != null) (insert as InsertProvider<TEntity>)._source.AddRange(data.Where(a => a != null)); //防止 Aop.AuditValue 触发两次
+            if (entitys != null)
+            {
+                (insert as InsertProvider<TEntity>)._source.AddRange(entitys.Where(a => a != null)); //防止 Aop.AuditValue 触发两次
+                if (_db.Options.AuditValueHandler != null)
+                    foreach (var item in entitys)
+                        _db.Options.AuditValueHandler(_db, new DbContextAuditValueEventArgs(Aop.AuditValueType.Insert, _table.Type, item));
+            }
             return insert;
         }
 
@@ -84,7 +95,13 @@ protected virtual IUpdate<TEntity> OrmUpdate(IEnumerable<TEntity> entitys)
             var update = _db.OrmOriginal.Update<TEntity>().AsType(_entityType).WithTransaction(_uow?.GetOrBeginTransaction());
             if (_db.Options.NoneParameter != null) update.NoneParameter(_db.Options.NoneParameter.Value);
             if (_db.Options.EnableGlobalFilter == false) update.DisableGlobalFilter();
-            if (entitys != null) (update as UpdateProvider<TEntity>)._source.AddRange(entitys.Where(a => a != null)); //防止 Aop.AuditValue 触发两次
+            if (entitys != null)
+            {
+                (update as UpdateProvider<TEntity>)._source.AddRange(entitys.Where(a => a != null)); //防止 Aop.AuditValue 触发两次
+                if (_db.Options.AuditValueHandler != null)
+                    foreach (var item in entitys)
+                        _db.Options.AuditValueHandler(_db, new DbContextAuditValueEventArgs(Aop.AuditValueType.Update, _table.Type, item));
+            }
             return update;
         }
         protected virtual IDelete<TEntity> OrmDelete(object dywhere)

diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.DbContext/UnitOfWork/UnitOfWorkManager.cs b/FreeSql.DbContext/UnitOfWork/UnitOfWorkManager.cs
@@ -72,6 +72,7 @@ public void Binding(IBaseRepository repository)
         {
             var repoInfo = new RepoInfo(repository);
             repository.UnitOfWork = Current;
+            if (_repos.Any(a => a.Repository == repository)) return;
             _repos.Add(repoInfo);
         }
         void SetAllRepositoryUow()

diff --git a/FreeSql/Extensions/FreeSqlGlobalExtensions.cs b/FreeSql/Extensions/FreeSqlGlobalExtensions.cs
@@ -163,6 +163,7 @@ string LocalDisplayCsharpParameter(ParameterInfo lp)
     public static object CreateInstanceGetDefaultValue(this Type that)
     {
         if (that == null) return null;
+        if (that == typeof(void)) return null;
         if (that == typeof(string)) return default(string);
         if (that == typeof(Guid)) return default(Guid);
         if (that == typeof(byte[])) return default(byte[]);