Correction for mapper registration in DI container

DFE-Digital · Sep 11, 2024 · e31ca5a · e31ca5a
1 parent d0f0c5f
commit e31ca5a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/Dfe.Data.SearchPrototype/Infrastructure/CognitiveSearchServiceAdapter.cs b/Dfe.Data.SearchPrototype/Infrastructure/CognitiveSearchServiceAdapter.cs
@@ -55,7 +55,7 @@ public CognitiveSearchServiceAdapter(
     /// Makes call to underlying azure cognitive search service and uses the prescribed mapper
     /// to adapt the raw Azure search results to the <see cref="SearchResults"/> type.
     /// </summary>
-    /// <param name="searchRequest">
+    /// <param name="searchServiceAdapterRequest">
     /// Prescribes the context of the search including the keyword and collection target.
     /// </param>
     /// <returns>
@@ -69,7 +69,7 @@ public CognitiveSearchServiceAdapter(
     /// <exception cref="ArgumentException">
     /// Exception thrown if the data cannot be mapped
     /// </exception>
-    public async Task<SearchResults> SearchAsync(SearchServiceAdapterRequest searchRequest)
+    public async Task<SearchResults> SearchAsync(SearchServiceAdapterRequest searchServiceAdapterRequest)
     {
         SearchOptions searchOptions = new()
         {
@@ -78,21 +78,21 @@ public async Task<SearchResults> SearchAsync(SearchServiceAdapterRequest searchR
             IncludeTotalCount = _azureSearchOptions.IncludeTotalCount,
         };
 
-        searchRequest.SearchFields?.ToList()
+        searchServiceAdapterRequest.SearchFields?.ToList()
             .ForEach(searchOptions.SearchFields.Add);
 
-        searchRequest.Facets?.ToList()
+        searchServiceAdapterRequest.Facets?.ToList()
             .ForEach(searchOptions.Facets.Add);
 
         Response<SearchResults<TSearchResult>> searchResults =
             await _searchByKeywordService.SearchAsync<TSearchResult>(
-                searchRequest.SearchKeyword,
+                searchServiceAdapterRequest.SearchKeyword,
                 _azureSearchOptions.SearchIndex,
                 searchOptions
             )
             .ConfigureAwait(false) ??
                 throw new ApplicationException(
-                    $"Unable to derive search results based on input {searchRequest.SearchKeyword}.");
+                    $"Unable to derive search results based on input {searchServiceAdapterRequest.SearchKeyword}.");
 
         var results = new SearchResults()
         {

diff --git a/Dfe.Data.SearchPrototype/Infrastructure/CompositionRoot.cs b/Dfe.Data.SearchPrototype/Infrastructure/CompositionRoot.cs
@@ -7,7 +7,6 @@
 using Dfe.Data.SearchPrototype.SearchForEstablishments.Models;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Models = Dfe.Data.SearchPrototype.SearchForEstablishments.Models;
 
 namespace Dfe.Data.SearchPrototype.Infrastructure;
 
@@ -52,10 +51,10 @@ public static void AddCognitiveSearchAdaptorServices(this IServiceCollection ser
                        .GetSection(nameof(SearchByKeywordCriteria))
                        .Bind(settings));
 
-        services.AddScoped(typeof(ISearchServiceAdapter), typeof(CognitiveSearchServiceAdapter<SearchResults>));
-        services.AddSingleton(typeof(IMapper<Pageable<SearchResult<Models.Establishment>>, Models.EstablishmentResults>), typeof(PageableSearchResultsToEstablishmentResultsMapper));
+        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>();
         services.AddSingleton<IMapper<DataTransferObjects.Establishment, Address>, AzureSearchResultToAddressMapper>();
-        services.AddSingleton<IMapper<DataTransferObjects.Establishment, SearchForEstablishments.Models.Establishment>, AzureSearchResultToEstablishmentMapper>();
+        services.AddSingleton<IMapper<DataTransferObjects.Establishment, Establishment>, AzureSearchResultToEstablishmentMapper>();
     }
 }