TD-5502: Replace Web API layer with Open API Layer -Admin Operations-Catalogue Creation/Catalogue Edit/ Edit Folder Structure/resource Transfer and unpublish/resource details/user management- SIT fixes

swapnamol-abraham · swapnamol-abraham · commit 75e3e7afbd3d · 2025-06-20T12:04:18.000+01:00
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/CatalogueService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/CatalogueService.cs
@@ -25,11 +25,13 @@ 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)
+        : base(learningHubHttpClient, openApiHttpClient)
         {
             this.facade = openApiFacade;
         }
diff --git 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
         /// <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;
diff --git 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 <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;
diff --git a/LearningHub.Nhs.WebUI/web.config b/LearningHub.Nhs.WebUI/web.config
@@ -1,21 +1,29 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	<location path="." inheritInChildApplications="false">
-		<system.webServer>
-			<httpProtocol>
-				<customHeaders>
-					<remove name="X-Powered-By" />
-					<remove name="Server" />
-				</customHeaders>
-			</httpProtocol>
-			<security>
-				<requestFiltering removeServerHeader="true" />
-			</security>
-			<handlers>
-				<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
-			</handlers>
-			<aspNetCore processPath="dotnet" arguments=".\LearningHub.Nhs.WebUI.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="InProcess" />
-		</system.webServer>
-	</location>
+  <location path="." inheritInChildApplications="false">
+    <system.webServer>
+      <modules runAllManagedModulesForAllRequests="false">
+        <remove name="WebDAVModule" />
+      </modules>
+      <httpProtocol>
+        <customHeaders>
+          <remove name="X-Powered-By" />
+          <remove name="Server" />
+        </customHeaders>
+      </httpProtocol>
+      <security>
+        <requestFiltering removeServerHeader="true" />
+      </security>
+      <handlers>
+        <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
+      </handlers>
+      <aspNetCore processPath="bin\x64\Debug\net8.0\LearningHub.Nhs.WebUI.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="InProcess">
+        <environmentVariables>
+          <environmentVariable name="ASPNETCORE_HTTPS_PORT" value="443" />
+          <environmentVariable name="ASPNETCORE_ENVIRONMENT" value="Development" />
+        </environmentVariables>
+      </aspNetCore>
+    </system.webServer>
+  </location>
 </configuration>
-<!--ProjectGuid: 044CCD77-8B9E-4888-BC20-9FD6E2AFE904-->
+<!--ProjectGuid: 044CCD77-8B9E-4888-BC20-9FD6E2AFE904-->
diff --git 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)
         /// </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)
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/CatalogueController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/CatalogueController.cs
@@ -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);
@@ -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
             {
@@ -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
             {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public class ContentService : BaseService, IContentService`
`37`	`37`	`/// <param name="fileService">The fileService<see cref="IFileService"/>.</param>`
`38`	`38`	`/// <param name="azureMediaService">azureMediaService.</param>`
`39`	`39`	`public ContentService(ILearningHubHttpClient learningHubHttpClient, IOpenApiHttpClient openApiHttpClient, IFileService fileService, IAzureMediaService azureMediaService)`
`40`		`- : base(learningHubHttpClient)`
	`40`	`+ : base(learningHubHttpClient, openApiHttpClient)`
`41`	`41`	`{`
`42`	`42`	`this.fileService = fileService;`
`43`	`43`	`this.azureMediaService = azureMediaService;`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public CatalogueBasicViewModel GetBasicCatalogue(int catalogueNodeId)`
`189`	`189`	`/// </summary>`
`190`	`190`	`/// <param name="searchTerm">The searchTerm.</param>`
`191`	`191`	`/// <returns>The catalogues.</returns>`
`192`		`- public List<CatalogueViewModel> GetCatalogues(string searchTerm)`
	`192`	`+ public List<CatalogueViewModel> GetCatalogues(string? searchTerm)`
`193`	`193`	`{`
`194`	`194`	`IQueryable<CatalogueNodeVersion> catalogueVersions = this.catalogueNodeVersionRepository.GetAll()`
`195`	`195`	`.Include(x => x.Keywords)`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public async Task<IActionResult> GetAllCataloguesAsync(string filterChar = null)`
`57`	`57`	`/// <returns>The catalogues.</returns>`
`58`	`58`	`[HttpGet]`
`59`	`59`	`[Route("Catalogues")]`
`60`		`- public IActionResult GetCatalogues(string searchTerm)`
	`60`	`+ public IActionResult GetCatalogues([FromQuery] string? searchTerm)`
`61`	`61`	`{`
`62`	`62`	`var catalogues = this.catalogueService.GetCatalogues(searchTerm);`
`63`	`63`	`return this.Ok(catalogues);`
`@@ -152,7 +152,7 @@ public IActionResult GetCataloguesForCurrentUser()`
`152`	`152`	`/// <returns>The actionResult.</returns>`
`153`	`153`	`[HttpPost]`
`154`	`154`	`[Route("Catalogues")]`
`155`		`- public async Task<IActionResult> CreateCatalogue(CatalogueViewModel viewModel)`
	`155`	`+ public async Task<IActionResult> CreateCatalogue([FromBody] CatalogueViewModel viewModel)`
`156`	`156`	`{`
`157`	`157`	`try`
`158`	`158`	`{`
`@@ -237,7 +237,7 @@ public async Task<IActionResult> AccessRequest(int accessRequestId)`
`237`	`237`	`/// <returns>The updated catalogue.</returns>`
`238`	`238`	`[HttpPut]`
`239`	`239`	`[Route("Catalogues")]`
`240`		`- public async Task<IActionResult> UpdateCatalogue(CatalogueViewModel viewModel)`
	`240`	`+ public async Task<IActionResult> UpdateCatalogue([FromBody] CatalogueViewModel viewModel)`
`241`	`241`	`{`
`242`	`242`	`try`
`243`	`243`	`{`