Redesign of command handling

Author: dotnetprog

src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Dataverse.ConfigurationMigrationTool.Console.csproj

@@ -14,6 +14,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.4" />
     <PackageReference Include="Microsoft.PowerPlatform.Dataverse.Client" Version="1.2.7" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta6.25358.103" />
   </ItemGroup>
   <ItemGroup>
     <None Update="appsettings.Development.json">

src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Import/CoconaAppExtensions.cs

@@ -11,4 +11,5 @@ public static ICoconaCommandsBuilder UseImportFeature(this ICoconaCommandsBuilde
         app.AddCommands<ImportCommands>();
         return app;
     }
+
 }

src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Import/Commands/ImportCommandOptions.cs

@@ -0,0 +1,6 @@
+namespace Dataverse.ConfigurationMigrationTool.Console.Features.Import.Commands;
+public class ImportCommandOptions
+{
+    public string schema { get; set; }
+    public string data { get; set; }
+}

src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Import/Commands/ImportCommands.cs

@@ -2,28 +2,35 @@
 using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using ConsoleApp = System.Console;
 
 namespace Dataverse.ConfigurationMigrationTool.Console.Features.Import.Commands;
-
-public class ImportCommands
+[CommandVerb("import")]
+public class ImportCommands : ICommand
 {
     private readonly ILogger<ImportCommands> _logger;
     private readonly IImportDataProvider _importDataProvider;
     private readonly IValidator<ImportSchema> _schemaValidator;
     private readonly IImportTaskProcessorService _importDataService;
+    private readonly ImportCommandOptions _options;
 
     public ImportCommands(ILogger<ImportCommands> logger,
         IImportDataProvider importDataProvider,
         IValidator<ImportSchema> schemaValidator,
-        IImportTaskProcessorService importDataService)
+        IImportTaskProcessorService importDataService,
+        IOptions<ImportCommandOptions> options)
     {
         _logger = logger;
         _importDataProvider = importDataProvider;
         _schemaValidator = schemaValidator;
         _importDataService = importDataService;
+        _options = options.Value;
     }
 
+    public async Task Execute() => await Import(_options.schema, _options.data);
+
+
     [Command("import")]
     public async Task Import([Option("schema")] string schemafilepath, [Option("data")] string datafilepath)
     {

src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Import/IServiceCollectionExtensions.cs

@@ -1,18 +1,21 @@
-using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Commands;
+using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Model;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules.EntitySchemas;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules.EntitySchemas.FieldSchemas;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Import.Validators.Rules.EntitySchemas.RelationshipSchemas;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Import.ValueConverters;
 using Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using System.Reflection;
 
 namespace Dataverse.ConfigurationMigrationTool.Console.Features.Import;
 
 public static class IServiceCollectionExtensions
 {
-    public static IServiceCollection AddImportFeature(this IServiceCollection services)
+    public static IServiceCollection AddImportFeature(this IServiceCollection services, IConfiguration Configuration)
     {
 
         return services.RegisterFromReflection<IFieldSchemaValidationRule>()
@@ -26,7 +29,14 @@ public static IServiceCollection AddImportFeature(this IServiceCollection servic
             .AddSingleton<IDataverseValueConverter, DataverseValueConverter>()
             .AddTransient<IValidator<ImportSchema>, SchemaValidator>()
             .AddTransient<IValidator<EntitySchema>, EntitySchemaValidator>()
-            .AddSingleton<IImportTaskProcessorService, ImportTaskProcessorService>();
+            .AddSingleton<IImportTaskProcessorService, ImportTaskProcessorService>()
+            .Configure<ImportCommandOptions>(Configuration);
+
+    }
+    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)
     {

src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Shared/CommandProcessorHostingService.cs

@@ -0,0 +1,43 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+using System.Reflection;
+
+namespace Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
+public class CommandProcessorHostingService : BackgroundService
+{
+    private readonly CommandProcessorHostingServiceOptions _options;
+    private readonly IServiceScopeFactory _serviceProviderFactory;
+    private readonly IHostApplicationLifetime _lifetime;
+
+    public CommandProcessorHostingService(IOptions<CommandProcessorHostingServiceOptions> options, IServiceScopeFactory serviceProviderFactory, IHostApplicationLifetime lifetime)
+    {
+        _options = options.Value;
+        _serviceProviderFactory = serviceProviderFactory;
+        _lifetime = lifetime;
+    }
+
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        var types = from type in Assembly.GetExecutingAssembly().GetTypes()
+                    where Attribute.IsDefined(type, typeof(CommandVerbAttribute)) &&
+                          type.IsClass &&
+                          !type.IsAbstract &&
+                          typeof(ICommand).IsAssignableFrom(type)
+                    select (type, (CommandVerbAttribute)Attribute.GetCustomAttribute(type, typeof(CommandVerbAttribute)));
+
+        var mathingVerbCommandType = types.FirstOrDefault(t => t.Item2.Verb.Equals(_options.CommandVerb, StringComparison.OrdinalIgnoreCase)).type;
+        using (var scope = _serviceProviderFactory.CreateScope())
+        {
+            if (mathingVerbCommandType == null)
+            {
+                throw new InvalidOperationException($"No command found for verb '{_options.CommandVerb}'");
+            }
+            var command = ActivatorUtilities.CreateInstance(scope.ServiceProvider, mathingVerbCommandType) as ICommand;
+            await command.Execute();
+
+
+        }
+        _lifetime.StopApplication();
+    }
+}

src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Shared/CommandProcessorHostingServiceOptions.cs

@@ -0,0 +1,5 @@
+namespace Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
+public class CommandProcessorHostingServiceOptions
+{
+    public string CommandVerb { get; set; }
+}

src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Shared/CommandVerbAttribute.cs

@@ -0,0 +1,10 @@
+namespace Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
+[AttributeUsage(AttributeTargets.Class)]
+public class CommandVerbAttribute : Attribute
+{
+    public string Verb { get; }
+    public CommandVerbAttribute(string verb)
+    {
+        Verb = verb ?? throw new ArgumentNullException(nameof(verb), "Verb cannot be null");
+    }
+}

src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Features/Shared/ICommand.cs

@@ -0,0 +1,5 @@
+namespace Dataverse.ConfigurationMigrationTool.Console.Features.Shared;
+public interface ICommand
+{
+    Task Execute();
+}

src/Dataverse.ConfigurationMigrationTool/Dataverse.ConfigurationMigrationTool.Console/Program.cs

@@ -14,12 +14,14 @@
 builder.ConfigureHostConfiguration((config) =>
 {
     // Configure the host configuration, such as environment variables, command line arguments, etc.
-    config.AddEnvironmentVariables();
+    config.AddEnvironmentVariables().AddCommandLine(args);
+
 });
 builder.ConfigureAppConfiguration((context, config) =>
 {
     config
         .AddEnvironmentVariables()
+        .AddCommandLine(args)
         .AddJsonFile("appsettings.json", false, false)
         .AddJsonFile($"appsettings.{context.HostingEnvironment.EnvironmentName}.json", false, false);
     if (!context.HostingEnvironment.IsProduction())
@@ -41,6 +43,7 @@
 
     services
     .AddLogging(lb => lb.AddConsole())
+
     .Configure<SdkDataverseServiceFactoryOptions>(context.Configuration.GetSection("Dataverse"))
     .Configure<ParallelismBulkOrganizationServiceOptions>(context.Configuration.GetSection("Dataverse"))
     .AddTransient<IImportDataProvider, FileReaderDataImportProvider>()
@@ -49,15 +52,17 @@
     .AddTransient<ServiceClient>((sp) => (ServiceClient)sp.GetRequiredService<IDataverseClientFactory>().Create())
     .AddSingleton<IBulkOrganizationService, ParallelismBulkOrganizationService>()
     .AddDataverseClient()
-    .AddImportFeature();
+    .UseCommands(args)
+    .AddImportFeature(context.Configuration);
     // Configure other services.
 });
 builder.ConfigureCocona(args, configureApplication: app =>
 {
     // Configure your app's commands normally as you would with app
     app.UseImportFeature();
 });
-await builder.RunConsoleAsync(x => x.SuppressStatusMessages = true);
+var app = builder.Build();
+await app.RunAsync();
 //var builder = CoconaApp.CreateBuilder();
 //builder.Configuration
 //        .AddEnvironmentVariables()