Feature/generic cached decorator (dotnet-architecture#604)

* make TODO: Make a generic decorator for any LookupData type * remove useless GetById in ICatalogLookupDataService
vslsanthosh · Oct 31, 2021 · 68beb21 · 68beb21
1 parent ed63faa
commit 68beb21
Showing 6 changed files with 55 additions and 123 deletions.
diff --git a/src/BlazorAdmin/Services/CachedCatalogBrandServiceDecorator.cs b/src/BlazorAdmin/Services/CachedCatalogBrandServiceDecorator.cs
diff --git a/src/BlazorAdmin/Services/CachedCatalogLookupDataServiceDecorator .cs b/src/BlazorAdmin/Services/CachedCatalogLookupDataServiceDecorator .cs
@@ -0,0 +1,53 @@
+using Blazored.LocalStorage;
+using BlazorShared.Interfaces;
+using BlazorShared.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace BlazorAdmin.Services
+{
+    public class CachedCatalogLookupDataServiceDecorator<TLookupData, TReponse>
+        : ICatalogLookupDataService<TLookupData>
+        where TLookupData : LookupData
+        where TReponse : ILookupDataResponse<TLookupData>
+    {
+        private readonly ILocalStorageService _localStorageService;
+        private readonly CatalogLookupDataService<TLookupData, TReponse> _catalogTypeService;
+        private ILogger<CachedCatalogLookupDataServiceDecorator<TLookupData, TReponse>> _logger;
+
+        public CachedCatalogLookupDataServiceDecorator(ILocalStorageService localStorageService,
+            CatalogLookupDataService<TLookupData, TReponse> catalogTypeService,
+            ILogger<CachedCatalogLookupDataServiceDecorator<TLookupData, TReponse>> logger)
+        {
+            _localStorageService = localStorageService;
+            _catalogTypeService = catalogTypeService;
+            _logger = logger;
+        }
+
+        public async Task<List<TLookupData>> List()
+        {
+            string key = typeof(TLookupData).Name;
+            var cacheEntry = await _localStorageService.GetItemAsync<CacheEntry<List<TLookupData>>>(key);
+            if (cacheEntry != null)
+            {
+                _logger.LogInformation($"Loading {key} from local storage.");
+                if (cacheEntry.DateCreated.AddMinutes(1) > DateTime.UtcNow)
+                {
+                    return cacheEntry.Value;
+                }
+                else
+                {
+                    _logger.LogInformation($"Cache expired; removing {key} from local storage.");
+                    await _localStorageService.RemoveItemAsync(key);
+                }
+            }
+
+            var types = await _catalogTypeService.List();
+            var entry = new CacheEntry<List<TLookupData>>(types);
+            await _localStorageService.SetItemAsync(key, entry);
+            return types;
+        }
+    }
+}
diff --git a/src/BlazorAdmin/Services/CachedCatalogTypeServiceDecorator.cs b/src/BlazorAdmin/Services/CachedCatalogTypeServiceDecorator.cs
diff --git a/src/BlazorAdmin/Services/CatalogLookupDataService.cs b/src/BlazorAdmin/Services/CatalogLookupDataService.cs
@@ -31,11 +31,6 @@ public CatalogLookupDataService(HttpClient httpClient,
             _apiUrl = baseUrlConfiguration.ApiBase;
         }
 
-        public async Task<TLookupData> GetById(int id)
-        {
-            return (await List()).FirstOrDefault(x => x.Id == id);
-        }
-
         public async Task<List<TLookupData>> List()
         {
             var endpointName = typeof(TLookupData).GetCustomAttribute<EndpointAttribute>().Name;

diff --git a/src/BlazorAdmin/ServicesConfiguration.cs b/src/BlazorAdmin/ServicesConfiguration.cs
@@ -9,9 +9,9 @@ public static class ServicesConfiguration
     {
         public static IServiceCollection AddBlazorServices(this IServiceCollection services)
         {
-            services.AddScoped<ICatalogLookupDataService<CatalogBrand>, CachedCatalogBrandServiceDecorator>();
+            services.AddScoped<ICatalogLookupDataService<CatalogBrand>, CachedCatalogLookupDataServiceDecorator<CatalogBrand,CatalogBrandResponse>>();
             services.AddScoped<CatalogLookupDataService<CatalogBrand, CatalogBrandResponse>>();
-            services.AddScoped<ICatalogLookupDataService<CatalogType>, CachedCatalogTypeServiceDecorator>();
+            services.AddScoped<ICatalogLookupDataService<CatalogType>, CachedCatalogLookupDataServiceDecorator<CatalogType,CatalogTypeResponse>>();
             services.AddScoped<CatalogLookupDataService<CatalogType, CatalogTypeResponse>>();
             services.AddScoped<ICatalogItemService, CachedCatalogItemServiceDecorator>();
             services.AddScoped<CatalogItemService>();

diff --git a/src/BlazorShared/Interfaces/ICatalogLookupDataService.cs b/src/BlazorShared/Interfaces/ICatalogLookupDataService.cs
@@ -7,6 +7,5 @@ namespace BlazorShared.Interfaces
     public interface ICatalogLookupDataService<TLookupData> where TLookupData : LookupData
     {
         Task<List<TLookupData>> List();
-        Task<TLookupData> GetById(int id);
     }
 }