Fix Json serializer to be converting consistently - making enums seri…

…alize as integers
Cratis · Sep 18, 2024 · eb38492 · eb38492
1 parent 5d53c7c
commit eb38492
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/Source/DotNET/Applications/ServiceCollectionExtensions.cs b/Source/DotNET/Applications/ServiceCollectionExtensions.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Cratis. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.Text.Json.Serialization;
 using Cratis.Applications.ModelBinding;
 using Cratis.Json;
 using Cratis.Reflection;
@@ -40,12 +41,23 @@ public static IServiceCollection AddControllersFromProjectReferencedAssembles(th
                     .AddTenancy()
                     .AddCQRS();
             })
-            .AddJsonOptions(_ =>
+            .AddJsonOptions(options =>
             {
-                _.JsonSerializerOptions.PropertyNamingPolicy = AcronymFriendlyJsonCamelCaseNamingPolicy.Instance;
+                options.JsonSerializerOptions.PropertyNamingPolicy = AcronymFriendlyJsonCamelCaseNamingPolicy.Instance;
+
+                // Find and remove the JsonStringEnumConverter if it exists, we want to have integers for enums. The Json converter in Fundamentals gives us integer in transport.
+                var converterToRemove = options.JsonSerializerOptions.Converters
+                    .OfType<JsonStringEnumConverter>()
+                    .FirstOrDefault();
+
+                if (converterToRemove != null)
+                {
+                    options.JsonSerializerOptions.Converters.Remove(converterToRemove);
+                }
+
                 foreach (var converter in Globals.JsonSerializerOptions!.Converters)
                 {
-                    _.JsonSerializerOptions.Converters.Add(converter);
+                    options.JsonSerializerOptions.Converters.Add(converter);
                 }
             });