Separating saved files

RoelantVos · RoelantVos · commit 419ad10df8c4 · 2024-10-02T14:06:56.000+10:00
diff --git a/Virtual_EDW/CustomTabPage.cs b/Virtual_EDW/CustomTabPage.cs
diff --git a/Virtual_EDW/FodyWeavers.xml b/Virtual_EDW/FodyWeavers.xml
@@ -1,4 +1 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <Costura />
-</Weavers>
+﻿<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd" />
diff --git a/Virtual_EDW/Form_Main.cs b/Virtual_EDW/Form_Main.cs
@@ -6,13 +6,10 @@
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using System.Security.Permissions;
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
 using DataWarehouseAutomation;
-using DataWarehouseAutomation.DwaModel;
-using DataWarehouseAutomation.Utils;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using TEAM_Library;
@@ -43,7 +40,7 @@ public FormMain()
             InitializeComponent();
 
             // Set the version of the build for everything
-            const string versionNumberForApplication = "v1.6.14";
+            const string versionNumberForApplication = "v1.7.0";
 
             Text = $"Virtual Data Warehouse - {versionNumberForApplication}";
             labelWelcome.Text = $"{labelWelcome.Text} - {versionNumberForApplication}";
@@ -586,7 +583,7 @@ internal class LocalTemplate
         {
             internal string classification { get; set; }
             internal string notes { get; set; }
-            internal Dictionary<string, VdwDataObjectMappingList> itemList { get; set; }
+            internal Dictionary<string, VdwDataObjectMappingList> vdwDataObjectMappingList { get; set; }
         }
 
 
@@ -602,13 +599,12 @@ internal void InformUser(string text, EventTypes eventType)
         /// <returns></returns>
         internal List<LocalTemplate> GetMetadata()
         {
-
             var hideDisabled = checkBoxHideDisabled.Checked;
 
             #region Deserialisation
 
             // Deserialise the Json files into a local List of Data Object Mappings (mappingList) for further use.
-            List<VdwDataObjectMappingList> mappingList = new List<VdwDataObjectMappingList>();
+            List<VdwDataObjectMappingList> vdwDataObjectMappigLists = new List<VdwDataObjectMappingList>();
 
             if (Directory.Exists(VdwConfigurationSettings.VdwMetadatPath))
             {
@@ -632,6 +628,17 @@ internal List<LocalTemplate> GetMetadata()
                     "Production_TEAM_Table_Mapping.json"
                 };
 
+                var localConventions = new MetadataConfiguration();
+                localConventions.recordSourceAttribute = TeamConfigurationSettings.RecordSourceAttribute;
+                localConventions.recordChecksumAttribute = TeamConfigurationSettings.RecordChecksumAttribute;
+                localConventions.changeDataCaptureAttribute = TeamConfigurationSettings.ChangeDataCaptureAttribute;
+                localConventions.expiryDateTimeAttribute = TeamConfigurationSettings.ExpiryDateTimeAttribute;
+                localConventions.eventDateTimeAttribute = TeamConfigurationSettings.EventDateTimeAttribute;
+                localConventions.etlProcessAttribute = TeamConfigurationSettings.EtlProcessAttribute;
+                localConventions.changeDataCaptureAttribute = TeamConfigurationSettings.ChangeDataCaptureAttribute;
+                localConventions.loadDateTimeAttribute = TeamConfigurationSettings.LoadDateTimeAttribute;
+                localConventions.sourceRowIdAttribute = TeamConfigurationSettings.RowIdAttribute;
+
                 if (fileEntries.Length > 0)
                 {
                     foreach (var fileName in fileEntries)
@@ -677,10 +684,13 @@ internal List<LocalTemplate> GetMetadata()
                                 }
                                 deserialisedMapping.DataObjectMappings = tempDOM;
 
+
+
                                 if (deserialisedMapping != null)
                                 {
                                     deserialisedMapping.metadataFileName = fileName;
-                                    mappingList.Add(deserialisedMapping);
+                                    deserialisedMapping.metadataConfiguration = localConventions;
+                                    vdwDataObjectMappigLists.Add(deserialisedMapping);
                                 }
                             }
                             catch (Exception exception)
@@ -716,23 +726,23 @@ internal List<LocalTemplate> GetMetadata()
             // In the Tuple, Item1 is the classification, Item2 is the mapping name and Item 3 is notes.
             Dictionary<VdwDataObjectMappingList, Tuple<string, string, string>> objectDictionary = new Dictionary<VdwDataObjectMappingList, Tuple<string, string, string>>();
 
-            if (mappingList.Any())
+            if (vdwDataObjectMappigLists.Any())
             {
-                foreach (VdwDataObjectMappingList dataObjectMappings in mappingList)
+                foreach (VdwDataObjectMappingList dataObjectMappings in vdwDataObjectMappigLists)
                 {
                     if (dataObjectMappings.DataObjectMappings != null)
                     {
                         foreach (DataObjectMapping dataObjectMapping in dataObjectMappings.DataObjectMappings)
                         {
-                            if (dataObjectMapping.Name == null)
+                            if (dataObjectMapping.MappingName == null)
                             {
-                                dataObjectMapping.Name = dataObjectMapping.TargetDataObject.Name;
+                                dataObjectMapping.MappingName = dataObjectMapping.TargetDataObject.Name;
                                 InformUser($"The Data Object Mapping for target {dataObjectMapping.TargetDataObject.Name} does not have a mapping name, so the target name is used.", EventTypes.Warning);
                             }
                             // Check if there are classifications, as these are used to create the tabs.
-                            if (dataObjectMapping.Classifications != null)
+                            if (dataObjectMapping.MappingClassifications != null)
                             {
-                                foreach (DataClassification classification in dataObjectMapping.Classifications)
+                                foreach (DataClassification classification in dataObjectMapping.MappingClassifications)
                                 {
                                     if (!objectDictionary.ContainsKey(dataObjectMappings))
                                     {
@@ -747,7 +757,7 @@ internal List<LocalTemplate> GetMetadata()
                                     objectDictionary.Add(dataObjectMappings, new Tuple<string, string, string>("Miscellaneous", dataObjectMapping.TargetDataObject.Name, ""));
                                 }
 
-                                InformUser($"The Data Object Mapping {dataObjectMapping.Name} does not have a classification, and therefore will be placed under 'Miscellaneous'", EventTypes.Warning);
+                                InformUser($"The Data Object Mapping {dataObjectMapping.MappingName} does not have a classification, and therefore will be placed under 'Miscellaneous'", EventTypes.Warning);
                             }
                         }
                     }
@@ -799,7 +809,7 @@ internal List<LocalTemplate> GetMetadata()
 
                 localTemplateMapping.classification = classification.Key;
                 localTemplateMapping.notes = classification.Value;
-                localTemplateMapping.itemList = itemList;
+                localTemplateMapping.vdwDataObjectMappingList = itemList;
 
                 finalMappingList.Add(localTemplateMapping);
             }
@@ -839,6 +849,7 @@ internal void CreateCustomTabPages()
             Dictionary<string, LocalTemplate> sortedMappingList = new Dictionary<string, LocalTemplate>();
             foreach (var mapping in finalMappingList)
             {
+                int counter = 1;
                 string orderNumber = mapping.classification switch
                 {
                     "Source" => "0",
@@ -862,16 +873,25 @@ internal void CreateCustomTabPages()
                     "NaturalBusinessRelationshipContextDrivingKey" => "71",
                     "Link-Satellite Driving Key" => "72",
                     "Presentation" => "80",
-                    _ => "900"
+                    "Helper" => "85",
+                    "Export" => "86",
+                    _ => $"{900+counter}" // To ensure uniquness for all unknowns
                 };
 
-                sortedMappingList.Add(orderNumber, mapping);
+                if (!sortedMappingList.ContainsKey(orderNumber))
+                {
+                    sortedMappingList.Add(orderNumber, mapping);
+                }
+                else
+                {
+                    // TODO
+                }
             }
 
             // Add the Custom Tab Pages
             foreach (var template in sortedMappingList.OrderBy(x => x.Key))
             {
-                CustomTabPage localCustomTabPage = new CustomTabPage(template.Value.classification, template.Value.notes, template.Value.itemList);
+                CustomTabPage localCustomTabPage = new CustomTabPage(template.Value.classification, template.Value.notes, template.Value.vdwDataObjectMappingList);
                 localCustomTabPage.OnChangeMainText += UpdateMainInformationTextBox;
                 localCustomTabPage.OnClearMainText += ClearMainInformationTextBox;
 
@@ -998,7 +1018,7 @@ private void RefreshMetadata()
                     {
                         if (localTemplate.classification == tabName)
                         {
-                            customTabPage.SetItemList(localTemplate.itemList);
+                            customTabPage.SetItemList(localTemplate.vdwDataObjectMappingList);
                         }
                     }
                 }
@@ -1249,24 +1269,23 @@ private void SaveTemplateCollectionFileToolStripMenuItem_Click(object sender, Ev
                         TemplateType = singleRow[1].ToString(),
                         TemplateConnectionKey = singleRow[2].ToString(),
                         TemplateOutputFileConvention = singleRow[3].ToString(),
-                        TemplateFilePath = singleRow[4].ToString(),
-                        TemplateNotes = singleRow[5].ToString()
+                        TemplateOutputFileSplit = singleRow[4].ToString(),
+                        TemplateFilePath = singleRow[5].ToString(),
+                        TemplateNotes = singleRow[6].ToString()
                     });
                     outputFileArray.Add(individualRow);
                 }
 
                 string json = JsonConvert.SerializeObject(outputFileArray, Formatting.Indented);
 
-
                 File.WriteAllText(chosenFile, json);
 
                 SetTextMain("The file " + chosenFile + " was updated.\r\n");
 
                 try
                 {
                     // Quick fix, in the file again to commit changes to memory.
-                    VdwConfigurationSettings.templateList =
-                        JsonConvert.DeserializeObject<List<TemplateHandling>>(File.ReadAllText(chosenFile));
+                    VdwConfigurationSettings.templateList = JsonConvert.DeserializeObject<List<TemplateHandling>>(File.ReadAllText(chosenFile));
                     CreateCustomTabPages();
                 }
                 catch (Exception ex)
diff --git a/Virtual_EDW/GlobalSuppressions.cs b/Virtual_EDW/GlobalSuppressions.cs
@@ -6,3 +6,7 @@
 using System.Diagnostics.CodeAnalysis;
 
 [assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>", Scope = "member", Target = "~M:Virtual_Data_Warehouse.FormMain.#ctor")]
+[assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>", Scope = "member", Target = "~M:Virtual_Data_Warehouse.FormMain.SaveTemplateCollectionFileToolStripMenuItem_Click(System.Object,System.EventArgs)")]
+[assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>", Scope = "member", Target = "~M:Virtual_Data_Warehouse.FormMain.PictureBoxUpdateTemplatePath_Click(System.Object,System.EventArgs)")]
+[assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>", Scope = "member", Target = "~M:Virtual_Data_Warehouse.FormMain.openTemplateCollectionFileToolStripMenuItem_Click(System.Object,System.EventArgs)")]
+[assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>", Scope = "member", Target = "~M:Virtual_Data_Warehouse.CustomTabPage.GenerateFromTemplate")]
diff --git a/Virtual_EDW/InterfaceObjectModel.cs b/Virtual_EDW/InterfaceObjectModel.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using DataWarehouseAutomation;
-using DataWarehouseAutomation.DwaModel;
 
 namespace Virtual_Data_Warehouse
 {
@@ -11,9 +10,11 @@ namespace Virtual_Data_Warehouse
     class VdwDataObjectMappingList : DataObjectMappingList
     {
         // TEAM and VDW specific details
-        public MetadataConfiguration conventions { get; set; }
+        public MetadataConfiguration metadataConfiguration { get; set; }
 
         public string metadataFileName { get; set; }
+
+        public GenerationSpecificMetadata generationSpecificMetadata { get; set; }
     }
 
 
diff --git a/Virtual_EDW/LoadPatternGrid.cs b/Virtual_EDW/LoadPatternGrid.cs
@@ -96,6 +96,15 @@ public TemplateGridView(TeamConfiguration teamConfiguration)
             };
             Columns.Add(TemplateOutputFileConvention);
 
+            DataGridViewCheckBoxColumn TemplateOutputFileSplit= new DataGridViewCheckBoxColumn
+            {
+                Name = TemplateGridColumns.TemplateOutputFileSplit.ToString(),
+                HeaderText = "Separate Files",
+                DataPropertyName = TemplateGridColumns.TemplateOutputFileSplit.ToString(),
+                MinimumWidth = 100
+            };
+            Columns.Add(TemplateOutputFileSplit);
+
             DataGridViewTextBoxColumn TemplatePath = new DataGridViewTextBoxColumn
             {
                 Name = TemplateGridColumns.TemplateFilePath.ToString(),
@@ -108,7 +117,8 @@ public TemplateGridView(TeamConfiguration teamConfiguration)
             {
                 Name = TemplateGridColumns.TemplateNotes.ToString(),
                 HeaderText = "Notes",
-                DataPropertyName = TemplateGridColumns.TemplateNotes.ToString()
+                DataPropertyName = TemplateGridColumns.TemplateNotes.ToString(),
+                MinimumWidth = 100
                 //Width = 400
             };
             Columns.Add(TemplateNotes);
@@ -208,8 +218,9 @@ public enum TemplateGridColumns
         TemplateType = 1,
         TemplateConnectionKey = 2,
         TemplateOutputFileConvention = 3,
-        TemplateFilePath = 4,
-        TemplateNotes = 5,
+        TemplateOutputFileSplit = 4,
+        TemplateFilePath = 5,
+        TemplateNotes = 6,
     }
 
 
diff --git a/Virtual_EDW/TemplateHandling.cs b/Virtual_EDW/TemplateHandling.cs
@@ -19,6 +19,7 @@ class TemplateHandling
         public string TemplateType { get; set; }
         public string TemplateConnectionKey { get; set; }
         public string TemplateOutputFileConvention { get; set; }
+        public bool TemplateOutputFileSplit { get; set; } = false;
         public string TemplateFilePath { get; set; }
         public string TemplateNotes { get; set; }
 
diff --git a/Virtual_EDW/VdwUtility.cs b/Virtual_EDW/VdwUtility.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using Microsoft.Data.SqlClient;
 using System.IO;
 using System.Reflection;
 using System.Text;
@@ -8,11 +7,8 @@
 using Microsoft.SqlServer.Management.Smo;
 using Microsoft.Win32;
 using TEAM_Library;
-using System.Data.SqlClient;
-using Microsoft.SqlServer.Management.Sdk.Sfc;
 using System.Data;
 using Snowflake.Data.Client;
-using System.Linq;
 
 
 namespace Virtual_Data_Warehouse
diff --git a/Virtual_EDW/Virtual_Data_Warehouse.csproj b/Virtual_EDW/Virtual_Data_Warehouse.csproj
@@ -139,6 +139,9 @@
     <None Remove="Templates\template_test_SAT_StagingMappingCheck.Handlebars" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Snowflake.Data">
+      <HintPath>Libraries\Snowflake.Data.dll</HintPath>
+    </Reference>
     <Reference Include="TEAM_Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Libraries\TEAM_Library.dll</HintPath>
@@ -589,22 +592,26 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Costura.Fody" Version="5.7.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="DataWarehouseAutomation">
       <Version>1.3.4</Version>
     </PackageReference>
-    <PackageReference Include="Fody" Version="6.8.1">
+    <PackageReference Include="Fody" Version="6.8.2">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Handlebars.Net">
       <Version>2.1.6</Version>
     </PackageReference>
-    <PackageReference Include="log4net" Version="2.0.17" />
+    <PackageReference Include="log4net" Version="3.0.1" />
     <PackageReference Include="Microsoft.Data.SqlClient">
       <Version>5.2.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Identity.Client">
-      <Version>4.64.0</Version>
+      <Version>4.65.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects">
       <Version>171.30.0</Version>
@@ -616,5 +623,6 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.8" />
+    <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,10 @@`
`6`	`6`	`using System.Drawing;`
`7`	`7`	`using System.IO;`
`8`	`8`	`using System.Linq;`
`9`		`-using System.Security.Permissions;`
`10`	`9`	`using System.Text;`
`11`	`10`	`using System.Threading;`
`12`	`11`	`using System.Windows.Forms;`
`13`	`12`	`using DataWarehouseAutomation;`
`14`		`-using DataWarehouseAutomation.DwaModel;`
`15`		`-using DataWarehouseAutomation.Utils;`
`16`	`13`	`using Newtonsoft.Json;`
`17`	`14`	`using Newtonsoft.Json.Linq;`
`18`	`15`	`using TEAM_Library;`
`@@ -43,7 +40,7 @@ public FormMain()`
`43`	`40`	`InitializeComponent();`
`44`	`41`
`45`	`42`	`// Set the version of the build for everything`
`46`		`- const string versionNumberForApplication = "v1.6.14";`
	`43`	`+ const string versionNumberForApplication = "v1.7.0";`
`47`	`44`
`48`	`45`	`Text = $"Virtual Data Warehouse - {versionNumberForApplication}";`
`49`	`46`	`labelWelcome.Text = $"{labelWelcome.Text} - {versionNumberForApplication}";`
`@@ -586,7 +583,7 @@ internal class LocalTemplate`
`586`	`583`	`{`
`587`	`584`	`internal string classification { get; set; }`
`588`	`585`	`internal string notes { get; set; }`
`589`		`- internal Dictionary<string, VdwDataObjectMappingList> itemList { get; set; }`
	`586`	`+ internal Dictionary<string, VdwDataObjectMappingList> vdwDataObjectMappingList { get; set; }`
`590`	`587`	`}`
`591`	`588`
`592`	`589`
`@@ -602,13 +599,12 @@ internal void InformUser(string text, EventTypes eventType)`
`602`	`599`	`/// <returns></returns>`
`603`	`600`	`internal List<LocalTemplate> GetMetadata()`
`604`	`601`	`{`
`605`		`-`
`606`	`602`	`var hideDisabled = checkBoxHideDisabled.Checked;`
`607`	`603`
`608`	`604`	`#region Deserialisation`
`609`	`605`
`610`	`606`	`// Deserialise the Json files into a local List of Data Object Mappings (mappingList) for further use.`
`611`		`- List<VdwDataObjectMappingList> mappingList = new List<VdwDataObjectMappingList>();`
	`607`	`+ List<VdwDataObjectMappingList> vdwDataObjectMappigLists = new List<VdwDataObjectMappingList>();`
`612`	`608`
`613`	`609`	`if (Directory.Exists(VdwConfigurationSettings.VdwMetadatPath))`
`614`	`610`	`{`
`@@ -632,6 +628,17 @@ internal List<LocalTemplate> GetMetadata()`
`632`	`628`	`"Production_TEAM_Table_Mapping.json"`
`633`	`629`	`};`
`634`	`630`
	`631`	`+ var localConventions = new MetadataConfiguration();`
	`632`	`+ localConventions.recordSourceAttribute = TeamConfigurationSettings.RecordSourceAttribute;`
	`633`	`+ localConventions.recordChecksumAttribute = TeamConfigurationSettings.RecordChecksumAttribute;`
	`634`	`+ localConventions.changeDataCaptureAttribute = TeamConfigurationSettings.ChangeDataCaptureAttribute;`
	`635`	`+ localConventions.expiryDateTimeAttribute = TeamConfigurationSettings.ExpiryDateTimeAttribute;`
	`636`	`+ localConventions.eventDateTimeAttribute = TeamConfigurationSettings.EventDateTimeAttribute;`
	`637`	`+ localConventions.etlProcessAttribute = TeamConfigurationSettings.EtlProcessAttribute;`
	`638`	`+ localConventions.changeDataCaptureAttribute = TeamConfigurationSettings.ChangeDataCaptureAttribute;`
	`639`	`+ localConventions.loadDateTimeAttribute = TeamConfigurationSettings.LoadDateTimeAttribute;`
	`640`	`+ localConventions.sourceRowIdAttribute = TeamConfigurationSettings.RowIdAttribute;`
	`641`	`+`
`635`	`642`	`if (fileEntries.Length > 0)`
`636`	`643`	`{`
`637`	`644`	`foreach (var fileName in fileEntries)`
`@@ -677,10 +684,13 @@ internal List<LocalTemplate> GetMetadata()`
`677`	`684`	`}`
`678`	`685`	`deserialisedMapping.DataObjectMappings = tempDOM;`
`679`	`686`
	`687`	`+`
	`688`	`+`
`680`	`689`	`if (deserialisedMapping != null)`
`681`	`690`	`{`
`682`	`691`	`deserialisedMapping.metadataFileName = fileName;`
`683`		`- mappingList.Add(deserialisedMapping);`
	`692`	`+ deserialisedMapping.metadataConfiguration = localConventions;`
	`693`	`+ vdwDataObjectMappigLists.Add(deserialisedMapping);`
`684`	`694`	`}`
`685`	`695`	`}`
`686`	`696`	`catch (Exception exception)`
`@@ -716,23 +726,23 @@ internal List<LocalTemplate> GetMetadata()`
`716`	`726`	`// In the Tuple, Item1 is the classification, Item2 is the mapping name and Item 3 is notes.`
`717`	`727`	`Dictionary<VdwDataObjectMappingList, Tuple<string, string, string>> objectDictionary = new Dictionary<VdwDataObjectMappingList, Tuple<string, string, string>>();`
`718`	`728`
`719`		`- if (mappingList.Any())`
	`729`	`+ if (vdwDataObjectMappigLists.Any())`
`720`	`730`	`{`
`721`		`- foreach (VdwDataObjectMappingList dataObjectMappings in mappingList)`
	`731`	`+ foreach (VdwDataObjectMappingList dataObjectMappings in vdwDataObjectMappigLists)`
`722`	`732`	`{`
`723`	`733`	`if (dataObjectMappings.DataObjectMappings != null)`
`724`	`734`	`{`
`725`	`735`	`foreach (DataObjectMapping dataObjectMapping in dataObjectMappings.DataObjectMappings)`
`726`	`736`	`{`
`727`		`- if (dataObjectMapping.Name == null)`
	`737`	`+ if (dataObjectMapping.MappingName == null)`
`728`	`738`	`{`
`729`		`- dataObjectMapping.Name = dataObjectMapping.TargetDataObject.Name;`
	`739`	`+ dataObjectMapping.MappingName = dataObjectMapping.TargetDataObject.Name;`
`730`	`740`	`InformUser($"The Data Object Mapping for target {dataObjectMapping.TargetDataObject.Name} does not have a mapping name, so the target name is used.", EventTypes.Warning);`
`731`	`741`	`}`
`732`	`742`	`// Check if there are classifications, as these are used to create the tabs.`
`733`		`- if (dataObjectMapping.Classifications != null)`
	`743`	`+ if (dataObjectMapping.MappingClassifications != null)`
`734`	`744`	`{`
`735`		`- foreach (DataClassification classification in dataObjectMapping.Classifications)`
	`745`	`+ foreach (DataClassification classification in dataObjectMapping.MappingClassifications)`
`736`	`746`	`{`
`737`	`747`	`if (!objectDictionary.ContainsKey(dataObjectMappings))`
`738`	`748`	`{`
`@@ -747,7 +757,7 @@ internal List<LocalTemplate> GetMetadata()`
`747`	`757`	`objectDictionary.Add(dataObjectMappings, new Tuple<string, string, string>("Miscellaneous", dataObjectMapping.TargetDataObject.Name, ""));`
`748`	`758`	`}`
`749`	`759`
`750`		`- InformUser($"The Data Object Mapping {dataObjectMapping.Name} does not have a classification, and therefore will be placed under 'Miscellaneous'", EventTypes.Warning);`
	`760`	`+ InformUser($"The Data Object Mapping {dataObjectMapping.MappingName} does not have a classification, and therefore will be placed under 'Miscellaneous'", EventTypes.Warning);`
`751`	`761`	`}`
`752`	`762`	`}`
`753`	`763`	`}`
`@@ -799,7 +809,7 @@ internal List<LocalTemplate> GetMetadata()`
`799`	`809`
`800`	`810`	`localTemplateMapping.classification = classification.Key;`
`801`	`811`	`localTemplateMapping.notes = classification.Value;`
`802`		`- localTemplateMapping.itemList = itemList;`
	`812`	`+ localTemplateMapping.vdwDataObjectMappingList = itemList;`
`803`	`813`
`804`	`814`	`finalMappingList.Add(localTemplateMapping);`
`805`	`815`	`}`
`@@ -839,6 +849,7 @@ internal void CreateCustomTabPages()`
`839`	`849`	`Dictionary<string, LocalTemplate> sortedMappingList = new Dictionary<string, LocalTemplate>();`
`840`	`850`	`foreach (var mapping in finalMappingList)`
`841`	`851`	`{`
	`852`	`+ int counter = 1;`
`842`	`853`	`string orderNumber = mapping.classification switch`
`843`	`854`	`{`
`844`	`855`	`"Source" => "0",`
`@@ -862,16 +873,25 @@ internal void CreateCustomTabPages()`
`862`	`873`	`"NaturalBusinessRelationshipContextDrivingKey" => "71",`
`863`	`874`	`"Link-Satellite Driving Key" => "72",`
`864`	`875`	`"Presentation" => "80",`
`865`		`- _ => "900"`
	`876`	`+ "Helper" => "85",`
	`877`	`+ "Export" => "86",`
	`878`	`+ _ => $"{900+counter}" // To ensure uniquness for all unknowns`
`866`	`879`	`};`
`867`	`880`
`868`		`- sortedMappingList.Add(orderNumber, mapping);`
	`881`	`+ if (!sortedMappingList.ContainsKey(orderNumber))`
	`882`	`+ {`
	`883`	`+ sortedMappingList.Add(orderNumber, mapping);`
	`884`	`+ }`
	`885`	`+ else`
	`886`	`+ {`
	`887`	`+ // TODO`
	`888`	`+ }`
`869`	`889`	`}`
`870`	`890`
`871`	`891`	`// Add the Custom Tab Pages`
`872`	`892`	`foreach (var template in sortedMappingList.OrderBy(x => x.Key))`
`873`	`893`	`{`
`874`		`- CustomTabPage localCustomTabPage = new CustomTabPage(template.Value.classification, template.Value.notes, template.Value.itemList);`
	`894`	`+ CustomTabPage localCustomTabPage = new CustomTabPage(template.Value.classification, template.Value.notes, template.Value.vdwDataObjectMappingList);`
`875`	`895`	`localCustomTabPage.OnChangeMainText += UpdateMainInformationTextBox;`
`876`	`896`	`localCustomTabPage.OnClearMainText += ClearMainInformationTextBox;`
`877`	`897`
`@@ -998,7 +1018,7 @@ private void RefreshMetadata()`
`998`	`1018`	`{`
`999`	`1019`	`if (localTemplate.classification == tabName)`
`1000`	`1020`	`{`
`1001`		`- customTabPage.SetItemList(localTemplate.itemList);`
	`1021`	`+ customTabPage.SetItemList(localTemplate.vdwDataObjectMappingList);`
`1002`	`1022`	`}`
`1003`	`1023`	`}`
`1004`	`1024`	`}`
`@@ -1249,24 +1269,23 @@ private void SaveTemplateCollectionFileToolStripMenuItem_Click(object sender, Ev`
`1249`	`1269`	`TemplateType = singleRow[1].ToString(),`
`1250`	`1270`	`TemplateConnectionKey = singleRow[2].ToString(),`
`1251`	`1271`	`TemplateOutputFileConvention = singleRow[3].ToString(),`
`1252`		`- TemplateFilePath = singleRow[4].ToString(),`
`1253`		`- TemplateNotes = singleRow[5].ToString()`
	`1272`	`+ TemplateOutputFileSplit = singleRow[4].ToString(),`
	`1273`	`+ TemplateFilePath = singleRow[5].ToString(),`
	`1274`	`+ TemplateNotes = singleRow[6].ToString()`
`1254`	`1275`	`});`
`1255`	`1276`	`outputFileArray.Add(individualRow);`
`1256`	`1277`	`}`
`1257`	`1278`
`1258`	`1279`	`string json = JsonConvert.SerializeObject(outputFileArray, Formatting.Indented);`
`1259`	`1280`
`1260`		`-`
`1261`	`1281`	`File.WriteAllText(chosenFile, json);`
`1262`	`1282`
`1263`	`1283`	`SetTextMain("The file " + chosenFile + " was updated.\r\n");`
`1264`	`1284`
`1265`	`1285`	`try`
`1266`	`1286`	`{`
`1267`	`1287`	`// Quick fix, in the file again to commit changes to memory.`
`1268`		`- VdwConfigurationSettings.templateList =`
`1269`		`- JsonConvert.DeserializeObject<List<TemplateHandling>>(File.ReadAllText(chosenFile));`
	`1288`	`+ VdwConfigurationSettings.templateList = JsonConvert.DeserializeObject<List<TemplateHandling>>(File.ReadAllText(chosenFile));`
`1270`	`1289`	`CreateCustomTabPages();`
`1271`	`1290`	`}`
`1272`	`1291`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using DataWarehouseAutomation;`
`3`		`-using DataWarehouseAutomation.DwaModel;`
`4`	`3`
`5`	`4`	`namespace Virtual_Data_Warehouse`
`6`	`5`	`{`
`@@ -11,9 +10,11 @@ namespace Virtual_Data_Warehouse`
`11`	`10`	`class VdwDataObjectMappingList : DataObjectMappingList`
`12`	`11`	`{`
`13`	`12`	`// TEAM and VDW specific details`
`14`		`- public MetadataConfiguration conventions { get; set; }`
	`13`	`+ public MetadataConfiguration metadataConfiguration { get; set; }`
`15`	`14`
`16`	`15`	`public string metadataFileName { get; set; }`
	`16`	`+`
	`17`	`+ public GenerationSpecificMetadata generationSpecificMetadata { get; set; }`
`17`	`18`	`}`
`18`	`19`
`19`	`20`