diff --git a/AsbCloudInfrastructure/Services/MeasureService.cs b/AsbCloudInfrastructure/Services/MeasureService.cs index 08e8b6b8..12bedf9d 100644 --- a/AsbCloudInfrastructure/Services/MeasureService.cs +++ b/AsbCloudInfrastructure/Services/MeasureService.cs @@ -2,7 +2,7 @@ using AsbCloudApp.Exceptions; using AsbCloudApp.Services; using AsbCloudDb.Model; -using AsbCloudInfrastructure.Services.Cache; +using AsbCloudInfrastructure.EfCache; using Mapster; using Microsoft.EntityFrameworkCore; using System.Collections.Generic; @@ -16,18 +16,17 @@ namespace AsbCloudInfrastructure.Services { private readonly IAsbCloudDbContext db; private readonly IWellService wellService; - private readonly CacheTable cacheCategories; + private static readonly System.TimeSpan cacheObsolescence = System.TimeSpan.FromMinutes(15); - public MeasureService(IAsbCloudDbContext db, Cache.CacheDb cacheDb, IWellService wellService) + public MeasureService(IAsbCloudDbContext db, IWellService wellService) { this.db = db; this.wellService = wellService; - cacheCategories = cacheDb.GetCachedTable((DbContext)db); } public async Task> GetCategoriesAsync(CancellationToken token) { - var entities = await cacheCategories.WhereAsync(token).ConfigureAwait(false); + var entities = await db.MeasureCategories.FromCacheAsync("MeasureCategories", cacheObsolescence, token).ConfigureAwait(false); var dto = entities.ToDictionary(e => e.Id, e => e.Name); return dto; }