Fixed deleting items from cache

CacheDrive.Tests/CachingSimpleTypesTests.cs

@@ -54,4 +54,41 @@ public async Task SimpleTypesShouldBeProperlyCachedAndRestoredFromTheMemory()
         cachedDoubleItem.Should().Be(doubleItem.value);
         cachedBoolItem.Should().Be(boolItem.value);
     }
+
+    [Test]
+    public async Task SimpleTypesShouldBeProperlyDeletedFromTheMemoryCache()
+    {
+        // Arrange
+        ServiceProvider serviceProvider = TestHelper.CreateServiceProvider(
+            DateTime.Now,
+            cacheEnabled: true,
+            cacheExpirationType: CacheExpirationType.Hours,
+            cacheExpiration: 2,
+            cacheType: CacheType.Memory);
+
+        ICacheService cacheService = serviceProvider.GetRequiredService<ICacheService>();
+
+        await cacheService.InitializeAsync();
+
+        // Act
+
+        // Add 50 items
+        for (int i = 0; i < 50; i++)
+        {
+            await cacheService.SetAsync($"test_{i}", i);
+        }
+
+        // Delete every second element
+        for (int i = 0; i < 50; i++)
+        {
+            if ((i + 1) % 2 == 0)
+            {
+                await cacheService.DeleteAsync<int>($"test_{i}");
+            }
+        }
+
+        // // Assert
+        int countCachedItems = cacheService.CountCachedItems();
+        countCachedItems.Should().Be(25);
+    }
 }

CacheDrive/Services/ICacheService.cs

@@ -60,18 +60,18 @@ public interface ICacheService
     /// </summary>
     /// <param name="key">The key of the element to be remove.</param>
     /// <returns>true if an object was removed successfully; otherwise, false.</returns>
-    bool Delete(string key);
+    bool Delete<T>(string key);
 
     /// <summary>
     /// Deletes the object associated with the given key.
     /// </summary>
     /// <param name="key">The key of the element to be remove.</param>
     /// <returns>true if an object was removed successfully; otherwise, false.</returns>
-    Task<bool> DeleteAsync(string key);
+    Task<bool> DeleteAsync<T>(string key);
 
     /// <summary>
     /// Returns the number of items in the cache.
     /// </summary>
     /// <returns>The number of items in the cache.</returns>
-    int CountCacheItems();
+    int CountCachedItems();
 }

CacheDrive/Services/MemoryCacheService.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Text.Json;
 using System.Threading.Tasks;
 using CacheDrive.Configuration;
@@ -76,7 +75,7 @@ public bool TryGetValue<T>(string key, out T value)
 
         if (cachedItem.Expired(_dateService))
         {
-            DeleteAsync(cachedItem);
+            Delete<T>(cachedItem.Key);
             value = default;
             return false;
         }
@@ -168,19 +167,19 @@ internal Task SetAsync(CachedItem cachedItem)
         return Task.CompletedTask;
     }
 
-    public bool Delete(string key)
-        => key is not null && Storage.TryRemove(key, out _);
+    public bool Delete<T>(string key)
+        => key is not null && Storage.TryRemove(CacheableItem<T>.GetCacheKey(key), out _);
 
-    public Task<bool> DeleteAsync(string key)
-        => key is null ? Task.FromResult(false) : Task.FromResult(Storage.TryRemove(key, out _));
+    public Task<bool> DeleteAsync<T>(string key)
+        => key is null ? Task.FromResult(false) : DeleteAsync(CacheableItem<T>.GetCacheKey(key));
 
-    private bool Delete(CachedItem item)
-        => Delete(item.Key);
+    private Task<bool> DeleteAsync(string key)
+        => key is null ? Task.FromResult(false) : Task.FromResult(Storage.TryRemove(key, out _));
 
     private Task<bool> DeleteAsync(CachedItem item)
         => DeleteAsync(item.Key);
 
-    public int CountCacheItems()
+    public int CountCachedItems()
         => Storage.Count;
 
     private CachedItem Get(ICacheable item)