Add audit Where

Add audit Where

Author: zzzprojects

src/Z.EntityFramework.Plus.EF5.NET40/Audit/Extensions/DbSet`AuditEntry/DbSet`AuditEntry.cs

@@ -0,0 +1,79 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if EF5 || EF6
+using System;
+using System.Data.Entity;
+using System.Linq;
+
+#elif EFCORE
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+
+#endif
+
+namespace Z.EntityFramework.Plus
+{
+    public static partial class AuditExtensions
+    {
+        public static IQueryable<AuditEntry> Where<T>(this DbSet<AuditEntry> set, T entry) where T : class
+        {
+            var context = set.GetDbContext();
+            var keyNames = context.GetKeyNames<T>();
+
+            if (entry == null)
+            {
+                return set.Where(x => false);
+            }
+
+            var query = set.Where(x => x.EntityTypeName == typeof(T).Name);
+
+            foreach (var keyName in keyNames)
+            {
+                var property = entry.GetType().GetProperty(keyName);
+                var value = property.GetValue(entry, null).ToString();
+
+                query = query.Where(x => x.Properties.Any(y => y.PropertyName == property.Name && y.NewValueFormatted == value));
+            }
+
+            query = query.Include(x => x.Properties).OrderBy(x => x.CreatedDate);
+
+            return query;
+        }
+
+        public static IQueryable<AuditEntry> Where<T>(this DbSet<AuditEntry> set, params object[] keyValues) where T : class
+        {
+            var context = set.GetDbContext();
+            var keyNames = context.GetKeyNames<T>();
+
+            var query = set.Where(x => x.EntityTypeName == typeof(T).Name);
+
+            if (keyValues == null)
+            {
+                throw new Exception(ExceptionMessage.Audit_Key_Null);
+            }
+            if (keyValues.Length != keyNames.Length)
+            {
+                throw new Exception(ExceptionMessage.Audit_Key_OutOfBound);
+            }
+
+            for (var i = 0; i < keyNames.Length; i++)
+            {
+                var propertyName = keyNames[i];
+                var value = keyValues[i] != null ? keyValues[i].ToString() : "";
+
+                query = query.Where(x => x.Properties.Any(y => y.PropertyName == propertyName && y.NewValueFormatted == value));
+            }
+
+            query = query.Include(x => x.Properties).OrderBy(x => x.CreatedDate);
+
+            return query;
+        }
+    }
+}

src/Z.EntityFramework.Plus.EF5.NET40/Audit/Extensions/DbSet`AuditEntry/SaveChanges - Copy (2).cs.bak

@@ -0,0 +1,39 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if EF5 || EF6
+using System.Data.Entity;
+
+#elif EFCORE
+using Microsoft.Data.Entity;
+
+#endif
+
+namespace Z.EntityFramework.Plus
+{
+    public static partial class AuditExtensions
+    {
+        /// <summary>Audits and saves all changes made in this context to the underlying database.</summary>
+        /// <param name="context">The context used to audits and saves all changes made.</param>
+        /// <param name="audit">The audit to use to add changes made to the context.</param>
+        /// <returns>The number of objects written to the underlying database.</returns>-
+        public static int SaveChanges(this DbContext context, Audit audit)
+        {
+            audit.PreSaveChanges(context);
+            var rowAffecteds = context.SaveChanges();
+            audit.PostSaveChanges();
+
+            if (audit.CurrentOrDefaultConfiguration.AutoSavePreAction != null)
+            {
+                audit.CurrentOrDefaultConfiguration.AutoSavePreAction(context, audit);
+                context.SaveChanges();
+            }
+
+            return rowAffecteds;
+        }
+    }
+}

src/Z.EntityFramework.Plus.EF5.NET40/ExceptionMessage.cs

@@ -14,8 +14,14 @@ internal class ExceptionMessage
 #if FULL
         public static string BatchOperations_MaxKeyColumns = "Oops! Batch operation only support table with primary keys containing 5 columns or less. For more information, contact us: [email protected]";
 #endif
+#if FULL || AUDIT
+        public static string Audit_DbSet_NotFound = "Oops! The audit DbSet cannot be found. Please refer to the documentation to learn how to add a custom audit DbSet. Please report the issue including the stack trace to our support team: [email protected]";
+        public static string Audit_Key_Null = "Oops! A key must be specified. Please report the issue including the stack trace to our support team: [email protected]";
+        public static string Audit_Key_OutOfBound = "Oops! The number of argument for the key specified doesn't match with the number of key members. Please report the issue including the stack trace to our support team: [email protected]";
+#endif
 #if FULL || BATCH_DELETE || BATCH_UPDATE
         public static string BatchOperations_PropertyNotFound = "Oops! Mapping for the property '{0}' cannot be found, the current version don't support yet Complex Type, Enum, TPC, TPH and TPT. For more information, contact us: [email protected]";
+        public static string BatchOperations_AssemblyNotFound = "Oops! The assembly 'Microsoft.EntityFrameworkCore.SqlServer' could not be found. This feature is only supported for SQL Server for .NET Core. For more information, contact us: [email protected]";
 #endif
 #if FULL || QUERY_INCLUDEFILTER
         public static string QueryIncludeFilter_ArgumentExpression = "Oops! immediate method with expression argument are not supported in EF+ Query IncludeFilter. For more information, contact us: [email protected]";

src/Z.EntityFramework.Plus.EF5.NET40/Properties/AssemblyInfo.cs

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("e4c2af73-caeb-4429-bcb6-0a359484e064")]
-[assembly: AssemblyVersion("1.3.10")]
-[assembly: AssemblyFileVersion("1.3.10")]
+[assembly: AssemblyVersion("1.3.11")]
+[assembly: AssemblyFileVersion("1.3.11")]

src/Z.EntityFramework.Plus.EF5.NET40/Z.EntityFramework.Plus.EF5.NET40.csproj

@@ -76,6 +76,7 @@
     <Compile Include="Audit\Audit\PreSaveChanges.cs" />
     <Compile Include="Audit\Extensions\DbContext\SaveChanges.cs" />
     <Compile Include="Audit\Extensions\DbContext\SaveChangesAsync.cs" />
+    <Compile Include="Audit\Extensions\DbSet`AuditEntry\DbSet`AuditEntry.cs" />
     <Compile Include="BatchDelete\BatchDelete.cs" />
     <Compile Include="BatchDelete\BatchDeleteManager.cs" />
     <Compile Include="BatchDelete\Extensions\Delete.cs" />
@@ -148,6 +149,7 @@
     <Compile Include="_Internal\EF5\IDbSet`\DbContext.AddRange.cs" />
     <Compile Include="_Internal\EF5\IDbSet`\DbContext.RemoveRange.cs" />
     <Compile Include="_Internal\EF5_EF6\Database\GetEntityConnection.cs" />
+    <Compile Include="_Internal\EF5_EF6\DbContext\DbContext.GetKeyNames.cs" />
     <Compile Include="_Internal\EF5_EF6\DbContext\DbContext.GetObjectContext.cs" />
     <Compile Include="_Internal\EF5_EF6\EntityConnection\GetDbTransaction.cs" />
     <Compile Include="_Internal\EF5_EF6\EntityConnection\GetEntityTransaction.cs" />
@@ -168,6 +170,7 @@
     <Compile Include="_Internal\EFCore\CreateEntity\CreateEntityDataReader.cs" />
     <Compile Include="_Internal\EFCore\CreateEntity\CreateEntityRelationalConnection.cs" />
     <Compile Include="_Internal\EFCore\DbContext\CreateStoreCommand.cs" />
+    <Compile Include="_Internal\EFCore\DbContext\DbContext.GetKeyNames.cs" />
     <Compile Include="_Internal\EFCore\DbSet`\GetDbContext.cs" />
     <Compile Include="_Internal\EFCore\GetStateManager.cs" />
     <Compile Include="_Internal\EFCore\IQueryable`\CreateCommand.cs" />
@@ -223,6 +226,9 @@
     <Content Include="Audit\Extensions\DbContext\SaveChanges.cs.bak">
       <DependentUpon>SaveChanges.cs</DependentUpon>
     </Content>
+    <Content Include="Audit\Extensions\DbSet`AuditEntry\SaveChanges - Copy %282%29.cs.bak">
+      <DependentUpon>DbSet`AuditEntry.cs</DependentUpon>
+    </Content>
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/Z.EntityFramework.Plus.EF5.NET40/_Internal/EF5_EF6/DbContext/DbContext.GetKeyNames.cs

@@ -0,0 +1,31 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if FULL || AUDIT
+#if EF5 || EF6
+
+using System.Data.Entity;
+using System.Data.Entity.Infrastructure;
+using System.Linq;
+
+namespace Z.EntityFramework.Plus
+{
+    public static partial class DbContextExtensions
+    {
+        public static string[] GetKeyNames<T>(this DbContext context) where T : class
+        {
+            var objectSet = ((IObjectContextAdapter)context).ObjectContext.CreateObjectSet<T>();
+            var keyNames = objectSet.EntitySet.ElementType.KeyMembers
+                .Select(k => k.Name)
+                .ToArray();
+            return keyNames;
+        }
+    }
+}
+
+#endif
+#endif

src/Z.EntityFramework.Plus.EF5.NET40/_Internal/EFCore/DbContext/DbContext.GetKeyNames.cs

@@ -0,0 +1,29 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if FULL || AUDIT
+#if EFCORE
+
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+
+namespace Z.EntityFramework.Plus
+{
+    public static class DbContextExtensions
+    {
+        public static string[] GetKeyNames<T>(this DbContext context) where T : class
+        {
+            var entityType = context.Model.FindEntityType(typeof (T));
+            var keys = entityType.GetKeys();
+
+            return keys.SelectMany(x => x.Properties.Select(y => y.Name)).ToArray();
+        }
+    }
+}
+
+#endif
+#endif

src/Z.EntityFramework.Plus.EF5/Audit/Extensions/DbSet`AuditEntry/DbSet`AuditEntry.cs

@@ -0,0 +1,79 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if EF5 || EF6
+using System;
+using System.Data.Entity;
+using System.Linq;
+
+#elif EFCORE
+using System;
+using System.Linq;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
+
+#endif
+
+namespace Z.EntityFramework.Plus
+{
+    public static partial class AuditExtensions
+    {
+        public static IQueryable<AuditEntry> Where<T>(this DbSet<AuditEntry> set, T entry) where T : class
+        {
+            var context = set.GetDbContext();
+            var keyNames = context.GetKeyNames<T>();
+
+            if (entry == null)
+            {
+                return set.Where(x => false);
+            }
+
+            var query = set.Where(x => x.EntityTypeName == typeof(T).Name);
+
+            foreach (var keyName in keyNames)
+            {
+                var property = entry.GetType().GetProperty(keyName);
+                var value = property.GetValue(entry, null).ToString();
+
+                query = query.Where(x => x.Properties.Any(y => y.PropertyName == property.Name && y.NewValueFormatted == value));
+            }
+
+            query = query.Include(x => x.Properties).OrderBy(x => x.CreatedDate);
+
+            return query;
+        }
+
+        public static IQueryable<AuditEntry> Where<T>(this DbSet<AuditEntry> set, params object[] keyValues) where T : class
+        {
+            var context = set.GetDbContext();
+            var keyNames = context.GetKeyNames<T>();
+
+            var query = set.Where(x => x.EntityTypeName == typeof(T).Name);
+
+            if (keyValues == null)
+            {
+                throw new Exception(ExceptionMessage.Audit_Key_Null);
+            }
+            if (keyValues.Length != keyNames.Length)
+            {
+                throw new Exception(ExceptionMessage.Audit_Key_OutOfBound);
+            }
+
+            for (var i = 0; i < keyNames.Length; i++)
+            {
+                var propertyName = keyNames[i];
+                var value = keyValues[i] != null ? keyValues[i].ToString() : "";
+
+                query = query.Where(x => x.Properties.Any(y => y.PropertyName == propertyName && y.NewValueFormatted == value));
+            }
+
+            query = query.Include(x => x.Properties).OrderBy(x => x.CreatedDate);
+
+            return query;
+        }
+    }
+}

src/Z.EntityFramework.Plus.EF5/Audit/Extensions/DbSet`AuditEntry/SaveChanges - Copy (2).cs.bak

@@ -0,0 +1,39 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if EF5 || EF6
+using System.Data.Entity;
+
+#elif EFCORE
+using Microsoft.Data.Entity;
+
+#endif
+
+namespace Z.EntityFramework.Plus
+{
+    public static partial class AuditExtensions
+    {
+        /// <summary>Audits and saves all changes made in this context to the underlying database.</summary>
+        /// <param name="context">The context used to audits and saves all changes made.</param>
+        /// <param name="audit">The audit to use to add changes made to the context.</param>
+        /// <returns>The number of objects written to the underlying database.</returns>-
+        public static int SaveChanges(this DbContext context, Audit audit)
+        {
+            audit.PreSaveChanges(context);
+            var rowAffecteds = context.SaveChanges();
+            audit.PostSaveChanges();
+
+            if (audit.CurrentOrDefaultConfiguration.AutoSavePreAction != null)
+            {
+                audit.CurrentOrDefaultConfiguration.AutoSavePreAction(context, audit);
+                context.SaveChanges();
+            }
+
+            return rowAffecteds;
+        }
+    }
+}

src/Z.EntityFramework.Plus.EF5/ExceptionMessage.cs

@@ -14,8 +14,14 @@ internal class ExceptionMessage
 #if FULL
         public static string BatchOperations_MaxKeyColumns = "Oops! Batch operation only support table with primary keys containing 5 columns or less. For more information, contact us: [email protected]";
 #endif
+#if FULL || AUDIT
+        public static string Audit_DbSet_NotFound = "Oops! The audit DbSet cannot be found. Please refer to the documentation to learn how to add a custom audit DbSet. Please report the issue including the stack trace to our support team: [email protected]";
+        public static string Audit_Key_Null = "Oops! A key must be specified. Please report the issue including the stack trace to our support team: [email protected]";
+        public static string Audit_Key_OutOfBound = "Oops! The number of argument for the key specified doesn't match with the number of key members. Please report the issue including the stack trace to our support team: [email protected]";
+#endif
 #if FULL || BATCH_DELETE || BATCH_UPDATE
         public static string BatchOperations_PropertyNotFound = "Oops! Mapping for the property '{0}' cannot be found, the current version don't support yet Complex Type, Enum, TPC, TPH and TPT. For more information, contact us: [email protected]";
+        public static string BatchOperations_AssemblyNotFound = "Oops! The assembly 'Microsoft.EntityFrameworkCore.SqlServer' could not be found. This feature is only supported for SQL Server for .NET Core. For more information, contact us: [email protected]";
 #endif
 #if FULL || QUERY_INCLUDEFILTER
         public static string QueryIncludeFilter_ArgumentExpression = "Oops! immediate method with expression argument are not supported in EF+ Query IncludeFilter. For more information, contact us: [email protected]";