From ced33d2f4f6c93dd77aa39d0d5a2a4ca012b3202 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Tue, 26 Sep 2023 15:31:58 +0300 Subject: [PATCH] Remove PageCacheKey --- .../CmsKit/Admin/Pages/PageAdminAppService.cs | 10 +++++----- .../Volo/CmsKit/Pages/PageCacheItem.cs | 5 +++++ .../Volo/CmsKit/Pages/PageCacheKey.cs | 15 --------------- .../CmsKit/Public/Pages/PagePublicAppService.cs | 10 +++++----- 4 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageCacheKey.cs diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs index 1109bd10a4..8d32cb5836 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs @@ -24,12 +24,12 @@ public class PageAdminAppService : CmsKitAdminAppServiceBase, IPageAdminAppServi protected PageManager PageManager { get; } - protected IDistributedCache PageCache { get; } + protected IDistributedCache PageCache { get; } public PageAdminAppService( IPageRepository pageRepository, PageManager pageManager, - IDistributedCache pageCache) + IDistributedCache pageCache) { PageRepository = pageRepository; PageManager = pageManager; @@ -66,7 +66,7 @@ public class PageAdminAppService : CmsKitAdminAppServiceBase, IPageAdminAppServi input.MapExtraPropertiesTo(page); await PageRepository.InsertAsync(page); - await PageCache.RemoveAsync(new PageCacheKey(page.Slug)); + await PageCache.RemoveAsync(PageCacheItem.GetKey(page.Slug)); return ObjectMapper.Map(page); } @@ -80,7 +80,7 @@ public class PageAdminAppService : CmsKitAdminAppServiceBase, IPageAdminAppServi await InvalidateDefaultHomePageCacheAsync(considerUow: true); } - await PageCache.RemoveAsync(new PageCacheKey(page.Slug)); + await PageCache.RemoveAsync(PageCacheItem.GetKey(page.Slug)); await PageManager.SetSlugAsync(page, input.Slug); @@ -119,6 +119,6 @@ public class PageAdminAppService : CmsKitAdminAppServiceBase, IPageAdminAppServi protected virtual async Task InvalidateDefaultHomePageCacheAsync(bool considerUow = false) { - await PageCache.RemoveAsync(new PageCacheKey(PageConsts.DefaultHomePageCacheKey), considerUow: considerUow); + await PageCache.RemoveAsync(PageCacheItem.GetKey(PageConsts.DefaultHomePageCacheKey), considerUow: considerUow); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageCacheItem.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageCacheItem.cs index 71c6800e04..4dadd04e8e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageCacheItem.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageCacheItem.cs @@ -16,4 +16,9 @@ public class PageCacheItem : ExtensibleObject public string Script { get; set; } public string Style { get; set; } + + public static string GetKey(string slug) + { + return $"CmsPage_{slug}"; + } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageCacheKey.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageCacheKey.cs deleted file mode 100644 index 97891c4f6f..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/PageCacheKey.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace Volo.CmsKit.Pages; -public class PageCacheKey -{ - public PageCacheKey(string slug) - { - Slug = slug; - } - - public string Slug { get; set; } - - public override string ToString() - { - return $"CmsPage_{Slug}"; - } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs index 984ea4c99d..a72afd4055 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PagePublicAppService.cs @@ -19,12 +19,12 @@ public class PagePublicAppService : CmsKitPublicAppServiceBase, IPagePublicAppSe protected IPageRepository PageRepository { get; } protected PageManager PageManager { get; } - protected IDistributedCache PageCache { get; } + protected IDistributedCache PageCache { get; } public PagePublicAppService( IPageRepository pageRepository, PageManager pageManager, - IDistributedCache pageCache) + IDistributedCache pageCache) { PageRepository = pageRepository; PageManager = pageManager; @@ -33,7 +33,7 @@ public class PagePublicAppService : CmsKitPublicAppServiceBase, IPagePublicAppSe public virtual async Task FindBySlugAsync(string slug) { - var pageCacheItem = await PageCache.GetOrAddAsync(new PageCacheKey(slug), async () => + var pageCacheItem = await PageCache.GetOrAddAsync(PageCacheItem.GetKey(slug), async () => { var page = await PageRepository.FindBySlugAsync(slug); if (page is null) @@ -54,7 +54,7 @@ public class PagePublicAppService : CmsKitPublicAppServiceBase, IPagePublicAppSe public virtual async Task FindDefaultHomePageAsync() { - var pageCacheItem = await PageCache.GetAsync(new PageCacheKey(PageConsts.DefaultHomePageCacheKey)); + var pageCacheItem = await PageCache.GetAsync(PageCacheItem.GetKey(PageConsts.DefaultHomePageCacheKey)); if (pageCacheItem is null) { var page = await PageManager.GetHomePageAsync(); @@ -65,7 +65,7 @@ public class PagePublicAppService : CmsKitPublicAppServiceBase, IPagePublicAppSe pageCacheItem = ObjectMapper.Map(page); - await PageCache.SetAsync(new PageCacheKey(PageConsts.DefaultHomePageCacheKey), pageCacheItem, + await PageCache.SetAsync(PageCacheItem.GetKey(PageConsts.DefaultHomePageCacheKey), pageCacheItem, new DistributedCacheEntryOptions { AbsoluteExpiration = DateTimeOffset.Now.AddHours(1) }); }