fix failing tests

Author: StuartFerguson

MessagingService.IntegrationTests/Common/DockerHelper.cs

@@ -90,12 +90,12 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do
 
         String Serialise(Object arg)
         {
-            return StringSerialiser.Serialise<Object>(arg);
+            return StringSerialiser.Serialise<Object>(arg, new SerialiserOptions(SerialiserPropertyFormat.SnakeCase));
         }
 
         Object Deserialise(String arg, Type type)
         {
-            return StringSerialiser.DeserializeObject<Object>(arg, type);
+            return StringSerialiser.DeserializeObject<Object>(arg, type, new SerialiserOptions(SerialiserPropertyFormat.SnakeCase));
         }
 
         private HttpClient CreateHttpClient() {

MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj

@@ -14,8 +14,8 @@
     <PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
     <PackageReference Include="Reqnroll" Version="3.3.3" />
     <PackageReference Include="Reqnroll.NUnit" Version="3.3.3" />
-    <PackageReference Include="SecurityService.Client" Version="2026.4.3-build154" />
-    <PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2026.4.3-build154" />
+    <PackageReference Include="SecurityService.Client" Version="2026.4.3-build156" />
+    <PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2026.4.3-build156" />
     <PackageReference Include="Shared.IntegrationTesting" Version="2026.5.4" />
     <PackageReference Include="Shouldly" Version="4.3.0" />
     <PackageReference Include="coverlet.collector" Version="8.0.0">

MessagingService/Bootstrapper/MiddlewareRegistry.cs

@@ -3,6 +3,10 @@
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi;
 using Shared.Authorisation;
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Shared.Serialisation;
 
 namespace MessagingService.Bootstrapper
 {
@@ -50,6 +54,8 @@ public MiddlewareRegistry() {
             RequestResponseMiddlewareLoggingConfig config = new(middlewareLogLevel, logRequests, logResponses);
 
             this.AddSingleton(config);
+
+            this.ConfigureHttpJsonOptions(jsonOptions => JsonSerializerConfiguration.ConfigureMinimalApi(jsonOptions.SerializerOptions));
         }
 
         private void ConfigureAuthentication() {
@@ -87,11 +93,11 @@ private void ConfigureAuthentication() {
             this.AddClientCredentialsOnlyPolicy();
             this.AddClientCredentialsHandler();
 
-            this.ConfigureHttpJsonOptions(options =>
-            {
-                options.SerializerOptions.PropertyNamingPolicy = new SnakeCaseNamingPolicy();
-                options.SerializerOptions.PropertyNameCaseInsensitive = true; // optional, but safer
-            });
+            //this.ConfigureHttpJsonOptions(options =>
+            //{
+            //    options.SerializerOptions.PropertyNamingPolicy = new SnakeCaseNamingPolicy();
+            //    options.SerializerOptions.PropertyNameCaseInsensitive = true; // optional, but safer
+            //});
         }
         private void ConfigureSwagger() {
 
@@ -127,3 +133,57 @@ private void ConfigureSwagger() {
         }
     }
 }
+
+public static class JsonSerializerConfiguration
+{
+    public static void ConfigureMinimalApi(JsonSerializerOptions serializerOptions)
+    {
+        var defaultOptions = SystemTextJsonSerializer.GetDefaultJsonSerializerOptions();
+        serializerOptions.PropertyNamingPolicy = defaultOptions.PropertyNamingPolicy;
+        serializerOptions.DictionaryKeyPolicy = defaultOptions.DictionaryKeyPolicy;
+        serializerOptions.ReferenceHandler = defaultOptions.ReferenceHandler;
+        serializerOptions.WriteIndented = defaultOptions.WriteIndented;
+        serializerOptions.Converters.Add(new UtcDateTimeJsonConverter());
+        serializerOptions.Converters.Add(new NullableUtcDateTimeJsonConverter());
+        
+    }
+
+    private sealed class UtcDateTimeJsonConverter : System.Text.Json.Serialization.JsonConverter<DateTime>
+    {
+        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var value = reader.GetDateTime();
+            return value.Kind == DateTimeKind.Utc ? value : value.ToUniversalTime();
+        }
+
+        public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value.Kind == DateTimeKind.Utc ? value : value.ToUniversalTime());
+        }
+    }
+
+    private sealed class NullableUtcDateTimeJsonConverter : System.Text.Json.Serialization.JsonConverter<DateTime?>
+    {
+        public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.Null)
+            {
+                return null;
+            }
+
+            var value = reader.GetDateTime();
+            return value.Kind == DateTimeKind.Utc ? value : value.ToUniversalTime();
+        }
+
+        public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options)
+        {
+            if (value.HasValue == false)
+            {
+                writer.WriteNullValue();
+                return;
+            }
+
+            writer.WriteStringValue(value.Value.Kind == DateTimeKind.Utc ? value.Value : value.Value.ToUniversalTime());
+        }
+    }
+}

MessagingService/Bootstrapper/SerialiserRegistry.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using Lamar;
+using Microsoft.Extensions.DependencyInjection;
+using Shared.Serialisation;
+
+namespace MessagingService.Bootstrapper;
+
+[ExcludeFromCodeCoverage]
+public class SerialiserRegistry : ServiceRegistry
+{
+    public SerialiserRegistry()
+    {
+        this.AddSingleton<IStringSerialiser, SystemTextJsonSerializer>();
+        this.AddSingleton<Func<Object, String>>(_ => obj => StringSerialiser.Serialise(obj));
+        this.AddSingleton<Func<String, Type, Object>>(_ => (str, type) => StringSerialiser.DeserializeObject<Object>(str, type));
+        this.AddSingleton(SystemTextJsonSerializer.GetDefaultJsonSerializerOptions());
+    }
+}

MessagingService/Startup.cs

@@ -1,3 +1,4 @@
+using MessagingService.Endpoints;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -6,7 +7,6 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
-using MessagingService.Endpoints;
 
 namespace MessagingService
 {
@@ -26,6 +26,7 @@ namespace MessagingService
     using Shared.General;
     using Shared.Logger;
     using Shared.Middleware;
+    using Shared.Serialisation;
     using SMSMessage.DomainEvents;
     using System.Diagnostics;
     using System.Diagnostics.CodeAnalysis;
@@ -56,8 +57,12 @@ public void ConfigureContainer(ServiceRegistry services)
             services.IncludeRegistry<DomainServiceRegistry>();
             services.IncludeRegistry<DomainEventHandlerRegistry>();
             services.IncludeRegistry<MessagingProxyRegistry>();
+            services.IncludeRegistry<SerialiserRegistry>();
 
             Startup.Container = new Container(services);
+
+            var serialiser = Container.GetRequiredService<IStringSerialiser>();
+            StringSerialiser.Initialise(serialiser);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.