ICacheableResponse replace bool with enum

Author: TDroogers

README.md

@@ -102,10 +102,11 @@ IsOffline is true when the last request had an `HttpRequestException`.
 If a response object implements ICacheableResponse, the FromCache property will be set to true if the result was retrieved from cache.
 
 ```c#
+using Drogecode.Blazor.ExpireStorage;
 public class YourObjectResponse : ICacheableResponse
 {
     ...
-    public bool FromCache { get; set; }
+    public HandledBy HandledBy { get; set; }
     ...
 }
 ```

Src/Drogecode.Blazor.ExpireStorage/Drogecode.Blazor.ExpireStorage.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Drogecode.Blazor.ExpireStorage</RootNamespace>
-    <Version>0.2.2</Version>
+    <Version>0.2.3</Version>
     <Title>Drogecode.Blazor.ExpireStorage</Title>
     <Authors>Taco Droogers</Authors>
     <PackageProjectUrl>https://github.com/Drogecode/Drogecode.Blazor.ExpireStorage</PackageProjectUrl>

Src/Drogecode.Blazor.ExpireStorage/Enums/HandledBy.cs

@@ -0,0 +1,8 @@
+namespace Drogecode.Blazor.ExpireStorage;
+
+public enum HandledBy
+{
+    Function = 0,
+    Cache = 1,
+    Default = 2
+}

Src/Drogecode.Blazor.ExpireStorage/Interfaces/ICacheableResponse.cs

@@ -2,5 +2,5 @@
 
 public interface ICacheableResponse
 {
-    public bool FromCache { get; set; }
-}
+    public HandledBy HandledBy { get; set; }
+}

Src/Drogecode.Blazor.ExpireStorage/Services/ExpireStorageService.cs

@@ -60,7 +60,10 @@ public ExpireStorageService(
                 cacheKey += $"__{Postfix}";
             }
 
-            if (clt.IsCancellationRequested) return defaultResponse;
+            if (clt.IsCancellationRequested)
+            {
+                return BuildResponse(defaultResponse, HandledBy.Default);
+            }
             if (request.CachedAndReplace && !(IsOffline && request.AlwaysCacheWhenOffline))
             {
                 var requestCopy = request;
@@ -70,29 +73,13 @@ public ExpireStorageService(
             if ((request.CachedAndReplace || request.OneCallPerSession || (IsOffline && request.AlwaysCacheWhenOffline)) && !request.IgnoreCache)
             {
                 var sessionResult = await _sessionStorageExpireService.GetItemAsync<TRes>(cacheKey, clt);
-                if (sessionResult is not null)
-                {
-                    if (sessionResult is ICacheableResponse response)
-                    {
-                        response.FromCache = true;
-                    }
-
-                    return sessionResult;
-                }
+                return BuildResponse(sessionResult, HandledBy.Cache);
             }
 
             if ((request.CachedAndReplace || request.OneCallPerCache || (IsOffline && request.AlwaysCacheWhenOffline)) && !request.IgnoreCache)
             {
                 var cacheResult = await _localStorageExpireService.GetItemAsync<TRes?>(cacheKey, clt);
-                if (cacheResult is not null)
-                {
-                    if (cacheResult is ICacheableResponse response)
-                    {
-                        response.FromCache = true;
-                    }
-
-                    return cacheResult;
-                }
+                return BuildResponse(cacheResult, HandledBy.Cache);
             }
 
             if (!request.CachedAndReplace)
@@ -115,19 +102,14 @@ public ExpireStorageService(
 
         if (request.IgnoreCache)
         {
-            return defaultResponse;
+            return BuildResponse(defaultResponse, HandledBy.Default);
         }
 
         try
         {
             var cacheResult = await _localStorageExpireService.GetItemAsync<TRes?>(cacheKey, clt);
             cacheResult ??= Activator.CreateInstance<TRes>();
-            if (cacheResult is ICacheableResponse response)
-            {
-                response.FromCache = true;
-            }
-
-            return cacheResult;
+            return BuildResponse(cacheResult, HandledBy.Cache);
         }
         catch (HttpRequestException)
         {
@@ -156,16 +138,26 @@ public ExpireStorageService(
             ConsoleHelper.WriteLine(ex);
         }
 
-        return defaultResponse;
+        return BuildResponse(defaultResponse, HandledBy.Default);
     }
 
-    private async Task<TRes> RunSaveAndReturn<TRes>(string cacheKey, Func<Task<TRes>> function, CachedRequest request, CancellationToken clt)
+    private async Task<TRes?> RunSaveAndReturn<TRes>(string cacheKey, Func<Task<TRes>> function, CachedRequest request, CancellationToken clt)
     {
         var result = await function();
         await _localStorageExpireService.SetItemAsync(cacheKey, result, request.ExpireLocalStorage, clt);
         if (request.OneCallPerSession)
             await _sessionStorageExpireService.SetItemAsync(cacheKey, result, request.ExpireSession, clt);
         IsOffline = false;
+        return BuildResponse(result, HandledBy.Function);
+    }
+
+    private static TRes? BuildResponse<TRes>(TRes? result, HandledBy handledBy)
+    {
+        if (result is null) return result;
+        if (result is ICacheableResponse response)
+        {
+            response.HandledBy = handledBy;
+        }
         return result;
     }
 }