Changed the way cache is used

kubagdynia · Nov 28, 2023 · 716f376 · 716f376
1 parent fe9ca50
commit 716f376
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 27 deletions.
diff --git a/CacheDrive.Tests/CachingObjectsTests.cs b/CacheDrive.Tests/CachingObjectsTests.cs
@@ -37,7 +37,7 @@ public async Task ObjectShouldBeProperlyCachedAndRestoredFromTheMemory()
 
         await cacheService.InitializeAsync();
 
-        await cacheService.SetAsync(_testClass);
+        await cacheService.SetAsync(_testClass.Id.ToString(), _testClass);
 
         var cachedTestClass = await cacheService.GetAsync<TestClass>(_testClass.Id.ToString());
 
@@ -59,7 +59,7 @@ public async Task ObjectShoulBeProperlyCachedInMemoryAndPersistedToTheFile()
 
         await cacheService.InitializeAsync();
 
-        await cacheService.SetAsync(_testClass);
+        await cacheService.SetAsync(_testClass.Id.ToString(), _testClass);
 
         var cachedTestClass = await cacheService.GetAsync<TestClass>(_testClass.Id.ToString());
 

diff --git a/CacheDrive.Tests/MemoryTests.cs b/CacheDrive.Tests/MemoryTests.cs
@@ -20,7 +20,7 @@ public async Task StringShouldBeCorrectlySavedAndReadFromTheCacheInMemory(string
 
         await cacheService.SetAsync(key, text);
 
-        string resultValue =  await cacheService.GetAsync(key);
+        string resultValue =  await cacheService.GetAsync<string>(key);
 
         await cacheService.FlushAsync();
 

diff --git a/CacheDrive/Models/ObjectItem.cs b/CacheDrive/Models/ObjectItem.cs
@@ -0,0 +1,22 @@
+using System.Text.Json.Serialization;
+
+namespace CacheDrive.Models;
+
+public class ObjectItem<T> : ICacheable
+{
+    [JsonPropertyName("key")]
+    public string Key { get; set; }
+
+    [JsonPropertyName("value")]
+    public T Value { get; set; }
+
+    [JsonIgnore]
+    public string CacheKey
+        => GetCacheKey(Key);
+
+    public static string GetCacheKey(string key)
+        => $"{nameof(ObjectItem<T>)}@{key}";
+
+    public static ObjectItem<T> Create(string key, T value)
+        => new() { Key = key, Value = value };
+}
diff --git a/CacheDrive/Services/ICacheService.cs b/CacheDrive/Services/ICacheService.cs
@@ -6,17 +6,13 @@ public interface ICacheService
 {
     bool HasItem(string key);
 
-    bool TryGetValue(string key, out string value);
-
-    bool TryGetValue<T>(string key, out T value) where T : ICacheable;
+    bool TryGetValue<T>(string key, out T value);
 
-    Task<string> GetAsync(string key);
-
-    Task<T> GetAsync<T>(string key) where T : ICacheable;
+    Task<T> GetAsync<T>(string key);
 
     void Set<T>(T item, int expirySeconds = 0) where T : ICacheable;
 
-    Task SetAsync(string key, string value);
+    Task SetAsync<T>(string key, T value);
 
     Task SetAsync<T>(T item, int expirySeconds = 0) where T : ICacheable;
 

diff --git a/CacheDrive/Services/MemoryCacheService.cs b/CacheDrive/Services/MemoryCacheService.cs
@@ -37,21 +37,30 @@ public bool HasItem(string key)
         return false;
     }
 
-    public bool TryGetValue(string key, out string value)
+    public bool TryGetValue<T>(string key, out T value)
     {
-        if (TryGetValue(key, out SpecificField cachedSpecificField))
+        if (TryGetCacheableValue(key, out ObjectItem<T> result))
         {
-            value = cachedSpecificField.Value;
-            return true;
+            if (result == null)
+            {
+                value = default;
+                return true;
+            }
+
+            if (result.Value is { } item)
+            {
+                value = item;
+                return true;
+            }
         }
 
-        value = null;
+        value = default;
         return false;
     }
 
-    public bool TryGetValue<T>(string key, out T value) where T : ICacheable
+    private bool TryGetCacheableValue<T>(string key, out T value) where T : ICacheable
     {
-        if (!Storage.TryGetValue(SpecificField.GetCacheKey(key), out var cachedItem))
+        if (!Storage.TryGetValue(ObjectItem<T>.GetCacheKey(key), out CachedItem cachedItem))
         {
             value = default;
             return false;
@@ -68,25 +77,31 @@ public bool TryGetValue<T>(string key, out T value) where T : ICacheable
         return true;
     }
 
-    public async Task<string> GetAsync(string key)
+    public async Task<T> GetAsync<T>(string key)
     {
-        var cachedSpecificField = await GetAsync<SpecificField>(key);
-        return await Task.FromResult(cachedSpecificField.Value);
+        var cachedItem = await GetCacheableAsync<ObjectItem<T>>(key);
+
+        if (cachedItem is null)
+        {
+            return await Task.FromResult<T>(default);
+        }
+
+        return await Task.FromResult(cachedItem.Value);
     }
 
-    public async Task<T> GetAsync<T>(string key) where T : ICacheable
+    private async Task<T> GetCacheableAsync<T>(string key) where T : ICacheable
     {
         var cacheKey = T.GetCacheKey(key);
 
         var cachedItem = Get(cacheKey);
 
-        if (cachedItem == null)
-            return default;
+        if (cachedItem is null)
+            return await Task.FromResult<T>(default);
 
         if (cachedItem.Expired(_dateService))
         {
             await DeleteAsync(cachedItem);
-            return default; 
+            return await Task.FromResult<T>(default);
         }
 
         return cachedItem.Unwrap<T>();
@@ -108,10 +123,10 @@ public void Set<T>(T item, int expirySeconds = 0) where T : ICacheable
         var cachedItem = CachedItem.FromCacheable(item, length, _dateService, true);
         Set(cachedItem);
     }
-
-    public Task SetAsync(string key, string value)
+    
+    public Task SetAsync<T>(string key, T value)
     {
-        return SetAsync(SpecificField.Create(key, value));
+        return SetAsync(ObjectItem<T>.Create(key, value));
     }
 
     public Task SetAsync<T>(T item, int expirySeconds = 0) where T : ICacheable