Merge branch 'dev'

src/Shiny.Mediator.DapperRequests/Contracts.cs

@@ -0,0 +1,47 @@
+namespace Shiny.Mediator;
+
+
+public record DapperRequest<TResult>(
+    FormattableString Sql, 
+    int? CommandTimeout = null,
+    string? RequestKey = null
+) : IRequest<TResult>, IRequestKey 
+{
+    public string GetKey()
+    {
+        if (this.RequestKey != null)
+            return this.RequestKey;
+
+        var key = typeof(TResult).FullName + "_" + Sql;
+        return key;
+    }
+}
+public record DapperQuery<TResult>(
+    FormattableString Sql, 
+    int? CommandTimeout = null,
+    string? RequestKey = null
+) : DapperRequest<IEnumerable<TResult>>(
+    Sql,
+    CommandTimeout,
+    RequestKey
+);
+
+public record DapperFirstQuery<TResult>(
+    FormattableString Sql, 
+    int? CommandTimeout = null,
+    string? RequestKey = null
+) : DapperRequest<TResult>(
+    Sql,
+    CommandTimeout,
+    RequestKey
+);
+
+public record DapperScalar(
+    FormattableString Sql, 
+    int? CommandTimeout = null,
+    string? RequestKey = null
+) : DapperRequest<object>(
+    Sql,
+    CommandTimeout,
+    RequestKey
+);

src/Shiny.Mediator/Caching/CacheExtensions.cs

@@ -7,6 +7,11 @@ namespace Shiny.Mediator;
 
 public static class CacheExtensions
 {
+    public static readonly (string Key, bool Value) ForceCacheRefreshHeader = ("ForceCacheRefresh", true);
+
+    public static bool HasForceCacheRefresh(this RequestContext context)
+        => context.Values.ContainsKey(ForceCacheRefreshHeader.Key);
+
     public static ShinyConfigurator AddCaching<TCache>(this ShinyConfigurator cfg) where TCache : class, ICacheService
     {
         cfg.Services.AddSingletonAsImplementedInterfaces<TCache>();

src/Shiny.Mediator/Caching/Infrastructure/CachingRequestMiddleware.cs

@@ -42,7 +42,7 @@ CancellationToken cancellationToken
             return await next().ConfigureAwait(false);
 
         TResult result = default!;
-        if (context.Request is ICacheControl { ForceRefresh: true })
+        if (context.Request is ICacheControl { ForceRefresh: true } || context.HasForceCacheRefresh())
         {
             logger.LogDebug("Cache Forced Refresh - {Request}", context.Request);
             result = await next().ConfigureAwait(false);

version.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "3.0.0-beta.{height}",
+    "version": "3.1.0-beta.{height}",
     "assemblyVersion": {
         "precision": "revision"
     },