Bugfix: support method call in Any() on embedded list

redis · Apr 26, 2024 · 3526fab · 3526fab
1 parent cd8919a
commit 3526fab
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -470,6 +470,7 @@ We'd love your contributions! If you want to contribute please read our [Contrib
 * [@mdrakib](https://github.com/mdrakib)
 * [@jrpavoncello](https://github.com/jrpavoncello)
 * [@axnetg](https://github.com/axnetg)
+* [@PrudiusVladislav](https://github.com/PrudiusVladislav)
 
 <!-- Logo -->
 [Logo]: images/logo.svg

diff --git a/src/Redis.OM/Common/ExpressionParserUtilities.cs b/src/Redis.OM/Common/ExpressionParserUtilities.cs
@@ -960,8 +960,17 @@ private static string TranslateAnyForEmbeddedObjects(MethodCallExpression exp, L
             var type = exp.Arguments.Last().Type;
             var prefix = GetOperandString(exp.Arguments[0]);
             var lambda = (LambdaExpression)exp.Arguments.Last();
-            var tempQuery = ExpressionTranslator.TranslateBinaryExpression((BinaryExpression)lambda.Body, parameters);
-            return tempQuery.Replace("@", $"{prefix}_");
+
+            if (lambda.Body is MethodCallExpression methodCall)
+            {
+                var tempQuery = TranslateMethodExpressions(methodCall, parameters);
+                return tempQuery.Replace("@", $"{prefix}_");
+            }
+            else
+            {
+                var tempQuery = ExpressionTranslator.TranslateBinaryExpression((BinaryExpression)lambda.Body, parameters);
+                return tempQuery.Replace("@", $"{prefix}_");
+            }
         }
 
         private static string ValueToString(object value)

diff --git a/test/Redis.OM.Unit.Tests/RediSearchTests/SearchTests.cs b/test/Redis.OM.Unit.Tests/RediSearchTests/SearchTests.cs
@@ -2237,6 +2237,26 @@ await _substitute.Received().ExecuteAsync(
                 "100");
         }
 
+        [Fact]
+        public async Task TestAnyQueryForArrayOfEmbeddedObjectsMethodCallExpression()
+        {
+            _substitute.ClearSubstitute();
+            _substitute.ExecuteAsync(Arg.Any<string>(), Arg.Any<object[]>()).Returns(_mockReply);
+
+            var collection = new RedisCollection<ObjectWithEmbeddedArrayOfObjects>(_substitute);
+
+            await collection.Where(x => 
+                x.Addresses.Any(a => a.City.Contains("Beach"))).ToListAsync();
+
+            await _substitute.Received().ExecuteAsync(
+                "FT.SEARCH",
+                "objectwithembeddedarrayofobjects-idx",
+                "(@Addresses_City:{*Beach*})",
+                "LIMIT",
+                "0",
+                "100");
+        }
+
         [Fact]
         public async Task SearchWithMultipleWhereClauses()
         {