Skip to content

Develop/fixes/td 5502 replace web api layer with open api layer admin operations #1205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Merge Open API Replacement work to Test ENV
merged 3 commits into from
Jun 23, 2025
Merged

Develop/fixes/td 5502 replace web api layer with open api layer admin operations #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75e3e7a
TD-5502: Replace Web API layer with Open API Layer -Admin Operations-…
swapnamol-abraham Jun 20, 2025
ad892e7
Reverted the config changes
swapnamol-abraham Jun 20, 2025
31c677a
Removed optional referenece from the service class
swapnamol-abraham Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Services/CatalogueService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ public class CatalogueService : BaseService, ICatalogueService
/// Initializes a new instance of the <see cref="CatalogueService"/> class.
/// </summary>
/// <param name="learningHubHttpClient">The learningHubHttpClient<see cref="ILearningHubHttpClient"/>.</param>
/// <param name="openApiHttpClient">The Open Api Http Client.</param>
/// <param name="openApiFacade">The openApiFacade<see cref="IOpenApiFacade"/>.</param>
public CatalogueService(
ILearningHubHttpClient learningHubHttpClient,
IOpenApiHttpClient openApiHttpClient,
IOpenApiFacade openApiFacade)
: base(learningHubHttpClient)
{
Expand Down
2 changes: 1 addition & 1 deletion AdminUI/LearningHub.Nhs.AdminUI/Services/ContentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class ContentService : BaseService, IContentService
/// <param name="fileService">The fileService<see cref="IFileService"/>.</param>
/// <param name="azureMediaService">azureMediaService.</param>
public ContentService(ILearningHubHttpClient learningHubHttpClient, IOpenApiHttpClient openApiHttpClient, IFileService fileService, IAzureMediaService azureMediaService)
: base(learningHubHttpClient)
: base(learningHubHttpClient, openApiHttpClient)
{
this.fileService = fileService;
this.azureMediaService = azureMediaService;
Expand Down
4 changes: 3 additions & 1 deletion AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,17 @@ public class UserGroupService : BaseService, IUserGroupService
/// Initializes a new instance of the <see cref="UserGroupService"/> class.
/// </summary>
/// <param name="learningHubHttpClient">The learningHubHttpClient<see cref="ILearningHubHttpClient"/>.</param>
/// <param name="openApiHttpClient">The Open Api Http Client.</param>
/// <param name="contextAccessor">The http context accessor.</param>
/// <param name="cacheService">The cacheService.</param>
/// <param name="roleService">The roleService.</param>
public UserGroupService(
ILearningHubHttpClient learningHubHttpClient,
IOpenApiHttpClient openApiHttpClient,
ICacheService cacheService,
IRoleService roleService,
IHttpContextAccessor contextAccessor)
: base(learningHubHttpClient)
: base(learningHubHttpClient, openApiHttpClient)
{
this.contextAccessor = contextAccessor;
this.cacheService = cacheService;
Expand Down
2 changes: 1 addition & 1 deletion OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/CatalogueService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public CatalogueBasicViewModel GetBasicCatalogue(int catalogueNodeId)
/// </summary>
/// <param name="searchTerm">The searchTerm.</param>
/// <returns>The catalogues.</returns>
public List<CatalogueViewModel> GetCatalogues(string searchTerm)
public List<CatalogueViewModel> GetCatalogues(string? searchTerm)
{
IQueryable<CatalogueNodeVersion> catalogueVersions = this.catalogueNodeVersionRepository.GetAll()
.Include(x => x.Keywords)
Expand Down
6 changes: 3 additions & 3 deletions OpenAPI/LearningHub.Nhs.OpenApi/Controllers/CatalogueController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public async Task<IActionResult> GetAllCataloguesAsync(string filterChar = null)
/// <returns>The catalogues.</returns>
[HttpGet]
[Route("Catalogues")]
public IActionResult GetCatalogues(string searchTerm)
public IActionResult GetCatalogues([FromQuery] string? searchTerm)
{
var catalogues = this.catalogueService.GetCatalogues(searchTerm);
return this.Ok(catalogues);
Expand Down Expand Up @@ -152,7 +152,7 @@ public IActionResult GetCataloguesForCurrentUser()
/// <returns>The actionResult.</returns>
[HttpPost]
[Route("Catalogues")]
public async Task<IActionResult> CreateCatalogue(CatalogueViewModel viewModel)
public async Task<IActionResult> CreateCatalogue([FromBody] CatalogueViewModel viewModel)
{
try
{
Expand Down Expand Up @@ -237,7 +237,7 @@ public async Task<IActionResult> AccessRequest(int accessRequestId)
/// <returns>The updated catalogue.</returns>
[HttpPut]
[Route("Catalogues")]
public async Task<IActionResult> UpdateCatalogue(CatalogueViewModel viewModel)
public async Task<IActionResult> UpdateCatalogue([FromBody] CatalogueViewModel viewModel)
{
try
{
Expand Down
Loading