Merge branch 'main' of https://github.com/DFE-Digital/external-applications-web

Author: FrostyApeOne

src/DfE.ExternalApplications.Infrastructure/DfE.ExternalApplications.Infrastructure.csproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="DfE.CoreLibs.Caching" Version="1.0.11-prerelease-77" />
     <PackageReference Include="DfE.CoreLibs.Contracts" Version="1.0.24" />
     <PackageReference Include="GovUK.Dfe.ExternalApplications.Api.Client" Version="0.1.3" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.3.0" />

src/DfE.ExternalApplications.Infrastructure/Providers/FormTemplateProvider.cs

@@ -1,15 +1,29 @@
-using DfE.ExternalApplications.Application.Interfaces;
+using DfE.CoreLibs.Caching.Helpers;
+using DfE.CoreLibs.Caching.Interfaces;
+using DfE.ExternalApplications.Application.Interfaces;
 using DfE.ExternalApplications.Domain.Models;
 using System.Diagnostics.CodeAnalysis;
 
 namespace DfE.ExternalApplications.Infrastructure.Providers;
 
-public class FormTemplateProvider(ITemplateStore store, IFormTemplateParser parser) : IFormTemplateProvider
+public class FormTemplateProvider(
+    ITemplateStore store, 
+    IFormTemplateParser parser,
+    ICacheService<IMemoryCacheType> cacheService) : IFormTemplateProvider
 {
     [ExcludeFromCodeCoverage]
     public async Task<FormTemplate> GetTemplateAsync(string templateId, CancellationToken cancellationToken = default)
     {
-        using var stream = await store.GetTemplateStreamAsync(templateId, cancellationToken);
-        return await parser.ParseAsync(stream, cancellationToken);
+        var cacheKey = $"FormTemplate_{CacheKeyHelper.GenerateHashedCacheKey(templateId)}";
+        var methodName = nameof(GetTemplateAsync);
+
+        return await cacheService.GetOrAddAsync(
+            cacheKey,
+            async () =>
+            {
+                using var stream = await store.GetTemplateStreamAsync(templateId, cancellationToken);
+                return await parser.ParseAsync(stream, cancellationToken);
+            },
+            methodName);
     }
 }

src/DfE.ExternalApplications.Infrastructure/Stores/ApiTemplateStore.cs

@@ -1,7 +1,7 @@
 using DfE.ExternalApplications.Application.Interfaces;
-using System.Text;
 using GovUK.Dfe.ExternalApplications.Api.Client.Contracts;
 using System.Diagnostics.CodeAnalysis;
+using System.Text;
 
 namespace DfE.ExternalApplications.Infrastructure.Stores;
 
@@ -10,13 +10,8 @@ public class ApiTemplateStore(ITemplatesClient templateClient) : ITemplateStore
     [ExcludeFromCodeCoverage]
     public async Task<Stream> GetTemplateStreamAsync(string templateId, CancellationToken cancellationToken = default)
     {
-        // TODO Implement caching
         var response = await templateClient.GetLatestTemplateSchemaAsync(new Guid(templateId), cancellationToken);
-
         var utf8 = Encoding.UTF8.GetBytes(response.JsonSchema);
-
-        var stream = new MemoryStream(utf8);
-
-        return stream;
+        return new MemoryStream(utf8);
     }
 }

src/DfE.ExternalApplications.Web/DfE.ExternalApplications.Web.csproj

@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+	  <PackageReference Include="DfE.CoreLibs.Caching" Version="1.0.11-prerelease-77" />
 	  <PackageReference Include="GovUK.Dfe.ExternalApplications.Api.Client" Version="0.1.3" />
 	  <PackageReference Include="GovUk.Frontend.AspNetCore" Version="2.8.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

src/DfE.ExternalApplications.Web/Program.cs

@@ -72,6 +72,8 @@
 builder.Services.AddScoped<IApplicationResponseService, ApplicationResponseService>();
 builder.Services.AddSingleton<ITemplateStore, ApiTemplateStore>();
 
+builder.Services.AddServiceCaching(configuration);
+
 //var templatesPath = Path.Combine(builder.Environment.ContentRootPath, "templates");
 //builder.Services.AddSingleton<ITemplateStore>(
 //    new JsonFileTemplateStore(templatesPath));

src/DfE.ExternalApplications.Web/appsettings.json

@@ -33,5 +33,13 @@
       "transfer": "9A4E9C58-9135-468C-B154-7B966F7ACFB7",
       "sigchange": "form-sigchange-guid"
     }
+  },
+  "CacheSettings": {
+    "Memory": {
+      "DefaultDurationInSeconds": 60,
+      "Durations": {
+        "GetTemplateAsync": 86400
+      }
+    }
   }
 }