Consolidates expiration handling for cache client

Ensures consistent calculation of expiration times for cache entries by using a single `ToExpiresIn` extension method.

This prevents inconsistencies arising from different calculations across various methods.

Author: niemyjski

src/Foundatio/Extensions/CacheClientExtensions.cs

@@ -21,12 +21,12 @@ public static Task<IDictionary<string, CacheValue<T>>> GetAllAsync<T>(this ICach
 
     public static Task<long> IncrementAsync(this ICacheClient client, string key, long amount, DateTime? expiresAtUtc)
     {
-        return client.IncrementAsync(key, amount, expiresAtUtc?.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime));
+        return client.IncrementAsync(key, amount, client.ToExpiresIn(expiresAtUtc));
     }
 
     public static Task<double> IncrementAsync(this ICacheClient client, string key, double amount, DateTime? expiresAtUtc)
     {
-        return client.IncrementAsync(key, amount, expiresAtUtc?.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime));
+        return client.IncrementAsync(key, amount, client.ToExpiresIn(expiresAtUtc));
     }
 
     public static Task<long> IncrementAsync(this ICacheClient client, string key, TimeSpan? expiresIn = null)
@@ -46,42 +46,42 @@ public static Task<long> DecrementAsync(this ICacheClient client, string key, lo
 
     public static Task<long> DecrementAsync(this ICacheClient client, string key, long amount, DateTime? expiresAtUtc)
     {
-        return client.IncrementAsync(key, -amount, expiresAtUtc?.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime));
+        return client.IncrementAsync(key, -amount, client.ToExpiresIn(expiresAtUtc));
     }
 
     public static Task<double> DecrementAsync(this ICacheClient client, string key, double amount, DateTime? expiresAtUtc)
     {
-        return client.IncrementAsync(key, -amount, expiresAtUtc?.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime));
+        return client.IncrementAsync(key, -amount, client.ToExpiresIn(expiresAtUtc));
     }
 
     public static Task<bool> AddAsync<T>(this ICacheClient client, string key, T value, DateTime? expiresAtUtc)
     {
-        return client.AddAsync(key, value, expiresAtUtc?.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime));
+        return client.AddAsync(key, value, client.ToExpiresIn(expiresAtUtc));
     }
 
     public static Task<bool> SetAsync<T>(this ICacheClient client, string key, T value, DateTime? expiresAtUtc)
     {
-        return client.SetAsync(key, value, expiresAtUtc?.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime));
+        return client.SetAsync(key, value, client.ToExpiresIn(expiresAtUtc));
     }
 
     public static Task<bool> ReplaceAsync<T>(this ICacheClient client, string key, T value, DateTime? expiresAtUtc)
     {
-        return client.ReplaceAsync(key, value, expiresAtUtc?.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime));
+        return client.ReplaceAsync(key, value, client.ToExpiresIn(expiresAtUtc));
     }
 
     public static Task<bool> ReplaceIfEqualAsync<T>(this ICacheClient client, string key, T value, T expected, DateTime? expiresAtUtc)
     {
-        return client.ReplaceIfEqualAsync(key, value, expected, expiresAtUtc?.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime));
+        return client.ReplaceIfEqualAsync(key, value, expected, client.ToExpiresIn(expiresAtUtc));
     }
 
     public static Task<int> SetAllAsync(this ICacheClient client, IDictionary<string, object> values, DateTime? expiresAtUtc)
     {
-        return client.SetAllAsync(values, expiresAtUtc?.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime));
+        return client.SetAllAsync(values, client.ToExpiresIn(expiresAtUtc));
     }
 
     public static Task SetExpirationAsync(this ICacheClient client, string key, DateTime expiresAtUtc)
     {
-        return client.SetExpirationAsync(key, expiresAtUtc.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime));
+        return client.SetExpirationAsync(key, client.ToExpiresIn(expiresAtUtc) ?? TimeSpan.MaxValue);
     }
 
     public static async Task<bool> ListAddAsync<T>(this ICacheClient client, string key, T value, TimeSpan? expiresIn = null)
@@ -152,7 +152,7 @@ public static Task<bool> SetUnixTimeMillisecondsAsync(this ICacheClient client,
 
     public static Task<bool> SetUnixTimeMillisecondsAsync(this ICacheClient client, string key, DateTime value, DateTime? expiresAtUtc)
     {
-        return client.SetAsync(key, value.ToUnixTimeMilliseconds(), expiresAtUtc?.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime));
+        return client.SetAsync(key, value.ToUnixTimeMilliseconds(), client.ToExpiresIn(expiresAtUtc));
     }
 
     public static async Task<DateTimeOffset> GetUnixTimeSecondsAsync(this ICacheClient client, string key, DateTime? defaultValue = null)
@@ -171,6 +171,18 @@ public static Task<bool> SetUnixTimeSecondsAsync(this ICacheClient client, strin
 
     public static Task<bool> SetUnixTimeSecondsAsync(this ICacheClient client, string key, DateTime value, DateTime? expiresAtUtc)
     {
-        return client.SetAsync(key, value.ToUnixTimeSeconds(), expiresAtUtc?.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime));
+        return client.SetAsync(key, value.ToUnixTimeSeconds(), client.ToExpiresIn(expiresAtUtc));
+    }
+
+    /// <summary>
+    /// Converts a DateTime expiration to a TimeSpan relative to now.
+    /// DateTime.MaxValue is treated as null (no expiration).
+    /// </summary>
+    private static TimeSpan? ToExpiresIn(this ICacheClient client, DateTime? expiresAtUtc)
+    {
+        if (!expiresAtUtc.HasValue || expiresAtUtc.Value == DateTime.MaxValue)
+            return null;
+
+        return expiresAtUtc.Value.Subtract(client.GetTimeProvider().GetUtcNow().UtcDateTime);
     }
 }