Improve code quality: serializer safety, FieldValue consistency, and test assertions

- Make LazyDocument require ITextSerializer (no hardcoded default)
- Add serializer parameter to TopHitsAggregate.Documents<T>() for round-trip path
- Use explicit FieldValue factory methods in FieldConditionsQueryBuilder.ToFieldValue
  with decimal/DateTime/DateTimeOffset cases (aligns with PageableQueryBuilder)
- Add readonly to FindHitExtensions._options static field
- Cache JsonSerializerOptions in AggregationsSystemTextJsonConverter.Write
- Use ToLowerInvariant() instead of ToLower() in BucketsSystemTextJsonConverter
- Remove no-op b.Pipeline(DefaultPipeline) in bulk patch loop (unreachable when set)
- Split Assert.NotNull(x?.Id) patterns and add null guards in test files
- Remove duplicate identity1 declaration (merge artifact)

Made-with: Cursor

Author: niemyjski

src/Foundatio.Repositories.Elasticsearch/Extensions/FindHitExtensions.cs

@@ -12,7 +12,7 @@ namespace Foundatio.Repositories.Elasticsearch.Extensions;
 
 public static class FindHitExtensions
 {
-    private static JsonSerializerOptions _options;
+    private static readonly JsonSerializerOptions _options;
     static FindHitExtensions()
     {
         _options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };

src/Foundatio.Repositories.Elasticsearch/Queries/Builders/FieldConditionsQueryBuilder.cs

@@ -289,14 +289,17 @@ private static FieldValue ToFieldValue(object value)
         {
             return value switch
             {
-                null => null,
-                string s => s,
-                long l => l,
-                int i => i,
-                double d => d,
-                float f => f,
-                bool b => b,
-                _ => value.ToString()
+                null => FieldValue.Null,
+                string s => FieldValue.String(s),
+                bool b => FieldValue.Boolean(b),
+                long l => FieldValue.Long(l),
+                int i => FieldValue.Long(i),
+                double d => FieldValue.Double(d),
+                float f => FieldValue.Double(f),
+                decimal m => FieldValue.Double((double)m),
+                DateTime dt => FieldValue.String(dt.ToString("o")),
+                DateTimeOffset dto => FieldValue.String(dto.ToString("o")),
+                _ => FieldValue.String(value.ToString())
             };
         }
     }

src/Foundatio.Repositories.Elasticsearch/Repositories/ElasticRepositoryBase.cs

@@ -478,8 +478,6 @@ public virtual async Task PatchAsync(Ids ids, IPatchOperation operation, IComman
             b.Refresh(options.GetRefreshMode(DefaultConsistency));
             foreach (var id in ids)
             {
-                b.Pipeline(DefaultPipeline);
-
                 if (scriptOperation != null)
                     b.Update<T>(u =>
                     {

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

@@ -1,6 +1,8 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Foundatio.Serializer;
 
 namespace Foundatio.Repositories.Models;
 
@@ -23,19 +25,21 @@ public TopHitsAggregate(IList<ILazyDocument> hits)
 
     public TopHitsAggregate() { }
 
-    public IReadOnlyCollection<T> Documents<T>() where T : class
+    public IReadOnlyCollection<T> Documents<T>(ITextSerializer serializer = null) where T : class
     {
         if (_hits != null && _hits.Count > 0)
             return _hits.Select(h => h.As<T>()).ToList();
 
         if (Hits != null && Hits.Count > 0)
         {
+            ArgumentNullException.ThrowIfNull(serializer);
+
             return Hits
                 .Select(json =>
                 {
                     if (string.IsNullOrEmpty(json))
                         return null;
-                    var lazy = new LazyDocument(Encoding.UTF8.GetBytes(json));
+                    var lazy = new LazyDocument(Encoding.UTF8.GetBytes(json), serializer);
                     return lazy.As<T>();
                 })
                 .Where(d => d != null)

src/Foundatio.Repositories/Models/LazyDocument.cs

@@ -39,11 +39,12 @@ public class LazyDocument : ILazyDocument
     /// Initializes a new instance of the <see cref="LazyDocument"/> class.
     /// </summary>
     /// <param name="data">The raw document data.</param>
-    /// <param name="serializer">The serializer to use for deserialization. Defaults to JSON.</param>
-    public LazyDocument(byte[] data, ITextSerializer serializer = null)
+    /// <param name="serializer">The serializer to use for deserialization.</param>
+    public LazyDocument(byte[] data, ITextSerializer serializer)
     {
+        ArgumentNullException.ThrowIfNull(serializer);
         _data = data;
-        _serializer = serializer ?? new JsonNetSerializer();
+        _serializer = serializer;
     }
 
     /// <inheritdoc/>

src/Foundatio.Repositories/Utility/AggregationsSystemTextJsonConverter.cs

@@ -1,12 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Foundatio.Repositories.Models;
 
 namespace Foundatio.Repositories.Utility;
 
 public class AggregationsSystemTextJsonConverter : System.Text.Json.Serialization.JsonConverter<IAggregate>
 {
+    private static readonly ConditionalWeakTable<JsonSerializerOptions, JsonSerializerOptions> _writeOptionsCache = new();
+
     public override bool CanConvert(Type type)
     {
         return typeof(IAggregate).IsAssignableFrom(type);
@@ -36,10 +39,8 @@ public override IAggregate Read(ref Utf8JsonReader reader, Type typeToConvert, J
 
     public override void Write(Utf8JsonWriter writer, IAggregate value, JsonSerializerOptions options)
     {
-        var serializerOptions = new JsonSerializerOptions(options)
-        {
-            Converters = { new DoubleSystemTextJsonConverter() }
-        };
+        var serializerOptions = _writeOptionsCache.GetValue(options, static o =>
+            new JsonSerializerOptions(o) { Converters = { new DoubleSystemTextJsonConverter() } });
 
         JsonSerializer.Serialize(writer, value, value.GetType(), serializerOptions);
     }

src/Foundatio.Repositories/Utility/BucketsSystemTextJsonConverter.cs

@@ -77,7 +77,7 @@ public override void Write(Utf8JsonWriter writer, IBucket value, JsonSerializerO
         if (element.TryGetProperty(propertyName, out var dataElement))
             return dataElement;
 
-        if (element.TryGetProperty(propertyName.ToLower(), out dataElement))
+        if (element.TryGetProperty(propertyName.ToLowerInvariant(), out dataElement))
             return dataElement;
 
         return null;

tests/Foundatio.Repositories.Elasticsearch.Tests/AggregationQueryTests.cs

@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Elastic.Clients.Elasticsearch.Core.Search;
 using Exceptionless.DateTimeExtensions;
 using Foundatio.Repositories.Elasticsearch.Extensions;
 using Foundatio.Repositories.Elasticsearch.Tests.Repositories.Models;
 using Foundatio.Repositories.Models;
+using Foundatio.Serializer;
 using Microsoft.Extensions.Time.Testing;
 using Newtonsoft.Json;
 using Xunit;
@@ -532,7 +534,8 @@ public async Task GetTermAggregationsWithTopHitsAsync()
 
         tophits = bucket.Aggregations.TopHits();
         Assert.NotNull(tophits);
-        employees = tophits.Documents<Employee>();
+        var serializer = new SystemTextJsonSerializer(new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+        employees = tophits.Documents<Employee>(serializer);
         Assert.Single(employees);
         Assert.Equal(19, employees.First().Age);
         Assert.Equal(1, employees.First().YearsEmployed);

tests/Foundatio.Repositories.Elasticsearch.Tests/ParentChildTests.cs

@@ -108,7 +108,8 @@ public async Task CanQueryByParent()
     {
         var parent = ParentGenerator.Default;
         parent = await _parentRepository.AddAsync(parent, o => o.ImmediateConsistency());
-        Assert.NotNull(parent?.Id);
+        Assert.NotNull(parent);
+        Assert.NotNull(parent.Id);
 
         await _parentRepository.AddAsync(ParentGenerator.Generate(), o => o.ImmediateConsistency());
 

tests/Foundatio.Repositories.Elasticsearch.Tests/PipelineTests.cs

@@ -43,8 +43,10 @@ public async Task AddAsync_WithLowercasePipeline_LowercasesName()
         employee = await _employeeRepository.AddAsync(employee, o => o.ImmediateConsistency());
 
         // Assert
-        Assert.NotNull(employee?.Id);
+        Assert.NotNull(employee);
+        Assert.NotNull(employee.Id);
         var result = await _employeeRepository.GetByIdAsync(employee.Id);
+        Assert.NotNull(result);
         Assert.Equal("  blake  ", result.Name);
     }
 
@@ -98,6 +100,7 @@ public async Task JsonPatchAsync_WithLowercasePipeline_LowercasesName()
 
         // Assert
         employee = await _employeeRepository.GetByIdAsync(employee.Id);
+        Assert.NotNull(employee);
         Assert.Equal(EmployeeGenerator.Default.Age, employee.Age);
         Assert.Equal("patched", employee.Name);
     }
@@ -134,6 +137,7 @@ public async Task PartialPatchAsync_WithLowercasePipeline_LowercasesName()
 
         // Assert
         employee = await _employeeRepository.GetByIdAsync(employee.Id);
+        Assert.NotNull(employee);
         Assert.Equal(EmployeeGenerator.Default.Age, employee.Age);
         Assert.Equal("patched", employee.Name);
     }
@@ -169,6 +173,7 @@ public async Task ScriptPatchAsync_WithLowercasePipeline_LowercasesName()
 
         // Assert
         employee = await _employeeRepository.GetByIdAsync(employee.Id);
+        Assert.NotNull(employee);
         Assert.Equal(EmployeeGenerator.Default.Age, employee.Age);
         Assert.Equal("patched", employee.Name);
     }