From d45bf3da479bf4625af5ebd2f0afc07cf5d62e03 Mon Sep 17 00:00:00 2001
From: enisn <info@enisnecipoglu.com>
Date: Tue, 17 Aug 2021 13:44:11 +0300
Subject: [PATCH] tenant management - implement concurrency stamp

---
 .../Volo/Abp/TenantManagement/TenantDto.cs                | 5 ++++-
 .../Volo/Abp/TenantManagement/TenantUpdateDto.cs          | 8 +++++---
 .../Volo/Abp/TenantManagement/TenantAppService.cs         | 5 +++++
 .../Pages/TenantManagement/Tenants/EditModal.cshtml       | 1 +
 .../Pages/TenantManagement/Tenants/EditModal.cshtml.cs    | 6 +++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantDto.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantDto.cs
index 36422c7a1c..3d027707e0 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantDto.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantDto.cs
@@ -1,10 +1,13 @@
 using System;
 using Volo.Abp.Application.Dtos;
+using Volo.Abp.Domain.Entities;
 
 namespace Volo.Abp.TenantManagement
 {
-    public class TenantDto : ExtensibleEntityDto<Guid>
+    public class TenantDto : ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
     {
         public string Name { get; set; }
+
+        public string ConcurrencyStamp { get; set; }
     }
 }
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantUpdateDto.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantUpdateDto.cs
index 8bbe7adebb..8617733a2c 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantUpdateDto.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantUpdateDto.cs
@@ -1,7 +1,9 @@
-namespace Volo.Abp.TenantManagement
+using Volo.Abp.Domain.Entities;
+
+namespace Volo.Abp.TenantManagement
 {
-    public class TenantUpdateDto : TenantCreateOrUpdateDtoBase
+    public class TenantUpdateDto : TenantCreateOrUpdateDtoBase, IHasConcurrencyStamp
     {
-
+        public string ConcurrencyStamp { get; set; }
     }
 }
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs
index 50a92bc751..9188a9edd9 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs
@@ -98,9 +98,14 @@ namespace Volo.Abp.TenantManagement
         public virtual async Task<TenantDto> UpdateAsync(Guid id, TenantUpdateDto input)
         {
             var tenant = await TenantRepository.GetAsync(id);
+
             await TenantManager.ChangeNameAsync(tenant, input.Name);
+
+            tenant.SetConcurrencyStamp(input.ConcurrencyStamp);
             input.MapExtraPropertiesTo(tenant);
+
             await TenantRepository.UpdateAsync(tenant);
+
             return ObjectMapper.Map<Tenant, TenantDto>(tenant);
         }
 
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml
index 98e99c0603..6b2c840f1b 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml
@@ -18,6 +18,7 @@
         <abp-modal-header title="@L["Edit"].Value"></abp-modal-header>
         <abp-modal-body>
             <input asp-for="Tenant.Id" />
+            <input asp-for="Tenant.ConcurrencyStamp" />
             <abp-input asp-for="Tenant.Name" label="@L["TenantName"].Value" />
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<EditModalModel.TenantInfoModel>())
             {
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs
index f605f77190..58204a513e 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs
@@ -2,6 +2,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Domain.Entities;
 using Volo.Abp.ObjectExtending;
 using Volo.Abp.Validation;
 
@@ -38,7 +39,7 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
             return NoContent();
         }
 
-        public class TenantInfoModel : ExtensibleObject
+        public class TenantInfoModel : ExtensibleObject, IHasConcurrencyStamp
         {
             [HiddenInput]
             public Guid Id { get; set; }
@@ -47,6 +48,9 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
             [DynamicStringLength(typeof(TenantConsts), nameof(TenantConsts.MaxNameLength))]
             [Display(Name = "DisplayName:TenantName")]
             public string Name { get; set; }
+
+            [HiddenInput]
+            public string ConcurrencyStamp { get; set; }
         }
     }
 }
\ No newline at end of file