Issue koenbeuk#71

alexeypj · Mar 27, 2024 · cd0319e · cd0319e
1 parent ac67d12
commit cd0319e
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 20 deletions.
diff --git a/samples/BasicSample/Program.cs b/samples/BasicSample/Program.cs
@@ -19,7 +19,7 @@ public class User
 
         [Projectable(UseMemberBody = nameof(_FullName))]
         public string FullName { get; set; }
-        private string _FullName => FirstName + " " + LastName;
+        public string _FullName => FirstName + " " + LastName;
 
         [Projectable(UseMemberBody = nameof(_TotalSpent))]
         public double TotalSpent { get; set; }

diff --git a/src/EntityFrameworkCore.Projectables.Abstractions/ProjectableAttribute.cs b/src/EntityFrameworkCore.Projectables.Abstractions/ProjectableAttribute.cs
@@ -13,6 +13,15 @@ namespace EntityFrameworkCore.Projectables
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
     public sealed class ProjectableAttribute : Attribute
     {
+        public ProjectableAttribute() { }
+
+        public ProjectableAttribute(string useMemberBody, object memberBodyParameterValue)
+        {
+            UseMemberBody = useMemberBody;
+            MemberBodyParameterValues = new[] { memberBodyParameterValue };
+        }
+        public ProjectableAttribute(string useMemberBody, string memberBodyParameterValue) : this(useMemberBody, (object)memberBodyParameterValue) { }
+
         /// <summary>
         /// Get or set how null-conditional operators are handeled
         /// </summary>
@@ -23,5 +32,10 @@ public sealed class ProjectableAttribute : Attribute
         /// or null to get it from the current member.
         /// </summary>
         public string? UseMemberBody { get; set; }
+
+        /// <summary>
+        /// Parameters values for UseMemberBody.
+        /// </summary>
+        public object[]? MemberBodyParameterValues { get; set; }
     }
 }
diff --git a/src/EntityFrameworkCore.Projectables/Extensions/ExpressionExtensions.cs b/src/EntityFrameworkCore.Projectables/Extensions/ExpressionExtensions.cs
@@ -18,6 +18,6 @@ public static Expression ExpandQuaryables(this Expression expression)
         /// Replaces all calls to properties and methods that are marked with the <C>Projectable</C> attribute with their respective expression tree
         /// </summary>
         public static Expression ExpandProjectables(this Expression expression)
-            => new ProjectableExpressionReplacer(new ProjectionExpressionResolver()).Replace(expression);
+            => new ProjectableExpressionReplacer(new ProjectionExpressionResolver()).Visit(expression);
     }
 }
diff --git a/src/EntityFrameworkCore.Projectables/Infrastructure/Internal/CustomQueryCompiler.cs b/src/EntityFrameworkCore.Projectables/Infrastructure/Internal/CustomQueryCompiler.cs
@@ -34,6 +34,6 @@ public TResult ExecuteAsync<TResult>(Expression query, CancellationToken cancell
             => _decoratedQueryCompiler.ExecuteAsync<TResult>(Expand(query), cancellationToken);
 
         Expression Expand(Expression expression)
-            => _projectableExpressionReplacer.Replace(expression);
+            => _projectableExpressionReplacer.Visit(expression);
     }
 }
diff --git a/src/EntityFrameworkCore.Projectables/Services/ProjectableExpressionReplacer.cs b/src/EntityFrameworkCore.Projectables/Services/ProjectableExpressionReplacer.cs
@@ -48,7 +48,7 @@ bool TryGetReflectedExpression(MemberInfo memberInfo, [NotNullWhen(true)] out La
 
                 reflectedExpression = projectableAttribute is not null
                     ? _resolver.FindGeneratedExpression(memberInfo)
-                    : null;
+                    : (LambdaExpression?)null;
 
                 _projectableMemberCache.Add(memberInfo, reflectedExpression);
             }

diff --git a/src/EntityFrameworkCore.Projectables/Services/ProjectionExpressionResolver.cs b/src/EntityFrameworkCore.Projectables/Services/ProjectionExpressionResolver.cs
@@ -15,9 +15,14 @@ public LambdaExpression FindGeneratedExpression(MemberInfo projectableMemberInfo
 
             var expression = GetExpressionFromGeneratedType(projectableMemberInfo);
 
+            if (expression is null && projectableAttribute.UseMemberBody is not null && projectableAttribute.MemberBodyParameterValues is null)
+            {
+                expression = GetExpressionFromGeneratedType(projectableMemberInfo, true, projectableAttribute.UseMemberBody);
+            }
+
             if (expression is null && projectableAttribute.UseMemberBody is not null)
             {
-                expression = GetExpressionFromMemberBody(projectableMemberInfo, projectableAttribute.UseMemberBody);
+                expression = GetExpressionFromMemberBody(projectableMemberInfo, projectableAttribute.UseMemberBody, projectableAttribute.MemberBodyParameterValues);
             }
 
             if (expression is null)
@@ -33,17 +38,22 @@ public LambdaExpression FindGeneratedExpression(MemberInfo projectableMemberInfo
 
             return expression;
 
-            static LambdaExpression? GetExpressionFromMemberBody(MemberInfo projectableMemberInfo, string memberName)
+            static LambdaExpression? GetExpressionFromMemberBody(MemberInfo projectableMemberInfo, string memberName, object[]? memberParameters)
             {
                 var declaringType = projectableMemberInfo.DeclaringType ?? throw new InvalidOperationException("Expected a valid type here");
-                var exprProperty = declaringType.GetProperty(memberName, BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+                var exprProperty = declaringType.GetProperty(memberName, BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+                                   ?? declaringType.BaseType?.GetProperty(memberName, BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
                 var lambda = exprProperty?.GetValue(null) as LambdaExpression;
 
                 if (lambda is not null)
                 {
-                    if (projectableMemberInfo is PropertyInfo property &&
-                        lambda.Parameters.Count == 1 &&
-                        lambda.Parameters[0].Type == declaringType && lambda.ReturnType == property.PropertyType)
+                    if (projectableMemberInfo is PropertyInfo property && (lambda.Parameters.Count == (1 + memberParameters?.Length ?? 0))
+                                                                       && (lambda.Parameters[0].Type == declaringType || lambda.Parameters[0].Type == declaringType.BaseType)
+                                                                       && lambda.ReturnType == property.PropertyType
+                                                                       && (memberParameters?.Any() != true
+                                                                           || lambda.Parameters.Skip(1)
+                                                                               .Select((Parameter, Index) => new { Parameter, Index })
+                                                                               .All(p => p.Parameter.Type == memberParameters[p.Index].GetType())))
                     {
                         return lambda;
                     }
@@ -59,12 +69,14 @@ public LambdaExpression FindGeneratedExpression(MemberInfo projectableMemberInfo
                 return null;
             }
 
-            static LambdaExpression? GetExpressionFromGeneratedType(MemberInfo projectableMemberInfo)
+            static LambdaExpression? GetExpressionFromGeneratedType(MemberInfo projectableMemberInfo, bool useLocalType = false, string methodName = "Expression")
             {
                 var declaringType = projectableMemberInfo.DeclaringType ?? throw new InvalidOperationException("Expected a valid type here");
                 var generatedContainingTypeName = ProjectionExpressionClassNameGenerator.GenerateFullName(declaringType.Namespace, declaringType.GetNestedTypePath().Select(x => x.Name), projectableMemberInfo.Name);
 
-                var expressionFactoryType = declaringType.Assembly.GetType(generatedContainingTypeName);
+                var expressionFactoryType = !useLocalType
+                                            ? declaringType.Assembly.GetType(generatedContainingTypeName)
+                                            : declaringType;
 
                 if (expressionFactoryType is not null)
                 {
@@ -73,7 +85,7 @@ public LambdaExpression FindGeneratedExpression(MemberInfo projectableMemberInfo
                         expressionFactoryType = expressionFactoryType.MakeGenericType(declaringType.GenericTypeArguments);
                     }
 
-                    var expressionFactoryMethod = expressionFactoryType.GetMethod("Expression", BindingFlags.Static | BindingFlags.NonPublic);
+                    var expressionFactoryMethod = expressionFactoryType.GetMethod(methodName, BindingFlags.Static | BindingFlags.NonPublic);
 
                     var methodGenericArguments = projectableMemberInfo switch {
                         MethodInfo methodInfo => methodInfo.GetGenericArguments(),

diff --git a/tests/EntityFrameworkCore.Projectables.Tests/Services/ProjectableExpressionReplacerTests.cs b/tests/EntityFrameworkCore.Projectables.Tests/Services/ProjectableExpressionReplacerTests.cs
@@ -61,7 +61,7 @@ public void VisitMember_SimpleProperty()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Replace(input);
+            var actual = subject.Visit(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }
@@ -77,7 +77,7 @@ public void VisitMember_SimpleMethod()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Replace(input);
+            var actual = subject.Visit(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }
@@ -93,7 +93,7 @@ public void VisitMember_SimpleMethodWithArguments()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Replace(input);
+            var actual = subject.Visit(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }
@@ -109,7 +109,7 @@ public void VisitMember_SimpleStatefullProperty()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Replace(input);
+            var actual = subject.Visit(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }
@@ -125,7 +125,7 @@ public void VisitMember_SimpleStatefullMethod()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Replace(input);
+            var actual = subject.Visit(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }
@@ -141,7 +141,7 @@ public void VisitMember_SimpleStaticMethod()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Replace(input);
+            var actual = subject.Visit(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }
@@ -157,7 +157,7 @@ public void VisitMember_SimpleStaticMethodWithArguments()
             );
             var subject = new ProjectableExpressionReplacer(resolver);
 
-            var actual = subject.Replace(input);
+            var actual = subject.Visit(input);
 
             Assert.Equal(expected.ToString(), actual.ToString());
         }