- PR comments

Author: BorisDog

src/MongoDB.Driver/Search/OperatorSearchDefinitions.cs

@@ -176,29 +176,26 @@ private protected override BsonDocument RenderArguments(IBsonSerializer<TDocumen
             new(_area.Render());
     }
 
-    internal sealed class MoreLikeThisSearchDefinition<TDocumentCollection, TDocumentLike> : OperatorSearchDefinition<TDocumentCollection>
+    internal sealed class MoreLikeThisSearchDefinition<TDocument, TLike> : OperatorSearchDefinition<TDocument>
     {
-        private readonly TDocumentLike[] _like;
+        private readonly TLike[] _like;
 
-        public MoreLikeThisSearchDefinition(IEnumerable<TDocumentLike> like)
+        public MoreLikeThisSearchDefinition(IEnumerable<TLike> 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<TDocumentCollection> documentSerializer, IBsonSerializerRegistry serializerRegistry)
+        private protected override BsonDocument RenderArguments(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)
         {
-            var likeArray = typeof(TDocumentLike) == typeof(BsonDocument) ?
-                new BsonArray(_like.OfType<BsonDocument>()) :
-                new BsonArray(_like.OfType<TDocumentCollection>().Select(e => e.ToBsonDocument(documentSerializer)));
+            var likeSerializer = typeof(TLike) switch
+            {
+                var t when t == typeof(BsonDocument) => null,
+                var t when t == typeof(TDocument) => (IBsonSerializer<TLike>)documentSerializer,
+                _ => serializerRegistry.GetSerializer<TLike>()
+            };
 
-            return new("like", likeArray);
+            return new("like", new BsonArray(_like.Select(document => document.ToBsonDocument(likeSerializer))));
         }
     }
 

src/MongoDB.Driver/Search/SearchDefinitionBuilder.cs

@@ -289,42 +289,24 @@ public SearchDefinition<TDocument> GeoWithin<TCoordinates>(
         /// <summary>
         /// Creates a search definition that returns documents similar to the input documents.
         /// </summary>
+        /// <typeparam name="TLike">The type of the like documents.</typeparam>
         /// <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<TDocument> like) =>
-            new MoreLikeThisSearchDefinition<TDocument, TDocument>(like);
+        public SearchDefinition<TDocument> MoreLikeThis<TLike>(IEnumerable<TLike> like) =>
+            new MoreLikeThisSearchDefinition<TDocument, TLike>(like);
 
         /// <summary>
         /// Creates a search definition that returns documents similar to the input documents.
         /// </summary>
+        /// <typeparam name="TLike">The type of the like documents.</typeparam>
         /// <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.
-        /// </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 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);
+        public SearchDefinition<TDocument> MoreLikeThis<TLike>(params TLike[] like) =>
+            new MoreLikeThisSearchDefinition<TDocument, TLike>(like);
 
         /// <summary>
         /// Creates a search definition that supports querying and scoring numeric and date values.

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

@@ -374,6 +374,12 @@ public void MoreLikeThis()
                     new BsonDocument("x", "foo"),
                     new BsonDocument("x", "bar")),
                 "{ moreLikeThis: { like: [{ x: 'foo' }, { x: 'bar' }] } }");
+
+            AssertRendered(
+              subject.MoreLikeThis(
+                  new SimplePerson { FirstName = "John", LastName = "Doe" },
+                  new SimplePerson { FirstName = "Jane", LastName = "Doe" }),
+             "{ moreLikeThis: { like: [{ fn: 'John', ln: 'Doe' }, { fn: 'Jane', ln: 'Doe' }] } }");
         }
 
         [Fact]
@@ -383,31 +389,29 @@ public void MoreLikeThis_typed()
 
             AssertRendered(
                 subject.MoreLikeThis(
-                    new SimplePerson
-                    {
-                        FirstName = "John",
-                        LastName = "Doe"
-                    },
-                    new SimplePerson
-                    {
-                        FirstName = "Jane",
-                        LastName = "Doe"
-                    }),
-                "{ moreLikeThis: { like: [{ fn: 'John', ln: 'Doe' }, { fn: 'Jane', ln: 'Doe' }] } }");
+                    new SimplestPerson { FirstName = "John" },
+                    new SimplestPerson { FirstName = "Jane" }),
+                "{ moreLikeThis: { like: [{ fn: 'John' }, { fn: 'Jane' }] } }");
 
             AssertRendered(
                 subject.MoreLikeThis(
-                    new BsonDocument
-                    {
+                    new SimplePerson { FirstName = "John", LastName = "Doe" },
+                    new SimplePerson { FirstName = "Jane", LastName = "Doe" }),
+                "{ moreLikeThis: { like: [{ fn: 'John', ln: 'Doe' }, { fn: 'Jane', ln: 'Doe' }] } }");
+
+            AssertRendered(
+               subject.MoreLikeThis(
+                   new BsonDocument
+                   {
                         { "fn", "John" },
                         { "ln", "Doe" },
-                    },
-                    new BsonDocument
-                    {
+                   },
+                   new BsonDocument
+                   {
                         { "fn", "Jane" },
                         { "ln", "Doe" },
-                    }),
-                "{ moreLikeThis: { like: [{ fn: 'John', ln: 'Doe' }, { fn: 'Jane', ln: 'Doe' }] } }");
+                   }),
+               "{ moreLikeThis: { like: [{ fn: 'John', ln: 'Doe' }, { fn: 'Jane', ln: 'Doe' }] } }");
         }
 
         [Fact]
@@ -949,5 +953,11 @@ private class SimplePerson
             [BsonElement("ln")]
             public string LastName { get; set; }
         }
+
+        private class SimplestPerson
+        {
+            [BsonElement("fn")]
+            public string FirstName { get; set; }
+        }
     }
 }