Fixed STJ issue with KeyedBucket serialization

Author: niemyjski

src/Foundatio.Repositories/Extensions/FindResultsExtensions.cs

@@ -10,15 +10,15 @@ public static string GetAsyncQueryId(this IHaveData results)
     }
 
     /// <summary>
-    /// Whether or not the query completed successfully or was interupted (will also be true while the query is still running)
+    /// Whether the query completed successfully or was interrupted (will also be true while the query is still running)
     /// </summary>
     public static bool IsAsyncQueryPartial(this IHaveData results)
     {
         return results.Data.GetBoolean(AsyncQueryDataKeys.IsPartial, false);
     }
 
     /// <summary>
-    /// Whether or not the query is still running
+    /// Whether the query is still running
     /// </summary>
     public static bool IsAsyncQueryRunning(this IHaveData results)
     {

src/Foundatio.Repositories/Models/Aggregations/DateHistogramBucket.cs

@@ -7,7 +7,9 @@ namespace Foundatio.Repositories.Models;
 [DebuggerDisplay("Date: {Date}: Ticks: {Key}")]
 public class DateHistogramBucket : KeyedBucket<double>
 {
-    public DateHistogramBucket() { }
+    public DateHistogramBucket()
+    {
+    }
 
     [System.Text.Json.Serialization.JsonConstructor]
     public DateHistogramBucket(DateTime date, IReadOnlyDictionary<string, IAggregate> aggregations) : base(aggregations)

src/Foundatio.Repositories/Models/Aggregations/KeyedBucket.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using Foundatio.Repositories.Utility;
 
@@ -7,12 +8,16 @@ namespace Foundatio.Repositories.Models;
 [DebuggerDisplay("KeyAsString: {KeyAsString} Key: {Key} Total: {Total}")]
 public class KeyedBucket<T> : BucketBase
 {
-    public KeyedBucket() { }
+    public KeyedBucket()
+    {
+    }
 
     [System.Text.Json.Serialization.JsonConstructor]
-    public KeyedBucket(IReadOnlyDictionary<string, IAggregate> aggregations) : base(aggregations) { }
+    public KeyedBucket(IReadOnlyDictionary<string, IAggregate> aggregations) : base(aggregations)
+    {
+    }
 
-    [System.Text.Json.Serialization.JsonConverter(typeof(ObjectToInferredTypesSystemTextJsonConverter))]
+    [System.Text.Json.Serialization.JsonConverter(typeof(ObjectToInferredTypesConverter))]
     public T Key { get; set; }
     public string KeyAsString { get; set; }
     public long? Total { get; set; }

src/Foundatio.Repositories/Utility/ObjectToInferredTypesConverter.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Foundatio.Repositories.Utility;
+
+public class ObjectToInferredTypesConverter : JsonConverterFactory
+{
+    public override bool CanConvert(Type typeToConvert) => true;
+
+    public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+    {
+        var converterType = typeof(ObjectToInferredTypesConverterInner<>).MakeGenericType(typeToConvert);
+        return (JsonConverter)Activator.CreateInstance(converterType);
+    }
+
+    private class ObjectToInferredTypesConverterInner<T> : JsonConverter<T>
+    {
+        public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            object result = reader.TokenType switch
+            {
+                JsonTokenType.Number when reader.TryGetInt64(out long l) => l,
+                JsonTokenType.Number => reader.GetDouble(),
+                JsonTokenType.String when reader.TryGetDateTime(out DateTime datetime) => datetime,
+                JsonTokenType.String => reader.GetString()!,
+                JsonTokenType.True => true,
+                JsonTokenType.False => false,
+                JsonTokenType.Null => null!,
+                _ => JsonDocument.ParseValue(ref reader).RootElement.Clone()
+            };
+
+            if (result == null)
+                return default!;
+
+            if (result is T typedResult)
+                return typedResult;
+
+            try
+            {
+                // Special case for JsonElement
+                if (result is JsonElement element)
+                {
+                    return JsonSerializer.Deserialize<T>(element.GetRawText(), options)!;
+                }
+
+                return (T)Convert.ChangeType(result, typeof(T));
+            }
+            catch (Exception ex)
+            {
+                throw new JsonException($"Cannot convert {result} to type {typeof(T)}: {ex.Message}", ex);
+            }
+        }
+
+        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+        {
+            JsonSerializer.Serialize(writer, value, typeof(T), options);
+        }
+    }
+}