fix bootstrapper test

Author: StuartFerguson

EstateReportingAPI.Tests/General/BootstrapperTests.cs

@@ -42,6 +42,8 @@ private IConfigurationRoot SetupMemoryConfiguration()
             IConfigurationBuilder builder = new ConfigurationBuilder();
 
             configuration.Add("ConnectionStrings:HealthCheck", "HeathCheckConnString");
+            configuration.Add("ConnectionStrings:TransactionProcessorReadModel", "TransactionProcessorReadModel");
+            
             configuration.Add("SecurityConfiguration:Authority", "https://127.0.0.1");
             configuration.Add("EventStoreSettings:ConnectionString", "https://127.0.0.1:2113");
             configuration.Add("EventStoreSettings:ConnectionName", "UnitTestConnection");

EstateReportingAPI/Bootstrapper/RepositoryRegistry.cs

@@ -5,6 +5,7 @@ namespace EstateReportingAPI.Bootstrapper;
 using BusinessLogic;
 using Common;
 using Lamar;
+using Microsoft.EntityFrameworkCore;
 using Shared.EntityFramework;
 using Shared.EntityFramework.ConnectionStringConfiguration;
 using Shared.General;
@@ -14,31 +15,21 @@ namespace EstateReportingAPI.Bootstrapper;
 [ExcludeFromCodeCoverage]
 public class RepositoryRegistry : ServiceRegistry{
     public RepositoryRegistry(){
-
-        Boolean useConnectionStringConfig = bool.Parse(ConfigurationReader.GetValue("AppSettings", "UseConnectionStringConfig"));
-
-        if (useConnectionStringConfig)
+        String? inTestMode = Environment.GetEnvironmentVariable("InTestMode");
+        if (String.Compare(inTestMode, Boolean.TrueString, StringComparison.InvariantCultureIgnoreCase) != 0)
         {
-            String connectionStringConfigurationConnString = ConfigurationReader.GetConnectionString("ConnectionStringConfiguration");
-            this.AddSingleton<IConnectionStringConfigurationRepository, ConnectionStringConfigurationRepository>();
-            this.AddTransient(c => { return new ConnectionStringConfigurationContext(connectionStringConfigurationConnString); });
+            this.AddSingleton<IReportingManager, ReportingManager>();
+        }
 
-            // TODO: Read this from a the database and set
+        this.AddSingleton(typeof(IDbContextResolver<>), typeof(DbContextResolver<>));
+        if (Startup.WebHostEnvironment.IsEnvironment("IntegrationTest") || Startup.Configuration.GetValue<Boolean>("ServiceOptions:UseInMemoryDatabase") == true)
+        {
+            this.AddDbContext<EstateManagementContext>(builder => builder.UseInMemoryDatabase("TransactionProcessorReadModel"));
         }
         else
         {
-            this.AddSingleton<IConnectionStringConfigurationRepository, ConfigurationReaderConnectionStringRepository>();
+            this.AddDbContext<EstateManagementContext>(options =>
+                options.UseSqlServer(ConfigurationReader.GetConnectionString("TransactionProcessorReadModel")));
         }
-
-        String? inTestMode = Environment.GetEnvironmentVariable("InTestMode");
-        if (String.Compare(inTestMode, Boolean.TrueString, StringComparison.InvariantCultureIgnoreCase) != 0){
-            this.AddSingleton<IReportingManager, ReportingManager>();
-        }
-
-        this.AddSingleton<IDbContextFactory<EstateManagementContext>, DbContextFactory<EstateManagementContext>>();
-
-        this.AddSingleton<Func<String, EstateManagementContext>>(cont => connectionString => {
-            return new EstateManagementContext(connectionString);
-        });
     }
 }

EstateReportingAPI/Startup.cs

@@ -43,24 +43,30 @@ public void ConfigureContainer(ServiceRegistry services)
             services.IncludeRegistry<RepositoryRegistry>();
             services.IncludeRegistry<MediatorRegistry>();
 
+            //String? inTestMode = Environment.GetEnvironmentVariable("InTestMode");
+            //if (String.Compare(inTestMode, Boolean.TrueString, StringComparison.InvariantCultureIgnoreCase) == 0)
+            //{
+            //    services.AddSingleton<IReportingManager, ReportingManager>();
+            //}
+
             Container = new Container(services);
         }
 
-        public void ConfigureServices(IServiceCollection services){
-            //    ConfigurationReader.Initialise(Configuration);
-            //    ServiceRegistry registry = new ServiceRegistry(services);
-            //    registry.IncludeRegistry<MiddlewareRegistry>();
-            //    registry.IncludeRegistry<RepositoryRegistry>();
+        //public void ConfigureServices(IServiceCollection services){
+        //    //    ConfigurationReader.Initialise(Configuration);
+        //    //    ServiceRegistry registry = new ServiceRegistry(services);
+        //    //    registry.IncludeRegistry<MiddlewareRegistry>();
+        //    //    registry.IncludeRegistry<RepositoryRegistry>();
 
-            //    Container = new Container(registry);
-            String? inTestMode = Environment.GetEnvironmentVariable("InTestMode");
-            if (String.Compare(inTestMode, Boolean.TrueString, StringComparison.InvariantCultureIgnoreCase) == 0)
-            {
-                services.AddSingleton<IReportingManager, ReportingManager>();
-            }
+        //    //    Container = new Container(registry);
+        //    String? inTestMode = Environment.GetEnvironmentVariable("InTestMode");
+        //    if (String.Compare(inTestMode, Boolean.TrueString, StringComparison.InvariantCultureIgnoreCase) == 0)
+        //    {
+        //        services.AddSingleton<IReportingManager, ReportingManager>();
+        //    }
 
 
-        }
+        //}
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
         {