diff --git a/src/Dynamicweb.DataIntegration.Providers.UserProvider.csproj b/src/Dynamicweb.DataIntegration.Providers.UserProvider.csproj index 8555fd0..b336f56 100644 --- a/src/Dynamicweb.DataIntegration.Providers.UserProvider.csproj +++ b/src/Dynamicweb.DataIntegration.Providers.UserProvider.csproj @@ -1,6 +1,6 @@  - 10.7.1 + 10.8.0 1.0.0.0 User Provider User Provider @@ -23,7 +23,7 @@ snupkg - + diff --git a/src/UserProvider.cs b/src/UserProvider.cs index 3366915..3ca674a 100644 --- a/src/UserProvider.cs +++ b/src/UserProvider.cs @@ -661,24 +661,6 @@ public override void OrderTablesInJob(Job job, bool isSource) job.Mappings = tables; } - private static IEnumerable ReplaceKeyColumnsWithAutoIdIfExists(Mapping mapping) - { - //will move this to MappingExtensions - US https://dev.azure.com/dynamicwebsoftware/Dynamicweb/_workitems/edit/20900 - if (mapping == null) return []; - - var autoIdDestinationColumnName = MappingExtensions.GetAutoIdColumnName(mapping.DestinationTable?.Name ?? ""); - if (string.IsNullOrEmpty(autoIdDestinationColumnName)) return mapping.GetColumnMappings(); - - var columnMappings = mapping.GetColumnMappings().ToList(); - var autoIdColumnMapping = columnMappings.Where(obj => obj.DestinationColumn.Name.Equals(autoIdDestinationColumnName, StringComparison.OrdinalIgnoreCase)).FirstOrDefault(); - if (autoIdColumnMapping != null) - { - columnMappings.ForEach(obj => obj.IsKey = false); - autoIdColumnMapping.IsKey = true; - } - return columnMappings; - } - public override bool RunJob(Job job) { ReplaceMappingConditionalsWithValuesFromRequest(job); @@ -713,7 +695,7 @@ public override bool RunJob(Job job) { if (mapping.Active) { - var columnMapping = ReplaceKeyColumnsWithAutoIdIfExists(mapping); + var columnMapping = MappingExtensions.ReplaceKeyColumnsWithAutoIdIfExists(mapping); if (!columnMapping.Any()) continue; Logger.Log("Importing data to table: " + mapping.DestinationTable.Name);