Fixup FhirResourceConverter to pretty print on multiple platforms.

JoeShook · Oct 13, 2024 · 1becca1 · 1becca1
1 parent 8c0d1a0
commit 1becca1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Udap.CdsHooks.Model/FhirResourceConverter.cs b/Udap.CdsHooks.Model/FhirResourceConverter.cs
@@ -10,6 +10,7 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.RegularExpressions;
 using Hl7.Fhir.Model;
 using Hl7.Fhir.Serialization;
 
@@ -65,6 +66,8 @@ public override void Write(Utf8JsonWriter writer, Dictionary<string, Resource> v
         {
             writer.WritePropertyName(kvp.Key);
             var resourceJson = new FhirJsonSerializer(serializerSettings).SerializeToString(kvp.Value);
+
+            // Console.WriteLine(resourceJson);
             var indentedResourceJson = IndentJson(resourceJson, 2);
             writer.WriteRawValue(indentedResourceJson);
         }
@@ -76,12 +79,12 @@ public override void Write(Utf8JsonWriter writer, Dictionary<string, Resource> v
     private string IndentJson(string json, int additionalIndentationLevels)
     {
         var indentedJson = new StringBuilder();
-        var lines = json.Split('\n');
+        var lines = Regex.Split(json, @"\r\n|\r|\n");
         var additionalIndentation = new string(' ', additionalIndentationLevels * 2); // Assuming 2 spaces per level
 
         foreach (var line in lines)
         {
-            indentedJson.Append(additionalIndentation + line);
+            indentedJson.AppendLine(additionalIndentation + line);
         }
 
         return indentedJson.ToString();

diff --git a/_tests/Udap.Common.Tests/CdsHooks/Experimental.cs b/_tests/Udap.Common.Tests/CdsHooks/Experimental.cs
@@ -7,8 +7,6 @@
 // */
 #endregion
 
-using Hl7.Fhir.Model;
-using Hl7.Fhir.Serialization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Udap.CdsHooks.Model;
@@ -41,5 +39,6 @@ public void TestCdsRequestDeserialize()
         var serializedCdsRequest = JsonSerializer.Serialize(cdsRequest, options);
 
         _testOutputHelper.WriteLine(serializedCdsRequest);
+
     }
 }