From d4e3ae0778a2e0440ec471e2e026e87c0b3dd42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enis=20Necipo=C4=9Flu?= <iletisim@enisnecipoglu.com>
Date: Thu, 17 Jun 2021 15:17:06 +0300
Subject: [PATCH] CmsKit - Refactoring Menu caching

---
 .../Volo/CmsKit/Menus/MenuUpdatedHandler.cs   | 18 +++++++--------
 .../Volo/CmsKit/Menus/MenuUpdatedEto.cs       | 12 ----------
 .../Public/Menus/MenuPublicAppService.cs      |  7 +-----
 .../CmsKit/Public/Menus/MenuUpdatedHandler.cs | 23 -------------------
 4 files changed, 9 insertions(+), 51 deletions(-)
 delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/MenuUpdatedEto.cs
 delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Menus/MenuUpdatedHandler.cs

diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Menus/MenuUpdatedHandler.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Menus/MenuUpdatedHandler.cs
index b9d4cfabc4..ae95be4057 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Menus/MenuUpdatedHandler.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Menus/MenuUpdatedHandler.cs
@@ -1,26 +1,24 @@
 using System.Threading.Tasks;
+using Volo.Abp.Caching;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities.Events;
 using Volo.Abp.EventBus;
-using Volo.Abp.EventBus.Distributed;
+using Volo.CmsKit.Public.Menus;
 
 namespace Volo.CmsKit.Menus
 {
-    public class MenuUpdatedHandler : ILocalEventHandler<EntityUpdatedEventData<Menu>>, ITransientDependency
+    public class MenuUpdatedHandler :  ILocalEventHandler<EntityUpdatedEventData<Menu>>, ITransientDependency
     {
-        public IDistributedEventBus EventBus { get; }
-
-        public MenuUpdatedHandler(IDistributedEventBus eventBus)
+        protected IDistributedCache<MenuWithDetailsDto, MainMenuCacheKey> DistributedCache { get; }
+        
+        public MenuUpdatedHandler(IDistributedCache<MenuWithDetailsDto, MainMenuCacheKey> distributedCache)
         {
-            EventBus = eventBus;
+            DistributedCache = distributedCache;
         }
 
         public async Task HandleEventAsync(EntityUpdatedEventData<Menu> eventData)
         {
-            await EventBus.PublishAsync(new MenuUpdatedEto
-            {
-                MenuId = eventData.Entity.Id
-            });
+            await DistributedCache.RemoveAsync(new MainMenuCacheKey());
         }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/MenuUpdatedEto.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/MenuUpdatedEto.cs
deleted file mode 100644
index 75c6474d9b..0000000000
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/MenuUpdatedEto.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using Volo.Abp.Domain.Entities.Events.Distributed;
-using Volo.Abp.EventBus;
-
-namespace Volo.CmsKit.Menus
-{
-    [EventName("Volo.CmsKit.Menus.Updated")]
-    public class MenuUpdatedEto : EtoBase
-    {
-        public Guid MenuId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Menus/MenuPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Menus/MenuPublicAppService.cs
index 76c648238a..c737367738 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Menus/MenuPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Menus/MenuPublicAppService.cs
@@ -33,17 +33,12 @@ namespace Volo.CmsKit.Public.Menus
                     
                     if (menu == null)
                     {
-                        return null;
+                        return new MenuWithDetailsDto(); 
                     }
 
                     return ObjectMapper.Map<Menu, MenuWithDetailsDto>(menu);
                 });
 
-            if (cachedMenu == null)
-            {
-                return null;
-            }
-
             return cachedMenu;
         }
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Menus/MenuUpdatedHandler.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Menus/MenuUpdatedHandler.cs
deleted file mode 100644
index 2c21cd254f..0000000000
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Menus/MenuUpdatedHandler.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.Caching;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.EventBus.Distributed;
-using Volo.CmsKit.Menus;
-
-namespace Volo.CmsKit.Public.Menus
-{
-    public class MenuUpdatedHandler : IDistributedEventHandler<MenuUpdatedEto>, ITransientDependency
-    {
-        protected IDistributedCache<MenuWithDetailsDto, MainMenuCacheKey> DistributedCache { get; }
-        
-        public MenuUpdatedHandler(IDistributedCache<MenuWithDetailsDto, MainMenuCacheKey> distributedCache)
-        {
-            DistributedCache = distributedCache;
-        }
-
-        public async Task HandleEventAsync(MenuUpdatedEto eventData)
-        {
-            await DistributedCache.RemoveAsync(new MainMenuCacheKey());
-        }
-    }
-}
\ No newline at end of file