Som bugfixes to fix the StockUnit logic and handle the concatenation …

…of columns.
dynamicweb · Nov 27, 2023 · 8a8a78c · 8a8a78c
1 parent 71932da
commit 8a8a78c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Dynamicweb.DataIntegration.Providers.EcomProvider.csproj b/src/Dynamicweb.DataIntegration.Providers.EcomProvider.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>10.0.12</Version>
+		<Version>10.0.13</Version>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Title>Ecom Provider</Title>
 		<Description>Ecom Provider</Description>

diff --git a/src/EcomDestinationWriter.cs b/src/EcomDestinationWriter.cs
@@ -1053,7 +1053,7 @@ public void Write(Dictionary<string, object> row, Mapping mapping, bool discardD
                     row[columnMapping.SourceColumn.Name] = stockLocationID;
                 }
 
-                if (mappingColumns.Any(obj => obj.DestinationColumn.Name == columnMapping.DestinationColumn.Name && obj.GetId() != columnMapping.GetId()))
+                if (mappingColumns.Any(obj => obj.DestinationColumn.Name == columnMapping.DestinationColumn.Name && obj.GetId() < columnMapping.GetId()))
                 {
                     dataRow[columnMapping.DestinationColumn.Name] += columnMapping.ConvertInputToOutputFormat(row[columnMapping.SourceColumn.Name]) + "";
                 }
@@ -1124,7 +1124,7 @@ public void Write(Dictionary<string, object> row, Mapping mapping, bool discardD
                 }
                 break;
             case "EcomStockUnit":
-                WriteStockUnits(row, columnMappings, dataRow);
+                WriteStockUnits(row, columnMappings, dataRow, mapping);
                 break;
         }
 
@@ -1135,7 +1135,7 @@ public void Write(Dictionary<string, object> row, Mapping mapping, bool discardD
             {
                 object dataToRow = columnMapping.ConvertInputValueToOutputValue(rowValue);
 
-                if (mappingColumns.Any(obj => obj.DestinationColumn.Name == columnMapping.DestinationColumn.Name && obj.GetId() != columnMapping.GetId()))
+                if (mappingColumns.Any(obj => obj.DestinationColumn.Name == columnMapping.DestinationColumn.Name && obj.GetId() < columnMapping.GetId()))
                 {
                     dataRow[columnMapping.DestinationColumn.Name] += dataToRow.ToString();
                 }
@@ -1860,12 +1860,14 @@ private string HandleGroupId(Dictionary<string, object> row, Dictionary<string,
         return groupID;
     }
 
-    private void WriteStockUnits(Dictionary<string, object> row, Dictionary<string, ColumnMapping> columnMappings, DataRow dataRow)
+    private void WriteStockUnits(Dictionary<string, object> row, Dictionary<string, ColumnMapping> columnMappings, DataRow dataRow, Mapping mapping)
     {
         if (!columnMappings.TryGetValue("StockUnitId", out _))
-        {
+        {            
             if (columnMappings.TryGetValue("StockUnitProductID", out var stockUnitProductIDColumn) && columnMappings.TryGetValue("StockUnitVariantID", out var stockUnitVariantIDColumn))
             {
+                mapping.AddMapping(mapping.SourceTable.Columns.FirstOrDefault(), mapping.DestinationTable.Columns.Where(obj => obj.Name.Equals("StockUnitId", StringComparison.OrdinalIgnoreCase)).FirstOrDefault());
+
                 var productID = row[stockUnitProductIDColumn.SourceColumn.Name].ToString();
                 var variantID = row[stockUnitVariantIDColumn.SourceColumn.Name].ToString();
                 if (productID.Equals(variantID, StringComparison.OrdinalIgnoreCase))