Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Admin panel - CustomerGroupController.cs - changes with validators
supportd5cb51f32633
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.csindex 6b3448626..a7f10bf34 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs@@ -5,7 +5,6 @@ using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Utilities.Common.Security;using Grand.Infrastructure;-using Grand.SharedKernel;using Grand.Web.Admin.Extensions.Mapping;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Customers;@@ -54,15 +53,18 @@ namespace Grand.Web.Admin.Controllerspublic IActionResult Index() => RedirectToAction("List");- public IActionResult List() => View();+ public IActionResult List()+ {+ return View();+ }[PermissionAuthorizeAction(PermissionActionName.List)][HttpPost]public async Task<IActionResult> List(DataSourceRequest command){- var customerGroups = await _groupService.GetAllCustomerGroups(pageIndex: command.Page - 1, pageSize: command.PageSize, showHidden: true);- var gridModel = new DataSourceResult- {+ var customerGroups = await _groupService.GetAllCustomerGroups(pageIndex: command.Page - 1,+ pageSize: command.PageSize, showHidden: true);+ var gridModel = new DataSourceResult {Data = customerGroups.Select(x =>{var rolesModel = x.ToModel();@@ -88,8 +90,11 @@ namespace Grand.Web.Admin.Controllers{var customerGroup = await _customerGroupViewModelService.InsertCustomerGroupModel(model);Success(_translationService.GetResource("Admin.Customers.CustomerGroups.Added"));- return continueEditing ? RedirectToAction("Edit", new { id = customerGroup.Id }) : RedirectToAction("List");+ return continueEditing+ ? RedirectToAction("Edit", new { id = customerGroup.Id })+ : RedirectToAction("List");}+//If we got this far, something failed, redisplay formreturn View(model);}@@ -119,15 +124,11 @@ namespace Grand.Web.Admin.Controllers{if (ModelState.IsValid){- if (customerGroup.IsSystem && !model.Active)- throw new GrandException(_translationService.GetResource("Admin.Customers.CustomerGroups.Fields.Active.CantEditSystem"));-- if (customerGroup.IsSystem && !customerGroup.SystemName.Equals(model.SystemName, StringComparison.OrdinalIgnoreCase))- throw new GrandException(_translationService.GetResource("Admin.Customers.CustomerGroups.Fields.SystemName.CantEditSystem"));-customerGroup = await _customerGroupViewModelService.UpdateCustomerGroupModel(customerGroup, model);Success(_translationService.GetResource("Admin.Customers.CustomerGroups.Updated"));- return continueEditing ? RedirectToAction("Edit", new { id = customerGroup.Id }) : RedirectToAction("List");+ return continueEditing+ ? RedirectToAction("Edit", new { id = customerGroup.Id })+ : RedirectToAction("List");}//If we got this far, something failed, redisplay form@@ -142,14 +143,9 @@ namespace Grand.Web.Admin.Controllers[PermissionAuthorizeAction(PermissionActionName.Delete)][HttpPost]- public async Task<IActionResult> Delete(string id)+ public async Task<IActionResult> Delete(CustomerGroupDeleteModel model){- var customerGroup = await _groupService.GetCustomerGroupById(id);- if (customerGroup == null)- //No customer group found with the specified id- return RedirectToAction("List");- if (customerGroup.IsSystem)- ModelState.AddModelError("", "You can't delete system group");+ var customerGroup = await _groupService.GetCustomerGroupById(model.Id);try{if (ModelState.IsValid)@@ -158,25 +154,27 @@ namespace Grand.Web.Admin.ControllersSuccess(_translationService.GetResource("Admin.Customers.CustomerGroups.Deleted"));return RedirectToAction("List");}+Error(ModelState);- return RedirectToAction("Edit", new { id = customerGroup.Id });+ return RedirectToAction("Edit", new { id = model.Id });}catch (Exception exc){Error(exc.Message);- return RedirectToAction("Edit", new { id = customerGroup.Id });+ return RedirectToAction("Edit", new { id = model.Id });}}+#endregion#region Products+[PermissionAuthorizeAction(PermissionActionName.Preview)][HttpPost]public async Task<IActionResult> Products(string customerGroupId, DataSourceRequest command){var products = await _customerGroupViewModelService.PrepareCustomerGroupProductModel(customerGroupId);- var gridModel = new DataSourceResult- {+ var gridModel = new DataSourceResult {Data = products,Total = products.Count};@@ -195,6 +193,7 @@ namespace Grand.Web.Admin.Controllersawait _customerGroupProductService.DeleteCustomerGroupProduct(crp);return new JsonResult("");}+return ErrorForKendoGridJson(ModelState);}@@ -211,6 +210,7 @@ namespace Grand.Web.Admin.Controllersawait _customerGroupProductService.UpdateCustomerGroupProduct(crp);return new JsonResult("");}+return ErrorForKendoGridJson(ModelState);}@@ -223,11 +223,12 @@ namespace Grand.Web.Admin.Controllers[PermissionAuthorizeAction(PermissionActionName.Edit)][HttpPost]- public async Task<IActionResult> ProductAddPopupList(DataSourceRequest command, CustomerGroupProductModel.AddProductModel model)+ public async Task<IActionResult> ProductAddPopupList(DataSourceRequest command,+ CustomerGroupProductModel.AddProductModel model){- var products = await _customerGroupViewModelService.PrepareProductModel(model, command.Page, command.PageSize);- var gridModel = new DataSourceResult- {+ var products =+ await _customerGroupViewModelService.PrepareProductModel(model, command.Page, command.PageSize);+ var gridModel = new DataSourceResult {Data = products.products,Total = products.totalCount};@@ -242,8 +243,10 @@ namespace Grand.Web.Admin.Controllers{await _customerGroupViewModelService.InsertProductModel(model);}+return Content("");}+#endregion#region Acl@@ -257,8 +260,7 @@ namespace Grand.Web.Admin.Controllersforeach (var pr in permissionRecords){- model.Add(new CustomerGroupPermissionModel- {+ model.Add(new CustomerGroupPermissionModel {Id = pr.Id,Name = pr.GetTranslationPermissionName(_translationService, _workContext),SystemName = pr.SystemName,@@ -267,8 +269,7 @@ namespace Grand.Web.Admin.Controllers});}- var gridModel = new DataSourceResult- {+ var gridModel = new DataSourceResult {Data = model,Total = model.Count};@@ -277,38 +278,27 @@ namespace Grand.Web.Admin.Controllers[PermissionAuthorizeAction(PermissionActionName.Edit)][HttpPost]- public async Task<IActionResult> AclUpdate(string customerGroupId, string id, bool access)+ public async Task<IActionResult> AclUpdate(CustomerGroupAclUpdateModel model){- if (!await _permissionService.Authorize(StandardPermission.ManageAcl))- ModelState.AddModelError("", "You don't have permission to the update");-- var cr = await _groupService.GetCustomerGroupById(customerGroupId);- if (cr == null)- throw new ArgumentException("No customer group found with the specified id");-- var permissionRecord = await _permissionService.GetPermissionById(id);- if (permissionRecord == null)- throw new ArgumentException("No permission found with the specified id");-if (ModelState.IsValid){- if (access)+ var permissionRecord = await _permissionService.GetPermissionById(model.Id);+ if (model.Access){- if (!permissionRecord.CustomerGroups.Contains(customerGroupId))- permissionRecord.CustomerGroups.Add(customerGroupId);+ if (!permissionRecord.CustomerGroups.Contains(model.CustomerGroupId))+ permissionRecord.CustomerGroups.Add(model.CustomerGroupId);}- else- if (permissionRecord.CustomerGroups.Contains(customerGroupId))- permissionRecord.CustomerGroups.Remove(customerGroupId);+ else if (permissionRecord.CustomerGroups.Contains(model.CustomerGroupId))+ permissionRecord.CustomerGroups.Remove(model.CustomerGroupId);await _permissionService.UpdatePermission(permissionRecord);return new JsonResult("");}+return ErrorForKendoGridJson(ModelState);}-#endregion}-}+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupAclUpdateModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupAclUpdateModel.csnew file mode 100644index 000000000..25bea4f16--- /dev/null+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupAclUpdateModel.cs@@ -0,0 +1,3 @@+namespace Grand.Web.Admin.Models.Customers;++public record CustomerGroupAclUpdateModel(string CustomerGroupId, string Id, bool Access);\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupDeleteModel.cs b/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupDeleteModel.csnew file mode 100644index 000000000..80ce91979--- /dev/null+++ b/src/Web/Grand.Web.Admin/Models/Customers/CustomerGroupDeleteModel.cs@@ -0,0 +1,3 @@+namespace Grand.Web.Admin.Models.Customers;++public record CustomerGroupDeleteModel(string Id);diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupAclUpdateValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupAclUpdateValidator.csnew file mode 100644index 000000000..b975aaa1d--- /dev/null+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupAclUpdateValidator.cs@@ -0,0 +1,31 @@+using FluentValidation;+using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Security;+using Grand.Business.Core.Utilities.Common.Security;+using Grand.Infrastructure.Validators;+using Grand.Web.Admin.Models.Customers;++namespace Grand.Web.Admin.Validators.Customers;++public class CustomerGroupAclUpdateValidator : BaseGrandValidator<CustomerGroupAclUpdateModel>+{+ public CustomerGroupAclUpdateValidator(IEnumerable<IValidatorConsumer<CustomerGroupAclUpdateModel>> validators,+ IGroupService groupService, IPermissionService permissionService)+ : base(validators)+ {+ RuleFor(x => x).CustomAsync(async (x, context, _) =>+ {+ if (!await permissionService.Authorize(StandardPermission.ManageAcl))+ context.AddFailure("You don't have permission to the update");++ var customerGroup = await groupService.GetCustomerGroupById(x.CustomerGroupId);+ if (customerGroup == null)+ context.AddFailure("No customer group found with the specified id");++ var permissionRecord = await permissionService.GetPermissionById(x.Id);+ if (permissionRecord == null)+ context.AddFailure("No permission found with the specified id");++ });+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupDeleteValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupDeleteValidator.csnew file mode 100644index 000000000..1d9014811--- /dev/null+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupDeleteValidator.cs@@ -0,0 +1,27 @@+using FluentValidation;+using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Infrastructure.Validators;+using Grand.Web.Admin.Models.Customers;++namespace Grand.Web.Admin.Validators.Customers+{+ public class CustomerGroupDeleteValidator : BaseGrandValidator<CustomerGroupDeleteModel>+ {+ public CustomerGroupDeleteValidator(IEnumerable<IValidatorConsumer<CustomerGroupDeleteModel>> validators,+ IGroupService groupService)+ : base(validators)+ {+ RuleFor(x => x).CustomAsync(async (x, context, _) =>+ {+ var customerGroup = await groupService.GetCustomerGroupById(x.Id);+ if (customerGroup == null)+ context.AddFailure("Not found with the specified id");+ else+ {+ if (customerGroup!.IsSystem)+ context.AddFailure("You can't delete system group");+ }+ });+ }+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupValidator.csindex 39bec011a..3f79c09b8 100644--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupValidator.cs@@ -1,4 +1,5 @@using FluentValidation;+using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Infrastructure.Validators;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Web.Admin.Models.Customers;@@ -9,10 +10,26 @@ namespace Grand.Web.Admin.Validators.Customers{public CustomerGroupValidator(IEnumerable<IValidatorConsumer<CustomerGroupModel>> validators,+ IGroupService groupService,ITranslationService translationService): base(validators){RuleFor(x => x.Name).NotEmpty().WithMessage(translationService.GetResource("Admin.Customers.CustomerGroups.Fields.Name.Required"));+ RuleFor(x => x).CustomAsync(async (x, context, _) =>+ {+ var customerGroup = await groupService.GetCustomerGroupById(x.Id);++ if (customerGroup.IsSystem && !x.Active)+ context.AddFailure(+ translationService.GetResource(+ "Admin.Customers.CustomerGroups.Fields.Active.CantEditSystem"));++ if (customerGroup.IsSystem &&+ !customerGroup.SystemName.Equals(x.SystemName, StringComparison.OrdinalIgnoreCase))+ context.AddFailure(+ translationService.GetResource(+ "Admin.Customers.CustomerGroups.Fields.SystemName.CantEditSystem"));+ });}}}\ No newline at end of file