Merge pull request #26 from dynamicweb/mss/19895

added logic for setting rowsAffected and handling of empty values for…
dynamicweb · Aug 1, 2024 · 7f6d043 · 7f6d043
2 parents cf167ac + 6596430
commit 7f6d043
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 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.0.16</Version>
+		<Version>10.6.0</Version>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Title>Order Provider</Title>
 		<Description>Order Provider</Description>
@@ -14,7 +14,7 @@
 		<Copyright>Copyright © 2023 Dynamicweb Software A/S</Copyright>
 	</PropertyGroup>
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<IncludeSymbols>true</IncludeSymbols>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -23,8 +23,8 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Dynamicweb.DataIntegration" Version="10.0.17" />
-		<PackageReference Include="Dynamicweb.Ecommerce" Version="10.0.9" />
+		<PackageReference Include="Dynamicweb.DataIntegration" Version="10.6.3" />
+		<PackageReference Include="Dynamicweb.Ecommerce" Version="10.6.3" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>
 </Project>
diff --git a/src/OrderDestinationWriter.cs b/src/OrderDestinationWriter.cs
@@ -77,7 +77,7 @@ internal void FinishWriting()
         }
     }
 
-    internal void MoveDataToMainTable(SqlTransaction sqlTransaction, bool updateOnlyExistingRecords, bool insertOnlyNewRecords) =>
+    internal int MoveDataToMainTable(SqlTransaction sqlTransaction, bool updateOnlyExistingRecords, bool insertOnlyNewRecords) =>
         MoveDataToMainTable(Mapping, SqlCommand, sqlTransaction, TempTablePrefix, updateOnlyExistingRecords, insertOnlyNewRecords);
 
     public new void Write(Dictionary<string, object> row)
@@ -102,7 +102,7 @@ internal void MoveDataToMainTable(SqlTransaction sqlTransaction, bool updateOnly
             }
             else
             {
-                Logger.Info(BaseDestinationWriter.GetRowValueNotFoundMessage(row, columnMapping.SourceColumn.Table.Name, columnMapping.SourceColumn.Name));
+                Logger.Info(GetRowValueNotFoundMessage(row, columnMapping.SourceColumn.Table.Name, columnMapping.SourceColumn.Name));
             }
         }
 

diff --git a/src/OrderProvider.cs b/src/OrderProvider.cs
@@ -359,9 +359,11 @@ public override bool RunJob(Job job)
                         while (!reader.IsDone())
                         {
                             sourceRow = reader.GetNext();
-                            ProcessInputRow(mapping, sourceRow);
-                            ProcessRow(mapping, columnMappings, sourceRow);
-                            writer.Write(sourceRow);
+                            if (ProcessInputRow(sourceRow, mapping))
+                            {
+                                ProcessRow(mapping, columnMappings, sourceRow);
+                                writer.Write(sourceRow);
+                            }
                         }
                         writer.FinishWriting();
                         writers.Add(writer);
@@ -375,7 +377,7 @@ public override bool RunJob(Job job)
             sqlTransaction = Connection.BeginTransaction();
             foreach (OrderDestinationWriter writer in writers)
             {
-                writer.MoveDataToMainTable(sqlTransaction, false, false);
+                TotalRowsAffected += writer.MoveDataToMainTable(sqlTransaction, false, false);
             }
 
             RemoveMissingRows(writers, sqlTransaction);
@@ -396,6 +398,9 @@ public override bool RunJob(Job job)
             Logger.Log("Import job failed: " + msg);
             if (sqlTransaction != null)
                 sqlTransaction.Rollback();
+
+            TotalRowsAffected = 0;
+
             return false;
         }
         finally
@@ -546,7 +551,7 @@ private void RemoveMissingRows(IEnumerable<OrderDestinationWriter> writers, SqlT
                     writer.SqlCommand.CommandText = $"DELETE FROM EcomOrderLines WHERE OrderLineID NOT IN (SELECT OrderLineID FROM {tempTableName}) " +
                         $"AND OrderLineOrderID IN(SELECT DISTINCT(OrderLineOrderID) FROM EcomOrderLines WHERE OrderLineID IN(SELECT OrderLineID FROM {tempTableName}))";
                 }
-                writer.SqlCommand.ExecuteNonQuery();
+                TotalRowsAffected += writer.SqlCommand.ExecuteNonQuery();
             }
         }
     }