Add TrimDuplicates to Search

microsoftgraph · Jul 31, 2023 · aa7d025 · aa7d025
1 parent 4137b02
commit aa7d025
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/src/Models/SearchQuery.cs b/src/Models/SearchQuery.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -12,7 +12,7 @@ public SearchQuery()
       this.Request = new RequestProperties();
     }
 
-    public SearchQuery(string queryText, List<string> selectProperties = null, List<Sort> sortList = null, long? startRow = null, int? rowLimit = null, int? rowsPerPage = null)
+    public SearchQuery(string queryText, List<string> selectProperties = null, List<Sort> sortList = null, long? startRow = null, int? rowLimit = null, int? rowsPerPage = null, bool? trimDuplicates = false)
       : this()
     {
       this.Request.Querytext = queryText;
@@ -29,6 +29,8 @@ public SearchQuery(string queryText, List<string> selectProperties = null, List<
       {
         this.Request.SortList.SortProperties.AddRange(sortList);
       }
+
+      this.Request.TrimDuplicates = trimDuplicates;
     }
 
     [JsonPropertyName("request")]
@@ -55,6 +57,8 @@ public class RequestProperties
       public int? RowsPerPage { get; set; }
       public bool ShouldSerializeRowsPerPage() => this.RowsPerPage.HasValue;
 
+      public bool? TrimDuplicates { get; set; }
+
       public RequestProperties()
       {
         this.SelectProperties = new SelectProperties();

diff --git a/src/Serializer/SPSearchQueryConverter.cs b/src/Serializer/SPSearchQueryConverter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Dynamic;
 using System.Text.Json;
@@ -49,7 +49,14 @@ public override void Write(Utf8JsonWriter writer, SearchQuery value, JsonSeriali
       {
         requestObjectToSerialize.RowsPerPage = value.Request.RowsPerPage.Value;
       }
-
+      if (value.Request.TrimDuplicates.HasValue)
+      {
+        requestObjectToSerialize.TrimDuplicates = value.Request.TrimDuplicates.Value;
+      }
+      else
+      {
+        requestObjectToSerialize.TrimDuplicates = false;
+      }
 
       var objectToSerialize = new
       {

diff --git a/test/Mocks/MockHttpProvider.cs b/test/Mocks/MockHttpProvider.cs
@@ -18,15 +18,12 @@ public class MockHttpProvider : Mock<IHttpProvider>
     public MockHttpProvider(HttpResponseMessage httpResponseMessage, ISerializer serializer)
         : base(MockBehavior.Strict)
     {
-      var paul = "Debug";
-
       this.Setup(provider => provider.SendAsync(It.IsAny<HttpRequestMessage>(), It.IsAny<HttpCompletionOption>(), It.IsAny<CancellationToken>()))
         .Callback<HttpRequestMessage, HttpCompletionOption, CancellationToken>(async (req, opt, tok) => await this.ReadRequestContent(req))
         .ReturnsAsync(httpResponseMessage);
 
 
       ISerializer s() {
-        var paul = "debug";
         return serializer;
       }
       this.SetupGet(provider => provider.Serializer).Returns(s());

diff --git a/test/SearchRequestTests.cs b/test/SearchRequestTests.cs
@@ -105,8 +105,8 @@ public async Task PostQuery_GeneratesCorrectRequest()
     {
       // ARRANGE
       var expectedUri = new Uri($"{mockWebUrl}/_api/search/postquery");
-      var mockPostQueryRequest = new SearchQuery("sharepoint", new List<string> { "Title", "Author" });
-      var expectedContent = "{\"request\":{\"Querytext\":\"sharepoint\",\"SelectProperties\":{\"results\":[\"Title\",\"Author\"]}}}";
+      var mockPostQueryRequest = new SearchQuery("sharepoint", new List<string> { "Title", "Author" }, trimDuplicates: true);
+      var expectedContent = "{\"request\":{\"Querytext\":\"sharepoint\",\"SelectProperties\":{\"results\":[\"Title\",\"Author\"]},\"TrimDuplicates\":true}}";
 
       using HttpResponseMessage response = new HttpResponseMessage();
       using TestGraphServiceClient gsc = TestGraphServiceClient.Create(response);