Merge pull request #15 from EAVFW/pks/polylookup-split

Pks/polylookup split
EAVFW · May 28, 2024 · e9a6b48 · e9a6b48
2 parents cf5f714 + aa05f12
commit e9a6b48
Show file tree

Hide file tree

Showing 18 changed files with 321 additions and 214 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build
+name: Build
 
 on:
   pull_request:
@@ -63,10 +63,10 @@ jobs:
         run: dotnet build -o ../build/net6.0/ -f net6.0 -c Release --no-restore -m:1
 
       - name: Restore NuGet packages
-        run: dotnet restore EAVFramework.sln -p:TargetFramework=netcoreapp3.1
+        run: dotnet restore EAVFramework.sln -p:TargetFramework=net8.0
 
       - name: Build solution
-        run: dotnet build -o ../build/netcoreapp3.1/ -f netcoreapp3.1 -c Release --no-restore -m:1
+        run: dotnet build -o ../build/net8.0/ -f net8.0 -c Release --no-restore -m:1
 
       - name: Archive build to artifacts
         uses: actions/upload-artifact@v2

diff --git a/sdk/DTO/AttributeDefinition.cs b/sdk/DTO/AttributeDefinition.cs
@@ -19,8 +19,11 @@ public override AttributeDefinitionBase Read(
                     return new AttributeStringDefinition { Value = reader.GetString() ?? "" };
                 case JsonTokenType.StartObject:
                     var node = JsonNode.Parse(ref reader);
-                    var t = node.Deserialize<AttributeObjectDefinition>();
-                    return t;
+
+                        var t = node.Deserialize<AttributeObjectDefinition>(new JsonSerializerOptions { Converters={ new TypeDefinitionConverter()} });
+                        return t;
+
+
                 default:
                     throw new Exception($"{reader.TokenType} is not supported as AttributeDefinition");
             }
@@ -51,10 +54,12 @@ public class AttributeStringDefinition : AttributeDefinitionBase
     {
         public string Value { get; set; }
     }
+
 
     public class AttributeObjectDefinition : AttributeDefinitionBase
     {
         [JsonPropertyName("isPrimaryField")] public bool IsPrimaryField { get; set; }
+        [JsonPropertyName("logicalName")] public string LogicalName { get; set; }
 
         [JsonPropertyName("moduleSource")] public string ModuleSource { get; set; }
 
@@ -69,9 +74,52 @@ public class AttributeObjectDefinition : AttributeDefinitionBase
         public Dictionary<string, JsonElement> AdditionalFields { get; set; }
     }
 
-    public class TypeDefinition
+
+    public class TypeDefinitionConverter : JsonConverter<TypeDefinition>
+    {
+        public override TypeDefinition Read(
+            ref Utf8JsonReader reader,
+            Type typeToConvert,
+            JsonSerializerOptions options)
+        {
+            switch (reader.TokenType)
+            {
+                case JsonTokenType.String:
+                    return new TypeDefinition { Type = reader.GetString() ?? "" };
+                case JsonTokenType.StartObject:
+                    var node = JsonNode.Parse(ref reader);
+
+                        var t = node.Deserialize<TypeDefinition>();
+                        return t;
+
+
+                default:
+                    throw new Exception($"{reader.TokenType} is not supported as AttributeDefinition");
+            }
+        }
+
+        public override void Write(Utf8JsonWriter writer, TypeDefinition value, JsonSerializerOptions options)
+        {
+            var jsonString = value switch
+            {
+                TypeDefinition attributeObjectDefinition =>
+                    JsonSerializer.Serialize(attributeObjectDefinition),
+
+                _ => throw new ArgumentException($"{value.GetType()} is not supported")
+            };
+
+            var jsonNode = JsonNode.Parse(jsonString);
+            jsonNode?.WriteTo(writer, options);
+        }
+    }
+
+   // [JsonConverter(typeof(TypeDefinitionConverter))]
+
+    public class TypeDefinition 
     {
         [JsonPropertyName("type")] public string Type { get; set; }
+
+        [JsonPropertyName("split")] public bool Split { get; set; }
         [JsonPropertyName("referenceType")] public string ReferenceType { get; set; }
 
         [JsonPropertyName("options")] public Dictionary<string, JsonElement> Options { get; set; }

diff --git a/sdk/DTO/EntityDefinition.cs b/sdk/DTO/EntityDefinition.cs
@@ -1,19 +1,41 @@
+using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace EAVFW.Extensions.Manifest.SDK
 {
     public class EntityDefinition
     {
-        [JsonPropertyName("pluralName")] public string PluralName { get; set; }
-        [JsonPropertyName("description")] public string Description { get; set; }
-        [JsonPropertyName("attributes")] public Dictionary<string, AttributeDefinitionBase> Attributes { get; set; }
-        [JsonPropertyName("wizards")] public Dictionary<string, WizardDefinition> Wizards { get; set; }
+        [JsonProperty("pluralName")]
+        [JsonPropertyName("pluralName")] 
+        public string PluralName { get; set; }
+
+        [JsonProperty("collectionSchemaName")]
+        [JsonPropertyName("collectionSchemaName")]
+        public string CollectionSchemaName { get; set; }
+
+        [JsonProperty("logicalName")]
+        [JsonPropertyName("logicalName")]
+        public string LogicalName { get; set; }
+
+
+        [JsonPropertyName("description")]
+        [JsonProperty("description")]
+        public string Description { get; set; }
+
+        [JsonPropertyName("attributes")]
+        [JsonProperty("attributes")]
+        public Dictionary<string, AttributeDefinitionBase> Attributes { get; set; }
+
+        [JsonPropertyName("wizards")]
+        [JsonProperty("wizards")]
+        public Dictionary<string, WizardDefinition> Wizards { get; set; }
 
         /// <summary>
         /// Exclusively used to capture non-spec items
         /// </summary>
-        [JsonExtensionData]
+        [System.Text.Json.Serialization.JsonExtensionData]
+        [Newtonsoft.Json.JsonExtensionData]
         public Dictionary<string, object> AdditionalFields { get; set; }
     }
 }
diff --git a/sdk/DTO/MessageDefinition.cs b/sdk/DTO/MessageDefinition.cs
@@ -4,6 +4,6 @@ namespace EAVFW.Extensions.Manifest.SDK
 {
     public class MessageDefinition
     {
-        [JsonPropertyName("title")] public string? Title { get; set; }
+        [JsonPropertyName("title")] public string Title { get; set; }
     }
 }
diff --git a/sdk/DefaultManifestReplacementRunner.cs b/sdk/DefaultManifestReplacementRunner.cs
@@ -1,4 +1,4 @@
-using DotNETDevOps.JsonFunctions;
+using DotNETDevOps.JsonFunctions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json.Linq;
@@ -211,14 +211,10 @@ public async Task RunReplacements(JToken jsonraw, string customizationprefix, IL
                                     }
                                     else
                                     {
-                                        try
-                                        {
+
                                             parentObj.Add(childProp);
                                             q.Enqueue(childProp);
-                                        }catch(Exception ex)
-                                        {
-                                            throw;
-                                        }
+
                                     }
 
                                     // parentObj.Add(childProp.Name, childProp.Value);
@@ -284,7 +280,7 @@ public async Task RunReplacements(JToken jsonraw, string customizationprefix, IL
                     }
 
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                     Console.WriteLine($"{entityPath}| {attributePath}");
                     throw;

diff --git a/sdk/EAVFW.Extensions.Manifest.SDK.csproj b/sdk/EAVFW.Extensions.Manifest.SDK.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>disable</Nullable>