code review tweaks

Author: StuartFerguson

FileProcessor.Tests/BootstrapperTests.cs

@@ -30,34 +30,16 @@ public void VerifyBootstrapperIsValid()
 
             this.AddTestRegistrations(services, hostingEnvironment.Object);
             s.ConfigureContainer(services);
-
-            var g = Startup.Container.GetInstance<ISecurityServiceClient>();
-
-
+            
             Startup.Container.AssertConfigurationIsValid(AssertMode.Full);
         }
 
         private IConfigurationRoot SetupMemoryConfiguration()
         {
-            //Dictionary<String, String> configuration = new Dictionary<String, String>();
-
             IConfigurationBuilder builder = new ConfigurationBuilder();
 
-            //configuration.Add("ConnectionStrings:HealthCheck", "HeathCheckConnString");
-            //configuration.Add("SecurityConfiguration:Authority", "https://127.0.0.1");
-            //configuration.Add("EventStoreSettings:ConnectionString", "https://127.0.0.1:2113");
-            //configuration.Add("EventStoreSettings:ConnectionName", "UnitTestConnection");
-            //configuration.Add("EventStoreSettings:UserName", "admin");
-            //configuration.Add("EventStoreSettings:Password", "changeit");
-            //configuration.Add("AppSettings:UseConnectionStringConfig", "false");
-            //configuration.Add("AppSettings:SecurityService", "http://127.0.0.1");
-            //configuration.Add("AppSettings:MessagingServiceApi", "http://127.0.0.1");
-            //configuration.Add("AppSettings:EstateManagementApi", "http://127.0.0.1");
-            //configuration.Add("AppSettings:TransactionProcessorApi", "http://127.0.0.1");
-            //configuration.Add("AppSettings:DatabaseEngine", "SqlServer");
-
-            //builder.AddInMemoryCollection(configuration);
             builder.AddInMemoryCollection(TestData.DefaultAppSettings);
+
             return builder.Build();
         }
 

FileProcessor/Bootstrapper/ClientRegistry.cs

@@ -0,0 +1,44 @@
+namespace FileProcessor.Bootstrapper;
+
+using System;
+using System.Net.Http;
+using EstateManagement.Client;
+using Lamar;
+using Microsoft.Extensions.DependencyInjection;
+using SecurityService.Client;
+using Shared.General;
+using TransactionProcessor.Client;
+
+/// <summary>
+/// 
+/// </summary>
+/// <seealso cref="Lamar.ServiceRegistry" />
+public class ClientRegistry : ServiceRegistry
+{
+    #region Constructors
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ClientRegistry"/> class.
+    /// </summary>
+    public ClientRegistry() {
+        this.AddSingleton<ISecurityServiceClient, SecurityServiceClient>();
+        this.AddSingleton<IEstateClient, EstateClient>();
+        this.AddSingleton<ITransactionProcessorClient, TransactionProcessorClient>();
+
+        this.AddSingleton<Func<String, String>>(container => serviceName => { return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; });
+
+        SocketsHttpHandler httpMessageHandler = new SocketsHttpHandler {
+                                                                           SslOptions = {
+                                                                                            RemoteCertificateValidationCallback = (sender,
+                                                                                                certificate,
+                                                                                                chain,
+                                                                                                errors) => true,
+                                                                                        }
+                                                                       };
+
+        HttpClient httpClient = new(httpMessageHandler);
+        this.AddSingleton(httpClient);
+    }
+
+    #endregion
+}

FileProcessor/Bootstrapper/DomainEventHandlerRegistry.cs

@@ -0,0 +1,49 @@
+namespace FileProcessor.Bootstrapper;
+
+using System;
+using System.Collections.Generic;
+using BusinessLogic.EventHandling;
+using Lamar;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Shared.EventStore.EventHandling;
+
+/// <summary>
+/// 
+/// </summary>
+/// <seealso cref="Lamar.ServiceRegistry" />
+public class DomainEventHandlerRegistry : ServiceRegistry
+{
+    #region Constructors
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DomainEventHandlerRegistry"/> class.
+    /// </summary>
+    public DomainEventHandlerRegistry()
+    {
+        Dictionary<String, String[]> eventHandlersConfiguration = new Dictionary<String, String[]>();
+
+        if (Startup.Configuration != null)
+        {
+            IConfigurationSection section = Startup.Configuration.GetSection("AppSettings:EventHandlerConfiguration");
+
+            if (section != null)
+            {
+                Startup.Configuration.GetSection("AppSettings:EventHandlerConfiguration").Bind(eventHandlersConfiguration);
+            }
+        }
+
+        this.AddSingleton(eventHandlersConfiguration);
+
+        this.AddSingleton<Func<Type, IDomainEventHandler>>(container => type =>
+                                                                        {
+                                                                            IDomainEventHandler handler = container.GetService(type) as IDomainEventHandler;
+                                                                            return handler;
+                                                                        });
+
+        this.AddSingleton<FileDomainEventHandler>();
+        this.AddSingleton<IDomainEventHandlerResolver, DomainEventHandlerResolver>();
+    }
+
+    #endregion
+}

FileProcessor/Bootstrapper/FileRegistry.cs

@@ -0,0 +1,59 @@
+namespace FileProcessor.Bootstrapper;
+
+using System;
+using System.Collections.Generic;
+using System.IO.Abstractions;
+using System.Linq;
+using BusinessLogic.FileFormatHandlers;
+using FIleProcessor.Models;
+using Lamar;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// 
+/// </summary>
+/// <seealso cref="Lamar.ServiceRegistry" />
+public class FileRegistry : ServiceRegistry
+{
+    #region Constructors
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FileRegistry"/> class.
+    /// </summary>
+    public FileRegistry()
+    {
+        IEnumerable<FileProfile> fileProfiles = Startup.Configuration.GetSection("AppSettings:FileProfiles").GetChildren().ToList().Select(x => new
+            {
+                Name = x.GetValue<String>("Name"),
+                FileProfileId = x.GetValue<Guid>("Id"),
+                RequestType = x.GetValue<String>("RequestType"),
+                ListeningDirectory = x.GetValue<String>("ListeningDirectory"),
+                OperatorName = x.GetValue<String>("OperatorName"),
+                LineTerminator = x.GetValue<String>("LineTerminator"),
+                FileFormatHandler = x.GetValue<String>("FileFormatHandler")
+            }).Select(f =>
+                      {
+                          return new FileProfile(f.FileProfileId,
+                                                 f.Name,
+                                                 f.ListeningDirectory,
+                                                 f.RequestType,
+                                                 f.OperatorName,
+                                                 f.LineTerminator,
+                                                 f.FileFormatHandler);
+                      });
+        this.AddSingleton(fileProfiles.ToList());
+        this.AddSingleton<IFileSystem, FileSystem>();
+        this.AddSingleton<Func<String, IFileFormatHandler>>(container => fileFormatHandlerName =>
+                                                                         {
+                                                                             if (fileFormatHandlerName == "SafaricomFileFormatHandler")
+                                                                                 return new SafaricomFileFormatHandler();
+                                                                             if (fileFormatHandlerName == "VoucherFileFormatHandler")
+                                                                                 return new VoucherFileFormatHandler();
+
+                                                                             return null;
+                                                                         });
+    }
+
+    #endregion
+}

FileProcessor/Bootstrapper/MediatorRegistry.cs

@@ -0,0 +1,35 @@
+namespace FileProcessor.Bootstrapper;
+
+using System;
+using BusinessLogic.RequestHandlers;
+using BusinessLogic.Requests;
+using Lamar;
+using MediatR;
+using Microsoft.Extensions.DependencyInjection;
+
+/// <summary>
+/// 
+/// </summary>
+/// <seealso cref="Lamar.ServiceRegistry" />
+public class MediatorRegistry : ServiceRegistry
+{
+    #region Constructors
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MediatorRegistry"/> class.
+    /// </summary>
+    public MediatorRegistry()
+    {
+        this.AddSingleton<IMediator, Mediator>();
+        // request & notification handlers
+        this.AddTransient<ServiceFactory>(context => { return t => context.GetService(t); });
+
+        this.AddSingleton<IRequestHandler<UploadFileRequest, Guid>, FileRequestHandler>();
+        this.AddSingleton<IRequestHandler<ProcessUploadedFileRequest, Unit>, FileRequestHandler>();
+        this.AddSingleton<IRequestHandler<SafaricomTopupRequest, Unit>, FileRequestHandler>();
+        this.AddSingleton<IRequestHandler<VoucherRequest, Unit>, FileRequestHandler>();
+        this.AddSingleton<IRequestHandler<ProcessTransactionForFileLineRequest, Unit>, FileRequestHandler>();
+    }
+
+    #endregion
+}