Skip to content

Commit 3e9f034

Browse files
dotnetprogdotnetprog
committed
Moving some Classes to Shared Folder For common logic and init of Export Data Command
1 parent 2e16213 commit 3e9f034

File tree

46 files changed

+438
-161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+438
-161
lines changed

‎src/Dataverse.ConfigurationMigrationTool/Console.Tests/FakeDatasets.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
1+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
22

33
namespace Dataverse.ConfigurationMigrationTool.Console.Tests;
44
internal static class FakeDatasets

‎src/Dataverse.ConfigurationMigrationTool/Console.Tests/FakeSchemas.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
1+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
22

33
namespace Dataverse.ConfigurationMigrationTool.Console.Tests;
44
internal static class FakeSchemas

‎src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Commands/ImportCommandsTest.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Commands;
33
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
44
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
5+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
56
using Dataverse.ConfigurationMigrationTool.Console.Tests.Extensions;
67
using Microsoft.Extensions.Logging;
78
using Microsoft.Extensions.Options;
@@ -13,7 +14,7 @@ public class ImportCommandsTest
1314
{
1415
private readonly ILogger<ImportCommands> _logger;
1516
private readonly IImportDataProvider _importDataProvider;
16-
private readonly IValidator<ImportSchema> _schemaValidator;
17+
private readonly IValidator<DataSchema> _schemaValidator;
1718
private readonly IImportTaskProcessorService _importDataService;
1819
private readonly ImportCommands _importCommands;
1920
const string DataFilePath = "data.json";
@@ -28,7 +29,7 @@ public ImportCommandsTest()
2829
{
2930
_logger = Substitute.For<ILogger<ImportCommands>>();
3031
_importDataProvider = Substitute.For<IImportDataProvider>();
31-
_schemaValidator = Substitute.For<IValidator<ImportSchema>>();
32+
_schemaValidator = Substitute.For<IValidator<DataSchema>>();
3233
_importDataService = Substitute.For<IImportTaskProcessorService>();
3334
var options = Substitute.For<IOptions<ImportCommandOptions>>();
3435
options.Value.Returns(_options);
@@ -43,7 +44,7 @@ public ImportCommandsTest()
4344
public async Task GivenDataToImportWithSchema_WhenTheCommandExecutes_ThenItShouldProcessImportsAccordingly()
4445
{
4546
//Arrange
46-
var importSchema = new ImportSchema
47+
var importSchema = new DataSchema
4748
{
4849
Entity = new()
4950
{
@@ -84,7 +85,7 @@ public async Task GivenDataToImportWithSchema_WhenTheCommandExecutes_ThenItShoul
8485
public async Task GivenDataToImportWithSchema_WhenTheCommandExecutesAndFails_ThenItShouldThrowAnError()
8586
{
8687
//Arrange
87-
var importSchema = new ImportSchema
88+
var importSchema = new DataSchema
8889
{
8990
Entity = new()
9091
{
@@ -122,7 +123,7 @@ public async Task GivenDataToImportWithSchema_WhenTheCommandExecutesAndFails_The
122123
public async Task GivenAnInvalidSchema_WhenTheCommandExecutes_ThenItShouldFailAndLogIssues()
123124
{
124125
//Arrange
125-
var importSchema = new ImportSchema
126+
var importSchema = new DataSchema
126127
{
127128
Entity = new()
128129
{

‎src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/ImportTaskProcessorServiceTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
44
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.ValueConverters;
55
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
6+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
67
using Dataverse.ConfigurationMigrationTool.Console.Services.Dataverse.Connection;
78
using Dataverse.ConfigurationMigrationTool.Console.Tests.Extensions;
89
using Dataverse.ConfigurationMigrationTool.Console.Tests.FakeBuilders;

‎src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Mappers/FieldSchemaToAttributeTypeMapperTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Mappers;
2-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
2+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
33
using Microsoft.Xrm.Sdk.Metadata;
44
using Shouldly;
55

‎src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/EntitySchemaValidatorTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
2-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules;
3-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules.EntitySchemas;
4-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules.EntitySchemas.FieldSchemas;
5-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules.EntitySchemas.RelationshipSchemas;
1+
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules.EntitySchemas;
62
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
3+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
4+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules;
5+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.FieldSchemas;
6+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.RelationshipSchemas;
77
using Microsoft.Xrm.Sdk.Metadata;
88
using NSubstitute;
99
using Shouldly;

‎src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/FieldSchemas/BaseFieldSchemaValidationRuleTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
2-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules;
3-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules.EntitySchemas.FieldSchemas;
1+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Domain;
2+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules;
3+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.FieldSchemas;
44
using Microsoft.Xrm.Sdk.Metadata;
55

66
namespace Dataverse.ConfigurationMigrationTool.Console.Tests.Features.Import.Validators.Rules.EntitySchemas.FieldSchemas;

‎src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/FieldSchemas/FieldTypeMustMatchWithAttributeValidationRuleTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
2-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules.EntitySchemas.FieldSchemas;
2+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.FieldSchemas;
33
using Microsoft.Xrm.Sdk.Metadata;
44
using Shouldly;
55

‎src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/FieldSchemas/LookupFieldsTargetsMustMatchValidationRuleTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
2-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules.EntitySchemas.FieldSchemas;
2+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.FieldSchemas;
33
using Microsoft.Xrm.Sdk.Metadata;
44
using Shouldly;
55

‎src/Dataverse.ConfigurationMigrationTool/Console.Tests/Features/Import/Validators/Rules/EntitySchemas/RelationshipSchemas/SourceEntityNameMustMatchValidationRuleTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
2-
using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules.EntitySchemas.RelationshipSchemas;
2+
using Dataverse.ConfigurationMigrationTool.Console.Features.Shared.Validators.Rules.EntitySchemas.RelationshipSchemas;
33
using Microsoft.Xrm.Sdk.Metadata;
44
using Shouldly;
55

0 commit comments

Comments
 (0)