fix: Readded cache invalidation (but globally)

Author: linkdotnet

src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPost.razor

@@ -334,7 +334,7 @@
         await OnBlogPostCreated.InvokeAsync(model.ToBlogPost());
         if (model.ShouldInvalidateCache)
         {
-            CacheInvalidator.Cancel();
+            await CacheInvalidator.ClearCacheAsync();
         }
 
         InstantJobRegistry.RunInstantJob<SimilarBlogPostJob>(parameter: true);

src/LinkDotNet.Blog.Web/Features/Admin/Settings/SettingsPage.razor

@@ -22,12 +22,11 @@
 		</thead>
 		<tbody>
 		<tr>
-			<td>Cache Duration (First Page)</td>
-			<td>Defines how long the first page remains cached before a refresh is required.<br/>
-			The longer the cache lives, the longer it takes for the user to see updated content on the first page, but the faster the page loads.<br/>
-				You can manually invalidate the cache.</td>
-			<td>@ApplicationConfiguration.Value.FirstPageCacheDurationInMinutes Minutes</td>
-			<td><button class="btn btn-warning" id="invalidate-cache" @onclick="InvalidateCache">Invalidate Cache</button></td>
+			<td>Cache</td>
+			<td>Clears all cached data including the first page, sitemap, and other cached content.<br/>
+				Use this to immediately reflect changes across the blog.</td>
+			<td>-</td>
+			<td><button class="btn btn-warning" id="invalidate-cache" @onclick="InvalidateCacheAsync">Clear Cache</button></td>
 		</tr>
 		<tr>
 			<td>Run Visit Counter Data Collection</td>
@@ -41,10 +40,10 @@
 </div>
 
 @code {
-	private void InvalidateCache()
+	private async Task InvalidateCacheAsync()
 	{
-		CacheInvalidator.Cancel();
-		ToastService.ShowInfo("Cache was invalidated.");
+		await CacheInvalidator.ClearCacheAsync();
+		ToastService.ShowInfo("Cache was cleared.");
 	}
 
 	private void RunVisitTransformer()

src/LinkDotNet.Blog.Web/Features/BlogPostPublisher.cs

@@ -47,7 +47,7 @@ private async Task<int> PublishScheduledBlogPostsAsync()
 
         if (blogPostsToPublish.Count > 0)
         {
-            cacheInvalidator.Cancel();
+            await cacheInvalidator.ClearCacheAsync();
         }
 
         return blogPostsToPublish.Count;

src/LinkDotNet.Blog.Web/Features/Home/Index.razor

@@ -5,12 +5,8 @@
 @using LinkDotNet.Blog.Infrastructure
 @using LinkDotNet.Blog.Infrastructure.Persistence
 @using LinkDotNet.Blog.Web.Features.Home.Components
-@using LinkDotNet.Blog.Web.Features.Services
-@using Microsoft.Extensions.Caching.Memory
-@using Microsoft.Extensions.Primitives
 @using ZiggyCreatures.Caching.Fusion
 @inject IFusionCache FusionCache
-@inject ICacheTokenProvider CacheTokenProvider
 @inject IRepository<BlogPost> BlogPostRepository
 @inject IOptions<Introduction> Introduction
 @inject IOptions<ApplicationConfiguration> AppConfiguration

src/LinkDotNet.Blog.Web/Features/Services/CacheService.cs

@@ -1,19 +1,16 @@
-using System;
-using System.Threading;
+using System.Threading.Tasks;
+using ZiggyCreatures.Caching.Fusion;
 
 namespace LinkDotNet.Blog.Web.Features.Services;
 
-public sealed class CacheService : ICacheTokenProvider, ICacheInvalidator, IDisposable
+public sealed class CacheService : ICacheInvalidator
 {
-    private CancellationTokenSource cancellationTokenSource = new();
+    private readonly IFusionCache fusionCache;
 
-    public CancellationToken Token => cancellationTokenSource.Token;
-
-    public void Cancel()
+    public CacheService(IFusionCache fusionCache)
     {
-        cancellationTokenSource.Cancel();
-        cancellationTokenSource = new();
+        this.fusionCache = fusionCache;
     }
 
-    public void Dispose() => cancellationTokenSource.Dispose();
+    public Task ClearCacheAsync() => fusionCache.ClearAsync().AsTask();
 }

src/LinkDotNet.Blog.Web/Features/Services/ICacheInvalidator.cs

@@ -1,6 +1,8 @@
+using System.Threading.Tasks;
+
 namespace LinkDotNet.Blog.Web.Features.Services;
 
 public interface ICacheInvalidator
 {
-    void Cancel();
+    Task ClearCacheAsync();
 }

src/LinkDotNet.Blog.Web/Features/Services/ICacheTokenProvider.cs

@@ -27,7 +27,6 @@ public static IServiceCollection AddApplicationServices(this IServiceCollection
         services.AddScoped<ICurrentUserService, CurrentUserService>();
 
         services.AddSingleton<CacheService>();
-        services.AddSingleton<ICacheTokenProvider>(s => s.GetRequiredService<CacheService>());
         services.AddSingleton<ICacheInvalidator>(s => s.GetRequiredService<CacheService>());
 
         services.AddBackgroundServices();

src/LinkDotNet.Blog.Web/ServiceExtensions.cs

@@ -49,14 +49,14 @@ public async Task ShouldInvalidateCacheWhenPublishing()
 
         await sut.RunAsync(Substitute.For<IJobExecutionContext>(), CancellationToken.None);
 
-        cacheInvalidator.Received().Cancel();
+        await cacheInvalidator.Received().ClearCacheAsync();
     }
 
     [Fact]
     public async Task ShouldNotInvalidateCacheWhenThereIsNothingToPublish()
     {
         await sut.RunAsync(Substitute.For<IJobExecutionContext>(), CancellationToken.None);
 
-        cacheInvalidator.DidNotReceive().Cancel();
+        await cacheInvalidator.DidNotReceive().ClearCacheAsync();
     }
 }

tests/LinkDotNet.Blog.IntegrationTests/Web/Features/BlogPostPublisherTests.cs

@@ -7,7 +7,6 @@
 using LinkDotNet.Blog.Web.Features.Bookmarks;
 using LinkDotNet.Blog.Web.Features.Components;
 using LinkDotNet.Blog.Web.Features.Home;
-using LinkDotNet.Blog.Web.Features.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using ZiggyCreatures.Caching.Fusion;
@@ -225,7 +224,6 @@ private void RegisterComponents(BunitContext ctx, string? profilePictureUri = nu
         ctx.Services.AddScoped(_ => Repository);
         ctx.Services.AddScoped(_ => Options.Create(CreateSampleAppConfiguration(profilePictureUri, useMultiAuthorMode).ApplicationConfiguration));
         ctx.Services.AddScoped(_ => Options.Create(CreateSampleAppConfiguration(profilePictureUri, useMultiAuthorMode).Introduction));
-        ctx.Services.AddScoped(_ => Substitute.For<ICacheTokenProvider>());
         ctx.Services.AddScoped(_ => Substitute.For<IBookmarkService>());
         ctx.Services.AddScoped<IFusionCache>(_ => new FusionCache(new FusionCacheOptions(), memoryLocker: new AsyncKeyedMemoryLocker()));
     }