22941-Fix EcomAssortmentPermissions import

src/Dynamicweb.DataIntegration.Providers.DynamicwebProvider.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>10.9.0</Version>
+    <Version>10.9.1</Version>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <Title>Dynamicweb Provider</Title>
     <Description>Dynamicweb Provider</Description>

src/DynamicwebBulkInsertDestinationWriter.cs

@@ -193,6 +193,7 @@ public DynamicwebBulkInsertDestinationWriter(Mapping mapping, SqlCommand mockSql
                             if (!string.IsNullOrEmpty(userNumber))
                             {
                                 userIDs = ExistingUsers.Select("AccessUserCustomerNumber='" + userNumber.Replace("'", "''") + "'").Select(r => r["AccessUserID"].ToString()).ToList();
+                                dataRow["AssortmentPermissionCustomerNumber"] = userNumber;
                             }
                         }
                         var externalIdmapping = columnMappings.Find(cm => cm.DestinationColumn.Name == "AssortmentPermissionExternalID");
@@ -202,6 +203,7 @@ public DynamicwebBulkInsertDestinationWriter(Mapping mapping, SqlCommand mockSql
                             if (!string.IsNullOrEmpty(externalId))
                             {
                                 userIDs.AddRange(ExistingUsers.Select("AccessUserExternalID='" + externalId.Replace("'", "''") + "'").Select(r => r["AccessUserID"].ToString()));
+                                dataRow["AssortmentPermissionExternalID"] = externalId;
                             }
                         }
                         var userIdMapping = columnMappings.Find(cm => cm.DestinationColumn.Name == "AssortmentPermissionAccessUserID");
@@ -211,8 +213,14 @@ public DynamicwebBulkInsertDestinationWriter(Mapping mapping, SqlCommand mockSql
                             if (!string.IsNullOrEmpty(id))
                             {
                                 userIDs.AddRange(ExistingUsers.Select("AccessUserID='" + id.Replace("'", "''") + "'").Select(r => r["AccessUserID"].ToString()));
+                                dataRow["AssortmentPermissionAccessUserID"] = id;
                             }
                         }
+                        dataRow["AssortmentPermissionAssortmentID"] = assortmentID;
+                        if (discardDuplicates && duplicateRowsHandler.IsRowDuplicate(columnMappings.Where(cm => cm.Active), Mapping, dataRow, row))
+                        {
+                            return;
+                        }
                         foreach (string userID in userIDs.Distinct())
                         {
                             DataRow relation = TableToWrite.NewRow();

src/DynamicwebProvider.cs

@@ -226,7 +226,7 @@
         xmlTextWriter.WriteElementString("Shop", Shop);
         xmlTextWriter.WriteElementString("DeleteProductsAndGroupForSpecificLanguage", DeleteProductsAndGroupForSpecificLanguage.ToString(CultureInfo.CurrentCulture));
         xmlTextWriter.WriteElementString("DefaultLanguage", DefaultLanguage);
         xmlTextWriter.WriteElementString("RepositoriesIndexUpdate", RepositoriesIndexUpdate);
         xmlTextWriter.WriteElementString("DiscardDuplicates", DiscardDuplicates.ToString(CultureInfo.CurrentCulture));
         xmlTextWriter.WriteElementString("HideDeactivatedProducts", HideDeactivatedProducts.ToString(CultureInfo.CurrentCulture));
         xmlTextWriter.WriteElementString("SkipFailingRows", SkipFailingRows.ToString(CultureInfo.CurrentCulture));
@@ -329,7 +329,7 @@
                 case "RepositoriesIndexUpdate":
                     if (node.HasChildNodes)
                     {
                         RepositoriesIndexUpdate = node.FirstChild.Value;
                     }
                     break;
                 case "DiscardDuplicates":
@@ -435,8 +435,8 @@
         Table ecomAssortmentPermissionsTable = result.GetTables().Find(t => t.Name == "EcomAssortmentPermissions");
         if (ecomAssortmentPermissionsTable != null)
         {
-            ecomAssortmentPermissionsTable.AddColumn(new SqlColumn(("AssortmentPermissionCustomerNumber"), typeof(string), SqlDbType.NVarChar, ecomAssortmentPermissionsTable, -1, false, false, true));
-            ecomAssortmentPermissionsTable.AddColumn(new SqlColumn(("AssortmentPermissionExternalID"), typeof(string), SqlDbType.NVarChar, ecomAssortmentPermissionsTable, -1, false, false, true));
+            ecomAssortmentPermissionsTable.AddColumn(new SqlColumn(("AssortmentPermissionCustomerNumber"), typeof(string), SqlDbType.NVarChar, ecomAssortmentPermissionsTable, -1, false, true, true));
+            ecomAssortmentPermissionsTable.AddColumn(new SqlColumn(("AssortmentPermissionExternalID"), typeof(string), SqlDbType.NVarChar, ecomAssortmentPermissionsTable, -1, false, true, true));
         }
         return result;
     }
@@ -704,15 +704,15 @@
 
     private void MoveRepositoriesIndexToJob(Job job)
     {
         if (!string.IsNullOrEmpty(RepositoriesIndexUpdate))
         {
             char[] separator = [','];
             // if the provider already have RepositoriesIndexUpdate set, then we move them to the job, and set the add-in to string.empty
             if (job.RepositoriesIndexSettings?.RepositoriesIndexes?.Count == 0)
             {
                 job.RepositoriesIndexSettings = new RepositoriesIndexSettings(new Collection<string>([.. RepositoriesIndexUpdate.Split(separator, StringSplitOptions.RemoveEmptyEntries)]));
             }
             RepositoriesIndexUpdate = string.Empty;
             job.Save();
         }
     }