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
CatalogController - move validator logic from Controller to Validator
support6b9eb0811442
diff --git a/src/Web/Grand.Web/Controllers/CatalogController.cs b/src/Web/Grand.Web/Controllers/CatalogController.csindex abcccc386..177f99ea7 100644--- a/src/Web/Grand.Web/Controllers/CatalogController.cs+++ b/src/Web/Grand.Web/Controllers/CatalogController.cs@@ -8,16 +8,13 @@ using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Logging;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Interfaces.Customers;-using Grand.Business.Core.Queries.Checkout.Orders;using Grand.Business.Core.Utilities.Common.Security;using Grand.Domain.Catalog;using Grand.Domain.Customers;-using Grand.Domain.Orders;using Grand.Domain.Vendors;using Grand.Infrastructure;using Grand.Web.Commands.Models.Vendors;using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Captcha;using Grand.Web.Features.Models.Catalog;using Grand.Web.Features.Models.Vendors;using Grand.Web.Models.Catalog;@@ -333,47 +330,14 @@ namespace Grand.Web.Controllers[HttpPost][AutoValidateAntiforgeryToken]- [ValidateCaptcha][DenySystemAccount]public virtual async Task<IActionResult> VendorReviews(- VendorReviewsModel model, bool captchaValid,- [FromServices] CaptchaSettings captchaSettings)+ VendorReviewsModel model){var vendor = await _vendorService.GetVendorById(model.VendorId);if (vendor is not { Active: true } || !vendor.AllowCustomerReviews)return Content("");-- //validate CAPTCHA- if (captchaSettings.Enabled && captchaSettings.ShowOnVendorReviewPage && !captchaValid)- {- ModelState.AddModelError("", captchaSettings.GetWrongCaptchaMessage(_translationService));- }-- if (await _groupService.IsGuest(_workContext.CurrentCustomer) && !_vendorSettings.AllowAnonymousUsersToReviewVendor)- {- ModelState.AddModelError("", _translationService.GetResource("VendorReviews.OnlyRegisteredUsersCanWriteReviews"));- }-- //allow reviews only by customer that bought something from this vendor- if (_vendorSettings.VendorReviewPossibleOnlyAfterPurchasing &&- !(await _mediator.Send(new GetOrderQuery {- CustomerId = _workContext.CurrentCustomer.Id,- VendorId = vendor.Id,- Os = (int)OrderStatusSystem.Complete,- PageSize = 1- })).Any())- ModelState.AddModelError(string.Empty, _translationService.GetResource("VendorReviews.VendorReviewPossibleOnlyAfterPurchasing"));-- if (ModelState.IsValid && _vendorSettings.VendorReviewPossibleOnlyOnce)- {- if ((await _vendorService.GetAllVendorReviews(- customerId: _workContext.CurrentCustomer.Id,- approved: null,- vendorId: vendor.Id,- pageSize: 1)).Any())- ModelState.AddModelError(string.Empty, _translationService.GetResource("VendorReviews.VendorReviewPossibleOnlyOnce"));- }-+if (ModelState.IsValid){var vendorReview = await _mediator.Send(new InsertVendorReviewCommand { Vendor = vendor, Store = _workContext.CurrentStore, Model = model });@@ -401,13 +365,13 @@ namespace Grand.Web.Controllersreturn Json(model);}- var returnmodel = await _mediator.Send(new GetVendorReviews { Vendor = vendor });- returnmodel.AddVendorReview.ReviewText = model.AddVendorReview.ReviewText;- returnmodel.AddVendorReview.Title = model.AddVendorReview.Title;- returnmodel.AddVendorReview.SuccessfullyAdded = false;- returnmodel.AddVendorReview.Result = string.Join("; ", ModelState.Values.SelectMany(x => x.Errors).Select(x => x.ErrorMessage));+ var returnModel = await _mediator.Send(new GetVendorReviews { Vendor = vendor });+ returnModel.AddVendorReview.ReviewText = model.AddVendorReview.ReviewText;+ returnModel.AddVendorReview.Title = model.AddVendorReview.Title;+ returnModel.AddVendorReview.SuccessfullyAdded = false;+ returnModel.AddVendorReview.Result = string.Join("; ", ModelState.Values.SelectMany(x => x.Errors).Select(x => x.ErrorMessage));- return Json(returnmodel);+ return Json(returnModel);}[DenySystemAccount]@@ -505,18 +469,18 @@ namespace Grand.Web.Controllers#region Searching- public virtual async Task<IActionResult> Search(SearchModel model, CatalogPagingFilteringModel command, string searchCategoryId)+ public virtual async Task<IActionResult> Search(SearchModel model, CatalogPagingFilteringModel command){//'Continue shopping' URLawait SaveLastContinueShoppingPage(_workContext.CurrentCustomer);- if (model != null && !string.IsNullOrEmpty(searchCategoryId))+ if (model != null && !string.IsNullOrEmpty(model.SearchCategoryId)){- model.cid = searchCategoryId;+ model.cid = model.SearchCategoryId;model.adv = true;}//Prepare modelvar isSearchTermSpecified = HttpContext?.Request?.Query.ContainsKey("q");- var searchmodel = await _mediator.Send(new GetSearch {+ var searchModel = await _mediator.Send(new GetSearch {Command = command,Currency = _workContext.WorkingCurrency,Customer = _workContext.CurrentCustomer,@@ -525,7 +489,7 @@ namespace Grand.Web.ControllersModel = model,Store = _workContext.CurrentStore});- return View(searchmodel);+ return View(searchModel);}public virtual async Task<IActionResult> SearchTermAutoComplete(string term, string categoryId, [FromServices] CatalogSettings catalogSettings)diff --git a/src/Web/Grand.Web/Models/Catalog/SearchModel.cs b/src/Web/Grand.Web/Models/Catalog/SearchModel.csindex 93566cee9..e6d195144 100644--- a/src/Web/Grand.Web/Models/Catalog/SearchModel.cs+++ b/src/Web/Grand.Web/Models/Catalog/SearchModel.cs@@ -18,7 +18,8 @@ namespace Grand.Web.Models.Catalogpublic string Warning { get; set; }public bool NoResults { get; set; }-++ public string SearchCategoryId { get; set; }/// <summary>/// Query string/// </summary>diff --git a/src/Web/Grand.Web/Models/Vendors/VendorReviewOverviewModel.cs b/src/Web/Grand.Web/Models/Vendors/VendorReviewOverviewModel.csindex 3d18d6bb9..c493ba4b4 100644--- a/src/Web/Grand.Web/Models/Vendors/VendorReviewOverviewModel.cs+++ b/src/Web/Grand.Web/Models/Vendors/VendorReviewOverviewModel.cs@@ -1,5 +1,6 @@using Grand.Infrastructure.ModelBinding;using Grand.Infrastructure.Models;+using Grand.Web.Models.Common;namespace Grand.Web.Models.Vendors{@@ -30,6 +31,7 @@ namespace Grand.Web.Models.Vendorspublic IList<VendorReviewModel> Items { get; set; }public AddVendorReviewModel AddVendorReview { get; set; }public VendorReviewOverviewModel VendorReviewOverview { get; set; }+ public ICaptchaValidModel Captcha { get; set; } = new CaptchaModel();}public class VendorReviewModel : BaseEntityModeldiff --git a/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs b/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.csindex 53b4c701d..6d04d5b26 100644--- a/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs+++ b/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs@@ -1,7 +1,18 @@using FluentValidation;+using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Customers;+using Grand.Business.Core.Queries.Checkout.Orders;+using Grand.Domain.Orders;+using Grand.Domain.Vendors;+using Grand.Infrastructure;+using Grand.Infrastructure.Models;using Grand.Infrastructure.Validators;+using Grand.Web.Common.Security.Captcha;+using Grand.Web.Common.Validators;using Grand.Web.Models.Vendors;+using MediatR;+using Microsoft.AspNetCore.Http;namespace Grand.Web.Validators.Vendors{@@ -9,12 +20,56 @@ namespace Grand.Web.Validators.Vendors{public VendorReviewsValidator(IEnumerable<IValidatorConsumer<VendorReviewsModel>> validators,+ IEnumerable<IValidatorConsumer<ICaptchaValidModel>> validatorsCaptcha,+ IMediator mediator,+ IGroupService groupService, IWorkContext workContext, IVendorService vendorService,+ CaptchaSettings captchaSettings, VendorSettings vendorSettings,+ IHttpContextAccessor contextAccessor, GoogleReCaptchaValidator googleReCaptchaValidator,ITranslationService translationService): base(validators){RuleFor(x => x.AddVendorReview.Title).NotEmpty().WithMessage(translationService.GetResource("Reviews.Fields.Title.Required")).When(x => x.AddVendorReview != null);RuleFor(x => x.AddVendorReview.Title).Length(1, 200).WithMessage(string.Format(translationService.GetResource("Reviews.Fields.Title.MaxLengthValidation"), 200)).When(x => x.AddVendorReview != null && !string.IsNullOrEmpty(x.AddVendorReview.Title));RuleFor(x => x.AddVendorReview.ReviewText).NotEmpty().WithMessage(translationService.GetResource("Reviews.Fields.ReviewText.Required")).When(x => x.AddVendorReview != null);+ RuleFor(x => x).CustomAsync(async (x, context, _) =>+ {+ var vendor = await vendorService.GetVendorById(x.VendorId);+ if (vendor is not { Active: true } || !vendor.AllowCustomerReviews)+ context.AddFailure(translationService.GetResource("VendorReviews.VendorNotActiveOrAllowCustomerReviewsDisabled"));++ if (await groupService.IsGuest(workContext.CurrentCustomer) &&+ !vendorSettings.AllowAnonymousUsersToReviewVendor)+ {+ context.AddFailure(translationService.GetResource("VendorReviews.OnlyRegisteredUsersCanWriteReviews"));+ }+ //allow reviews only by customer that bought something from this vendor+ if (vendorSettings.VendorReviewPossibleOnlyAfterPurchasing &&+ !(await mediator.Send(new GetOrderQuery {+ CustomerId = workContext.CurrentCustomer.Id,+ VendorId = x.VendorId,+ Os = (int)OrderStatusSystem.Complete,+ PageSize = 1+ }, _)).Any())+ context.AddFailure(translationService.GetResource("VendorReviews.VendorReviewPossibleOnlyAfterPurchasing"));+++ if (vendorSettings.VendorReviewPossibleOnlyOnce)+ {+ if ((await vendorService.GetAllVendorReviews(+ customerId: workContext.CurrentCustomer.Id,+ approved: null,+ vendorId: vendor.Id,+ pageSize: 1)).Any())+ context.AddFailure(translationService.GetResource("VendorReviews.VendorReviewPossibleOnlyOnce"));+ }+++ });+ if (captchaSettings.Enabled && captchaSettings.ShowOnVendorReviewPage)+ {+ RuleFor(x => x.Captcha).NotNull().WithMessage(translationService.GetResource("Account.Captcha.Required"));;+ RuleFor(x => x.Captcha).SetValidator(new CaptchaValidator(validatorsCaptcha, contextAccessor, googleReCaptchaValidator));+ }}}}