TD-6628 -Update autosuggest panel to improve result limits and update type labels

Binon · Binon · commit d832da0b2e56 · 2025-11-28T16:06:25.000Z
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -89,7 +89,7 @@
 		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
diff --git a/LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj b/LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj
@@ -12,7 +12,7 @@
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
 		<PackageReference Include="Selenium.Axe" Version="4.0.19" />
diff --git a/LearningHub.Nhs.WebUI/Controllers/SearchController.cs b/LearningHub.Nhs.WebUI/Controllers/SearchController.cs
@@ -338,7 +338,14 @@ public async Task<IActionResult> GetAutoSuggestion(string term)
 
             var autoSuggestions = await this.searchService.GetAutoSuggestionList(term);
 
-            return this.PartialView("_AutoComplete", autoSuggestions);
+            var azureSearchEnabled = Task.Run(() => this.featureManager.IsEnabledAsync(FeatureFlags.AzureSearch)).Result;
+
+            if (!azureSearchEnabled)
+            {
+                return this.PartialView("_AutoComplete", autoSuggestions);
+            }
+
+            return this.PartialView("_AutoSuggest", autoSuggestions);
         }
 
         /// <summary>
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -113,7 +113,7 @@
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<PackageReference Include="linqtotwitter" Version="6.9.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_AutoSuggest.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_AutoSuggest.cshtml
@@ -0,0 +1,70 @@
+﻿@model LearningHub.Nhs.Models.Search.AutoSuggestionModel;
+@inject LearningHub.Nhs.WebUI.Interfaces.IMoodleApiService moodleApiService;
+
+@using LearningHub.Nhs.Models.Search.SearchClick;
+@using Microsoft.AspNetCore.WebUtilities
+@using System.Web
+@{
+    var counter = 0;
+    var counter_res = 0;
+    string GetUrl(string term, string searchType, AutoSuggestionClickPayloadModel payload, string reference, int? resourceReferenceId)
+    {
+       
+        var url = string.Empty;
+        if (!string.IsNullOrEmpty(reference) && searchType == "catalogue")
+        {
+            url = "/Catalogue/" + reference;
+        }
+        else if ((resourceReferenceId > 0) && searchType == "resource")
+        {
+            url = "/Resource/" + resourceReferenceId;
+        }
+        else if ((resourceReferenceId > 0) && searchType == "course")
+        {
+            if (resourceReferenceId != null)
+                return moodleApiService.GetCourseUrl(resourceReferenceId.Value);
+        }
+        else if (!string.IsNullOrEmpty(term) && searchType == "Concepts")
+        {
+            url = "/Search/results?term=" + term;
+        }
+        else
+        {
+            url = "/Search/results?term=" + term;
+        }
+
+        return $@"/search/record-autosuggestion-click?term={term}&url={url}&clickTargetUrl={payload.ClickTargetUrl}&itemIndex={payload?.HitNumber}&&totalNumberOfHits={payload?.SearchSignal?.Stats?.TotalHits}
+&containerId={payload?.ContainerId}&name={payload?.DocumentFields.Name}&query={payload?.SearchSignal?.Query}&userQuery={HttpUtility.UrlEncode(payload?.SearchSignal?.UserQuery)}
+&searchId={payload?.SearchSignal?.SearchId}&timeOfSearch={payload?.SearchSignal?.TimeOfSearch}&title={payload?.DocumentFields?.Title}";
+    }
+}
+@if (Model != null)
+{
+    @foreach (var item in Model.ConceptDocument.ConceptDocumentList)
+    {
+        counter++;
+        <li class="autosuggestion-option autosugg-concepts" style="@((Model.ConceptDocument.ConceptDocumentList.Count == counter)? "border-bottom: 3px solid #d8dde0;": "" )">
+            <a tabindex="0" style="text-decoration:none !important" href="@GetUrl(item.Concept,"Concepts", item.Click.Payload, null, null)">
+                <svg class="nhsuk-icon autosuggestion-icon" width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M11.8558 10.5296L15.7218 14.3861C15.8998 14.5627 16 14.8031 16 15.0539C16 15.3047 15.8998 15.5451 15.7218 15.7218C15.5451 15.8998 15.3047 16 15.0539 16C14.8031 16 14.5627 15.8998 14.3861 15.7218L10.5296 11.8558C7.76424 13.9254 3.86973 13.5064 1.60799 10.8959C-0.653748 8.28537 -0.513826 4.37088 1.92852 1.92852C4.37088 -0.513826 8.28537 -0.653748 10.8959 1.60799C13.5064 3.86973 13.9254 7.76424 11.8558 10.5296ZM6.58846 1.88528C3.99101 1.88528 1.88537 3.99093 1.88537 6.58837C1.88537 9.18581 3.99101 11.2915 6.58846 11.2915C9.1859 11.2915 11.2915 9.18581 11.2915 6.58837C11.2915 3.99093 9.1859 1.88528 6.58846 1.88528Z" />
+                </svg>
+                <p class="nhsuk-u-font-size-16 autosuggestion-link">@item.Concept</p>
+            </a>
+        </li>
+    }
+    @foreach (var item in Model.ResourceCollectionDocument.DocumentList)
+    {
+        counter_res++;
+        <li class="autosuggestion-option autosugg-resource" style="@((Model.ResourceCollectionDocument.DocumentList.Count == counter_res)? "border-bottom: 3px solid #d8dde0;": "" )">
+            <a tabindex="0" style="text-decoration:none !important" href="@GetUrl(item.Title, item.ResourceType, item.Click.Payload, item.URL, item.ResourceReferenceId)">
+                <p class="nhsuk-u-font-size-16 autosuggestion-link">@item.Title</p>
+                <p class="nhsuk-u-font-size-14 autosuggestion-subtext" style="padding:0;">
+                    Type: <span style="font-weight:bold; text-transform:capitalize;">
+                        @(item.ResourceType == "resource" ? "Learning resource" : item.ResourceType)
+                    </span>
+                </p>
+
+            </a>
+        </li>
+    }    
+}
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
@@ -17,7 +17,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Azure.Search.Documents" Version="11.6.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
 	</ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/ServiceModels/AzureSearch/SearchDocument.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Models/ServiceModels/AzureSearch/SearchDocument.cs
@@ -117,6 +117,12 @@ public string Description
         [JsonPropertyName("author")]
         public string Author { get; set; } = string.Empty;
 
+        /// <summary>
+        /// Gets or sets the url.
+        /// </summary>
+        [JsonPropertyName("url")]
+        public string Url { get; set; } = string.Empty;
+
         /// <summary>
         /// Strips paragraph tags from input string.
         /// </summary>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj
@@ -17,7 +17,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
 	</ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj
@@ -24,7 +24,7 @@
 		<PackageReference Include="AutoMapper" Version="10.1.1" />
 		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
@@ -17,7 +17,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
@@ -31,7 +31,7 @@
 		<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<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/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/AzureSearch/AzureSearchService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/AzureSearch/AzureSearchService.cs
@@ -593,11 +593,13 @@ public async Task<AutoSuggestionModel> GetAutoSuggestionResultsAsync(string term
                 suggestOptions.Select.Add("manual_tag");
                 suggestOptions.Select.Add("resource_type");
                 suggestOptions.Select.Add("resource_collection");
+                suggestOptions.Select.Add("url");
+                suggestOptions.Select.Add("resource_reference_id");                
 
                 var autoOptions = new AutocompleteOptions
                 {
                     Mode = AutocompleteMode.OneTermWithContext,
-                    Size = 50
+                    Size = 5
                 };
 
                 var searchText = LuceneQueryBuilder.EscapeLuceneSpecialCharacters(term);
@@ -618,15 +620,19 @@ public async Task<AutoSuggestionModel> GetAutoSuggestionResultsAsync(string term
                     {
                         Id = r.Document.Id,
                         Text = r.Document.Title.Trim(),
+                        URL = r.Document.Url,
+                        ResourceReferenceId = (r.Document.ResourceCollection == "resource") ? r.Document.ResourceReferenceId : r.Document.Id,
                         Type = r.Document.ResourceCollection ?? "Suggestion"
                     });
 
-                var autoResults = autoResponse.Value.Results
+               var autoResults = autoResponse.Value.Results
                     .Where(r => !string.IsNullOrWhiteSpace(r.Text))
                     .Select((r, index) => new
                     {
                         Id = "A" + (index + 1),
                         Text = r.Text.Trim(),
+                        URL = string.Empty,
+                        ResourceReferenceId = (string?)null,
                         Type = "AutoComplete"
                     });
 
@@ -641,18 +647,19 @@ public async Task<AutoSuggestionModel> GetAutoSuggestionResultsAsync(string term
                     TotalHits = combined.Count
                 };
 
-                var autoSuggestionResource = new AutoSuggestionResource
+                var autoSuggestion = new AutoSuggestionResourceCollection
                 {
                     TotalHits = suggestResults.Count(),
-                    ResourceDocumentList = suggestResults
-                        .Where(a => a.Type == "resource")
-                        .Select(item => new AutoSuggestionResourceDocument
-                        {
-                            Id = item.Id?.Substring(1),
-                            Title = item.Text,
-                            Click = BuildAutoSuggestClickModel(item.Id?.Substring(1), item.Text, 0, 0 , term, suggestResults.Count())
-                        })
-                        .Take(3)
+                    DocumentList = suggestResults.Select(item => new AutoSuggestionResourceCollectionDocument
+                    {
+                        Id = item.Id,
+                        ResourceType = item.Type,
+                        URL = item.URL,
+                        ResourceReferenceId = item.ResourceReferenceId != null && int.TryParse(item.ResourceReferenceId, out var refId) ? refId : 0,
+                        Title = item.Text,
+                        Click = BuildAutoSuggestClickModel(item.Id, item.Text, 0, 0, term, suggestResults.Count())
+                    })
+                        .Take(5)
                         .ToList()
                 };
 
@@ -663,11 +670,11 @@ public async Task<AutoSuggestionModel> GetAutoSuggestionResultsAsync(string term
                         .Where(a => a.Type == "catalogue")
                         .Select(item => new AutoSuggestionCatalogueDocument
                         {
-                            Id = item.Id?.Substring(1),
+                            Id = item.Id,
                             Name = item.Text,
-                            Click = BuildAutoSuggestClickModel(item.Id?.Substring(1), item.Text, 0, 0, term, suggestResults.Count())
+                            Click = BuildAutoSuggestClickModel(item.Id, item.Text, 0, 0, term, suggestResults.Count())
                         })
-                        .Take(3)
+                        .Take(0)
                         .ToList()
                 };
 
@@ -677,15 +684,15 @@ public async Task<AutoSuggestionModel> GetAutoSuggestionResultsAsync(string term
                     ConceptDocumentList = autoResults
                         .Select(item => new AutoSuggestionConceptDocument
                         {
-                            Id = item.Id?.Substring(1),
+                            Id = item.Id,
                             Concept = item.Text,
                             Title = item.Text,
-                            Click = BuildAutoSuggestClickModel(item.Id?.Substring(1), item.Text, 0, 0, term, autoResults.Count())
+                            Click = BuildAutoSuggestClickModel(item.Id, item.Text, 0, 0, term, autoResults.Count())
                         })
                         .ToList()
                 };
 
-                viewmodel.ResourceDocument = autoSuggestionResource;
+                viewmodel.ResourceCollectionDocument = autoSuggestion;
                 viewmodel.CatalogueDocument = autoSuggestionCatalogue;
                 viewmodel.ConceptDocument = autoSuggestionConcept;
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/LearningHub.Nhs.OpenApi.Tests.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/LearningHub.Nhs.OpenApi.Tests.csproj
@@ -11,7 +11,7 @@
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="FluentAssertions" Version="5.10.3" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
 		<PackageReference Include="Moq" Version="4.16.1" />
 		<PackageReference Include="NBuilder" Version="6.1.0" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj b/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj
@@ -19,7 +19,7 @@
         <PackageReference Include="AspNetCore.Authentication.ApiKey" Version="8.0.1" />
         <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
         <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-        <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+        <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
         <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
         <PackageReference Include="Microsoft.ApplicationInsights.NLogTarget" Version="2.22.0" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.36" />
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj
@@ -16,7 +16,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.3" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj
@@ -18,7 +18,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="AutoFixture" Version="4.18.1" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="Moq" Version="4.20.72" />
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj
@@ -19,7 +19,7 @@
 		<PackageReference Include="AutoMapper" Version="10.1.1" />
 		<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.3" />
 		<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj
@@ -17,7 +17,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+	  <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
@@ -20,7 +20,7 @@
 
 	<ItemGroup>
 
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
 
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -29,7 +29,7 @@
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
 		<PackageReference Include="Microsoft.AspNetCore" Version="2.3.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
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,7 @@
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<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.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
@@ -11,7 +11,7 @@
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="FluentAssertions" Version="8.0.1" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="Moq" Version="4.20.72" />
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
@@ -10,7 +10,7 @@
    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-   <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
+   <PackageReference Include="LearningHub.Nhs.Models" Version="4.0.11" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	 <PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
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
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
