Merge pull request #36 from dynamicweb/dbe/20222-Null-handling

20222-Null-handling
dynamicweb · Jul 3, 2024 · 63effde · 63effde
2 parents cd916b0 + 810539b
commit 63effde
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/src/Dynamicweb.DataIntegration.Providers.ODataProvider.csproj b/src/Dynamicweb.DataIntegration.Providers.ODataProvider.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>10.0.23</Version>
+		<Version>10.6.0</Version>
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Title>OData Provider</Title>
 		<Description>The Odata Provider lets you fetch and map data from or to any OData endpoint.</Description>
@@ -15,7 +15,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>
@@ -24,8 +24,8 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Dynamicweb.DataIntegration" Version="10.0.24" />
-		<PackageReference Include="Dynamicweb.Ecommerce" Version="10.0.34" />
+		<PackageReference Include="Dynamicweb.DataIntegration" Version="10.6.2" />
+		<PackageReference Include="Dynamicweb.Ecommerce" Version="10.6.2" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>
   <ItemGroup>

diff --git a/src/ODataProvider.cs b/src/ODataProvider.cs
@@ -686,29 +686,31 @@ public override bool RunJob(Job job)
                         while (!sourceReader.IsDone())
                         {
                             var sourceRow = sourceReader.GetNext();
-                            ProcessInputRow(mapping, sourceRow);
-                            writer.Write(sourceRow);
-                            if (sourceReaderIsResponseWriter)
+                            if (ProcessInputRow(sourceRow, mapping))
                             {
-                                if (writer.PostBackObject != null && writer.PostBackObject.Count > 0)
+                                writer.Write(sourceRow);
+                                if (sourceReaderIsResponseWriter)
                                 {
-                                    Dictionary<string, object> responseToWrite = new Dictionary<string, object>();
-                                    foreach (var item in responseMappingCollection)
+                                    if (writer.PostBackObject != null && writer.PostBackObject.Count > 0)
                                     {
-                                        if (item.HasScriptWithValue)
+                                        Dictionary<string, object> responseToWrite = new Dictionary<string, object>();
+                                        foreach (var item in responseMappingCollection)
                                         {
-                                            responseToWrite.Add(item.DestinationColumn.Name, item.GetScriptValue());
-                                        }
-                                        else
-                                        {
-                                            var postBackValue = writer.GetPostBackValue(item);
-                                            if (postBackValue != null)
+                                            if (item.HasScriptWithValue)
+                                            {
+                                                responseToWrite.Add(item.DestinationColumn.Name, item.GetScriptValue());
+                                            }
+                                            else
                                             {
-                                                responseToWrite.Add(item.DestinationColumn.Name, postBackValue);
+                                                var postBackValue = writer.GetPostBackValue(item);
+                                                if (postBackValue != null)
+                                                {
+                                                    responseToWrite.Add(item.DestinationColumn.Name, postBackValue);
+                                                }
                                             }
                                         }
+                                        responseMappingWriter.Write(responseToWrite);
                                     }
-                                    responseMappingWriter.Write(responseToWrite);
                                 }
                             }
                         }