test the service registrations in the composition root for the applic…

…ation tier (#53)

* test the service registrations in the composition root for the application tier

* warnings

Dfe.Data.SearchPrototype/Dfe.Data.SearchPrototype.csproj

@@ -48,6 +48,8 @@
 
 
 	<ItemGroup>
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
 	  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
 	  <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
 	</ItemGroup>

Dfe.Data.SearchPrototype/Infrastructure/CompositionRoot.cs

@@ -44,13 +44,6 @@ public static void AddCognitiveSearchAdaptorServices(this IServiceCollection ser
                        .GetSection(nameof(AzureSearchOptions))
                        .Bind(settings));
 
-        services.AddOptions<SearchByKeywordCriteria>()
-           .Configure<IConfiguration>(
-               (settings, configuration) =>
-                   configuration
-                       .GetSection(nameof(SearchByKeywordCriteria))
-                       .Bind(settings));
-
         services.AddScoped(typeof(ISearchServiceAdapter), typeof(CognitiveSearchServiceAdapter<DataTransferObjects.Establishment>));
         services.AddSingleton(typeof(IMapper<Pageable<SearchResult<DataTransferObjects.Establishment>>, EstablishmentResults>), typeof(PageableSearchResultsToEstablishmentResultsMapper));
         services.AddSingleton<IMapper<Dictionary<string, IList<Azure.Search.Documents.Models.FacetResult>>, EstablishmentFacets>, AzureFacetResultToEstablishmentFacetsMapper>();

Dfe.Data.SearchPrototype/Infrastructure/Tests/Integration/CognitiveSearchServiceAdaptorIntegrationTests.cs → Dfe.Data.SearchPrototype/Infrastructure/Tests/Integration/CompositionRootTests.cs

@@ -8,7 +8,7 @@
 
 namespace Dfe.Data.SearchPrototype.Infrastructure.Tests.Integration;
 
-public class CognitiveSearchServiceAdaptorIntegrationTests :IClassFixture<ConfigBuilder>, IClassFixture<CompositionRootServiceProvider>
+public class CompositionRootTests :IClassFixture<ConfigBuilder>, IClassFixture<CompositionRootServiceProvider>
 {
     private IConfiguration _configuration;
     private IServiceProvider _serviceProvider;
@@ -17,7 +17,7 @@ public class CognitiveSearchServiceAdaptorIntegrationTests :IClassFixture<Config
             {"AzureSearchOptions:SearchIndex", "establishments" }
         };
 
-    public CognitiveSearchServiceAdaptorIntegrationTests(ConfigBuilder configBuilder, CompositionRootServiceProvider serviceProvider)
+    public CompositionRootTests(ConfigBuilder configBuilder, CompositionRootServiceProvider serviceProvider)
     {
         _configuration = configBuilder.SetupConfiguration(InMemoryConfig);
         _serviceProvider = serviceProvider.SetUpServiceProvider(_configuration);

Dfe.Data.SearchPrototype/SearchForEstablishments/CompositionRoot.cs

@@ -1,5 +1,7 @@
 using Dfe.Data.SearchPrototype.Common.CleanArchitecture.Application.UseCase;
 using Dfe.Data.SearchPrototype.SearchForEstablishments.ByKeyword.Usecase;
+using Dfe.Data.SearchPrototype.SearchForEstablishments.Models;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Dfe.Data.SearchPrototype.SearchForEstablishments;
@@ -17,17 +19,25 @@ public static class CompositionRoot
     /// <param name="services">
     /// The originating application services onto which to register the search dependencies.
     /// </param>
+    /// <param name="configuration">
+    /// The originating configuration block from which to derive use-case settings.
+    /// </param>
     /// <exception cref="ArgumentNullException">
     /// The exception thrown if no valid <see cref="IServiceCollection"/> is provisioned.
     /// </exception>
-    public static void AddSearchForEstablishmentServices(this IServiceCollection services)
+    public static void AddSearchForEstablishmentServices(this IServiceCollection services, IConfiguration configuration)
     {
         if (services is null)
         {
             throw new ArgumentNullException(nameof(services),
                 "A service collection is required to configure the search by keyword use-case.");
         }
-
+        services.AddOptions<SearchByKeywordCriteria>()
+           .Configure<IConfiguration>(
+               (settings, configuration) =>
+                   configuration
+                       .GetSection(nameof(SearchByKeywordCriteria))
+                       .Bind(settings));
         services.AddScoped<IUseCase<SearchByKeywordRequest, SearchByKeywordResponse>, SearchByKeywordUseCase>();
     }
 }

Dfe.Data.SearchPrototype/Tests/Integration/CompositionRootTests.cs

@@ -0,0 +1,35 @@
+using Dfe.Data.SearchPrototype.Common.CleanArchitecture.Application.UseCase;
+using Dfe.Data.SearchPrototype.SearchForEstablishments.ByKeyword.Usecase;
+using Dfe.Data.SearchPrototype.Tests.Integration.TestHarness;
+using FluentAssertions;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Dfe.Data.SearchPrototype.Tests.Integration;
+
+public class CompositionRootTests : IClassFixture<CompositionRootServiceProvider>, IClassFixture<ConfigBuilder>
+{
+    private Dictionary<string, string?> InMemoryConfig => new()  {
+        { "SearchByKeywordCriteria:SearchFields:0", "ESTABLISHMENTNAME" },
+        { "SearchByKeywordCriteria:Facets:0", "FACET1"}
+    };
+    private readonly IConfiguration _config;
+    private readonly IServiceProvider _compositionRootServiceProvider;
+
+    public CompositionRootTests(CompositionRootServiceProvider serviceProvider, ConfigBuilder configBuilder)
+    {
+        _config = configBuilder.SetupConfiguration(InMemoryConfig);
+        _compositionRootServiceProvider = serviceProvider.SetUpServiceProvider(_config);
+    }
+
+    [Fact]
+    public async Task AddSearchForEstablishmentServices_CanCreateUsecase()
+    {
+        var usecase = _compositionRootServiceProvider.GetRequiredService<IUseCase<SearchByKeywordRequest, SearchByKeywordResponse>>();
+
+        var response = await usecase.HandleRequest(new SearchByKeywordRequest("searchkeyword"));
+
+        response.Should().NotBeNull();
+    }
+}

Dfe.Data.SearchPrototype/Tests/Integration/TestHarness/CompositionRootServiceProvider.cs

@@ -0,0 +1,24 @@
+using Dfe.Data.SearchPrototype.Infrastructure;
+using Dfe.Data.SearchPrototype.Infrastructure.DataTransferObjects;
+using Dfe.Data.SearchPrototype.SearchForEstablishments;
+using Dfe.Data.SearchPrototype.SearchForEstablishments.ByKeyword.ServiceAdapters;
+using Dfe.Data.SearchPrototype.Tests.SearchForEstablishments.ByKeyword.TestDoubles;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+
+namespace Dfe.Data.SearchPrototype.Tests.Integration.TestHarness;
+
+public class CompositionRootServiceProvider
+{
+    public IServiceProvider SetUpServiceProvider(IConfiguration config)
+    {
+        IServiceCollection services = new ServiceCollection();
+        services.AddSingleton<IConfiguration>(config);
+
+        services.AddSearchForEstablishmentServices(config);
+
+        services.AddScoped<ISearchServiceAdapter>(provider => SearchServiceAdapterTestDouble.MockFor(SearchResultsTestDouble.CreateWithNoResults()));
+        return services.BuildServiceProvider();
+    }
+}

Dfe.Data.SearchPrototype/Tests/Integration/TestHarness/ConfigBuilder.cs

@@ -0,0 +1,14 @@
+using Microsoft.Extensions.Configuration;
+
+namespace Dfe.Data.SearchPrototype.Tests.Integration.TestHarness;
+
+public class ConfigBuilder
+{
+    public IConfiguration SetupConfiguration(Dictionary<string, string?> options)
+    {
+        var configBuilder = new ConfigurationBuilder();
+
+        configBuilder.AddInMemoryCollection(options);
+        return configBuilder.Build();
+    }
+}