notify doctors work, audit work, new product advisory sprints

src/Scanner/StellaOps.Scanner.WebService/Serialization/OrchestratorEventSerializer.cs

@@ -1,32 +1,41 @@
 using System;
 using System.Collections.Immutable;
 using System.Linq;
+using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
+using StellaOps.Canonical.Json;
 using StellaOps.Scanner.WebService.Contracts;
 
 namespace StellaOps.Scanner.WebService.Serialization;
 
 internal static class OrchestratorEventSerializer
 {
-    private static readonly JsonSerializerOptions CompactOptions = CreateOptions(writeIndented: false);
-    private static readonly JsonSerializerOptions PrettyOptions = CreateOptions(writeIndented: true);
+    private static readonly JsonSerializerOptions CanonicalOptions = CreateOptions();
+    private static readonly JsonSerializerOptions PrettyOptions = new()
+    {
+        WriteIndented = true,
+        Encoder = JavaScriptEncoder.Default
+    };
 
     public static string Serialize(OrchestratorEvent @event)
-        => JsonSerializer.Serialize(@event, CompactOptions);
+        => Encoding.UTF8.GetString(CanonJson.Canonicalize(@event, CanonicalOptions));
 
     public static string SerializeIndented(OrchestratorEvent @event)
-        => JsonSerializer.Serialize(@event, PrettyOptions);
+    {
+        var canonicalBytes = CanonJson.Canonicalize(@event, CanonicalOptions);
+        using var document = JsonDocument.Parse(canonicalBytes);
+        return JsonSerializer.Serialize(document.RootElement, PrettyOptions);
+    }
 
-    private static JsonSerializerOptions CreateOptions(bool writeIndented)
+    private static JsonSerializerOptions CreateOptions()
     {
         var options = new JsonSerializerOptions(JsonSerializerDefaults.Web)
         {
-            WriteIndented = writeIndented,
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+            Encoder = JavaScriptEncoder.Default
         };
 
         var baselineResolver = options.TypeInfoResolver ?? new DefaultJsonTypeInfoResolver();