service dependency issue

Author: OluwatobiAwe

AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs

@@ -86,6 +86,7 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
             services.AddSingleton(configuration);
 
             services.AddScoped<ILearningHubApiFacade, LearningHubApiFacade>();
+            services.AddScoped<IOpenApiFacade, OpenApiFacade>();
             services.AddScoped<IResourceService, ResourceService>();
             services.AddScoped<IUserService, UserService>();
             services.AddScoped<IUserGroupService, UserGroupService>();
@@ -132,11 +133,19 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
                             ServerCertificateCustomValidationCallback =
                                           HttpClientHandler.DangerousAcceptAnyServerCertificateValidator,
                         });
+                services.AddHttpClient<IOpenApiHttpClient, OpenApiHttpClient>()
+                   .ConfigurePrimaryHttpMessageHandler(
+                       () => new HttpClientHandler
+                       {
+                           ServerCertificateCustomValidationCallback =
+                                         HttpClientHandler.DangerousAcceptAnyServerCertificateValidator,
+                       });
             }
             else
             {
                 services.AddHttpClient<ILearningHubHttpClient, LearningHubHttpClient>();
                 services.AddHttpClient<IUserApiHttpClient, UserApiHttpClient>();
+                services.AddHttpClient<IOpenApiHttpClient, OpenApiHttpClient>();
             }
 
             services.AddTransient<CookieEventHandler>();

OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/ICatalogueService.cs

@@ -26,6 +26,13 @@ public interface ICatalogueService
         /// <returns>BulkCatalogueViewModel.</returns>
         public Task<BulkCatalogueViewModel> GetAllCatalogues();
 
+        /// <summary>
+        /// The GetCatalogues.
+        /// </summary>
+        /// <param name="searchTerm">The searchTerm.</param>
+        /// <returns>The catalogues.</returns>
+        List<CatalogueViewModel> GetCatalogues(string searchTerm);
+
         /// <summary>
         /// The GetCatalogue.
         /// </summary>

OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CatalogueService.cs

@@ -11,6 +11,7 @@
     using LearningHub.Nhs.Models.Email.Models;
     using LearningHub.Nhs.Models.Entities;
     using LearningHub.Nhs.Models.Entities.Activity;
+    using LearningHub.Nhs.Models.Entities.Hierarchy;
     using LearningHub.Nhs.Models.Entities.Resource;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Resource;
@@ -183,6 +184,25 @@ public CatalogueBasicViewModel GetBasicCatalogue(int catalogueNodeId)
             return this.mapper.Map<CatalogueBasicViewModel>(catalogue);
         }
 
+        /// <summary>
+        /// The GetCatalogues.
+        /// </summary>
+        /// <param name="searchTerm">The searchTerm.</param>
+        /// <returns>The catalogues.</returns>
+        public List<CatalogueViewModel> GetCatalogues(string searchTerm)
+        {
+            IQueryable<CatalogueNodeVersion> catalogueVersions = this.catalogueNodeVersionRepository.GetAll()
+                 .Include(x => x.Keywords)
+                  .Include(x => x.CatalogueNodeVersionProvider).Where(x => !x.Deleted)
+                 .Include(x => x.NodeVersion)
+                 .ThenInclude(x => x.Node);
+            if (!string.IsNullOrEmpty(searchTerm))
+            {
+                catalogueVersions = catalogueVersions.Where(x => x.Name.ToLower().Contains(searchTerm.ToLower()));
+            }
+
+            return this.mapper.ProjectTo<CatalogueViewModel>(catalogueVersions).ToList();
+        }
 
         /// <summary>
         /// The GetCatalogue.

OpenAPI/LearningHub.Nhs.OpenApi/Controllers/CatalogueController.cs

@@ -50,6 +50,19 @@ public async Task<IActionResult> GetAllCataloguesAsync(string filterChar = null)
             return this.Ok(response);
         }
 
+        /// <summary>
+        /// The GetCatalogue.
+        /// </summary>
+        /// <param name="searchTerm">The searchTerm.</param>
+        /// <returns>The catalogues.</returns>
+        [HttpGet]
+        [Route("Catalogues")]
+        public IActionResult GetCatalogues(string searchTerm)
+        {
+            var catalogues = this.catalogueService.GetCatalogues(searchTerm);
+            return this.Ok(catalogues);
+        }
+
         /// <summary>
         /// The GetCatalogue.
         /// </summary>