DI Refactoring and html encode strings upon export and grouping m2m rels by sourceId for export as well

dotnetprog · dotnetprog · commit b80526926880 · 2025-08-02T12:03:40.000-04:00
diff --git a/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/EntitySchemaValidatorTests.cs b/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/EntitySchemaValidatorTests.cs
@@ -1,7 +1,8 @@
-﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules.EntitySchemas;
+﻿
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.FieldSchemas;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.RelationshipSchemas;
 using Microsoft.Xrm.Sdk.Metadata;
diff --git a/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/FieldSchemas/FieldTypeMustMatchWithAttributeValidationRuleTests.cs b/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/FieldSchemas/FieldTypeMustMatchWithAttributeValidationRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
+﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.FieldSchemas;
 using Microsoft.Xrm.Sdk.Metadata;
 using Shouldly;
diff --git a/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/FieldSchemas/LookupFieldsTargetsMustMatchValidationRuleTests.cs b/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/FieldSchemas/LookupFieldsTargetsMustMatchValidationRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
+﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.FieldSchemas;
 using Microsoft.Xrm.Sdk.Metadata;
 using Shouldly;
diff --git a/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/RelationshipSchemas/SourceEntityNameMustMatchValidationRuleTests.cs b/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/RelationshipSchemas/SourceEntityNameMustMatchValidationRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
+﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.RelationshipSchemas;
 using Microsoft.Xrm.Sdk.Metadata;
 using Shouldly;
diff --git a/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/RelationshipSchemas/TargetEntityNameMustMatchValidationRuleTests.cs b/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/RelationshipSchemas/TargetEntityNameMustMatchValidationRuleTests.cs
@@ -1,4 +1,4 @@
-﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
+﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.RelationshipSchemas;
 using Microsoft.Xrm.Sdk.Metadata;
 using Shouldly;
diff --git a/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/SchemaValidatorTests.cs b/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/SchemaValidatorTests.cs
@@ -1,6 +1,6 @@
-﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators;
-using Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
+﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators;
 using NSubstitute;
 using Shouldly;
 
diff --git a/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/ValueConverters/DataverseValueConverterTests.cs b/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/ValueConverters/DataverseValueConverterTests.cs
@@ -1,5 +1,5 @@
-﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
-using Dataverse.ConfigurationMigrationTool.Console.Features.Import.ValueConverters;
+﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Import.ValueConverters;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
 using Dataverse.ConfigurationMigrationTool.Console.Tests.FakeBuilders;
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Metadata;
diff --git a/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Services/Filesystem/FileReaderDataImportProviderTests.cs b/src/Dataverse.ConfigurationMigrationTool/Console.Tests/Services/Filesystem/FileReaderDataImportProviderTests.cs
@@ -8,11 +8,11 @@
 namespace Dataverse.ConfigurationMigrationTool.Console.Tests.Services.Filesystem;
 public class FileReaderDataImportProviderTests
 {
-    private readonly IFileDataReader _dataReader;
+    private readonly IFileDataService _dataReader;
     private readonly FileReaderDataImportProvider _fileReaderDataImportProvider;
     public FileReaderDataImportProviderTests()
     {
-        _dataReader = Substitute.For<IFileDataReader>();
+        _dataReader = Substitute.For<IFileDataService>();
         _fileReaderDataImportProvider = new FileReaderDataImportProvider(_dataReader,
             Substitute.For<ILogger<FileReaderDataImportProvider>>());
 
diff --git a/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Export/Commands/ExportCommand.cs b/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Export/Commands/ExportCommand.cs
@@ -4,24 +4,25 @@
 using Microsoft.Extensions.Options;
 
 namespace Dataverse.ConfigurationMigrationTool.Console.Features.Export.Commands;
+[CommandVerb("export-data")]
 public class ExportCommand : ICommand
 {
     private readonly ILogger<ExportCommand> _logger;
     private readonly ExportCommandOption _options;
     private readonly IValidator<DataSchema> _schemaValidator;
-    private readonly IFileDataReader _fileDataReader;
+    private readonly IFileDataService _fileDataService;
     private readonly IDataExportService _dataExportService;
 
     public ExportCommand(ILogger<ExportCommand> logger,
         IOptions<ExportCommandOption> options,
         IValidator<DataSchema> schemaValidator,
-        IFileDataReader fileDataReader,
+        IFileDataService fileDataReader,
         IDataExportService dataExportService)
     {
         _logger = logger;
         _options = options.Value;
         _schemaValidator = schemaValidator;
-        _fileDataReader = fileDataReader;
+        _fileDataService = fileDataReader;
         _dataExportService = dataExportService;
     }
 
@@ -31,7 +32,7 @@ private async Task Export(string schemafilepath, string outputfilepath)
     {
 
         _logger.LogInformation("Parsing schema file from arguments");
-        var schema = await _fileDataReader.ReadAsync<DataSchema>(schemafilepath);
+        var schema = await _fileDataService.ReadAsync<DataSchema>(schemafilepath);
 
         var schemaValidationResult = await _schemaValidator.Validate(schema);
         if (schemaValidationResult.IsError)
@@ -46,7 +47,11 @@ private async Task Export(string schemafilepath, string outputfilepath)
         _logger.LogInformation("Schema validation succeeded.");
 
         var entities = await _dataExportService.ExportEntitiesFromSchema(schema);
-
+        var wrapper = new Entities
+        {
+            Entity = entities.ToList()
+        };
+        await _fileDataService.WriteAsync(wrapper, outputfilepath);
     }
 
 }
diff --git a/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Export/IServiceCollectionExtensions.cs b/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Export/IServiceCollectionExtensions.cs
@@ -0,0 +1,14 @@
+﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Export.Commands;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Dataverse.ConfigurationMigrationTool.Console.Features.Export;
+public static class IServiceCollectionExtensions
+{
+    public static IServiceCollection AddExportFeature(this IServiceCollection services, IConfiguration Configuration)
+    {
+        services.AddScoped<IDataExportService, DataExportService>()
+            .Configure<ExportCommandOption>(Configuration);
+        return services;
+    }
+}
diff --git a/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Export/Mappers/EntityFieldValueToFieldMapper.cs b/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Export/Mappers/EntityFieldValueToFieldMapper.cs
@@ -2,6 +2,7 @@
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Metadata;
+using System.Web;
 
 namespace Dataverse.ConfigurationMigrationTool.Console.Features.Export.Mappers;
 public class EntityFieldValueToFieldMapper : IMapper<(AttributeMetadata, FieldSchema, object), Field>
@@ -48,25 +49,25 @@ public Field Map((AttributeMetadata, FieldSchema, object) source)
         {
             var moneyAttr = attributeMetadata as MoneyAttributeMetadata;
             var precision = moneyAttr.PrecisionSource ?? 2;
-            fieldResult.Value = moneyValue.Value.ToString($"F{precision}", System.Globalization.CultureInfo.InvariantCulture);
+            fieldResult.Value = moneyValue.Value.ToString();
             return fieldResult;
         }
         if (value is Decimal decimalValue)
         {
             var decimalAttr = attributeMetadata as DecimalAttributeMetadata;
             var precision = decimalAttr.Precision ?? 2;
-            fieldResult.Value = decimalValue.ToString($"F{precision}", System.Globalization.CultureInfo.InvariantCulture);
+            fieldResult.Value = decimalValue.ToString();
             return fieldResult;
         }
         if (value is double doubleValue)
         {
             var doubleAttr = attributeMetadata as DoubleAttributeMetadata;
             var precision = doubleAttr.Precision ?? 2;
-            fieldResult.Value = doubleValue.ToString($"F{precision}", System.Globalization.CultureInfo.InvariantCulture);
+            fieldResult.Value = doubleValue.ToString();
             return fieldResult;
         }
-
-        fieldResult.Value = value?.ToString() ?? string.Empty;
+        var str = value?.ToString() ?? string.Empty;
+        fieldResult.Value = HttpUtility.HtmlEncode(str);
         return fieldResult;
     }
 }
diff --git a/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/IServiceCollectionExtensions.cs b/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/IServiceCollectionExtensions.cs
@@ -0,0 +1,45 @@
+﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Export;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Import;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.FieldSchemas;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.RelationshipSchemas;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using System.Reflection;
+
+namespace Dataverse.ConfigurationMigrationTool.Console.Features;
+public static class IServiceCollectionExtensions
+{
+    public static IServiceCollection AddConfigurationMigrationTool(this IServiceCollection services, IConfiguration Configuration)
+    {
+        return services
+            .AddSharedServices()
+            .AddImportFeature(Configuration)
+            .AddExportFeature(Configuration);
+    }
+    public static IServiceCollection AddSharedServices(this IServiceCollection services)
+    {
+        return services.RegisterFromReflection<IFieldSchemaValidationRule>()
+            .RegisterFromReflection<IRelationshipSchemaValidationRule>()
+            .AddTransient<IValidator<DataSchema>, SchemaValidator>()
+            .AddTransient<IValidator<EntitySchema>, EntitySchemaValidator>();
+    }
+    public static IServiceCollection UseCommands(this IServiceCollection services, params string[] args)
+    {
+        services.AddSingleton<IOptions<CommandProcessorHostingServiceOptions>>(Options.Create(new CommandProcessorHostingServiceOptions() { CommandVerb = args[0] }));
+        return services.AddHostedService<CommandProcessorHostingService>();
+    }
+    public static IServiceCollection RegisterFromReflection<T>(this IServiceCollection services)
+    {
+        var genericType = typeof(T);
+        var classes = Assembly.GetCallingAssembly().GetTypes()
+        .Where(type => genericType.IsAssignableFrom(type) && !type.IsInterface && !type.IsAbstract);
+        foreach (var c in classes)
+            services.AddTransient(genericType, c);
+        return services;
+    }
+}
diff --git a/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Import/IServiceCollectionExtensions.cs b/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Import/IServiceCollectionExtensions.cs
@@ -1,15 +1,8 @@
 ﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Commands;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Interceptors;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Import.ValueConverters;
-using Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
-using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
-using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators;
-using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas;
-using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.FieldSchemas;
-using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.RelationshipSchemas;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 using System.Reflection;
 
 namespace Dataverse.ConfigurationMigrationTool.Console.Features.Import;
@@ -19,17 +12,15 @@ public static class IServiceCollectionExtensions
     public static IServiceCollection AddImportFeature(this IServiceCollection services, IConfiguration Configuration)
     {
 
-        return services.RegisterFromReflection<IFieldSchemaValidationRule>()
-            .RegisterFromReflection<IRelationshipSchemaValidationRule>()
+        return services
             .AddSingleton<IMainConverter, ReflectionMainConverter>(_ =>
             {
                 var valueConverterTypes = Assembly.GetExecutingAssembly().GetTypes().Where(t => !t.IsAbstract &&
               !t.IsInterface && t.BaseType != null && t.BaseType.IsConstructedGenericType && t.BaseType.GetGenericTypeDefinition() == typeof(BaseValueConverter<>)).ToList();
                 return new ReflectionMainConverter(valueConverterTypes);
             })
             .AddSingleton<IDataverseValueConverter, DataverseValueConverter>()
-            .AddTransient<IValidator<DataSchema>, SchemaValidator>()
-            .AddTransient<IValidator<EntitySchema>, EntitySchemaValidator>()
+
             .AddSingleton<IImportTaskProcessorService, ImportTaskProcessorService>()
             .AddSingleton<IEntityInterceptor>((sp) =>
             {
@@ -48,18 +39,5 @@ public static T BuildService<T>(this IServiceProvider serviceProvider) where T :
 
         return ActivatorUtilities.CreateInstance<T>(serviceProvider);
     }
-    public static IServiceCollection UseCommands(this IServiceCollection services, params string[] args)
-    {
-        services.AddSingleton<IOptions<CommandProcessorHostingServiceOptions>>(Options.Create(new CommandProcessorHostingServiceOptions() { CommandVerb = args[0] }));
-        return services.AddHostedService<CommandProcessorHostingService>();
-    }
-    public static IServiceCollection RegisterFromReflection<T>(this IServiceCollection services)
-    {
-        var genericType = typeof(T);
-        var classes = Assembly.GetCallingAssembly().GetTypes()
-        .Where(type => genericType.IsAssignableFrom(type) && !type.IsInterface && !type.IsAbstract);
-        foreach (var c in classes)
-            services.AddTransient(genericType, c);
-        return services;
-    }
+
 }
diff --git a/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Shared/IFileDataReader.cs b/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Shared/IFileDataReader.cs
diff --git a/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Shared/IFileDataService.cs b/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Shared/IFileDataService.cs
@@ -0,0 +1,7 @@
+﻿namespace Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
+
+public interface IFileDataService
+{
+    Task<T> ReadAsync<T>(string path);
+    Task WriteAsync<T>(T obj, string path);
+}
diff --git a/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Program.cs b/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Program.cs
@@ -1,4 +1,6 @@
-﻿using Dataverse.ConfigurationMigrationTool.Console.Features.Import;
+﻿using Dataverse.ConfigurationMigrationTool.Console.Features;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Export;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Import;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
 using Dataverse.ConfigurationMigrationTool.Console.Services.Dataverse;
 using Dataverse.ConfigurationMigrationTool.Console.Services.Dataverse.Configuration;
@@ -40,21 +42,21 @@
 
     services
     .AddLogging(lb => lb.AddConsole())
-
+    .AddScoped<IDomainService, DataverseDomainService>()
     .Configure<SdkDataverseServiceFactoryOptions>(context.Configuration.GetSection("Dataverse"))
     .Configure<ParallelismBulkOrganizationServiceOptions>(context.Configuration.GetSection("Dataverse"))
     .AddTransient<IImportDataProvider, FileReaderDataImportProvider>()
-    .AddSingleton<IFileDataReader, XmlFileDataReader>()
+    .AddSingleton<IFileDataService, XmlFileDataReader>()
     .AddTransient<IMetadataService, DataverseMetadataService>()
     .AddTransient<ServiceClient>((sp) => (ServiceClient)sp.GetRequiredService<IDataverseClientFactory>().Create())
     .AddSingleton<IBulkOrganizationService, ParallelismBulkOrganizationService>()
     .AddDataverseClient()
+    .AddConfigurationMigrationTool(context.Configuration)
     .UseCommands(args)
     .AddMemoryCache()
     .AddTransient<ISystemUserRepository, DataverseUserRepository>()
     .AddTransient<ITeamRepository, DataverseTeamRepository>()
-    .AddTransient<IBusinessUnitRepository, DataverseBusinessUnitRepository>()
-    .AddImportFeature(context.Configuration);
+    .AddTransient<IBusinessUnitRepository, DataverseBusinessUnitRepository>();
     // Configure other services.
 });
 
diff --git a/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Properties/launchSettings.json b/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Properties/launchSettings.json
@@ -6,6 +6,13 @@
       "environmentVariables": {
         "DOTNET_ENVIRONMENT": "Development"
       }
+    },
+    "export-data": {
+      "commandName": "Project",
+      "commandLineArgs": "export-data --schema ../../../TestAssets/data_schema.xml --output ../../../TestAssets/exporteddata.xml",
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
     }
   }
 }
diff --git a/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Services/Dataverse/DataverseDomainService.cs b/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Services/Dataverse/DataverseDomainService.cs
@@ -48,17 +48,17 @@ public async Task<IEnumerable<M2mrelationship>> GetM2mRelationships(ManyToManyRe
         };
         var entityCollection = await _orgService.RetrieveAll(query, page: 5000, _logger);
 
-        return entityCollection.Entities.Select(e =>
+        return entityCollection.Entities.GroupBy(e => e.GetAttributeValue<Guid>(metadata.Entity1IntersectAttribute)).Select(g =>
         {
             return new M2mrelationship
             {
-                Sourceid = e.GetAttributeValue<Guid>(metadata.Entity1IntersectAttribute),
+                Sourceid = g.Key,
                 Targetentityname = metadata.Entity2LogicalName,
                 Targetentitynameidfield = metadata.Entity2IntersectAttribute,
                 M2mrelationshipname = metadata.IntersectEntityName,
                 Targetids = new Targetids
                 {
-                    Targetid = entityCollection.Entities.Select(e => e.GetAttributeValue<Guid>(metadata.Entity2IntersectAttribute)).ToList()
+                    Targetid = g.Select(e => e.GetAttributeValue<Guid>(metadata.Entity2IntersectAttribute)).ToList()
                 }
             };
 
diff --git a/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Services/Filesystem/FileReaderDataImportProvider.cs b/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Services/Filesystem/FileReaderDataImportProvider.cs
@@ -7,10 +7,10 @@ namespace Dataverse.ConfigurationMigrationTool.Console.Services.Filesystem;
 
 public class FileReaderDataImportProvider : IImportDataProvider
 {
-    private readonly IFileDataReader _dataReader;
+    private readonly IFileDataService _dataReader;
     private readonly ILogger<FileReaderDataImportProvider> _logger;
 
-    public FileReaderDataImportProvider(IFileDataReader dataReader,
+    public FileReaderDataImportProvider(IFileDataService dataReader,
         ILogger<FileReaderDataImportProvider> logger)
     {
         _dataReader = dataReader;
diff --git a/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Services/Filesystem/XmlFileDataReader.cs b/src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Services/Filesystem/XmlFileDataReader.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;`
	`1`	`+using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;`
`2`	`2`	`using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.FieldSchemas;`
`3`	`3`	`using Microsoft.Xrm.Sdk.Metadata;`
`4`	`4`	`using Shouldly;`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@`
`8`	`8`	`namespace Dataverse.ConfigurationMigrationTool.Console.Tests.Services.Filesystem;`
`9`	`9`	`public class FileReaderDataImportProviderTests`
`10`	`10`	`{`
`11`		`- private readonly IFileDataReader _dataReader;`
	`11`	`+ private readonly IFileDataService _dataReader;`
`12`	`12`	`private readonly FileReaderDataImportProvider _fileReaderDataImportProvider;`
`13`	`13`	`public FileReaderDataImportProviderTests()`
`14`	`14`	`{`
`15`		`- _dataReader = Substitute.For<IFileDataReader>();`
	`15`	`+ _dataReader = Substitute.For<IFileDataService>();`
`16`	`16`	`_fileReaderDataImportProvider = new FileReaderDataImportProvider(_dataReader,`
`17`	`17`	`Substitute.For<ILogger<FileReaderDataImportProvider>>());`
`18`	`18`