Merge pull request #101 from Virtual-Finland-Development/feat/improved-cachings

lsipii · web-flow · commit c94d6be3e1d9 · 2023-11-24T10:42:11.000+02:00
Improved Cachings
diff --git a/Docs/README.adminfunction.md b/Docs/README.adminfunction.md
@@ -44,3 +44,6 @@ dotnet run --project ./VirtualFinland.UsersAPI.AdminFunction.CLI migrate
   - cli command: `dotnet run --project ./VirtualFinland.UsersAPI.AdminFunction.CLI update-terms-of-service`
 - `update-analytics`:
   - lambda function payload: `{"Action": "UpdateAnalytics"}`
+- `invalidate-caches`: invalidates the api gateway caches
+  - lambda function payload: `{"Action": "InvalidateCaches"}`
+  - cli command: `dotnet run --project ./VirtualFinland.UsersAPI.AdminFunction.CLI invalidate-caches`
diff --git a/Makefile b/Makefile
@@ -17,6 +17,10 @@ update-terms-of-service:
 	@echo "> Updating terms of service in database"
 	dotnet run --project ./VirtualFinland.UsersAPI.AdminFunction.CLI update-terms-of-service
 
+invalidate-caches:
+	@echo "> Invalidating caches"
+	dotnet run --project ./VirtualFinland.UsersAPI.AdminFunction.CLI invalidate-caches
+
 packages: test
 	@echo "> Ensuring local dependencies are installed"
 	dotnet tool install -g Amazon.Lambda.Tools || true
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/CacheRepository.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/CacheRepository.cs
@@ -46,11 +46,15 @@ public async Task<bool> Exists(string key)
 
     public async Task Clear()
     {
+        // Traverse all cluster endpoint servers
         var endpoints = _database.Multiplexer.GetEndPoints();
         foreach (var endpoint in endpoints)
         {
             var server = _database.Multiplexer.GetServer(endpoint);
-            await server.FlushDatabaseAsync();
+
+            // Clear all keys with the keyPrefix
+            var keys = server.Keys(pattern: $"{_keyPrefix}*");
+            await _database.KeyDeleteAsync(keys.ToArray());
         }
     }
 
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/CacheRepositoryFactory.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/CacheRepositoryFactory.cs
@@ -6,6 +6,7 @@ public class CacheRepositoryFactory : ICacheRepositoryFactory
 {
     private readonly IDatabase _database;
     private readonly string _factoryKeyPrefix;
+    static readonly List<string> KnownKeys = new(); // Static list of all known cache repository keys
 
     public CacheRepositoryFactory(IDatabase database, string factoryKeyPrefix = "")
     {
@@ -16,6 +17,12 @@ public CacheRepositoryFactory(IDatabase database, string factoryKeyPrefix = "")
 
     public ICacheRepository Create(string keyPrefix = "")
     {
-        return new CacheRepository(_database, $"{_factoryKeyPrefix}{keyPrefix}");
+        var cacheRepositoryKeyPrefix = $"{_factoryKeyPrefix}{keyPrefix}";
+
+        // Safety check to avoid accidentally overwriting existing cache repositories
+        if (KnownKeys.Contains(cacheRepositoryKeyPrefix)) throw new ArgumentException($"Key prefix {cacheRepositoryKeyPrefix} already in use");
+        KnownKeys.Add(cacheRepositoryKeyPrefix);
+
+        return new CacheRepository(_database, cacheRepositoryKeyPrefix);
     }
 }
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/CodesetsResourceRepository.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/CodesetsResourceRepository.cs
@@ -1,28 +1,34 @@
 using VirtualFinland.UserAPI.Helpers.Configurations;
 using VirtualFinland.UserAPI.Helpers.Services;
+using VirtualFinland.UserAPI.Data.Repositories;
+using System.Reflection.Metadata;
 
 namespace VirtualFinland.UserAPI.Helpers;
 
 public abstract class CodesetsResourceRepository<T>
 {
     private readonly CodesetsService _codesetsService;
-    private T? _resourceCache; // @TODO: Add caching suitable for AWS Lambda
+    private ICacheRepository _cacheRepository;
     protected CodesetsResource? _resource;
 
-    public CodesetsResourceRepository(CodesetsService codesetsService)
+    public CodesetsResourceRepository(CodesetsService codesetsService, ICacheRepositoryFactory cacheRepositoryFactory)
     {
         _codesetsService = codesetsService;
+        _cacheRepository = cacheRepositoryFactory.Create(Constants.Cache.CodesetsPrefix);
     }
 
     public async Task<T> GetResource(CodesetsResource? resource = null)
     {
-        if (_resourceCache is not null)
+        var resourceToGet = resource ?? _resource ?? throw new Exception("Resource not defined");
+
+        var cacheKey = resourceToGet.ToString();
+        if (await _cacheRepository.Exists(cacheKey))
         {
-            return _resourceCache;
+            return await _cacheRepository.Get<T>(cacheKey);
         }
 
-        var resourceToGet = resource ?? _resource ?? throw new Exception("Resource not defined");
-        _resourceCache = await _codesetsService.GetResource<T>(resourceToGet);
-        return _resourceCache;
+        var resolvedResource = await _codesetsService.GetResource<T>(resourceToGet);
+        await _cacheRepository.Set<T>(cacheKey, resolvedResource, TimeSpan.FromHours(24));
+        return resolvedResource;
     }
 }
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/CountriesRepository.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/CountriesRepository.cs
@@ -7,7 +7,7 @@ namespace VirtualFinland.UserAPI.Data.Repositories;
 
 public class CountriesRepository : CodesetsResourceRepository<List<Country>>, ICountriesRepository
 {
-    public CountriesRepository(CodesetsService codesetsService) : base(codesetsService)
+    public CountriesRepository(CodesetsService codesetsService, ICacheRepositoryFactory cacheRepositoryFactory) : base(codesetsService, cacheRepositoryFactory)
     {
         _resource = CodesetsResource.Countries;
     }
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/ICacheRepositoryFactory.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/ICacheRepositoryFactory.cs
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/LanguageRepository.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/LanguageRepository.cs
@@ -7,7 +7,7 @@ namespace VirtualFinland.UserAPI.Data.Repositories;
 
 public class LanguageRepository : CodesetsResourceRepository<List<Language>>, ILanguageRepository
 {
-    public LanguageRepository(CodesetsService codesetsService) : base(codesetsService)
+    public LanguageRepository(CodesetsService codesetsService, ICacheRepositoryFactory cacheRepositoryFactory) : base(codesetsService, cacheRepositoryFactory)
     {
         _resource = CodesetsResource.Languages;
     }
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/OccupationsFlatRepository.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/OccupationsFlatRepository.cs
@@ -7,7 +7,7 @@ namespace VirtualFinland.UserAPI.Data.Repositories;
 
 public class OccupationsFlatRepository : CodesetsResourceRepository<List<OccupationFlatRoot.Occupation>>, IOccupationsFlatRepository
 {
-    public OccupationsFlatRepository(CodesetsService codesetsService) : base(codesetsService)
+    public OccupationsFlatRepository(CodesetsService codesetsService, ICacheRepositoryFactory cacheRepositoryFactory) : base(codesetsService, cacheRepositoryFactory)
     {
         _resource = CodesetsResource.OccupationsFlat;
     }
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/OccupationsRepository.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Data/Repositories/OccupationsRepository.cs
@@ -7,7 +7,7 @@ namespace VirtualFinland.UserAPI.Data.Repositories;
 
 public class OccupationsRepository : CodesetsResourceRepository<List<OccupationRoot.Occupation>>, IOccupationsRepository
 {
-    public OccupationsRepository(CodesetsService codesetsService) : base(codesetsService)
+    public OccupationsRepository(CodesetsService codesetsService, ICacheRepositoryFactory cacheRepositoryFactory) : base(codesetsService, cacheRepositoryFactory)
     {
         _resource = CodesetsResource.Occupations;
     }
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Helpers/Constants.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Helpers/Constants.cs
@@ -13,7 +13,13 @@ public static class Security
         public static string ResolvePolicyFromTokenIssuer => "ResolvePolicyFromTokenIssuer";
         public static string RequestFromAccessFinland => "RequestFromAccessFinland";
         public static string RequestFromDataspace => "RequestFromDataspace";
-        public static string CachePrefix => "security";
+    }
+
+    public static class Cache
+    {
+        public static string SecurityPrefix => "security";
+        public static string OpenIdConfigPrefix => "openid-config";
+        public static string CodesetsPrefix => "codesets";
     }
 
     public static class Headers
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Program.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Program.cs
@@ -124,12 +124,15 @@
 // Redis connection
 //
 var redisEndpoint = Environment.GetEnvironmentVariable("REDIS_ENDPOINT") ?? builder.Configuration["Redis:Endpoint"];
-ConnectionMultiplexer redis = ConnectionMultiplexer.Connect($"{redisEndpoint},abortConnect=false,connectRetry=5");
+ConnectionMultiplexer redisCluster = ConnectionMultiplexer.Connect($"{redisEndpoint},abortConnect=false,connectRetry=5");
+IDatabase redisDatabase = redisCluster.GetDatabase();
+builder.Services.AddSingleton(redisDatabase);
+builder.Services.AddSingleton<ICacheRepositoryFactory, CacheRepositoryFactory>();
 
 //
 // App security
 //
-builder.Services.RegisterSecurityFeatures(builder.Configuration, redis);
+builder.Services.RegisterSecurityFeatures(builder.Configuration, new CacheRepositoryFactory(redisDatabase, Constants.Cache.SecurityPrefix));
 builder.Services.AddSingleton<IAuthorizationMiddlewareResultHandler, AuthorizationHanderMiddleware>();
 builder.Services.AddTransient<AuthenticationService>();
 builder.Services.RegisterConsentServiceProviders(builder.Configuration);
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Security/Extensions/SecurityFeatureServiceExtensions.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Security/Extensions/SecurityFeatureServiceExtensions.cs
@@ -18,7 +18,7 @@ public static class SecurityFeatureServiceExtensions
     /// <param name="services"></param>
     /// <param name="configuration"></param>
     /// <returns></returns>
-    public static IServiceCollection RegisterSecurityFeatures(this IServiceCollection services, IConfiguration configuration, ConnectionMultiplexer redis)
+    public static IServiceCollection RegisterSecurityFeatures(this IServiceCollection services, IConfiguration configuration, CacheRepositoryFactory cacheRepositoryFactory)
     {
         var features = new List<ISecurityFeature>();
 
@@ -37,7 +37,7 @@ public static IServiceCollection RegisterSecurityFeatures(this IServiceCollectio
                     InnerHandler = new HttpClientHandler()
                 }
             ),
-            CacheRepositoryFactory = new CacheRepositoryFactory(redis.GetDatabase(), Constants.Security.CachePrefix),
+            CacheRepositoryFactory = cacheRepositoryFactory,
         };
 
         // Dynamically map security feature name to correct class
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Security/Features/SecurityFeature.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Security/Features/SecurityFeature.cs
@@ -4,7 +4,9 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.IdentityModel.Tokens;
 using NetDevPack.Security.JwtExtensions;
+using VirtualFinland.UserAPI.Data.Repositories;
 using VirtualFinland.UserAPI.Exceptions;
+using VirtualFinland.UserAPI.Helpers;
 using VirtualFinland.UserAPI.Security.Models;
 using JwksExtension = VirtualFinland.UserAPI.Helpers.Extensions.JwksExtension;
 
@@ -21,12 +23,14 @@ public class SecurityFeature : ISecurityFeature
     /// <summary>
     /// Security feature options
     /// </summary>
-    protected SecurityFeatureOptions _options { get; set; }
+    protected SecurityFeatureOptions Options { get; set; }
 
     /// <summary>
     /// Cache repository
     /// </summary>
-    protected SecurityClientProviders _securityClientProviders { get; set; }
+    protected SecurityClientProviders SecurityClientProviders { get; set; }
+
+    protected ICacheRepository CacheRepository;
 
     /// <summary>
     /// The URL to the OpenID configuration
@@ -50,7 +54,7 @@ public class SecurityFeature : ISecurityFeature
 
     public SecurityFeature(SecurityFeatureOptions options, SecurityClientProviders securityClientProviders)
     {
-        _options = options;
+        Options = options;
         _issuer = options.Issuer;
         _openIDConfigurationURL = options.OpenIdConfigurationUrl;
         _jwksOptionsUrl = options.AuthorizationJwksJsonUrl;
@@ -60,7 +64,8 @@ public SecurityFeature(SecurityFeatureOptions options, SecurityClientProviders s
             throw new ArgumentException("Invalid security feature configuration");
         }
 
-        _securityClientProviders = securityClientProviders;
+        SecurityClientProviders = securityClientProviders;
+        CacheRepository = SecurityClientProviders.CacheRepositoryFactory.Create(GetType().Name);
     }
 
     /// <summary>
@@ -107,12 +112,12 @@ public string GetSecurityPolicySchemeName()
     /// <exception cref="NotAuthorizedException"></exception>
     public virtual async Task ValidateSecurityTokenAudience(string audience)
     {
-        if (_options.AudienceGuard.StaticConfig.IsEnabled)
+        if (Options.AudienceGuard.StaticConfig.IsEnabled)
         {
             await ValidateSecurityTokenAudienceByStaticConfiguration(audience);
         }
 
-        if (_options.AudienceGuard.Service.IsEnabled)
+        if (Options.AudienceGuard.Service.IsEnabled)
         {
             await ValidateSecurityTokenAudienceByService(audience);
         }
@@ -125,7 +130,7 @@ public virtual async Task ValidateSecurityTokenAudience(string audience)
     /// <exception cref="NotAuthorizedException"></exception>
     public virtual Task ValidateSecurityTokenAudienceByStaticConfiguration(string audience)
     {
-        if (!_options.AudienceGuard.StaticConfig.AllowedAudiences.Contains(audience)) throw new NotAuthorizedException("The given token audience is not allowed");
+        if (!Options.AudienceGuard.StaticConfig.AllowedAudiences.Contains(audience)) throw new NotAuthorizedException("The given token audience is not allowed");
         return Task.CompletedTask;
     }
 
@@ -166,7 +171,17 @@ protected virtual void ConfigureOpenIdConnect(AuthenticationBuilder authenticati
     /// </summary>
     protected virtual async void LoadOpenIdConfigUrl()
     {
-        var httpClient = _securityClientProviders.HttpClient;
+        if (_openIDConfigurationURL == null) return;
+
+        if (Options.IsOidcMetadataCachingEnabled && await CacheRepository.Exists(Constants.Cache.OpenIdConfigPrefix))
+        {
+            var cachedResult = await CacheRepository.Get<OpenIdConfiguration>(Constants.Cache.OpenIdConfigPrefix);
+            _issuer = cachedResult.Issuer;
+            _jwksOptionsUrl = cachedResult.JwksUri;
+            return;
+        }
+
+        var httpClient = SecurityClientProviders.HttpClient;
         var httpResponse = await httpClient.GetAsync(_openIDConfigurationURL);
 
         for (int retryCount = 0; retryCount < _configUrlMaxRetryCount; retryCount++)
@@ -179,6 +194,19 @@ protected virtual async void LoadOpenIdConfigUrl()
 
                 if (!string.IsNullOrEmpty(_issuer) && !string.IsNullOrEmpty(_jwksOptionsUrl))
                 {
+                    if (Options.IsOidcMetadataCachingEnabled)
+                    {
+                        // Check for standard cache headers or use default cache duration
+                        var cacheControlHeader = httpResponse.Headers.CacheControl;
+                        var cacheDuration = cacheControlHeader?.MaxAge ?? TimeSpan.FromSeconds(Options.DefaultOidcMetadataCacheDurationInSeconds);
+
+                        await CacheRepository.Set(Constants.Cache.OpenIdConfigPrefix, new OpenIdConfiguration()
+                        {
+                            Issuer = _issuer,
+                            JwksUri = _jwksOptionsUrl
+                        }, cacheDuration);
+                    }
+
                     break;
                 }
             }
@@ -191,4 +219,10 @@ protected virtual async void LoadOpenIdConfigUrl()
             throw new ArgumentNullException("Failed to retrieve OpenID configurations");
         }
     }
+
+    private class OpenIdConfiguration
+    {
+        public string Issuer { get; set; } = default!;
+        public string JwksUri { get; set; } = default!;
+    }
 }
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Security/Models/SecurityFeatureOptions.cs b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Security/Models/SecurityFeatureOptions.cs
@@ -8,5 +8,7 @@ public class SecurityFeatureOptions
     public string? AuthorizationJwksJsonUrl { get; set; }
     public string? Issuer { get; set; } = default!;
     public bool IsEnabled { get; set; }
+    public bool IsOidcMetadataCachingEnabled { get; set; }
+    public int DefaultOidcMetadataCacheDurationInSeconds { get; set; }
     public AudienceGuardConfig AudienceGuard { get; set; } = new();
 }
diff --git a/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/appsettings.json b/VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/appsettings.json
@@ -6,7 +6,9 @@
     }
   },
   "Serilog": {
-    "Using": ["Serilog.Sinks.Console"],
+    "Using": [
+      "Serilog.Sinks.Console"
+    ],
     "MinimumLevel": {
       "Default": "Information",
       "Override": {
@@ -30,7 +32,9 @@
     "Access": {
       "AccessFinland": {
         "HeaderName": "x-api-key",
-        "AccessKeys": ["secret"],
+        "AccessKeys": [
+          "secret"
+        ],
         "IsEnabled": false
       },
       "Dataspace": {
@@ -52,6 +56,8 @@
         "ConsentIssuer": "https://consent.testbed.fi",
         "ConsentVerifyUrl": "https://consent.testbed.fi/Consent/Verify",
         "IsEnabled": false,
+        "IsOidcMetadataCachingEnabled": true,
+        "DefaultOidcMetadataCacheDurationInSeconds": 3600,
         "AudienceGuard": {
           "StaticConfig": {
             "AllowedAudiences": [],
@@ -67,6 +73,8 @@
       "Sinuna": {
         "OpenIDConfigurationURL": "https://login.iam.qa.sinuna.fi/oxauth/.well-known/openid-configuration",
         "IsEnabled": false,
+        "IsOidcMetadataCachingEnabled": true,
+        "DefaultOidcMetadataCacheDurationInSeconds": 3600,
         "AudienceGuard": {
           "StaticConfig": {
             "AllowedAudiences": [],
@@ -110,4 +118,4 @@
       "IsEnabled": false
     }
   }
-}
+}
diff --git a/VirtualFinland.UsersAPI.AdminFunction/AdminApp/Actions/InvalidateCachesAction.cs b/VirtualFinland.UsersAPI.AdminFunction/AdminApp/Actions/InvalidateCachesAction.cs
@@ -0,0 +1,29 @@
+using Microsoft.Extensions.Logging;
+using VirtualFinland.UserAPI.Data.Repositories;
+
+namespace VirtualFinland.AdminFunction.AdminApp.Actions;
+
+/// <summary>
+/// </summary>
+public class InvalidateCachesAction : IAdminAppAction
+{
+    private readonly ICacheRepositoryFactory _cacheRepositoryFactory;
+    private readonly ILogger<InvalidateCachesAction> _logger;
+
+    public InvalidateCachesAction(ICacheRepositoryFactory cacheRepositoryFactory, ILogger<InvalidateCachesAction> logger)
+    {
+        _cacheRepositoryFactory = cacheRepositoryFactory;
+        _logger = logger;
+    }
+
+    public async Task Execute(string? _)
+    {
+        _logger.LogInformation("Invalidating caches");
+
+        // Invalidate all caches
+        var cacheRepository = _cacheRepositoryFactory.Create();
+        await cacheRepository.Clear();
+
+        _logger.LogInformation("Caches invalidated");
+    }
+}
diff --git a/VirtualFinland.UsersAPI.AdminFunction/AdminApp/App.cs b/VirtualFinland.UsersAPI.AdminFunction/AdminApp/App.cs
diff --git a/VirtualFinland.UsersAPI.AdminFunction/AdminApp/Models/Actions.cs b/VirtualFinland.UsersAPI.AdminFunction/AdminApp/Models/Actions.cs
diff --git a/VirtualFinland.UsersAPI.AdminFunction/Function.cs b/VirtualFinland.UsersAPI.AdminFunction/Function.cs
diff --git a/VirtualFinland.UsersAPI.UnitTests/Helpers/TestSecurityFeature.cs b/VirtualFinland.UsersAPI.UnitTests/Helpers/TestSecurityFeature.cs
diff --git a/VirtualFinland.UsersAPI.UnitTests/Tests/Security/TimeoutTests.cs b/VirtualFinland.UsersAPI.UnitTests/Tests/Security/TimeoutTests.cs
diff --git a/VirtualFinland.UsersAPI.UnitTests/Tests/Utils/InitializationTests.cs b/VirtualFinland.UsersAPI.UnitTests/Tests/Utils/InitializationTests.cs
diff --git a/docker-compose.yml b/docker-compose.yml

Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,15 @@ public async Task<bool> Exists(string key)`
`46`	`46`
`47`	`47`	`public async Task Clear()`
`48`	`48`	`{`
	`49`	`+ // Traverse all cluster endpoint servers`
`49`	`50`	`var endpoints = _database.Multiplexer.GetEndPoints();`
`50`	`51`	`foreach (var endpoint in endpoints)`
`51`	`52`	`{`
`52`	`53`	`var server = _database.Multiplexer.GetServer(endpoint);`
`53`		`- await server.FlushDatabaseAsync();`
	`54`	`+`
	`55`	`+ // Clear all keys with the keyPrefix`
	`56`	`+ var keys = server.Keys(pattern: $"{_keyPrefix}*");`
	`57`	`+ await _database.KeyDeleteAsync(keys.ToArray());`
`54`	`58`	`}`
`55`	`59`	`}`
`56`	`60`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ public class CacheRepositoryFactory : ICacheRepositoryFactory`
`6`	`6`	`{`
`7`	`7`	`private readonly IDatabase _database;`
`8`	`8`	`private readonly string _factoryKeyPrefix;`
	`9`	`+ static readonly List<string> KnownKeys = new(); // Static list of all known cache repository keys`
`9`	`10`
`10`	`11`	`public CacheRepositoryFactory(IDatabase database, string factoryKeyPrefix = "")`
`11`	`12`	`{`
`@@ -16,6 +17,12 @@ public CacheRepositoryFactory(IDatabase database, string factoryKeyPrefix = "")`
`16`	`17`
`17`	`18`	`public ICacheRepository Create(string keyPrefix = "")`
`18`	`19`	`{`
`19`		`- return new CacheRepository(_database, $"{_factoryKeyPrefix}{keyPrefix}");`
	`20`	`+ var cacheRepositoryKeyPrefix = $"{_factoryKeyPrefix}{keyPrefix}";`
	`21`	`+`
	`22`	`+ // Safety check to avoid accidentally overwriting existing cache repositories`
	`23`	`+ if (KnownKeys.Contains(cacheRepositoryKeyPrefix)) throw new ArgumentException($"Key prefix {cacheRepositoryKeyPrefix} already in use");`
	`24`	`+ KnownKeys.Add(cacheRepositoryKeyPrefix);`
	`25`	`+`
	`26`	`+ return new CacheRepository(_database, cacheRepositoryKeyPrefix);`
`20`	`27`	`}`
`21`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,28 +1,34 @@`
`1`	`1`	`using VirtualFinland.UserAPI.Helpers.Configurations;`
`2`	`2`	`using VirtualFinland.UserAPI.Helpers.Services;`
	`3`	`+using VirtualFinland.UserAPI.Data.Repositories;`
	`4`	`+using System.Reflection.Metadata;`
`3`	`5`
`4`	`6`	`namespace VirtualFinland.UserAPI.Helpers;`
`5`	`7`
`6`	`8`	`public abstract class CodesetsResourceRepository<T>`
`7`	`9`	`{`
`8`	`10`	`private readonly CodesetsService _codesetsService;`
`9`		`- private T? _resourceCache; // @TODO: Add caching suitable for AWS Lambda`
	`11`	`+ private ICacheRepository _cacheRepository;`
`10`	`12`	`protected CodesetsResource? _resource;`
`11`	`13`
`12`		`- public CodesetsResourceRepository(CodesetsService codesetsService)`
	`14`	`+ public CodesetsResourceRepository(CodesetsService codesetsService, ICacheRepositoryFactory cacheRepositoryFactory)`
`13`	`15`	`{`
`14`	`16`	`_codesetsService = codesetsService;`
	`17`	`+ _cacheRepository = cacheRepositoryFactory.Create(Constants.Cache.CodesetsPrefix);`
`15`	`18`	`}`
`16`	`19`
`17`	`20`	`public async Task<T> GetResource(CodesetsResource? resource = null)`
`18`	`21`	`{`
`19`		`- if (_resourceCache is not null)`
	`22`	`+ var resourceToGet = resource ?? _resource ?? throw new Exception("Resource not defined");`
	`23`	`+`
	`24`	`+ var cacheKey = resourceToGet.ToString();`
	`25`	`+ if (await _cacheRepository.Exists(cacheKey))`
`20`	`26`	`{`
`21`		`- return _resourceCache;`
	`27`	`+ return await _cacheRepository.Get<T>(cacheKey);`
`22`	`28`	`}`
`23`	`29`
`24`		`- var resourceToGet = resource ?? _resource ?? throw new Exception("Resource not defined");`
`25`		`- _resourceCache = await _codesetsService.GetResource<T>(resourceToGet);`
`26`		`- return _resourceCache;`
	`30`	`+ var resolvedResource = await _codesetsService.GetResource<T>(resourceToGet);`
	`31`	`+ await _cacheRepository.Set<T>(cacheKey, resolvedResource, TimeSpan.FromHours(24));`
	`32`	`+ return resolvedResource;`
`27`	`33`	`}`
`28`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace VirtualFinland.UserAPI.Data.Repositories;`
`7`	`7`
`8`	`8`	`public class CountriesRepository : CodesetsResourceRepository<List<Country>>, ICountriesRepository`
`9`	`9`	`{`
`10`		`- public CountriesRepository(CodesetsService codesetsService) : base(codesetsService)`
	`10`	`+ public CountriesRepository(CodesetsService codesetsService, ICacheRepositoryFactory cacheRepositoryFactory) : base(codesetsService, cacheRepositoryFactory)`
`11`	`11`	`{`
`12`	`12`	`_resource = CodesetsResource.Countries;`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace VirtualFinland.UserAPI.Data.Repositories;`
`7`	`7`
`8`	`8`	`public class LanguageRepository : CodesetsResourceRepository<List<Language>>, ILanguageRepository`
`9`	`9`	`{`
`10`		`- public LanguageRepository(CodesetsService codesetsService) : base(codesetsService)`
	`10`	`+ public LanguageRepository(CodesetsService codesetsService, ICacheRepositoryFactory cacheRepositoryFactory) : base(codesetsService, cacheRepositoryFactory)`
`11`	`11`	`{`
`12`	`12`	`_resource = CodesetsResource.Languages;`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace VirtualFinland.UserAPI.Data.Repositories;`
`7`	`7`
`8`	`8`	`public class OccupationsFlatRepository : CodesetsResourceRepository<List<OccupationFlatRoot.Occupation>>, IOccupationsFlatRepository`
`9`	`9`	`{`
`10`		`- public OccupationsFlatRepository(CodesetsService codesetsService) : base(codesetsService)`
	`10`	`+ public OccupationsFlatRepository(CodesetsService codesetsService, ICacheRepositoryFactory cacheRepositoryFactory) : base(codesetsService, cacheRepositoryFactory)`
`11`	`11`	`{`
`12`	`12`	`_resource = CodesetsResource.OccupationsFlat;`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace VirtualFinland.UserAPI.Data.Repositories;`
`7`	`7`
`8`	`8`	`public class OccupationsRepository : CodesetsResourceRepository<List<OccupationRoot.Occupation>>, IOccupationsRepository`
`9`	`9`	`{`
`10`		`- public OccupationsRepository(CodesetsService codesetsService) : base(codesetsService)`
	`10`	`+ public OccupationsRepository(CodesetsService codesetsService, ICacheRepositoryFactory cacheRepositoryFactory) : base(codesetsService, cacheRepositoryFactory)`
`11`	`11`	`{`
`12`	`12`	`_resource = CodesetsResource.Occupations;`
`13`	`13`	`}`