fix serialization issue

Author: apt-TebbeM

src/Meilisearch/Converters/AlwaysIncludeEmptyObjectConverter.cs

@@ -8,17 +8,28 @@ namespace Meilisearch.Converters
 {
     /// <summary>
     /// Always include property in json. MultiSearchFederationOptions will be serialized as "{}"
-    ///
     /// </summary>
-    /// <typeparam name="T"></typeparam>
     public class MultiSearchFederationOptionsConverter : JsonConverter<MultiSearchFederationOptions>
     {
+        /// <summary>
+        /// Would override the default read logic, but here we use the default
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="typeToConvert"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
         public override MultiSearchFederationOptions Read(ref Utf8JsonReader reader, Type typeToConvert,
             JsonSerializerOptions options)
         {
             return JsonSerializer.Deserialize<MultiSearchFederationOptions>(ref reader, options);
         }
 
+        /// <summary>
+        /// Write json for MultiSearchFederationOptions and include it always as empty object
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="value"></param>
+        /// <param name="options"></param>
         public override void Write(Utf8JsonWriter writer, MultiSearchFederationOptions value,
             JsonSerializerOptions options)
         {
@@ -28,20 +39,9 @@ public override void Write(Utf8JsonWriter writer, MultiSearchFederationOptions v
             }
             else
             {
-                var sanitizedOptions =
-                    RemoveSelfFromSerializerOptions(options); //Prevents getting stuck in a loop during serialization
-                JsonSerializer.Serialize(writer, value, sanitizedOptions);
+                JsonSerializer.Serialize(writer, value);
             }
         }
-
-        private static JsonSerializerOptions RemoveSelfFromSerializerOptions(JsonSerializerOptions options)
-        {
-            var sanitizedOptions = new JsonSerializerOptions(options);
-            sanitizedOptions.Converters.Remove(sanitizedOptions.Converters.First(c =>
-                c.GetType() == typeof(MultiSearchFederationOptionsConverter)));
-            return sanitizedOptions;
-        }
-
         private static void WriteEmptyObject(Utf8JsonWriter writer)
         {
             writer.WriteStartObject();
@@ -61,7 +61,6 @@ private bool HasAnyValueSet(MultiSearchFederationOptions value)
                     return true;
                 }
             }
-
             return false;
         }
 

src/Meilisearch/FederatedMultiSearchQuery.cs

@@ -8,7 +8,6 @@ namespace Meilisearch
     /// <summary>
     ///  Search query used in federated multi-index search
     /// </summary>
-    [JsonConverter(typeof(MultiSearchFederationOptionsConverter))]
     public class FederatedMultiSearchQuery
     {
         /// <summary>

src/Meilisearch/MultiSearchFederationOptions.cs

@@ -1,3 +1,8 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+using Meilisearch.Converters;
+
 namespace Meilisearch
 {
     /// <summary>
@@ -8,11 +13,13 @@ public class MultiSearchFederationOptions
         /// <summary>
         /// Number of documents to skip
         /// </summary>
+        [JsonPropertyName("offset")]
         public int Offset { get; set; }
 
         /// <summary>
         /// Maximum number of documents returned
         /// </summary>
+        [JsonPropertyName("limit")]
         public int Limit { get; set; }
     }
 }

tests/Meilisearch.Tests/Meilisearch.Tests.csproj

@@ -2,7 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

tests/Meilisearch.Tests/MultiIndexSearchTests.cs

@@ -89,7 +89,10 @@ public async Task FederatedSearchWithNoFederationOptions()
                     Queries = new List<FederatedSearchQuery>()
                     {
                         new FederatedSearchQuery() { IndexUid = _index1.Uid, Q = "", Filter = "genre = 'SF'" },
-                        new FederatedSearchQuery() { IndexUid = _index2.Uid, Q = "", Filter = "genre = 'Action'" }
+                        new FederatedSearchQuery()
+                        {
+                            IndexUid = _index2.Uid, Q = "", Filter = "genre = 'Action'"
+                        }
                     },
                 });
 
@@ -105,11 +108,12 @@ public async Task FederatedSearchWithEmptyOptions()
                     Queries = new List<FederatedSearchQuery>()
                     {
                         new FederatedSearchQuery() { IndexUid = _index1.Uid, Q = "", Filter = "genre = 'SF'" },
-                        new FederatedSearchQuery() { IndexUid = _index2.Uid, Q = "", Filter = "genre = 'Action'" }
+                        new FederatedSearchQuery()
+                        {
+                            IndexUid = _index2.Uid, Q = "", Filter = "genre = 'Action'"
+                        }
                     },
-                    FederationOptions = new MultiSearchFederationOptions()
-                    {
-                    }
+                    FederationOptions = new MultiSearchFederationOptions() { }
                 });
 
             result.Hits.Should().HaveCount(4);
@@ -118,20 +122,19 @@ public async Task FederatedSearchWithEmptyOptions()
         [Fact]
         public async Task FederatedSearchWithLimitAndOffset()
         {
-            var result = await _fixture.DefaultClient.FederatedMultiSearchAsync<Movie>(
-                new FederatedMultiSearchQuery()
+            var federatedquer = new FederatedMultiSearchQuery()
+            {
+                Queries = new List<FederatedSearchQuery>()
                 {
-                    Queries = new List<FederatedSearchQuery>()
-                    {
-                        new FederatedSearchQuery() { IndexUid = _index1.Uid, Q = "", Filter = "genre = 'SF'" },
-                        new FederatedSearchQuery() { IndexUid = _index2.Uid, Q = "", Filter = "genre = 'Action'" }
-                    },
-                    FederationOptions = new MultiSearchFederationOptions()
-                    {
-                        Limit = 2,
-                        Offset = 0
-                    }
-                });
+                    new FederatedSearchQuery() { IndexUid = _index1.Uid, Q = "", Filter = "genre = 'SF'" },
+                    new FederatedSearchQuery() { IndexUid = _index2.Uid, Q = "", Filter = "genre = 'Action'" }
+                },
+                FederationOptions = new MultiSearchFederationOptions() { Limit = 2, Offset = 0 }
+            };
+            var result = await _fixture.DefaultClient.FederatedMultiSearchAsync<Movie>(federatedquer
+            );
+
+            var testJson = JsonSerializer.Serialize(federatedquer);
 
             result.Hits.Should().HaveCount(2);
         }