From 0156679f43bf5b8527a4e141d0a59e1710638423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enis=20Necipo=C4=9Flu?= <iletisim@enisnecipoglu.com>
Date: Wed, 9 Jun 2021 11:09:17 +0300
Subject: [PATCH] CmsKit - Add missing Multi-Tenancy to Menu

---
 .../Volo/CmsKit/Admin/Menus/MenuAdminAppService.cs       | 2 +-
 .../src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/Menu.cs     | 9 +++++++--
 .../Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs    | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuAdminAppService.cs
index b47cbe9864..243004f541 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuAdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuAdminAppService.cs
@@ -58,7 +58,7 @@ namespace Volo.CmsKit.Admin.Menus
         [Authorize(CmsKitAdminPermissions.Menus.Create)]
         public async Task<MenuDto> CreateAsync(MenuCreateInput input)
         {
-            var menu = new Menu(GuidGenerator.Create(), input.Name);
+            var menu = new Menu(GuidGenerator.Create(), CurrentTenant.Id, input.Name);
 
             await MenuRepository.InsertAsync(menu);
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/Menu.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/Menu.cs
index 0e4b5fb7a5..ed5ae7ff69 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/Menu.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/Menu.cs
@@ -4,16 +4,21 @@ using System.Collections;
 using System.Collections.Generic;
 using Volo.Abp;
 using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.CmsKit.Menus
 {
-    public class Menu : FullAuditedAggregateRoot<Guid>
+    public class Menu : FullAuditedAggregateRoot<Guid>, IMultiTenant
     {
         public string Name { get; protected set; }
+
+        public Guid? TenantId { get; protected set; }
+
         public ICollection<MenuItem> Items { get; protected set; }
 
-        public Menu(Guid id, [NotNull] string name) : base(id)
+        public Menu(Guid id, Guid? tenantId, [NotNull] string name) : base(id)
         {
+            TenantId = tenantId;
             SetName(name);
             Items = new HashSet<MenuItem>();
         }
diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
index e9ac1c92cc..81fa265f95 100644
--- a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
@@ -415,7 +415,7 @@ namespace Volo.CmsKit
 
         private async Task SeedMenusAsync()
         {
-            var menu = new Menu(_cmsKitTestData.Menu_1_Id, _cmsKitTestData.Menu_1_Name);
+            var menu = new Menu(_cmsKitTestData.Menu_1_Id, null, _cmsKitTestData.Menu_1_Name);
 
             menu.Items.Add(
                 new MenuItem(