Merge pull request #24 from data-solution-automation-engine/dev2

Merging dev branch back into main

Author: RoelantVos

DataWarehouseAutomation/DataWarehouseAutomation.sln

@@ -52,7 +52,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RunDwhAutomation", "RunDwhA
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SchemaJsonConverter", "SchemaJsonConverter\SchemaJsonConverter.csproj", "{07214B80-37A9-4137-B0F3-109FA0D0926A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Export", "Export\Export.csproj", "{555AD192-6E8B-49DD-B60C-2E2CC41C0FA2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Export", "Export\Export.csproj", "{555AD192-6E8B-49DD-B60C-2E2CC41C0FA2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

DataWarehouseAutomation/DataWarehouseAutomation/DataWarehouseAutomation.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <Version>2.0.2</Version>

DataWarehouseAutomation/DataWarehouseAutomation/BusinessKeyDefinition.cs renamed to DataWarehouseAutomation/DataWarehouseAutomation/DwaModel/BusinessKeyDefinition.cs

@@ -1,4 +1,4 @@
-namespace DataWarehouseAutomation;
+namespace DataWarehouseAutomation.DwaModel;
 
 /// <summary>
 /// A Business Key, which consists of one or more components (column mappings) and has its own surrogate key.

DataWarehouseAutomation/DataWarehouseAutomation/DataClassification.cs renamed to DataWarehouseAutomation/DataWarehouseAutomation/DwaModel/DataClassification.cs

@@ -1,4 +1,4 @@
-namespace DataWarehouseAutomation;
+namespace DataWarehouseAutomation.DwaModel;
 
 /// <summary>
 /// Used to define a list of classifications (labels) and notes to add to various components of the schema definition.

DataWarehouseAutomation/DataWarehouseAutomation/DataConnection.cs renamed to DataWarehouseAutomation/DataWarehouseAutomation/DwaModel/DataConnection.cs

@@ -1,4 +1,4 @@
-namespace DataWarehouseAutomation;
+namespace DataWarehouseAutomation.DwaModel;
 
 /// <summary>
 /// Connectivity information, that can be used for either a DataObject or DataObjectQuery.

DataWarehouseAutomation/DataWarehouseAutomation/DataItem.cs renamed to DataWarehouseAutomation/DataWarehouseAutomation/DwaModel/DataItem.cs

@@ -1,4 +1,4 @@
-namespace DataWarehouseAutomation;
+namespace DataWarehouseAutomation.DwaModel;
 
 public class DataItem : IDataItem
 {

DataWarehouseAutomation/DataWarehouseAutomation/DataItemMapping.cs renamed to DataWarehouseAutomation/DataWarehouseAutomation/DwaModel/DataItemMapping.cs

@@ -1,4 +1,4 @@
-namespace DataWarehouseAutomation;
+namespace DataWarehouseAutomation.DwaModel;
 
 /// <summary>
 /// The individual column-to-column mapping.
@@ -16,7 +16,7 @@ public class DataItemMapping
     public List<IDataItem> SourceDataItems { get; set; } = new();
 
     [JsonPropertyName("targetDataItem")]
-    public DataItem TargetDataItem { get; set; } = new() { Name = "NewTargetDataItem" };
+    public IDataItem TargetDataItem { get; set; } = new DataItem() { Name = "newTargetDataItem" };
 
     /// <summary>
     /// The collection of extension Key/Value pairs.

DataWarehouseAutomation/DataWarehouseAutomation/DataItemQuery.cs renamed to DataWarehouseAutomation/DataWarehouseAutomation/DwaModel/DataItemQuery.cs

@@ -1,4 +1,4 @@
-namespace DataWarehouseAutomation;
+namespace DataWarehouseAutomation.DwaModel;
 
 public class DataItemQuery : IDataItem
 {

DataWarehouseAutomation/DataWarehouseAutomation/DataObject.cs renamed to DataWarehouseAutomation/DataWarehouseAutomation/DwaModel/DataObject.cs

@@ -1,4 +1,4 @@
-namespace DataWarehouseAutomation;
+namespace DataWarehouseAutomation.DwaModel;
 
 /// <summary>
 /// The definition of a data set, file, or table.

DataWarehouseAutomation/DataWarehouseAutomation/DataObjectMapping.cs renamed to DataWarehouseAutomation/DataWarehouseAutomation/DwaModel/DataObjectMapping.cs

@@ -1,4 +1,6 @@
-namespace DataWarehouseAutomation;
+using DataWarehouseAutomation.Utils;
+
+namespace DataWarehouseAutomation.DwaModel;
 
 /// <summary>
 /// The mapping between a source and target data set / table / file.
@@ -46,15 +48,35 @@ public class DataObjectMapping : IMetadata
     /// The target object of the mapping. This is always a Data Object type.
     /// </summary>
     [JsonPropertyName("targetDataObject")]
-    public DataObject TargetDataObject { get; set; } = new() { Name = "NewTargetDataObject" };
+    public IDataObject TargetDataObject { get; set; } = new DataObject() { Name = "newTargetDataObject" };
 
     /// <summary>
     /// The collection of associated data object for purposes other than source-target relationship.
     /// For example for lookups, merge joins, lineage etc.
     /// </summary>
     [JsonPropertyName("relatedDataObjects")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
-    public List<DataObject>? RelatedDataObjects { get; set; }
+    public List<IDataObject>? RelatedDataObjects { get; set; }
+
+    private List<IDataItem> _dataItems = [];
+    /// <summary>
+    /// The collection of Data Items <see cref="IDataItem"/> specifically associated with this Data Object Mapping,
+    /// used as source/target Data Items/Queries for the mapping or the Mappings BKCM as needed.
+    /// </summary>
+    [JsonPropertyName("dataItems")]
+    [JsonPropertyOrder(order: 55)]
+    public List<IDataItem> DataItems
+    {
+        get
+        {
+            return _dataItems;
+        }
+        set
+        {
+            _dataItems = value;
+            isSorted = false;
+        }
+    }
 
     /// <summary>
     /// The collection of individual attribute (column or query) mappings.
@@ -99,6 +121,33 @@ public class DataObjectMapping : IMetadata
     public string? Notes { get; set; }
     #endregion
 
+    #region Json Representation
+    private bool isSorted = false;
+
+    /// <summary>
+    /// Sort all the lists in the metadata object
+    /// </summary>
+    public void SortLists()
+    {
+        if (!isSorted)
+        {
+            isSorted = true;
+            SourceDataObjects.Sort();
+            RelatedDataObjects.Sort();
+            DataItemMappings.Sort();
+            BusinessKeyDefinitions.Sort();
+            Classifications.Sort();
+            Extensions.Sort();
+        }
+    }
+
+    /// <summary>
+    /// Get the standard Json representation
+    /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
+    public string Json => JsonSerializer.Serialize(this, DefaultJsonOptions.SerializerOptions);
+    #endregion
+
     #region Methods
     /// <summary>
     /// Use this method to assert if two Data Object Mappings are the same, based on their Ids.