diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/CatalogueService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/CatalogueService.cs index b2a082dc6..2ac0088d9 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/CatalogueService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/CatalogueService.cs @@ -25,9 +25,11 @@ public class CatalogueService : BaseService, ICatalogueService /// Initializes a new instance of the class. /// /// The learningHubHttpClient. + /// The Open Api Http Client. /// The openApiFacade. public CatalogueService( ILearningHubHttpClient learningHubHttpClient, + IOpenApiHttpClient openApiHttpClient, IOpenApiFacade openApiFacade) : base(learningHubHttpClient) { diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/ContentService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/ContentService.cs index cc792c228..ec983fffd 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/ContentService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/ContentService.cs @@ -37,7 +37,7 @@ public class ContentService : BaseService, IContentService /// The fileService. /// azureMediaService. public ContentService(ILearningHubHttpClient learningHubHttpClient, IOpenApiHttpClient openApiHttpClient, IFileService fileService, IAzureMediaService azureMediaService) - : base(learningHubHttpClient) + : base(learningHubHttpClient, openApiHttpClient) { this.fileService = fileService; this.azureMediaService = azureMediaService; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs index a9a7a3133..0a941c761 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs @@ -32,15 +32,17 @@ public class UserGroupService : BaseService, IUserGroupService /// Initializes a new instance of the class. /// /// The learningHubHttpClient. + /// The Open Api Http Client. /// The http context accessor. /// The cacheService. /// The roleService. public UserGroupService( ILearningHubHttpClient learningHubHttpClient, + IOpenApiHttpClient openApiHttpClient, ICacheService cacheService, IRoleService roleService, IHttpContextAccessor contextAccessor) - : base(learningHubHttpClient) + : base(learningHubHttpClient, openApiHttpClient) { this.contextAccessor = contextAccessor; this.cacheService = cacheService; diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CatalogueService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CatalogueService.cs index f75c0616e..53810f5d1 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CatalogueService.cs +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CatalogueService.cs @@ -189,7 +189,7 @@ public CatalogueBasicViewModel GetBasicCatalogue(int catalogueNodeId) /// /// The searchTerm. /// The catalogues. - public List GetCatalogues(string searchTerm) + public List GetCatalogues(string? searchTerm) { IQueryable catalogueVersions = this.catalogueNodeVersionRepository.GetAll() .Include(x => x.Keywords) diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/CatalogueController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/CatalogueController.cs index 3d6e330ff..55b812fdb 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/CatalogueController.cs +++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/CatalogueController.cs @@ -57,7 +57,7 @@ public async Task GetAllCataloguesAsync(string filterChar = null) /// The catalogues. [HttpGet] [Route("Catalogues")] - public IActionResult GetCatalogues(string searchTerm) + public IActionResult GetCatalogues([FromQuery] string? searchTerm) { var catalogues = this.catalogueService.GetCatalogues(searchTerm); return this.Ok(catalogues); @@ -152,7 +152,7 @@ public IActionResult GetCataloguesForCurrentUser() /// The actionResult. [HttpPost] [Route("Catalogues")] - public async Task CreateCatalogue(CatalogueViewModel viewModel) + public async Task CreateCatalogue([FromBody] CatalogueViewModel viewModel) { try { @@ -237,7 +237,7 @@ public async Task AccessRequest(int accessRequestId) /// The updated catalogue. [HttpPut] [Route("Catalogues")] - public async Task UpdateCatalogue(CatalogueViewModel viewModel) + public async Task UpdateCatalogue([FromBody] CatalogueViewModel viewModel) { try {