Appt xxx/add point read slide cache site

infrastructure/environments/perf-ukw/main.tf

@@ -121,6 +121,9 @@ module "mya_application_perf" {
   cosmos_aggregation_autoscale_settings = [{
     max_throughput = 10000
   }]
+  cosmos_booking_reference_data_autoscale_settings = [{
+    max_throughput = 25000
+  }]
   cosmos_core_autoscale_settings = [{
     max_throughput = 25000
   }]

infrastructure/environments/perf/main.tf

@@ -128,6 +128,9 @@ module "mya_application_perf" {
   cosmos_aggregation_autoscale_settings = [{
     max_throughput = 10000
   }]
+  cosmos_booking_reference_data_autoscale_settings = [{
+    max_throughput = 25000
+  }]
   cosmos_core_autoscale_settings = [{
     max_throughput = 25000
   }]

infrastructure/environments/prod-ukw/main.tf

@@ -131,6 +131,9 @@ module "mya_application_prod_ukw" {
   cosmos_aggregation_autoscale_settings = [{
     max_throughput = 10000
   }]
+  cosmos_booking_reference_data_autoscale_settings = [{
+    max_throughput = 25000
+  }]
   cosmos_core_autoscale_settings = [{
     max_throughput = 25000
   }]

infrastructure/environments/prod/main.tf

@@ -138,6 +138,9 @@ module "mya_application_prod" {
   cosmos_aggregation_autoscale_settings = [{
     max_throughput = 10000
   }]
+  cosmos_booking_reference_data_autoscale_settings = [{
+    max_throughput = 25000
+  }]
   cosmos_core_autoscale_settings = [{
     max_throughput = 25000
   }]

infrastructure/environments/stag-ukw/main.tf

@@ -121,6 +121,9 @@ module "mya_application_stag_ukw" {
   cosmos_aggregation_autoscale_settings = [{
     max_throughput = 10000
   }]
+  cosmos_booking_reference_data_autoscale_settings = [{
+    max_throughput = 25000
+  }]
   cosmos_core_autoscale_settings = [{
     max_throughput = 25000
   }]

infrastructure/environments/stag/main.tf

@@ -128,6 +128,9 @@ module "mya_application_stag" {
   cosmos_aggregation_autoscale_settings = [{
     max_throughput = 10000
   }]
+  cosmos_booking_reference_data_autoscale_settings = [{
+    max_throughput = 25000
+  }]
   cosmos_core_autoscale_settings = [{
     max_throughput = 25000
   }]

infrastructure/resources/cosmosdb.tf

@@ -116,6 +116,22 @@ resource "azurerm_cosmosdb_sql_container" "nbs_mya_core_container" {
   }
 }
 
+resource "azurerm_cosmosdb_sql_container" "nbs_mya_booking_reference_container" {
+  count                  = var.create_cosmos_db ? 1 : 0
+  name                   = "booking_reference_data"
+  resource_group_name    = local.resource_group_name
+  account_name           = azurerm_cosmosdb_account.nbs_mya_cosmos_db[0].name
+  database_name          = azurerm_cosmosdb_sql_database.nbs_appts_database[0].name
+  partition_key_paths    = ["/docType"]
+
+  dynamic "autoscale_settings" {
+    for_each = var.cosmos_booking_reference_data_autoscale_settings
+    content {
+      max_throughput = autoscale_settings.value["max_throughput"]
+    }
+  }
+}
+
 resource "azurerm_cosmosdb_sql_container" "nbs_mya_aggregation_container" {
   count                  = var.create_cosmos_db ? 1 : 0
   name                   = "aggregated_data"

infrastructure/resources/high_load_functions.tf

@@ -52,6 +52,8 @@ resource "azurerm_windows_function_app" "nbs_mya_high_load_func_app" {
     ALLSITES_SLIDING_CACHE_ENABLED                                         = var.allsites_sliding_cache_enabled
     ALLSITES_CACHE_DURATION_MINUTES                                        = var.allsites_cache_duration_minutes
     ALLSITES_SLIDING_CACHE_DURATION_MINUTES                                = var.allsites_sliding_cache_duration_minutes
+    SITE_CACHE_DURATION_MINUTES                                            = var.site_cache_duration_minutes
+    SITE_SLIDING_CACHE_DURATION_MINUTES                                    = var.site_sliding_cache_duration_minutes
     DISABLE_SITE_CACHE                                                     = var.disable_site_cache
     SITE_SUPPORTS_SERVICE_SLIDING_CACHE_ABSOLUTE_EXPIRATION_SECONDS        = var.site_supports_service_sliding_cache_absolute_expiration_seconds
     SITE_SUPPORTS_SERVICE_SLIDING_CACHE_SLIDE_THRESHOLD_SECONDS            = var.site_supports_service_sliding_cache_slide_threshold_seconds
@@ -205,6 +207,8 @@ resource "azurerm_windows_function_app_slot" "nbs_mya_high_load_func_app_preview
     ALLSITES_SLIDING_CACHE_ENABLED                                         = var.allsites_sliding_cache_enabled
     ALLSITES_CACHE_DURATION_MINUTES                                        = var.allsites_cache_duration_minutes
     ALLSITES_SLIDING_CACHE_DURATION_MINUTES                                = var.allsites_sliding_cache_duration_minutes
+    SITE_CACHE_DURATION_MINUTES                                            = var.site_cache_duration_minutes
+    SITE_SLIDING_CACHE_DURATION_MINUTES                                    = var.site_sliding_cache_duration_minutes
     DISABLE_SITE_CACHE                                                     = var.disable_site_cache
     SITE_SUPPORTS_SERVICE_SLIDING_CACHE_ABSOLUTE_EXPIRATION_SECONDS        = var.site_supports_service_sliding_cache_absolute_expiration_seconds
     SITE_SUPPORTS_SERVICE_SLIDING_CACHE_SLIDE_THRESHOLD_SECONDS            = var.site_supports_service_sliding_cache_slide_threshold_seconds

infrastructure/resources/http_functions.tf

@@ -76,6 +76,8 @@ resource "azurerm_windows_function_app" "nbs_mya_http_func_app" {
     ALLSITES_SLIDING_CACHE_ENABLED                                 = var.allsites_sliding_cache_enabled
     ALLSITES_CACHE_DURATION_MINUTES                                = var.allsites_cache_duration_minutes
     ALLSITES_SLIDING_CACHE_DURATION_MINUTES                        = var.allsites_sliding_cache_duration_minutes
+    SITE_CACHE_DURATION_MINUTES                                    = var.site_cache_duration_minutes
+    SITE_SLIDING_CACHE_DURATION_MINUTES                            = var.site_sliding_cache_duration_minutes
     DISABLE_SITE_CACHE                                             = var.disable_site_cache
     SITE_SUPPORTS_SERVICE_SLIDING_CACHE_ABSOLUTE_EXPIRATION_SECONDS = var.site_supports_service_sliding_cache_absolute_expiration_seconds
     SITE_SUPPORTS_SERVICE_SLIDING_CACHE_SLIDE_THRESHOLD_SECONDS    = var.site_supports_service_sliding_cache_slide_threshold_seconds
@@ -183,6 +185,8 @@ resource "azurerm_windows_function_app_slot" "nbs_mya_http_func_app_preview" {
     ALLSITES_SLIDING_CACHE_ENABLED                                 = var.allsites_sliding_cache_enabled
     ALLSITES_CACHE_DURATION_MINUTES                                = var.allsites_cache_duration_minutes
     ALLSITES_SLIDING_CACHE_DURATION_MINUTES                        = var.allsites_sliding_cache_duration_minutes
+    SITE_CACHE_DURATION_MINUTES                                    = var.site_cache_duration_minutes
+    SITE_SLIDING_CACHE_DURATION_MINUTES                            = var.site_sliding_cache_duration_minutes
     DISABLE_SITE_CACHE                                             = var.disable_site_cache
     SITE_SUPPORTS_SERVICE_SLIDING_CACHE_ABSOLUTE_EXPIRATION_SECONDS = var.site_supports_service_sliding_cache_absolute_expiration_seconds
     SITE_SUPPORTS_SERVICE_SLIDING_CACHE_SLIDE_THRESHOLD_SECONDS    = var.site_supports_service_sliding_cache_slide_threshold_seconds

infrastructure/resources/servicebus_functions.tf

@@ -54,6 +54,8 @@ resource "azurerm_windows_function_app" "nbs_mya_service_bus_func_app" {
     ALLSITES_SLIDING_CACHE_ENABLED                                         = var.allsites_sliding_cache_enabled
     ALLSITES_CACHE_DURATION_MINUTES                                        = var.allsites_cache_duration_minutes
     ALLSITES_SLIDING_CACHE_DURATION_MINUTES                                = var.allsites_sliding_cache_duration_minutes
+    SITE_CACHE_DURATION_MINUTES                                            = var.site_cache_duration_minutes
+    SITE_SLIDING_CACHE_DURATION_MINUTES                                    = var.site_sliding_cache_duration_minutes
     DISABLE_SITE_CACHE                                                     = var.disable_site_cache
     CANCEL_A_DATE_RANGE_MAXIMUM_DAYS                                       = var.cancel_a_date_range_maximum_days
     APPLICATION_NAME                                                       = "Service Bus Function App"
@@ -185,6 +187,8 @@ resource "azurerm_windows_function_app_slot" "nbs_mya_service_bus_func_app_previ
     ALLSITES_SLIDING_CACHE_ENABLED                                         = var.allsites_sliding_cache_enabled
     ALLSITES_CACHE_DURATION_MINUTES                                        = var.allsites_sliding_cache_duration_minutes
     ALLSITES_SLIDING_CACHE_DURATION_MINUTES                                = var.allsites_cache_duration_minutes
+    SITE_CACHE_DURATION_MINUTES                                            = var.site_cache_duration_minutes
+    SITE_SLIDING_CACHE_DURATION_MINUTES                                    = var.site_sliding_cache_duration_minutes
     DISABLE_SITE_CACHE                                                     = var.disable_site_cache
     SITE_SUMMARY_DAYS_FORWARD                                              = var.site_summary_days_forward
     SITE_SUMMARY_DAYS_CHUNK_SIZE                                           = var.site_summary_days_chunk_size

infrastructure/resources/timer_functions.tf

@@ -55,6 +55,8 @@ resource "azurerm_windows_function_app" "nbs_mya_timer_func_app" {
     ALLSITES_SLIDING_CACHE_ENABLED                                         = var.allsites_sliding_cache_enabled
     ALLSITES_CACHE_DURATION_MINUTES                                        = var.allsites_cache_duration_minutes
     ALLSITES_SLIDING_CACHE_DURATION_MINUTES                                = var.allsites_sliding_cache_duration_minutes
+    SITE_CACHE_DURATION_MINUTES                                            = var.site_cache_duration_minutes
+    SITE_SLIDING_CACHE_DURATION_MINUTES                                    = var.site_sliding_cache_duration_minutes
     DISABLE_SITE_CACHE                                                     = var.disable_site_cache
     SPLUNK_HOST_URL                                                        = var.splunk_host_url
     SPLUNK_HEC_TOKEN                                                       = var.splunk_hec_token
@@ -195,6 +197,8 @@ resource "azurerm_windows_function_app_slot" "nbs_mya_timer_func_app_preview" {
     ALLSITES_SLIDING_CACHE_ENABLED                                         = var.allsites_sliding_cache_enabled
     ALLSITES_CACHE_DURATION_MINUTES                                        = var.allsites_sliding_cache_duration_minutes
     ALLSITES_SLIDING_CACHE_DURATION_MINUTES                                = var.allsites_cache_duration_minutes
+    SITE_CACHE_DURATION_MINUTES                                            = var.site_cache_duration_minutes
+    SITE_SLIDING_CACHE_DURATION_MINUTES                                    = var.site_sliding_cache_duration_minutes
     DISABLE_SITE_CACHE                                                     = var.disable_site_cache
     SPLUNK_HOST_URL                                                        = var.splunk_host_url
     SPLUNK_HEC_TOKEN                                                       = var.splunk_hec_token

infrastructure/resources/variables.tf

@@ -194,6 +194,11 @@ variable "cosmos_core_autoscale_settings" {
   default = []
 }
 
+variable "cosmos_booking_reference_data_autoscale_settings" {
+  type    = list(any)
+  default = []
+}
+
 variable "cosmos_index_autoscale_settings" {
   type    = list(any)
   default = []
@@ -476,6 +481,16 @@ variable "allsites_sliding_cache_duration_minutes" {
   default = 20
 }
 
+variable "site_cache_duration_minutes" {
+  type = number
+  default = 20
+}
+
+variable "site_sliding_cache_duration_minutes" {
+  type = number
+  default = 10
+}
+
 variable "auditor_enable" {
   type = bool
 }

src/api/Nhs.Appointments.Api/FunctionConfigurationExtensions.cs

@@ -161,6 +161,7 @@ private static async Task SetupCosmosDatabase(CosmosClient cosmosClient)
         var database = await cosmosClient.CreateDatabaseIfNotExistsAsync(id: "appts");
         await database.Database.CreateContainerIfNotExistsAsync(id: "booking_data", partitionKeyPath: "/site");
         await database.Database.CreateContainerIfNotExistsAsync(id: "core_data", partitionKeyPath: "/docType");
+        await database.Database.CreateContainerIfNotExistsAsync(id: "booking_reference_data", partitionKeyPath: "/docType");
         await database.Database.CreateContainerIfNotExistsAsync(id: "index_data", partitionKeyPath: "/docType");
         await database.Database.CreateContainerIfNotExistsAsync(id: "audit_data", partitionKeyPath: "/user");
         await database.Database.CreateContainerIfNotExistsAsync(id: "aggregated_data", partitionKeyPath: "/date");

src/api/Nhs.Appointments.Api/Functions/HttpFunctions/GetSiteFunction.cs

@@ -47,7 +47,7 @@ public override Task<IActionResult> RunAsync(
 
     protected override async Task<ApiResult<Site>> HandleRequest(SiteBasedResourceRequest request, ILogger logger)
     {
-        var site = await siteService.GetSiteByIdAsync(request.Site, request.Scope);
+        var site = await siteService.GetSiteByIdAsync(request.Site, request.IgnoreCache, request.Scope);
         if (site != null)
         {
             return ApiResult<Site>.Success(site);

src/api/Nhs.Appointments.Api/Functions/HttpFunctions/GetSiteMetaDataFunction.cs

@@ -53,7 +53,7 @@ protected override async Task<ApiResult<GetSiteMetaDataResponse>> HandleRequest(
         ILogger logger)
     {
         const string scope = "site_details";
-        var site = await siteService.GetSiteByIdAsync(request.Site, scope);
+        var site = await siteService.GetSiteByIdAsync(request.Site, false, scope);
         if (site != null)
         {
             var patientInformation = site.Accessibilities.Any()

src/api/Nhs.Appointments.Api/Functions/HttpFunctions/SiteBasedResourceFunction.cs

@@ -15,14 +15,15 @@ public abstract class SiteBasedResourceFunction<TResponse>(IValidator<SiteBasedR
     protected override Task<(IReadOnlyCollection<ErrorMessageResponseItem> errors, SiteBasedResourceRequest request)> ReadRequestAsync(HttpRequest req)
     {
         var requestedScope = req.Query.Keys.Contains("scope") ? req.Query["scope"].ToString() : "*";
+        var requestedIgnoreCache = req.Query.Keys.Contains("ignoreCache") && bool.Parse(req.Query["ignoreCache"]);
 
         if (req.Query.Keys.Contains("site"))
         {
             var site = req.Query["site"];
-            return Task.FromResult((ErrorMessageResponseItem.None, new SiteBasedResourceRequest(site, requestedScope)));
+            return Task.FromResult((ErrorMessageResponseItem.None, new SiteBasedResourceRequest(site, requestedIgnoreCache, requestedScope)));
         }
 
         var siteId = RestUriHelper.GetResourceIdFromPath(req.Path.ToUriComponent(), "sites");
-        return Task.FromResult((ErrorMessageResponseItem.None, new SiteBasedResourceRequest(siteId, requestedScope)));
+        return Task.FromResult((ErrorMessageResponseItem.None, new SiteBasedResourceRequest(siteId, requestedIgnoreCache, requestedScope)));
     }
 }

src/api/Nhs.Appointments.Api/Models/SiteBasedResourceRequest.cs

@@ -1,3 +1,3 @@
 namespace Nhs.Appointments.Api.Models;
 
-public record SiteBasedResourceRequest(string Site, string Scope);
+public record SiteBasedResourceRequest(string Site, bool IgnoreCache, string Scope);

src/api/Nhs.Appointments.Api/Notifications/UserRolesChangedNotifier.cs

@@ -34,7 +34,7 @@ public async Task Notify(string eventType, string user, string siteId, string[]
             var rolesAddedNames = GetRoleNames(roles, rolesAdded);
             var rolesRemovedNames = GetRoleNames(roles, rolesRemoved);
 
-            var site = await siteService.GetSiteByIdAsync(siteId, "*");
+            var site = await siteService.GetSiteByIdAsync(siteId);
             var siteName = site == null ? $"Unknown site ({siteId})" : site.Name;
 
             var templateValues = new Dictionary<string, dynamic>

src/api/Nhs.Appointments.Core/Bookings/IReferenceNumberDocumentStore.cs

@@ -0,0 +1,7 @@
+namespace Nhs.Appointments.Core.Bookings;
+
+public interface IReferenceNumberDocumentStore
+{
+    Task<int> AssignReferenceGroup();
+    Task<int> GetNextSequenceNumber(int prefix);
+}

src/api/Nhs.Appointments.Core/Bookings/ReferenceNumberProvider.cs

@@ -1,3 +1,4 @@
+using Nhs.Appointments.Core.Caching;
 using Nhs.Appointments.Core.Sites;
 
 namespace Nhs.Appointments.Core.Bookings;
@@ -9,37 +10,51 @@ public interface IReferenceNumberProvider
 
 public class ReferenceNumberProvider : IReferenceNumberProvider
 {
-    private readonly ISiteStore _siteStore;
+    private readonly ISiteService _siteService;
+    private readonly ICacheService _cacheService;
     private readonly IReferenceNumberDocumentStore _referenceNumberDocumentStore;
     private readonly TimeProvider _timeProvider;
     public ReferenceNumberProvider(
-        ISiteStore siteStore,
+        ISiteService siteService,
+        ICacheService cacheService,
         IReferenceNumberDocumentStore referenceNumberDocumentStore,
         TimeProvider timeProvider)
     {
-        _siteStore = siteStore;
+        _siteService = siteService;
+        _cacheService = cacheService;
         _referenceNumberDocumentStore = referenceNumberDocumentStore;
         _timeProvider = timeProvider;
     }
     public async Task<string> GetReferenceNumber(string siteId)
-    {        
-        var referenceGroup = await _siteStore.GetReferenceNumberGroup(siteId);
-        if (referenceGroup == 0)
-        {
-            referenceGroup = await _referenceNumberDocumentStore.AssignReferenceGroup();
-            await _siteStore.AssignPrefix(siteId, referenceGroup);
-        }
+    {
+        var referenceNumberGroup =
+            await _cacheService.GetCacheValue(
+                $"site:referenceNumberGroup:{siteId}", 
+                new CacheOptions<int>(
+                    async () => await GetSitesAssignedReferenceGroup(siteId), 
+                    TimeSpan.FromHours(24)));
 
-        var sequence = await _referenceNumberDocumentStore.GetNextSequenceNumber(referenceGroup);
+        var sequence = await _referenceNumberDocumentStore.GetNextSequenceNumber(referenceNumberGroup);
         var now = _timeProvider.GetUtcNow();
         var rng = now.Day + now.Second;
 
-        return $"{referenceGroup:00}-{rng:00}-{sequence:000000}";
+        return $"{referenceNumberGroup:00}-{rng:00}-{sequence:000000}";
     }
-}
+
+    private async Task<int> GetSitesAssignedReferenceGroup(string siteId)
+    {
+        var site = await _siteService.GetSiteByIdAsync(siteId, true);
+        if (!SiteHasNotBeenAssignedReferenceGroup(site))
+        {
+            return site.ReferenceNumberGroup;
+        }
 
-public interface IReferenceNumberDocumentStore
-{
-    Task<int> AssignReferenceGroup();
-    Task<int> GetNextSequenceNumber(int prefix);
+        var referenceGroup = await _referenceNumberDocumentStore.AssignReferenceGroup();
+        await _siteService.AssignPrefix(siteId, referenceGroup);
+
+        return referenceGroup;
+
+    }
+
+    private static bool SiteHasNotBeenAssignedReferenceGroup(Site site) => site.ReferenceNumberGroup == 0;
 }

src/api/Nhs.Appointments.Core/ServiceRegistration.cs

@@ -30,6 +30,8 @@ public static IServiceCollection ConfigureSiteService(this IServiceCollection se
             opts.AllSitesSlidingCacheEnabled = configuration.GetValue("ALLSITES_SLIDING_CACHE_ENABLED", true);
             opts.AllSitesCacheDurationMinutes = configuration.GetValue("ALLSITES_CACHE_DURATION_MINUTES", 60);
             opts.AllSitesSlideCacheDurationMinutes = configuration.GetValue("ALLSITES_SLIDING_CACHE_DURATION_MINUTES", 20);
+            opts.SiteCacheDurationMinutes = configuration.GetValue("SITE_CACHE_DURATION_MINUTES", 5);
+            opts.SiteSlideCacheDurationMinutes = configuration.GetValue("SITE_SLIDING_CACHE_DURATION_MINUTES", 1);
             opts.DisableSiteCache = configuration.GetValue("DISABLE_SITE_CACHE", false);
             //default 4 hours
             opts.SiteSupportsServiceSlidingCacheAbsoluteExpirationSeconds = configuration.GetValue("SITE_SUPPORTS_SERVICE_SLIDING_CACHE_ABSOLUTE_EXPIRATION_SECONDS", 14400);

src/api/Nhs.Appointments.Core/Sites/ISiteStore.cs

@@ -14,7 +14,6 @@ Task<OperationResult> UpdateSiteDetails(string siteId, string name, string addre
     Task<OperationResult> UpdateSiteReferenceDetails(string siteId, string odsCode, string icb, string region);
 
     Task AssignPrefix(string site, int prefix);
-    Task<int> GetReferenceNumberGroup(string site);
     Task<IEnumerable<Site>> GetAllSites();
 
     Task<OperationResult> SaveSiteAsync(string siteId, string odsCode, string name, string address, string phoneNumber,

src/api/Nhs.Appointments.Core/Sites/Site.cs

@@ -18,13 +18,17 @@ public record Site(
     [JsonProperty("location")] Location location,
     [JsonProperty("status")] SiteStatus? status,
     [JsonProperty("isDeleted")] bool? isDeleted,
-    [JsonProperty("type")] string Type
+    [JsonProperty("type")] string Type,
+    int ReferenceNumberGroup
 )
 {
     public IEnumerable<Accessibility> Accessibilities { get; set; } = Accessibilities?.Select(a => new Accessibility(a.Id, a.Value.ToLower()));
 
     private Location Location { get; } = location;
 
+    [JsonIgnore] 
+    public int ReferenceNumberGroup { get; } = ReferenceNumberGroup;
+
     public Coordinates Coordinates
     {
         get