matteobortolazzo#183 - Fix .In within .Any

matteobortolazzo · matteobortolazzo · commit 318ee307b6f3 · 2023-06-20T23:10:50.000+02:00
diff --git a/src/CouchDB.Driver/Query/QueryCompiler.cs b/src/CouchDB.Driver/Query/QueryCompiler.cs
@@ -17,6 +17,7 @@ internal class QueryCompiler : IQueryCompiler
         private readonly IQueryTranslator _queryTranslator;
         private readonly IQuerySender _requestSender;
         private readonly string? _discriminator;
+
         private static readonly MethodInfo RequestSendMethod
             = typeof(IQuerySender).GetRuntimeMethods()
                 .Single(m => (m.Name == nameof(IQuerySender.Send)) && m.IsGenericMethod);
@@ -29,7 +30,8 @@ private static readonly MethodInfo PostProcessResultAsyncMethod
             = typeof(QueryCompiler).GetMethod(nameof(PostProcessResultAsync),
                 BindingFlags.NonPublic | BindingFlags.Static);
 
-        public QueryCompiler(IQueryOptimizer queryOptimizer, IQueryTranslator queryTranslator, IQuerySender requestSender, string? discriminator)
+        public QueryCompiler(IQueryOptimizer queryOptimizer, IQueryTranslator queryTranslator,
+            IQuerySender requestSender, string? discriminator)
         {
             _queryOptimizer = queryOptimizer;
             _queryTranslator = queryTranslator;
@@ -57,7 +59,8 @@ private TResult SendRequest<TResult>(Expression query, bool async, CancellationT
                 {
                     ConstantExpression _ => SendRequestWithoutFilter<TResult>(query,
                         async, cancellationToken),
-                    MethodCallExpression methodCallExpression => SendRequestWithFilter<TResult>(methodCallExpression, query,
+                    MethodCallExpression methodCallExpression => SendRequestWithFilter<TResult>(methodCallExpression,
+                        query,
                         async, cancellationToken),
                     _ => throw new ArgumentException($"Expression of type {query.GetType().Name} is not valid.")
                 };
@@ -69,7 +72,8 @@ private TResult SendRequest<TResult>(Expression query, bool async, CancellationT
             }
         }
 
-        private TResult SendRequestWithoutFilter<TResult>(Expression query, bool async, CancellationToken cancellationToken)
+        private TResult SendRequestWithoutFilter<TResult>(Expression query, bool async,
+            CancellationToken cancellationToken)
         {
             Expression optimizedQuery = _queryOptimizer.Optimize(query, _discriminator);
             var body = _queryTranslator.Translate(optimizedQuery);
@@ -87,7 +91,7 @@ private TResult SendRequestWithFilter<TResult>(MethodCallExpression methodCallEx
             }
 
             var body = _queryTranslator.Translate(optimizedQuery);
-            
+
             // If no operation must be done on the list return
             if (!methodCallExpression.Method.IsSupportedByComposition())
             {
@@ -101,12 +105,12 @@ private TResult SendRequestWithFilter<TResult>(MethodCallExpression methodCallEx
             // Query database
             object couchQueryable = RequestSendMethod
                 .MakeGenericMethod(couchListType)
-                .Invoke(_requestSender, new object[]{ body, async, cancellationToken });
+                .Invoke(_requestSender, new object[] { body, async, cancellationToken });
 
             // Apply in-memory operations
             MethodInfo postProcessResultMethodInfo = (async
-                ? PostProcessResultAsyncMethod
-                : PostProcessResultMethod)
+                    ? PostProcessResultAsyncMethod
+                    : PostProcessResultMethod)
                 .MakeGenericMethod(documentType, returnType);
 
             return (TResult)postProcessResultMethodInfo.Invoke(null,
@@ -174,7 +178,7 @@ private static TResult PostProcessResult<TSource, TResult>(
             // Execute
             try
             {
-                return (TResult)enumerableMethodInfo.Invoke(null, new[] {result});
+                return (TResult)enumerableMethodInfo.Invoke(null, new[] { result });
             }
             catch (TargetInvocationException ex)
             {
@@ -197,4 +201,4 @@ private static async Task<TResult> PostProcessResultAsync<TSource, TResult>(
             return PostProcessResult<TSource, TResult>(couchList, originalMethodCall, optimizedMethodCall);
         }
     }
-}
+}
diff --git a/src/CouchDB.Driver/Query/QueryTranslator.cs b/src/CouchDB.Driver/Query/QueryTranslator.cs
@@ -55,4 +55,4 @@ protected override Expression VisitLambda<T>(Expression<T> l)
             return l;
         }
     }
-}
+}
diff --git a/src/CouchDB.Driver/Query/Translators/MethodCallExpressionTranslator.cs b/src/CouchDB.Driver/Query/Translators/MethodCallExpressionTranslator.cs
@@ -456,10 +456,21 @@ private Expression VisitInMethod(MethodCallExpression m, bool not = false)
         {
             _sb.Append('{');
             Visit(m.Arguments[0]);
-            _sb.Append(not ? ":{\"$nin\":" : ":{\"$in\":");
+
+            var bracketOpened = _sb[^1] == '{';
+            if (!bracketOpened)
+            {
+                _sb.Append(":{"); 
+            }
+            
+            _sb.Append(not ? "\"$nin\":" : "\"$in\":");
 
             Visit(m.Arguments[1]);
-            _sb.Append("}}");
+            if (!bracketOpened)
+            {
+                _sb.Append("}");
+            }
+            _sb.Append("}");
             return m;
         }
 
diff --git a/tests/CouchDB.Driver.UnitTests/Find/Find_Selector_Combinations.cs b/tests/CouchDB.Driver.UnitTests/Find/Find_Selector_Combinations.cs
@@ -126,6 +126,14 @@ public void ElemMatchNestedImplicitBool()
                 @"{""selector"":{""battles"":{""$elemMatch"":{""vehicles"":{""$elemMatch"":{""canFly"":true}}}}}}",
                 json);
         }
+        
+        [Fact]
+        public void ElemMatch_In()
+        {
+            var search = new[] { "battle" };
+            var json = _rebels.Where(r => r.Skills.Any(s => s.In(search))).ToString();
+            Assert.Equal(@"{""selector"":{""skills"":{""$elemMatch"":{""$in"":[""battle""]}}}}", json);
+        }
 
         [Fact]
         public void AllMatch()

Original file line number	Diff line number	Diff line change
`@@ -55,4 +55,4 @@ protected override Expression VisitLambda<T>(Expression<T> l)`
`55`	`55`	`return l;`
`56`	`56`	`}`
`57`	`57`	`}`
`58`		`-}`
	`58`	`+}`