Implement ExpressionBuildContext to DynamicFilter

enisn · Oct 17, 2023 · 1c1a1a9 · 1c1a1a9
1 parent 15f9e66
commit 1c1a1a9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/AutoFilterer.Dynamics/DynamicFilter.cs b/src/AutoFilterer.Dynamics/DynamicFilter.cs
@@ -66,15 +66,17 @@ public Expression BuildExpression(Type entityType, Expression body)
 
         foreach (var key in this.Keys)
         {
-            var filterPropertyExpression = Expression.Property(Expression.Constant(this), key);
-            var filterValue = new DynamicFilter(this[key]);
+            var getter = this.GetType().GetMethod("get_Item");
+            var filterPropertyExpression = Expression.Call(Expression.Constant(this), getter, Expression.Constant(key));
+            var filterValue = getter.Invoke(this, parameters: [key]);
             if (IsPrimitive(key))
             {
                 var targetProperty = entityType.GetProperty(key);
                 var value = Convert.ChangeType((string)filterValue, targetProperty.PropertyType);
                 //var exp = OperatorComparisonAttribute.Equal.BuildExpression(body, targetProperty, filterProperty: null, value);
 
-                var exp = OperatorComparisonAttribute.Equal.BuildExpression(new ExpressionBuildContext(body, targetProperty, null, filterPropertyExpression, this, value));
+                var exp = OperatorComparisonAttribute.Equal.BuildExpression(
+                    new ExpressionBuildContext(body, targetProperty, null, filterPropertyExpression, this, value));
 
                 var combined = finalExpression.Combine(exp, CombineWith);
                 finalExpression = body.Combine(combined, CombineWith);