Cache fixes

shinyorg · Jun 29, 2024 · 6d94a04 · 6d94a04
1 parent 7587acb
commit 6d94a04
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/Sample/Handlers/CachedRequestHandler.cs b/Sample/Handlers/CachedRequestHandler.cs
@@ -6,7 +6,7 @@ namespace Sample.Handlers;
 [RegisterHandler]
 public class CachedRequestHandler : IRequestHandler<CacheRequest, string>
 {
-    [Cache]
+    [Cache(AbsoluteExpirationSeconds = 20)]
     public Task<string> Handle(CacheRequest request, CancellationToken cancellationToken)
     {
         var r = DateTimeOffset.Now.ToString("h:mm:ss tt");

diff --git a/src/Shiny.Mediator.Caching/CacheAttribute.cs b/src/Shiny.Mediator.Caching/CacheAttribute.cs
@@ -6,6 +6,6 @@ namespace Shiny.Mediator;
 public class CacheAttribute : Attribute
 {
     public CacheItemPriority Priority { get; set; } = CacheItemPriority.Normal;
-    public int? AbsoluteExpirationSeconds { get; set; }
-    public int? SlidingExpirationSeconds { get; set; }
+    public int AbsoluteExpirationSeconds { get; set; }
+    public int SlidingExpirationSeconds { get; set; }
 }
diff --git a/src/Shiny.Mediator.Caching/Infrastructure/CachingRequestMiddleware.cs b/src/Shiny.Mediator.Caching/Infrastructure/CachingRequestMiddleware.cs
@@ -20,19 +20,22 @@ CancellationToken cancellationToken
             return await next().ConfigureAwait(false);
 
         var cacheKey = this.GetCacheKey(request!, requestHandler);
-        var e = cache.CreateEntry(cacheKey);
-        e.Priority = cfg.Priority;
+        var result = await cache.GetOrCreateAsync<TResult>(
+            cacheKey,
+            entry =>
+            {
+                entry.Priority = cfg.Priority;
 
-        if (cfg.AbsoluteExpirationSeconds != null)
-            e.AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(cfg.AbsoluteExpirationSeconds.Value);
+                if (cfg.AbsoluteExpirationSeconds > 0)
+                    entry.AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(cfg.AbsoluteExpirationSeconds);
 
-        if (cfg.SlidingExpirationSeconds != null)
-            e.SlidingExpiration = TimeSpan.FromSeconds(cfg.SlidingExpirationSeconds.Value);
-
-        var result = await cache.GetOrCreateAsync<TResult>(
-            e,
-            _ => next()
+                if (cfg.SlidingExpirationSeconds > 0)
+                    entry.SlidingExpiration = TimeSpan.FromSeconds(cfg.SlidingExpirationSeconds);
+
+                return next();
+            }
         );
+
         return result!;
     }