(#description: Modified CachingService to be generic and support othe…

…r types of caching storage)

.github/workflows/nuget-package-template.yml

@@ -100,3 +100,23 @@ jobs:
         dotnet build -c Release
         dotnet pack -c Release -p:PackageVersion=${{ env.NEW_VERSION }} --output .
         dotnet nuget push "*.nupkg" --api-key ${{ secrets.GITHUB_TOKEN }} --source https://nuget.pkg.github.com/DFE-Digital/index.json
+
+    - name: Get Release Description
+      id: extract_description
+      run: |
+        DESCRIPTION=$(git log -1 --pretty=format:"%s" | grep -oP '\(#description:.*\)' | sed 's/#description: //')
+        if [[ -z "$DESCRIPTION" ]]; then
+          DESCRIPTION="No release notes provided."
+        fi
+        echo "RELEASE_DESCRIPTION=$DESCRIPTION" >> $GITHUB_ENV
+
+    - name: Create GitHub Release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ env.NEW_VERSION }}
+        release_name: Release ${{ env.NEW_VERSION }}
+        body: ${{ env.RELEASE_DESCRIPTION }}
+        draft: false
+        prerelease: false

src/DfE.CoreLibs.Caching/Interfaces/ICacheService.cs

@@ -1,8 +1,9 @@
 namespace DfE.CoreLibs.Caching.Interfaces
 {
-    public interface ICacheService
+    public interface ICacheService<TCacheType> where TCacheType : ICacheType
     {
         Task<T> GetOrAddAsync<T>(string cacheKey, Func<Task<T>> fetchFunction, string methodName);
         void Remove(string cacheKey);
+        Type CacheType { get; }
     }
 }

src/DfE.CoreLibs.Caching/Interfaces/ICacheType.cs

@@ -0,0 +1,4 @@
+namespace DfE.CoreLibs.Caching.Interfaces
+{
+    public interface ICacheType;
+}

src/DfE.CoreLibs.Caching/Interfaces/IMemoryCacheType.cs

@@ -0,0 +1,4 @@
+namespace DfE.CoreLibs.Caching.Interfaces
+{
+    public interface IMemoryCacheType : ICacheType;
+}

src/DfE.CoreLibs.Caching/ServiceCollectionExtensions.cs

@@ -11,7 +11,7 @@ public static IServiceCollection AddServiceCaching(
             this IServiceCollection services, IConfiguration config)
         {
             services.Configure<CacheSettings>(config.GetSection("CacheSettings"));
-            services.AddSingleton<ICacheService, MemoryCacheService>();
+            services.AddSingleton<ICacheService<IMemoryCacheType>, MemoryCacheService>();
 
             return services;
         }

src/DfE.CoreLibs.Caching/Services/MemoryCacheService.cs

@@ -1,9 +1,9 @@
-using System.Diagnostics.CodeAnalysis;
 using DfE.CoreLibs.Caching.Interfaces;
 using DfE.CoreLibs.Caching.Settings;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using System.Diagnostics.CodeAnalysis;
 
 namespace DfE.CoreLibs.Caching.Services
 {
@@ -12,9 +12,10 @@ public class MemoryCacheService(
         IMemoryCache memoryCache,
         ILogger<MemoryCacheService> logger,
         IOptions<CacheSettings> cacheSettings)
-        : ICacheService
+        : ICacheService<IMemoryCacheType>
     {
-        private readonly CacheSettings _cacheSettings = cacheSettings.Value;
+        private readonly MemoryCacheSettings _cacheSettings = cacheSettings.Value.Memory;
+        public Type CacheType => typeof(IMemoryCacheType);
 
         public async Task<T> GetOrAddAsync<T>(string cacheKey, Func<Task<T>> fetchFunction, string methodName)
         {

src/DfE.CoreLibs.Caching/Settings/CacheSettings.cs

@@ -1,6 +1,11 @@
 namespace DfE.CoreLibs.Caching.Settings
 {
     public class CacheSettings
+    {
+        public MemoryCacheSettings Memory { get; set; } = new();
+    }
+
+    public class MemoryCacheSettings
     {
         public int DefaultDurationInSeconds { get; set; } = 5;
         public Dictionary<string, int> Durations { get; set; } = new();