Merge pull request #59 from WeihanLi/dev

8.0.6.1

Author: WeihanLi

build/version.props

@@ -3,8 +3,9 @@
     <VersionMajor>8</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionPatch>6</VersionPatch>
-    <VersionRevision></VersionRevision>
-    <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
-    <VersionSuffix Condition="'$(Configuration)'=='DEBUG'">preview</VersionSuffix>
+    <VersionRevision>1</VersionRevision>
+    <VersionPrefix Condition="'$(VersionRevision)'=='0' or '$(VersionRevision)'==''">$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
+    <VersionPrefix Condition="'$(VersionRevision)'!='0'">$(VersionMajor).$(VersionMinor).$(VersionPatch).$(VersionRevision)</VersionPrefix>
+    <VersionSuffix Condition="'$(Configuration)'=='DEBUG'">dev</VersionSuffix>
   </PropertyGroup>
 </Project>

samples/WeihanLi.EntityFramework.Sample/Program.cs

@@ -375,7 +375,7 @@ private static void SoftDeleteTest()
         });
 
         services.AddSingleton<IUserIdProvider, EnvironmentUserIdProvider>();
-        services.AddAutoUpdateInterceptor();
+        services.AddEFAutoUpdateInterceptor();
 
         services.AddDbContext<SoftDeleteSampleContext>((provider, options) =>
         {

src/WeihanLi.EntityFramework/Audit/AuditInterceptor.cs

@@ -1,7 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
-using WeihanLi.Common;
 using WeihanLi.Common.Models;
 
 namespace WeihanLi.EntityFramework.Audit;
@@ -42,20 +41,22 @@ private void PreSaveChanges(DbContext dbContext)
 
         foreach (var entityEntry in dbContext.ChangeTracker.Entries())
         {
-            if (entityEntry.State == EntityState.Detached || entityEntry.State == EntityState.Unchanged)
+            if (entityEntry.State is EntityState.Detached or EntityState.Unchanged)
             {
                 continue;
             }
+
             if (AuditConfig.Options.EntityFilters.Any(entityFilter =>
                     entityFilter.Invoke(entityEntry) == false))
             {
                 continue;
             }
+
             AuditEntries.Add(new InternalAuditEntry(entityEntry));
         }
     }
 
-    private async Task PostSaveChanges(DbContext dbContext)
+    private async Task PostSaveChanges()
     {
         if (AuditEntries is { Count: > 0 })
         {
@@ -116,14 +117,14 @@ await Task.WhenAll(
 
     public override int SavedChanges(SaveChangesCompletedEventData eventData, int result)
     {
-        PostSaveChanges(Guard.NotNull(eventData.Context)).GetAwaiter().GetResult();
+        PostSaveChanges().GetAwaiter().GetResult();
         return base.SavedChanges(eventData, result);
     }
 
     public override async ValueTask<int> SavedChangesAsync(SaveChangesCompletedEventData eventData, int result,
         CancellationToken cancellationToken = new CancellationToken())
     {
-        await PostSaveChanges(Guard.NotNull(eventData.Context));
+        await PostSaveChanges();
         return await base.SavedChangesAsync(eventData, result, cancellationToken);
     }
 }

src/WeihanLi.EntityFramework/EFExtensions.cs

@@ -6,6 +6,7 @@
 using System.Data;
 using System.Linq.Expressions;
 using WeihanLi.Common.Models;
+using WeihanLi.Common.Services;
 using WeihanLi.EntityFramework.Audit;
 using WeihanLi.EntityFramework.Interceptors;
 using WeihanLi.EntityFramework.Services;
@@ -173,23 +174,37 @@ public static KeyEntry[] GetKeyValues(this EntityEntry entityEntry)
         return keyEntries;
     }
 
-    public static IServiceCollection AddAutoUpdateInterceptor(this IServiceCollection services)
+    public static IServiceCollection AddEFAutoUpdateInterceptor(this IServiceCollection services)
+        => services.AddEFAutoUpdateInterceptor(ServiceLifetime.Scoped);
+
+    public static IServiceCollection AddEFAutoUpdateInterceptor(this IServiceCollection services,
+        ServiceLifetime userProviderLifetime)
     {
         ArgumentNullException.ThrowIfNull(services);
 
         services.TryAddScoped<AutoUpdateInterceptor>();
         services.TryAddEnumerable(ServiceDescriptor.Singleton<IEntitySavingHandler, SoftDeleteEntitySavingHandler>());
         services.TryAddEnumerable(ServiceDescriptor.Singleton<IEntitySavingHandler, UpdatedAtEntitySavingHandler>());
-        services.TryAddEnumerable(ServiceDescriptor.Scoped<IEntitySavingHandler, UpdatedBySavingHandler>());
+        services.TryAddEnumerable(ServiceDescriptor.Describe(typeof(IEntitySavingHandler), typeof(UpdatedBySavingHandler), userProviderLifetime));
 
         return services;
     }
 
+    public static IServiceCollection AddEFAutoUpdateInterceptor<TUserProvider>(this IServiceCollection services,
+        ServiceLifetime userProviderLifetime = ServiceLifetime.Scoped)
+        where TUserProvider : class, IUserIdProvider
+    {
+        services.AddEFAutoUpdateInterceptor(userProviderLifetime)
+            .TryAdd(ServiceDescriptor.Describe(typeof(IUserIdProvider), typeof(TUserProvider), userProviderLifetime));
+        return services;
+    }
+
     public static IServiceCollection AddEFAutoAudit(this IServiceCollection services,
         Action<IAuditConfigBuilder> configAction)
     {
         ArgumentNullException.ThrowIfNull(configAction);
 
+        services.TryAddScoped<AuditInterceptor>();
         AuditConfig.Configure(services, configAction);
         return services;
     }