TD-5925 Tweaks and implement ICaching TODOs

Phil-NHS · Phil-NHS · commit b65a21b0207c · 2025-09-15T10:05:45.000+01:00
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs
@@ -2,7 +2,6 @@
 {
     using System.ComponentModel.DataAnnotations;
     using LearningHub.Nhs.Caching.Binders;
-    using LearningHub.Nhs.Models.Binders;
 
     /// <summary>
     /// Defines the <see cref="ContactViewModel" />.
diff --git a/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs b/LearningHub.Nhs.Shared/Interfaces/Http/IAPIHttpClient.cs
@@ -1,8 +1,8 @@
 ﻿using System.Net.Http;
-using System.Threading.Tasks;
-
 namespace LearningHub.Nhs.Shared.Interfaces.Http
 {
+    using System.Threading.Tasks;
+
     /// <summary>
     /// Represents an HTTP client for a specific API.
     /// </summary>
diff --git a/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj b/LearningHub.Nhs.Shared/LearningHub.Nhs.Shared.csproj
@@ -1,9 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<!--Shared so more restrictive so does not include aspnet.core-->
+	<!--Shared needs to be agnostic so uses netstandard 2.1 so can be widely consumed as it has maximum compatibility-->
 	<TargetFrameworks>netstandard2.1</TargetFrameworks>
-    <!--<TargetFramework>net8.0</TargetFramework>-->
     <Nullable>enable</Nullable>
   </PropertyGroup>
 	<Target Name="CheckForIncompatiblePackages" BeforeTargets="Restore">
diff --git a/LearningHub.Nhs.WebUI.BlazorClient/Program.cs b/LearningHub.Nhs.WebUI.BlazorClient/Program.cs
@@ -24,6 +24,7 @@
 using TELBlazor.Components.Core.Configuration;
 using TELBlazor.Components.Core.Services.HelperServices;
 using TELBlazor.Components.OptionalImplementations.Core.Services.HelperServices;
+using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
@@ -88,7 +89,7 @@
     builder.Services.AddScoped<LoggingLevelSwitch>(sp => levelSwitch);
     builder.Services.AddScoped<ILogLevelSwitcherService, SerilogLogLevelSwitcherService>();
 
-    // TODO (QQQQ) implement post TD-5925 builder.Services.AddScoped<ICacheService, WasmCacheServiceStub>();
+    builder.Services.AddScoped<ICacheService, WasmCacheServiceStub>();
 
     await builder.Build().RunAsync();
 }
diff --git a/LearningHub.Nhs.WebUI.BlazorClient/Services/WasmCacheServiceStub.cs b/LearningHub.Nhs.WebUI.BlazorClient/Services/WasmCacheServiceStub.cs
@@ -1,12 +1,12 @@
-﻿// TODO (QQQQ) implement post TD-5925: using LearningHub.Nhs.Models;
+﻿using LearningHub.Nhs.Models.WebUtilitiesInterfaces;
 
 namespace LearningHub.Nhs.WebUI.BlazorClient.Services
 {
     /// <summary>
     /// We may use storage, we may just stub it and throw an error, we cant directly use redis we may access it via an api
     /// The cachestub currently just returns there is nothing available so the caller then will revert to calling the api.
     /// </summary>
-    public class WasmCacheServiceStub // TODO (QQQQ) implement post TD-5925 and get from NHS.Models: ICacheService
+    public class WasmCacheServiceStub : ICacheService
     {
         public Task<T> GetAsync<T>(string key)
         {
diff --git a/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj b/LearningHub.Nhs.WebUI.Shared/LearningHub.Nhs.WebUI.Shared.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+	  <!--Shared needs to be agnostic so uses netstandard 2.1 so can be widely consumed as it has maximum compatibility-->
 	  <TargetFrameworks>netstandard2.1</TargetFrameworks>
-	  <!--<TargetFramework>net8.0</TargetFramework>-->
 	  <Nullable>enable</Nullable>
   </PropertyGroup>
   <Target Name="CheckForIncompatiblePackages" BeforeTargets="Restore">
diff --git a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs
@@ -306,7 +306,6 @@ public async Task<IActionResult> SelectSecurityQuestion(int questionIndex, strin
 
             var viewModel = new SecurityQuestionSelectViewModel
             {
-                // qqqq
                 SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(),
                 QuestionIndex = questionIndex,
                 SelectedSecurityQuestionId = userQuestion.SecurityQuestionId,
@@ -358,7 +357,6 @@ public async Task<IActionResult> SelectSecurityQuestionPost(SecurityQuestionSele
             {
                 var viewModel = new SecurityQuestionSelectViewModel
                 {
-                    // qqqq
                     SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(),
                     QuestionIndex = model.QuestionIndex,
                 };
@@ -425,7 +423,6 @@ public async Task<IActionResult> AnswerSecurityQuestionPost(SecurityQuestionAnsw
             {
                 var viewModel = new SecurityQuestionSelectViewModel
                 {
-                    // qqqq
                     SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(),
                     QuestionIndex = model.QuestionIndex,
                 };
diff --git a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs
@@ -302,7 +302,6 @@ public async Task<IActionResult> SecurityQuestionsDetails(int questionIndex)
             SecurityQuestionSelectViewModel securityViewModel = new SecurityQuestionSelectViewModel();
             var model = await this.loginWizardService.GetSecurityQuestionsModel(this.CurrentUserId);
 
-            // qqqq
             securityViewModel.SecurityQuestions = model.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList();
             securityViewModel.QuestionIndex = questionIndex;
             securityViewModel.SelectedSecurityQuestionId = model.UserSecurityQuestions.ElementAt(questionIndex).SecurityQuestionId;
diff --git a/LearningHub.Nhs.WebUI/Controllers/UserController.cs b/LearningHub.Nhs.WebUI/Controllers/UserController.cs
@@ -252,9 +252,6 @@ public async Task<IActionResult> AdditionalSecurity(SecurityQuestionsViewModel s
             else
             {
                 var questions = await this.loginWizardService.GetSecurityQuestions();
-
-                // qqqq securityQuestionsModel.SecurityQuestions = questions.Select(q => new SelectListItem() { Value = q.Id.ToString(), Text = q.Text }).ToList();
-                // securityQuestionsModel.SecurityQuestions = questions.Select(q => new List<(string Value, string Text)>() { Value = q.Id.ToString(), Text = q.Text }).ToList();
                 securityQuestionsModel.SecurityQuestions = questions.Select(q => (Value: q.Id.ToString(), Text: q.Text)).ToList();
             }
 
diff --git a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs
@@ -6,7 +6,6 @@
     using AspNetCoreRateLimit;
     using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Caching.Binders;
-    using LearningHub.Nhs.Models.Binders;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Extensions;
     using LearningHub.Nhs.WebUI.Configuration;
diff --git a/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml b/LearningHub.Nhs.WebUI/Views/User/AdditionalSecurity.cshtml
@@ -29,9 +29,8 @@
                                     <label asp-for="UserSecurityQuestions[i].SecurityQuestionId" class="control-label">Please select your @textualNumber[i] question</label>
                                 </dt>
                                 <dd class="nhsuk-summary-list__value">
-                                    @* qqqq original <select asp-for="UserSecurityQuestions[i].SecurityQuestionId" class="form-control" asp-items="@Model.SecurityQuestions"></select> *@
                                     <select asp-for="UserSecurityQuestions[i].SecurityQuestionId" class="form-control">
-                                        <!-- qqqq Manually populate the select list to keep Models agnostic -->
+                                        <!-- Manually populate the select list to keep Models agnostic -->
                                         @foreach (var question in Model.SecurityQuestions)
                                         {
                                             <option value="@question.Value">@question.Text</option>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
@@ -30,7 +30,6 @@
 		<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
 		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
 		<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
@@ -9,7 +9,6 @@
 	<ItemGroup>
 		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
@@ -13,7 +13,6 @@
 		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="9.3.0" />
 		<PackageReference Include="Microsoft.Azure.Management.Media" Version="6.0.0" />
 		<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.3.0" />
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
@@ -10,7 +10,6 @@
 		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="3.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`{`
`3`	`3`	`using System.ComponentModel.DataAnnotations;`
`4`	`4`	`using LearningHub.Nhs.Caching.Binders;`
`5`		`- using LearningHub.Nhs.Models.Binders;`
`6`	`5`
`7`	`6`	`/// <summary>`
`8`	`7`	`/// Defines the <see cref="ContactViewModel" />.`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`		`-// TODO (QQQQ) implement post TD-5925: using LearningHub.Nhs.Models;`
	`1`	`+using LearningHub.Nhs.Models.WebUtilitiesInterfaces;`
`2`	`2`
`3`	`3`	`namespace LearningHub.Nhs.WebUI.BlazorClient.Services`
`4`	`4`	`{`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// We may use storage, we may just stub it and throw an error, we cant directly use redis we may access it via an api`
`7`	`7`	`/// The cachestub currently just returns there is nothing available so the caller then will revert to calling the api.`
`8`	`8`	`/// </summary>`
`9`		`- public class WasmCacheServiceStub // TODO (QQQQ) implement post TD-5925 and get from NHS.Models: ICacheService`
	`9`	`+ public class WasmCacheServiceStub : ICacheService`
`10`	`10`	`{`
`11`	`11`	`public Task<T> GetAsync<T>(string key)`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,6 @@ public async Task<IActionResult> SelectSecurityQuestion(int questionIndex, strin`
`306`	`306`
`307`	`307`	`var viewModel = new SecurityQuestionSelectViewModel`
`308`	`308`	`{`
`309`		`- // qqqq`
`310`	`309`	`SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(),`
`311`	`310`	`QuestionIndex = questionIndex,`
`312`	`311`	`SelectedSecurityQuestionId = userQuestion.SecurityQuestionId,`
`@@ -358,7 +357,6 @@ public async Task<IActionResult> SelectSecurityQuestionPost(SecurityQuestionSele`
`358`	`357`	`{`
`359`	`358`	`var viewModel = new SecurityQuestionSelectViewModel`
`360`	`359`	`{`
`361`		`- // qqqq`
`362`	`360`	`SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(),`
`363`	`361`	`QuestionIndex = model.QuestionIndex,`
`364`	`362`	`};`
`@@ -425,7 +423,6 @@ public async Task<IActionResult> AnswerSecurityQuestionPost(SecurityQuestionAnsw`
`425`	`423`	`{`
`426`	`424`	`var viewModel = new SecurityQuestionSelectViewModel`
`427`	`425`	`{`
`428`		`- // qqqq`
`429`	`426`	`SecurityQuestions = securityViewModel.SecurityQuestions.Select(q => new SelectListItem { Value = q.Value, Text = q.Text }).ToList(),`
`430`	`427`	`QuestionIndex = model.QuestionIndex,`
`431`	`428`	`};`
Original file line number	Diff line number	Diff line change
`@@ -252,9 +252,6 @@ public async Task<IActionResult> AdditionalSecurity(SecurityQuestionsViewModel s`
`252`	`252`	`else`
`253`	`253`	`{`
`254`	`254`	`var questions = await this.loginWizardService.GetSecurityQuestions();`
`255`		`-`
`256`		`- // qqqq securityQuestionsModel.SecurityQuestions = questions.Select(q => new SelectListItem() { Value = q.Id.ToString(), Text = q.Text }).ToList();`
`257`		`- // securityQuestionsModel.SecurityQuestions = questions.Select(q => new List<(string Value, string Text)>() { Value = q.Id.ToString(), Text = q.Text }).ToList();`
`258`	`255`	`securityQuestionsModel.SecurityQuestions = questions.Select(q => (Value: q.Id.ToString(), Text: q.Text)).ToList();`
`259`	`256`	`}`
`260`	`257`