Refactor OpenInsight file handling to utilize JsonElement for data processing and enhance serialization with JsonSourceGeneration. Updated methods across multiple classes to improve data handling and reduce dependencies on ProcessDataStandardFormat.

Adaptation/Shared/Duplicator/Description.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace Adaptation.Shared.Duplicator;
 
@@ -178,4 +179,16 @@ public class Description : IDescription, Properties.IDescription
 
     internal static string GetDateFormat() => "MM/dd/yyyy hh:mm:ss tt";
 
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Description))]
+internal partial class SharedDescriptionSourceGenerationContext : JsonSerializerContext
+{
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+[JsonSerializable(typeof(Description[]))]
+internal partial class SharedDescriptionArraySourceGenerationContext : JsonSerializerContext
+{
 }

Adaptation/Shared/FileRead.cs

@@ -447,12 +447,13 @@ public class FileRead : Properties.IFileRead
     {
         List<Properties.IDescription> results = new();
         Duplicator.Description description;
-        JsonSerializerOptions jsonSerializerOptions = new() { NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString };
         foreach (JsonElement jsonElement in jsonElements)
         {
             if (jsonElement.ValueKind != JsonValueKind.Object)
                 throw new Exception();
-            description = JsonSerializer.Deserialize<Duplicator.Description>(jsonElement.ToString(), jsonSerializerOptions);
+            description = JsonSerializer.Deserialize(jsonElement.ToString(), Duplicator.SharedDescriptionSourceGenerationContext.Default.Description);
+            if (description is null)
+                continue;
             results.Add(description);
         }
         return results;

Adaptation/Shared/Metrology/WS.cs

@@ -48,6 +48,41 @@ public partial class WS
         return new(resultsJson, wsResults);
     }
 
+    public static (string, Results) SendData(string url, long sequence, string directory, string json, int timeoutSeconds = 120)
+    {
+        Results? wsResults = null;
+        string resultsJson = string.Empty;
+        try
+        {
+            if (string.IsNullOrEmpty(url) || !url.Contains(":") || !url.Contains("."))
+                throw new Exception("Invalid URL");
+            using (HttpClient httpClient = new())
+            {
+                httpClient.Timeout = new TimeSpan(0, 0, 0, timeoutSeconds, 0);
+                HttpRequestMessage httpRequestMessage = new()
+                {
+                    RequestUri = new Uri(url),
+                    Method = HttpMethod.Post,
+                    Content = new StringContent(json, Encoding.UTF8, "application/json")
+                };
+                HttpResponseMessage httpResponseMessage = httpClient.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).Result;
+                resultsJson = httpResponseMessage.Content.ReadAsStringAsync().Result;
+                wsResults = JsonSerializer.Deserialize(resultsJson, ResultsSourceGenerationContext.Default.Results);
+                if (wsResults is null)
+                    throw new NullReferenceException(nameof(wsResults));
+                string checkDirectory = Path.Combine(directory, $"-{wsResults.HeaderId}");
+                if (!Directory.Exists(checkDirectory))
+                    _ = Directory.CreateDirectory(checkDirectory);
+                File.WriteAllText(Path.Combine(checkDirectory, $"{sequence}.json"), json);
+            }
+            if (wsResults.Success is null || !wsResults.Success.Value)
+                wsResults.Errors?.Add(wsResults.ToString());
+        }
+        catch (Exception e)
+        { wsResults ??= Results.Get(resultsJson, e); }
+        return new(resultsJson, wsResults);
+    }
+
     public static void AttachFile(string url, Attachment attachment, int timeoutSeconds = 60)
     {
         using HttpClient httpClient = new();

Adaptation/Shared/ProcessDataStandardFormat.cs

@@ -654,6 +654,17 @@ internal class ProcessDataStandardFormat
         return results;
     }
 
+    internal static JsonElement[] GetArray(string reportFullPath, string[] lines, ProcessDataStandardFormat processDataStandardFormat)
+    {
+        JsonElement[] results;
+        string? json = GetRecordsJson(reportFullPath, lines);
+        if (string.IsNullOrEmpty(json))
+            results = GetArray(processDataStandardFormat);
+        else
+            results = JsonSerializer.Deserialize(json, JsonElementCollectionSourceGenerationContext.Default.JsonElementArray) ?? throw new Exception();
+        return results;
+    }
+
     internal static string GetPDSFText(IFileRead fileRead, Logistics logistics, JsonElement[] jsonElements, string logisticsText)
     {
         string result;
@@ -903,7 +914,7 @@ internal class ProcessDataStandardFormat
         }
         foreach (KeyValuePair<string, List<string>> keyValuePair in results)
         {
-            if (body.Count < 3)
+            if (body.Count < 2)
                 break;
             if (keyValuePair.Value.Count != body.Count)
                 continue;
@@ -956,6 +967,26 @@ internal class ProcessDataStandardFormat
         return result;
     }
 
+    private static string? GetRecordsJson(string reportFullPath, string[] lines)
+    {
+        string? result;
+        bool foundRecords = false;
+        List<string> results = new();
+        lines ??= File.ReadAllLines(reportFullPath);
+        foreach (string line in lines)
+        {
+            if (line.StartsWith("\"Records\""))
+                foundRecords = true;
+            if (!foundRecords)
+                continue;
+            if (line == "],")
+                break;
+            results.Add(line);
+        }
+        result = results.Count == 0 ? null : $"{string.Join(Environment.NewLine, results.Skip(1))}{Environment.NewLine}]";
+        return result;
+    }
+
 }
 
 [JsonSourceGenerationOptions(WriteIndented = true)]