fix code review issues

Author: StuartFerguson

EstateReportingAPI.IntegrationTests/CustomWebApplicationFactory.cs

@@ -53,11 +53,9 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
             var context = new EstateManagementContext(DatabaseConnectionString);
             Func<string, EstateManagementContext> f = connectionString => context;
 
-            //this.DbContextFactory = new Mock<IDbContextResolver<EstateManagementContext>>();
             containerBuilder.AddTransient<EstateManagementContext>(_ => context);
             var serviceProvider = containerBuilder.BuildServiceProvider();
-            //var scope = serviceProvider.CreateScope();
-
+            
             var inMemorySettings = new Dictionary<string, string>
             {
                 { "ConnectionStrings:TransactionProcessorReadModel", DatabaseConnectionString }
@@ -68,8 +66,6 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
                 .Build();
 
             IDbContextResolver<EstateManagementContext> resolver = new DbContextResolver<EstateManagementContext>(serviceProvider, configuration);
-            //IDbContextFactory<EstateManagementContext> factory = new DbContextFactory<EstateManagementContext>(new TestConnectionStringConfigurationRepository(DatabaseConnectionString), f);
-
             IReportingManager manager = new ReportingManager(resolver);
 
             containerBuilder.AddSingleton(manager);
@@ -86,33 +82,6 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
 
 }
 
-public class TestConnectionStringConfigurationRepository : IConnectionStringConfigurationRepository
-{
-    private readonly string DbConnectionString;
-
-    public TestConnectionStringConfigurationRepository(String dbConnectionString)
-    {
-        DbConnectionString = dbConnectionString;
-    }
-    public Task DeleteConnectionStringConfiguration(string externalIdentifier, string connectionStringIdentifier,
-        CancellationToken cancellationToken)
-    {
-        throw new NotImplementedException();
-    }
-
-    public async Task<string> GetConnectionString(string externalIdentifier, string connectionStringIdentifier,
-        CancellationToken cancellationToken)
-    {
-        return DbConnectionString;
-    }
-
-    public Task CreateConnectionString(string externalIdentifier, string connectionStringIdentifier, string connectionString,
-        CancellationToken cancellationToken)
-    {
-        throw new NotImplementedException();
-    }
-}
-
 public class TestAuthHandlerOptions : AuthenticationSchemeOptions
 {
     public string DefaultUserId { get; set; } = null!;

EstateReportingAPI/Startup.cs

@@ -42,32 +42,10 @@ public void ConfigureContainer(ServiceRegistry services)
             services.IncludeRegistry<MiddlewareRegistry>();
             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>();
-
-        //    //    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)
         {
             if (env.IsDevelopment())