Merge pull request #34 from dynamicweb/dbe/21761-Tablemapping-sorting

Tablemapping sorting
dynamicweb · Nov 26, 2024 · 9303fe1 · 9303fe1
2 parents 00885ce + 9d07055
commit 9303fe1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 33 deletions.
diff --git a/src/Dynamicweb.DataIntegration.Providers.OrderProvider.csproj b/src/Dynamicweb.DataIntegration.Providers.OrderProvider.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>10.8.4</Version>
+		<Version>10.9.0</Version>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Title>Order Provider</Title>
 		<Description>Order Provider</Description>
@@ -23,7 +23,7 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Dynamicweb.DataIntegration" Version="10.8.0" />
+		<PackageReference Include="Dynamicweb.DataIntegration" Version="10.9.4" />
 		<PackageReference Include="Dynamicweb.Ecommerce" Version="10.8.0" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>

diff --git a/src/OrderProvider.cs b/src/OrderProvider.cs
@@ -60,11 +60,18 @@ private SqlConnection Connection
         set { connection = value; }
     }
 
+    private void InitTableRelations()
+    {
+        TableRelations.Clear();
+        TableRelations.Add("EcomOrderLines", ["EcomOrders"]);
+    }
+
     public OrderProvider(string connectionString)
     {
         SqlConnectionString = connectionString;
         Connection = new SqlConnection(connectionString);
         DiscardDuplicates = false;
+        InitTableRelations();
     }
 
     public override void LoadSettings(Job job)
@@ -163,6 +170,8 @@ Schema ISource.GetSchema()
 
     public OrderProvider(XmlNode xmlNode)
     {
+        InitTableRelations();
+
         foreach (XmlNode node in xmlNode.ChildNodes)
         {
             switch (node.Name)
@@ -304,38 +313,9 @@ public OrderProvider()
     public override ISourceReader GetReader(Mapping mapping)
     {
         return new OrderSourceReader(mapping, Connection, ExportNotExportedOrders, ExportOnlyOrdersWithoutExtID, DoNotExportCarts);
-    }
-
-    public override void OrderTablesInJob(Job job, bool isSourceLookup)
-    {
-        MappingCollection tables = new MappingCollection();
-
-        var mappings = GetMappingsByName(job.Mappings, "EcomOrders", isSourceLookup);
-        if (mappings != null)
-        {
-            tables.AddRange(mappings);
-        }
+    }    
 
-        mappings = GetMappingsByName(job.Mappings, "EcomOrderLines", isSourceLookup);
-        if (mappings != null)
-        {
-            tables.AddRange(mappings);
-        }
-
-        mappings = GetMappingsByName(job.Mappings, "EcomOrderLineFields", isSourceLookup);
-        if (mappings != null)
-        {
-            tables.AddRange(mappings);
-        }
-
-        mappings = GetMappingsByName(job.Mappings, "EcomOrderLineFieldGroupRelation", isSourceLookup);
-        if (mappings != null)
-        {
-            tables.AddRange(mappings);
-        }
-
-        job.Mappings = tables;
-    }
+    public override void OrderTablesInJob(Job job, bool isSource) => OrderTablesByRelations(job, isSource);    
 
     internal static List<Mapping> GetMappingsByName(MappingCollection collection, string name, bool isSourceLookup)
     {