Improved audit logic

Author: JonathanMagnan

src/shared/Z.EF.Plus.Audit.Shared/Extensions/DbSet`AuditEntry/DbSet`AuditEntry.cs

@@ -28,11 +28,33 @@ public static IQueryable<AuditEntry> Where<T>(this DbSet<AuditEntry> set, T entr
         }
 
         public static IQueryable<TAuditEntry> Where<TAuditEntry, T>(this DbSet<TAuditEntry> set, T entry) where TAuditEntry : AuditEntry where T : class
+        {
+            return set.Where<TAuditEntry, T>(AuditManager.DefaultConfiguration, entry);
+        }
+
+        public static IQueryable<AuditEntry> Where<T>(this DbSet<AuditEntry> set, params object[] keyValues) where T : class
+        {
+            return set.Where<AuditEntry, T>(keyValues);
+        }
+
+        public static IQueryable<TAuditEntry> Where<TAuditEntry, T>(this DbSet<TAuditEntry> set, params object[] keyValues) where TAuditEntry : AuditEntry where T : class
+        {
+            return set.Where<TAuditEntry, T>(AuditManager.DefaultConfiguration, keyValues);          
+        }
+
+        public static IQueryable<AuditEntry> Where<T>(this DbSet<AuditEntry> set, AuditConfiguration auditConfiguration, T entry) where T : class
+        {
+            return set.Where<AuditEntry, T>(auditConfiguration, entry);
+        }
+
+        public static IQueryable<TAuditEntry> Where<TAuditEntry, T>(this DbSet<TAuditEntry> set, AuditConfiguration auditConfiguration, T entry) where TAuditEntry : AuditEntry where T : class
         {
             var context = set.GetDbContext();
             var keyNames = context.GetKeyNames<T>();
 
-            var name = AuditManager.DefaultConfiguration.DataAnnotationEntityDisplayName(typeof(T));
+            var name = auditConfiguration.EntityNameFactory != null ?
+                auditConfiguration.EntityNameFactory(typeof(T)) :
+                typeof(T).Name;
 
             if (entry == null)
             {
@@ -55,17 +77,19 @@ public static IQueryable<TAuditEntry> Where<TAuditEntry, T>(this DbSet<TAuditEnt
             return query;
         }
 
-        public static IQueryable<AuditEntry> Where<T>(this DbSet<AuditEntry> set, params object[] keyValues) where T : class
+        public static IQueryable<AuditEntry> Where<T>(this DbSet<AuditEntry> set, AuditConfiguration auditConfiguration, params object[] keyValues) where T : class
         {
-            return set.Where<AuditEntry, T>(keyValues);
+            return set.Where<AuditEntry, T>(auditConfiguration, keyValues);
         }
 
-        public static IQueryable<TAuditEntry> Where<TAuditEntry, T>(this DbSet<TAuditEntry> set, params object[] keyValues) where TAuditEntry : AuditEntry where T : class
+        public static IQueryable<TAuditEntry> Where<TAuditEntry, T>(this DbSet<TAuditEntry> set, AuditConfiguration auditConfiguration, params object[] keyValues) where TAuditEntry : AuditEntry where T : class
         {
             var context = set.GetDbContext();
             var keyNames = context.GetKeyNames<T>();
 
-            var name = AuditManager.DefaultConfiguration.DataAnnotationEntityDisplayName(typeof(T));
+            var name = auditConfiguration.EntityNameFactory != null ?
+                auditConfiguration.EntityNameFactory(typeof(T)) :
+                typeof(T).Name;
 
             var query = set.Where(x => x.EntityTypeName == name);
 

src/shared/Z.EF.Plus.Audit.Shared/Extensions/Type/GetAuditDisplayName.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Z.EntityFramework.Plus
+{
+	public static partial class AuditExtensions
+	{
+        /// <summary>Get the audit display name used in the Audit method (use the AuditManager.DefaultConfiguration).</summary>
+        /// <param name="this">The type.</param>
+        /// <returns>The audit display name used in the Audit method (use the AuditManager.DefaultConfiguration).</returns>
+        public static string GetAuditDisplayName(this Type @this)
+        {
+            return @this.GetAuditDisplayName(AuditManager.DefaultConfiguration);
+        }
+        /// <summary>Get the audit display name used in the Audit method.</summary>
+        /// <param name="this">The type.</param>
+        /// <param name="auditConfiguration">The audit configuration.</param>
+        /// <returns>The audit display name used in the Audit method.</returns>
+        public static string GetAuditDisplayName(this Type @this, AuditConfiguration auditConfiguration)
+        {
+            return auditConfiguration.EntityNameFactory != null ?
+                          auditConfiguration.EntityNameFactory(@this) :
+                          @this.Name;
+        }
+    }
+}

src/shared/Z.EF.Plus.Audit.Shared/Z.EF.Plus.Audit.Shared.projitems

@@ -53,5 +53,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\DbContext\SaveChanges.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\DbContext\SaveChangesAsync.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\DbSet`AuditEntry\DbSet`AuditEntry.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Type\GetAuditDisplayName.cs" />
   </ItemGroup>
 </Project>