- PR comments

Author: BorisDog

src/MongoDB.Driver/Search/OperatorSearchDefinitions.cs

@@ -176,18 +176,30 @@ private protected override BsonDocument RenderArguments(IBsonSerializer<TDocumen
             new(_area.Render());
     }
 
-    internal sealed class MoreLikeThisSearchDefinition<TDocument> : OperatorSearchDefinition<TDocument>
+    internal sealed class MoreLikeThisSearchDefinition<TDocumentCollection, TDocumentLike> : OperatorSearchDefinition<TDocumentCollection>
     {
-        private readonly TDocument[] _like;
+        private readonly TDocumentLike[] _like;
 
-        public MoreLikeThisSearchDefinition(IEnumerable<TDocument> like)
+        public MoreLikeThisSearchDefinition(IEnumerable<TDocumentLike> like)
             : base(OperatorType.MoreLikeThis)
         {
+            if (typeof(TDocumentLike) != typeof(BsonDocument) &&
+                typeof(TDocumentLike) != typeof(TDocumentCollection))
+            {
+                throw new ArgumentOutOfRangeException($"Only {nameof(BsonDocument)} and {nameof(TDocumentCollection)} are supported for {nameof(TDocumentLike)} type.");
+            }
+
             _like = Ensure.IsNotNull(like, nameof(like)).ToArray();
         }
 
-        private protected override BsonDocument RenderArguments(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry) =>
-            new("like", new BsonArray(_like.Select(e => e.ToBsonDocument(documentSerializer))));
+        private protected override BsonDocument RenderArguments(IBsonSerializer<TDocumentCollection> documentSerializer, IBsonSerializerRegistry serializerRegistry)
+        {
+            var likeArray = typeof(TDocumentLike) == typeof(BsonDocument) ?
+                new BsonArray(_like.OfType<BsonDocument>()) :
+                new BsonArray(_like.OfType<TDocumentCollection>().Select(e => e.ToBsonDocument(documentSerializer)));
+
+            return new("like", likeArray);
+        }
     }
 
     internal sealed class NearSearchDefinition<TDocument> : OperatorSearchDefinition<TDocument>
@@ -282,15 +294,16 @@ private protected override BsonDocument RenderArguments(IBsonSerializer<TDocumen
         private static BsonValue ToBsonValue(TField value) =>
             value switch
             {
-                sbyte v => v,
-                byte v => v,
-                short v => v,
-                ushort v => v,
-                int v => v,
-                uint v => v,
-                long v => v,
-                double v => v,
-                DateTime v => v,
+                sbyte v => (BsonInt32)v,
+                byte v => (BsonInt32)v,
+                short v => (BsonInt32)v,
+                ushort v => (BsonInt32)v,
+                int v => (BsonInt32)v,
+                uint v => (BsonInt32)v,
+                long v => (BsonInt64)v,
+                float v => (BsonDouble)v,
+                double v => (BsonDouble)v,
+                DateTime v => (BsonDateTime)v,
                 _ => throw new InvalidCastException()
             };
     }

src/MongoDB.Driver/Search/SearchDefinitionBuilder.cs

@@ -294,7 +294,17 @@ public SearchDefinition<TDocument> GeoWithin<TCoordinates>(
         /// </param>
         /// <returns>A more like this search definition.</returns>
         public SearchDefinition<TDocument> MoreLikeThis(IEnumerable<TDocument> like) =>
-            new MoreLikeThisSearchDefinition<TDocument>(like);
+            new MoreLikeThisSearchDefinition<TDocument, TDocument>(like);
+
+        /// <summary>
+        /// Creates a search definition that returns documents similar to the input documents.
+        /// </summary>
+        /// <param name="like">
+        /// One or more documents that Atlas Search uses to extract representative terms for.
+        /// </param>
+        /// <returns>A more like this search definition.</returns>
+        public SearchDefinition<TDocument> MoreLikeThis(IEnumerable<BsonDocument> like) =>
+            new MoreLikeThisSearchDefinition<TDocument, BsonDocument>(like);
 
         /// <summary>
         /// Creates a search definition that returns documents similar to the input documents.
@@ -306,6 +316,16 @@ public SearchDefinition<TDocument> MoreLikeThis(IEnumerable<TDocument> like) =>
         public SearchDefinition<TDocument> MoreLikeThis(params TDocument[] like) =>
             MoreLikeThis((IEnumerable<TDocument>)like);
 
+        /// <summary>
+        /// Creates a search definition that returns documents similar to the input documents.
+        /// </summary>
+        /// <param name="like">
+        /// One or more documents that Atlas Search uses to extract representative terms for.
+        /// </param>
+        /// <returns>A more like this search definition.</returns>
+        public SearchDefinition<TDocument> MoreLikeThis(params BsonDocument[] like) =>
+            MoreLikeThis((IEnumerable<BsonDocument>)like);
+
         /// <summary>
         /// Creates a search definition that supports querying and scoring numeric and date values.
         /// </summary>

tests/MongoDB.Driver.Tests/Search/MongoQueryableTests.cs

@@ -39,7 +39,6 @@ public void SearchMeta()
             var subject = CreateSubject();
 
             var query = subject
-                .Where(x => x.FirstName == "Alexandra")
                 .SearchMeta(Builders<Person>.Search.Text(x => x.FirstName, "Alex"));
 
             query.ToString().Should().EndWith("Aggregate([{ \"$searchMeta\" : { \"text\" : { \"query\" : \"Alex\", \"path\" : \"fn\" } } }])");

tests/MongoDB.Driver.Tests/Search/SearchDefinitionBuilderTests.cs

@@ -394,6 +394,20 @@ public void MoreLikeThis_typed()
                         LastName = "Doe"
                     }),
                 "{ moreLikeThis: { like: [{ fn: 'John', ln: 'Doe' }, { fn: 'Jane', ln: 'Doe' }] } }");
+
+            AssertRendered(
+                subject.MoreLikeThis(
+                    new BsonDocument
+                    {
+                        { "fn", "John" },
+                        { "ln", "Doe" },
+                    },
+                    new BsonDocument
+                    {
+                        { "fn", "Jane" },
+                        { "ln", "Doe" },
+                    }),
+                "{ moreLikeThis: { like: [{ fn: 'John', ln: 'Doe' }, { fn: 'Jane', ln: 'Doe' }] } }");
         }
 
         [Fact]