From c32aba9129155270630d6a3c91f51099f9874220 Mon Sep 17 00:00:00 2001
From: likp <petros.likidis@scb.se>
Date: Fri, 14 Aug 2026 11:02:35 +0200
Subject: [PATCH] Added classes from `PCAxis.Query` that `JsonSerializer` was
 dependent on and removed the nuget dependency.

---
 PCAxis.Serializers/JsonSerializer.cs         | 120 ++++++++++++++++++-
 PCAxis.Serializers/PCAxis.Serializers.csproj |   1 -
 2 files changed, 118 insertions(+), 3 deletions(-)

diff --git a/PCAxis.Serializers/JsonSerializer.cs b/PCAxis.Serializers/JsonSerializer.cs
index b64921e..39cd09b 100644
--- a/PCAxis.Serializers/JsonSerializer.cs
+++ b/PCAxis.Serializers/JsonSerializer.cs
@@ -1,12 +1,14 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 
+using Newtonsoft.Json;
+
 using PCAxis.Paxiom;
 using PCAxis.Paxiom.Extensions;
 using PCAxis.Paxiom.Operations;
-using PCAxis.Query;
 
 namespace PCAxis.Serializers
 {
@@ -180,4 +182,118 @@ private PXModel RearrangeValues(PXModel model)
         #endregion
 
     }
+
+
+    public class TableResponse
+    {
+
+
+        public TableResponse()
+        {
+
+            Columns = new List<TableResponseColumn>();
+            Comments = new List<TableResponseComment>();
+            Data = new List<TableResponseData>();
+            Metadata = new List<TableResponseMetadata>();
+        }
+
+        [JsonProperty("columns")]
+        public List<TableResponseColumn> Columns { get; set; }
+
+        [JsonProperty("comments")]
+        public List<TableResponseComment> Comments { get; set; }
+
+        [JsonProperty("data")]
+        public List<TableResponseData> Data { get; set; }
+
+        [JsonProperty("metadata")]
+        public List<TableResponseMetadata> Metadata { get; set; }
+    }
+
+    public class TableResponseColumn
+    {
+        [JsonProperty("code")]
+        public string Code { get; set; }
+
+        [JsonProperty("text")]
+        public string Text { get; set; }
+
+        [JsonProperty("comment", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string Comment { get; set; }
+
+        [JsonProperty("type", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string Type { get; set; }
+
+        [JsonProperty("unit", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string Unit { get; set; }
+    }
+
+    public class TableResponseComment
+    {
+        [JsonProperty("variable")]
+        public string Variable { get; set; }
+
+        [JsonProperty("value")]
+        public string Value { get; set; }
+
+        [JsonProperty("comment")]
+        public string Comment { get; set; }
+    }
+
+    public class TableResponseData
+    {
+        public TableResponseData()
+        {
+            Values = new List<string>();
+        }
+
+        [JsonProperty("key")]
+        public List<string> Key { get; set; }
+
+        [JsonProperty("values")]
+        public List<string> Values { get; set; }
+
+        [JsonProperty("comments", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public List<string> Comments { get; set; }
+    }
+
+    public class TableResponseMetadata
+    {
+        private DateTime _updated;
+
+        [JsonProperty("infofile")]
+        public string Infofile { get; set; }
+
+        [JsonProperty("updated")]
+        public string Updated
+        {
+            get { return _updated.ToString("yyyy-MM-ddTHH:mm:ssZ"); }
+            set { _updated = DateTime.Parse(value).ToUniversalTime(); }
+        }
+
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("source")]
+        public string Source { get; set; }
+
+
+    }
+    public static class JsonHelper
+    {
+        private static string SerializeJson(object obj, bool prettyPrint)
+        {
+            return JsonConvert.SerializeObject(obj, prettyPrint ? Formatting.Indented : Formatting.None, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+        }
+
+        public static string ToJSON(this object obj, bool prettyPrint)
+        {
+            return SerializeJson(obj, prettyPrint);
+        }
+
+        public static object Deserialize<T>(string data)
+        {
+            return JsonConvert.DeserializeObject<T>(data);
+        }
+    }
 }
diff --git a/PCAxis.Serializers/PCAxis.Serializers.csproj b/PCAxis.Serializers/PCAxis.Serializers.csproj
index 82c5a00..37fea93 100644
--- a/PCAxis.Serializers/PCAxis.Serializers.csproj
+++ b/PCAxis.Serializers/PCAxis.Serializers.csproj
@@ -30,7 +30,6 @@
     <PackageReference Include="Parquet.Net" Version="4.25.0" />
     <PackageReference Include="PCAxis.Core" Version="1.3.0" />
     <PackageReference Include="PCAxis.Metadata" Version="1.0.5" />
-    <PackageReference Include="PCAxis.Query" Version="1.0.10" />
     <PackageReference Include="ClosedXML" Version="0.97.0" />
     <PackageReference Include="PxWeb.Api2.Server.Models" Version="2.3.2" />
     <PackageReference Include="Snappier" Version="1.3.1" />