Merge pull request #359 from shesha-io/fix/json2logic_nested_properties

Fix JsonLogic2Linq nested entities
shesha-io · Jul 4, 2023 · 4db0922 · 4db0922
2 parents ff40289 + 3829cf5
commit 4db0922
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/shesha-core/src/Shesha.Framework/JsonLogic/ExpressionExtensions.cs b/shesha-core/src/Shesha.Framework/JsonLogic/ExpressionExtensions.cs
@@ -43,7 +43,7 @@ public static MemberExpression GetMemberExpression(this ParameterExpression para
             return GetMemberExpression((Expression)param, propertyName);
         }
 
-        private static MemberExpression GetMemberExpression(Expression param, string propertyName)
+        public static MemberExpression GetMemberExpression(Expression param, string propertyName)
         {
             if (!propertyName.Contains("."))
             {

diff --git a/shesha-core/src/Shesha.Framework/JsonLogic/JsonLogic2LinqConverter.cs b/shesha-core/src/Shesha.Framework/JsonLogic/JsonLogic2LinqConverter.cs
@@ -873,12 +873,13 @@ private void ConvertNullable(Expression a, ref Expression b)
         private void ConvertEntityReferenceForEquality(ParameterExpression param, Expression potentialIdExpr, ref Expression potentialEntityRefExpr) 
         {
             if (potentialEntityRefExpr is MemberExpression memberExpression &&
+                memberExpression.Expression != null &&
                 memberExpression.Type.IsEntityType() &&
                 potentialIdExpr is ConstantExpression idExpr && 
                 idExpr.Value != null /* null values should be processed as references not as Id value*/)
             {
                 var idName = $"{memberExpression.Member.Name}.{nameof(IEntity.Id)}";
-                var expr = ExpressionExtensions.GetMemberExpression(param, idName);
+                var expr = ExpressionExtensions.GetMemberExpression(memberExpression.Expression, idName);
                 potentialEntityRefExpr = expr;
             }
         }