Fix AsExpandable

Author: PanyushkinD

EFCore.CommonTools.Tests/AssertExtensions.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Linq.Expressions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -46,5 +47,14 @@ public static void MethodCallsAreMatch(this Assert assert, Expression expexted,
                 }
             }
         }
+
+        public static void SequenceEqual<T>(this Assert assert, IEnumerable<T> expexted, IEnumerable<T> actual)
+        {
+            expexted = expexted.ToList();
+            actual = actual.ToList();
+
+            Assert.AreEqual(expexted.Count(), actual.Count());
+            Assert.IsTrue(expexted.SequenceEqual(actual));
+        }
     }
 }

EFCore.CommonTools.Tests/Querying/ExtensionExpanderTests.cs

@@ -136,7 +136,7 @@ public void ShouldExpandExtensions()
                         .Where(p => p.CreatedUtc > today)
                         .Take(5)
                         .Count());
-                
+
                 Assert.AreEqual(expected.ToString(), query.ToString());
 
                 Assert.AreNotSame(expected.Expression, query.Expression);
@@ -176,7 +176,41 @@ public void ShouldExpandGeneric()
                 Assert.IsNull(query.FirstOrDefault());
             }
         }
-        
+
+        [TestMethod]
+        public void ShouldExpandBoundLambdas()
+        {
+            using (var context = CreateSqliteDbContext())
+            {
+                var user = new User();
+                context.Users.Add(user);
+
+                var post = new Post { Title = "first", Author = user };
+                context.Posts.Add(post);
+
+                context.SaveChanges();
+
+                var query = context.Users.AsExpandable()
+                    .SelectMany(u => context.Posts
+                        .Filter(p => p.CreatorUserId == u.Id && !p.IsDeleted));
+
+                var expected = context.Users.AsExpandable()
+                    .SelectMany(u => context.Posts
+                        .Where(p => p.CreatorUserId == u.Id && !p.IsDeleted));
+
+                Assert.AreEqual(expected.ToString(), query.ToString());
+
+                Assert.AreNotSame(expected.Expression, query.Expression);
+
+                Assert.That.MethodCallsAreMatch(expected.Expression, query.Expression);
+
+                var queryPosts = query.ToList();
+                var expectedPosts = expected.ToList();
+
+                Assert.That.SequenceEqual(expectedPosts.Select(p => p.Id), queryPosts.Select(p => p.Id));
+            }
+        }
+
         [TestMethod]
         public void ShouldExpandNestedExtensions()
         {

EFCore.CommonTools/EntityFrameworkCore.CommonTools.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>EntityFrameworkCore.CommonTools</PackageId>
-    <PackageVersion>2.0.0</PackageVersion>
+    <PackageVersion>2.0.1</PackageVersion>
     <Description>An extension for EntityFrameworkCore that provides Auditing, Concurrency Checks, JSON Complex Types and writing history to Transaction Log.</Description>
     <Authors>Dmitry Panyushkin</Authors>
     <Company />
@@ -13,7 +13,7 @@
     <RepositoryUrl>https://github.com/gnaeus/EntityFramework.CommonTools.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>EFCore 2.0; Improve AuditableEntities API</PackageReleaseNotes>
+    <PackageReleaseNotes>.AsExpandable() works with bound lambda arguments</PackageReleaseNotes>
     <Copyright>Copyright © Dmitry Panyushkin 2017</Copyright>
     <PackageTags>EF EFCore EntityFrameworkCore EntityFramework Entity Framework ChangeTracking Change Tracking Auditing Audit TransactionLog Transaction Log ComplexType Complex Type JSON</PackageTags>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>

EFCore.CommonTools/Expression/ExpressionExtensions.cs

@@ -82,6 +82,15 @@ public static object GetValue(this Expression expression)
                         }
                     }
                     break;
+
+                case ExpressionType.Quote:
+                    var quoteExpression = (UnaryExpression)expression;
+                    {
+                        return GetValue(quoteExpression.Operand);
+                    }
+
+                case ExpressionType.Lambda:
+                    return expression;
             }
 
             // we can't interpret the expression but we can compile and run it

EntityFramework.CommonTools/EntityFramework.CommonTools.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>EntityFramework.CommonTools</id>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <summary>Auditing, Concurrency Checks, JSON properties and Transaction Logs for EntityFramework</summary>
     <description>An extension for EntityFramework that provides Auditing, Concurrency Checks, storing complex types as JSON and storing history of all changes from DbContext to Transaction Log.</description>
     <authors>Dmitry Panyushkin</authors>
@@ -11,7 +11,7 @@
     <licenseUrl>https://github.com/gnaeus/EntityFramework.CommonTools/blob/master/LICENSE</licenseUrl>
     <iconUrl>https://raw.githubusercontent.com/gnaeus/EntityFramework.CommonTools/master/icon.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <releaseNotes>EntityFramework 6.2; Improve AuditableEntities API</releaseNotes>
+    <releaseNotes>.AsExpandable() works with bound lambda arguments</releaseNotes>
     <copyright>Copyright © Dmitry Panyushkin 2017</copyright>
     <tags>EF EntityFramework Entity Framework ChangeTracking Change Tracking Auditing Audit TransactionLog Transaction Log ComplexType Complex Type JSON</tags>
     <dependencies>

README.md

@@ -814,6 +814,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.1] - 2018-03-27
+### Fixed
+- `.AsExpandable()` works with bound lambda arguments
+
 ## [2.0.0] - 2018-03-23
 ### Added
 - EFCore 2.0 support
@@ -849,9 +853,10 @@ public interface IFullAuditableV1 : IFullTrackable,
 }
 ```
 
-## [1.0.0] - 2017-07-20
+## [1.0.0] - 2017-08-16
 ### Added
 Initial project version.
 
+[2.0.1]: https://github.com/gnaeus/EntityFramework.CommonTools/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/gnaeus/EntityFramework.CommonTools/compare/1.0.0...2.0.0
 [1.0.0]: https://github.com/gnaeus/EntityFramework.CommonTools/tree/1.0.0