Skip to content

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.

ARCH-001 Phase 18: ProductReview controller/service consolidation (Admin/Store) (#813)

Krzysztof Pajaka86ab292876d
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductReviewControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductReviewControllerTests.cs
new file mode 100644
index 000000000..30338f4f8
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductReviewControllerTests.cs
@@ -0,0 +1,391 @@
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Domain.Catalog;
+using Grand.Web.AdminShared.Controllers;
+using Grand.Web.AdminShared.Interfaces;
+using Grand.Web.AdminShared.Models.Catalog;
+using Grand.Web.Common.DataSource;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class BaseProductReviewControllerTests
+{
+ private Mock<IProductReviewViewModelService> _viewModelService;
+ private Mock<IProductReviewService> _productReviewService;
+ private Mock<ITranslationService> _translationService;
+ private Mock<IAdminDataScope<ProductReview>> _scope;
+
+ private class TestableProductReviewController(
+ IProductReviewViewModelService viewModelService,
+ IProductReviewService productReviewService,
+ ITranslationService translationService,
+ IAdminDataScope<ProductReview> scope)
+ : BaseProductReviewController(viewModelService, productReviewService, translationService, scope);
+
+ private TestableProductReviewController CreateController()
+ {
+ var controller = new TestableProductReviewController(_viewModelService.Object, _productReviewService.Object,
+ _translationService.Object, _scope.Object);
+
+ var httpContext = new DefaultHttpContext();
+ var loggerFactoryMock = new Mock<ILoggerFactory>();
+ loggerFactoryMock.Setup(l => l.CreateLogger(It.IsAny<string>())).Returns(new Mock<ILogger>().Object);
+ var urlHelperFactoryMock = new Mock<IUrlHelperFactory>();
+ urlHelperFactoryMock.Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>())).Returns(new Mock<IUrlHelper>().Object);
+ var requestServicesMock = new Mock<IServiceProvider>();
+ requestServicesMock.Setup(s => s.GetService(typeof(ILoggerFactory))).Returns(loggerFactoryMock.Object);
+ requestServicesMock.Setup(s => s.GetService(typeof(IUrlHelperFactory))).Returns(urlHelperFactoryMock.Object);
+ httpContext.RequestServices = requestServicesMock.Object;
+ controller.ControllerContext = new ControllerContext { HttpContext = httpContext };
+ controller.TempData = new TempDataDictionary(httpContext, new Mock<ITempDataProvider>().Object);
+
+ return controller;
+ }
+
+ [TestInitialize]
+ public void Setup()
+ {
+ _viewModelService = new Mock<IProductReviewViewModelService>();
+ _productReviewService = new Mock<IProductReviewService>();
+ _translationService = new Mock<ITranslationService>();
+ _scope = new Mock<IAdminDataScope<ProductReview>>();
+ }
+
+ [TestMethod]
+ public async Task ListGet_Admin_CallsPrepareProductReviewListModel_ReturnsPopulatedModel()
+ {
+ _scope.Setup(s => s.DefaultStoreId).Returns((string)null);
+ var listModel = new ProductReviewListModel { AvailableStores = { new Microsoft.AspNetCore.Mvc.Rendering.SelectListItem { Value = "", Text = "All" } } };
+ _viewModelService.Setup(s => s.PrepareProductReviewListModel("")).ReturnsAsync(listModel);
+
+ var result = await CreateController().List() as ViewResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreSame(listModel, result.Model);
+ _viewModelService.Verify(s => s.PrepareProductReviewListModel(""), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task ListGet_Store_CallsPrepareProductReviewListModelWithStoreId()
+ {
+ _scope.Setup(s => s.DefaultStoreId).Returns("store-1");
+ var listModel = new ProductReviewListModel();
+ _viewModelService.Setup(s => s.PrepareProductReviewListModel("store-1")).ReturnsAsync(listModel);
+
+ var result = await CreateController().List() as ViewResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreSame(listModel, result.Model);
+ }
+
+ [TestMethod]
+ public async Task ListPost_Admin_PreservesCallerSubmittedSearchStoreId()
+ {
+ _scope.Setup(s => s.DefaultStoreId).Returns((string)null);
+ _viewModelService
+ .Setup(s => s.PrepareProductReviewsModel(It.IsAny<ProductReviewListModel>(), 1, 10))
+ .ReturnsAsync((Enumerable.Empty<ProductReviewModel>(), 0));
+
+ var model = new ProductReviewListModel { SearchStoreId = "caller-chosen-store" };
+ await CreateController().List(new DataSourceRequest { Page = 1, PageSize = 10 }, model);
+
+ Assert.AreEqual("caller-chosen-store", model.SearchStoreId);
+ }
+
+ [TestMethod]
+ public async Task ListPost_Store_ForcesSearchStoreIdRegardlessOfSubmittedValue()
+ {
+ _scope.Setup(s => s.DefaultStoreId).Returns("store-1");
+ _viewModelService
+ .Setup(s => s.PrepareProductReviewsModel(It.IsAny<ProductReviewListModel>(), 1, 10))
+ .ReturnsAsync((Enumerable.Empty<ProductReviewModel>(), 0));
+
+ var model = new ProductReviewListModel { SearchStoreId = "some-other-store" };
+ await CreateController().List(new DataSourceRequest { Page = 1, PageSize = 10 }, model);
+
+ Assert.AreEqual("store-1", model.SearchStoreId);
+ }
+
+ [TestMethod]
+ public async Task EditGet_NotFound_RedirectsToList()
+ {
+ _productReviewService.Setup(s => s.GetProductReviewById("missing")).ReturnsAsync((ProductReview)null);
+
+ var result = await CreateController().Edit("missing") as RedirectToActionResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreEqual("List", result.ActionName);
+ }
+
+ [TestMethod]
+ public async Task EditGet_HasAccessFalse_RedirectsToList()
+ {
+ var review = new ProductReview { Id = "pr-1", StoreId = "store-2" };
+ _productReviewService.Setup(s => s.GetProductReviewById("pr-1")).ReturnsAsync(review);
+ _scope.Setup(s => s.HasAccess(review)).ReturnsAsync(false);
+
+ var result = await CreateController().Edit("pr-1") as RedirectToActionResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreEqual("List", result.ActionName);
+ }
+
+ [TestMethod]
+ public async Task EditGet_HasAccessTrue_ReturnsViewWithModel()
+ {
+ var review = new ProductReview { Id = "pr-1", StoreId = "store-1" };
+ _productReviewService.Setup(s => s.GetProductReviewById("pr-1")).ReturnsAsync(review);
+ _scope.Setup(s => s.HasAccess(review)).ReturnsAsync(true);
+
+ var result = await CreateController().Edit("pr-1") as ViewResult;
+
+ Assert.IsNotNull(result);
+ Assert.IsInstanceOfType(result.Model, typeof(ProductReviewModel));
+ _viewModelService.Verify(s => s.PrepareProductReviewModel(It.IsAny<ProductReviewModel>(), review, false, false), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task EditPost_HasAccessFalse_RedirectsToListWithoutSaving()
+ {
+ var review = new ProductReview { Id = "pr-1", StoreId = "store-2" };
+ _productReviewService.Setup(s => s.GetProductReviewById("pr-1")).ReturnsAsync(review);
+ _scope.Setup(s => s.HasAccess(review)).ReturnsAsync(false);
+
+ var result = await CreateController().Edit(new ProductReviewModel { Id = "pr-1" }, false) as RedirectToActionResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreEqual("List", result.ActionName);
+ _viewModelService.Verify(s => s.UpdateProductReview(It.IsAny<ProductReview>(), It.IsAny<ProductReviewModel>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task EditPost_HasAccessTrue_ValidModel_UpdatesAndRedirectsToList()
+ {
+ var review = new ProductReview { Id = "pr-1", StoreId = "store-1", ProductId = "prod-1" };
+ _productReviewService.Setup(s => s.GetProductReviewById("pr-1")).ReturnsAsync(review);
+ _scope.Setup(s => s.HasAccess(review)).ReturnsAsync(true);
+ _viewModelService.Setup(s => s.UpdateProductReview(review, It.IsAny<ProductReviewModel>())).ReturnsAsync(review);
+ _translationService.Setup(s => s.GetResource(It.IsAny<string>())).Returns("Updated");
+
+ var result = await CreateController().Edit(new ProductReviewModel { Id = "pr-1" }, false) as RedirectToActionResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreEqual("List", result.ActionName);
+ }
+
+ [TestMethod]
+ public async Task EditPost_ValidModel_ContinueEditing_RedirectsToEdit()
+ {
+ var review = new ProductReview { Id = "pr-1", StoreId = "store-1", ProductId = "prod-1" };
+ _productReviewService.Setup(s => s.GetProductReviewById("pr-1")).ReturnsAsync(review);
+ _scope.Setup(s => s.HasAccess(review)).ReturnsAsync(true);
+ _viewModelService.Setup(s => s.UpdateProductReview(review, It.IsAny<ProductReviewModel>())).ReturnsAsync(review);
+ _translationService.Setup(s => s.GetResource(It.IsAny<string>())).Returns("Updated");
+
+ var result = await CreateController().Edit(new ProductReviewModel { Id = "pr-1" }, true) as RedirectToActionResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreEqual("Edit", result.ActionName);
+ }
+
+ [TestMethod]
+ public async Task EditPost_InvalidModel_RedisplaysView()
+ {
+ var review = new ProductReview { Id = "pr-1", StoreId = "store-1" };
+ _productReviewService.Setup(s => s.GetProductReviewById("pr-1")).ReturnsAsync(review);
+ _scope.Setup(s => s.HasAccess(review)).ReturnsAsync(true);
+
+ var controller = CreateController();
+ controller.ModelState.AddModelError("Test", "Test error");
+
+ var model = new ProductReviewModel { Id = "pr-1" };
+ var result = await controller.Edit(model, false) as ViewResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreSame(model, result.Model);
+ _viewModelService.Verify(s => s.PrepareProductReviewModel(model, review, true, false), Times.Once);
+ _viewModelService.Verify(s => s.UpdateProductReview(It.IsAny<ProductReview>(), It.IsAny<ProductReviewModel>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task Delete_NotFound_RedirectsToList()
+ {
+ _productReviewService.Setup(s => s.GetProductReviewById("missing")).ReturnsAsync((ProductReview)null);
+
+ var result = await CreateController().Delete("missing") as RedirectToActionResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreEqual("List", result.ActionName);
+ }
+
+ [TestMethod]
+ public async Task Delete_HasAccessFalse_RedirectsToListWithoutDeleting()
+ {
+ var review = new ProductReview { Id = "pr-1", StoreId = "store-2" };
+ _productReviewService.Setup(s => s.GetProductReviewById("pr-1")).ReturnsAsync(review);
+ _scope.Setup(s => s.HasAccess(review)).ReturnsAsync(false);
+
+ var result = await CreateController().Delete("pr-1") as RedirectToActionResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreEqual("List", result.ActionName);
+ _viewModelService.Verify(s => s.DeleteProductReview(It.IsAny<ProductReview>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task Delete_HasAccessTrue_DeletesAndRedirectsToList()
+ {
+ var review = new ProductReview { Id = "pr-1", StoreId = "store-1" };
+ _productReviewService.Setup(s => s.GetProductReviewById("pr-1")).ReturnsAsync(review);
+ _scope.Setup(s => s.HasAccess(review)).ReturnsAsync(true);
+ _translationService.Setup(s => s.GetResource(It.IsAny<string>())).Returns("Deleted");
+
+ var result = await CreateController().Delete("pr-1") as RedirectToActionResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreEqual("List", result.ActionName);
+ _viewModelService.Verify(s => s.DeleteProductReview(review), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task Delete_HasAccessTrue_InvalidModelState_DoesNotDeleteAndRedirectsToEdit()
+ {
+ var review = new ProductReview { Id = "pr-1", StoreId = "store-1" };
+ _productReviewService.Setup(s => s.GetProductReviewById("pr-1")).ReturnsAsync(review);
+ _scope.Setup(s => s.HasAccess(review)).ReturnsAsync(true);
+
+ var controller = CreateController();
+ controller.ModelState.AddModelError("Test", "Test error");
+
+ var result = await controller.Delete("pr-1") as RedirectToActionResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreEqual("Edit", result.ActionName);
+ _viewModelService.Verify(s => s.DeleteProductReview(It.IsAny<ProductReview>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ApproveSelected_PassesDefaultStoreId()
+ {
+ _scope.Setup(s => s.DefaultStoreId).Returns("store-1");
+
+ await CreateController().ApproveSelected(new List<string> { "pr-1:prod-1" });
+
+ _viewModelService.Verify(s => s.ApproveSelected(It.Is<IEnumerable<string>>(ids => ids.Contains("pr-1:prod-1")), "store-1"), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task ApproveSelected_Admin_PassesEmptyStringNotNull()
+ {
+ _scope.Setup(s => s.DefaultStoreId).Returns((string)null);
+
+ await CreateController().ApproveSelected(new List<string> { "pr-1:prod-1" });
+
+ _viewModelService.Verify(s => s.ApproveSelected(It.IsAny<IEnumerable<string>>(), ""), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task DisapproveSelected_PassesDefaultStoreId()
+ {
+ _scope.Setup(s => s.DefaultStoreId).Returns("store-1");
+
+ await CreateController().DisapproveSelected(new List<string> { "pr-1:prod-1" });
+
+ _viewModelService.Verify(s => s.DisapproveSelected(It.Is<IEnumerable<string>>(ids => ids.Contains("pr-1:prod-1")), "store-1"), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task ApproveSelected_NullSelectedIds_DoesNotCallService()
+ {
+ await CreateController().ApproveSelected(null);
+
+ _viewModelService.Verify(s => s.ApproveSelected(It.IsAny<IEnumerable<string>>(), It.IsAny<string>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ProductSearchAutoComplete_TermTooShort_ReturnsEmptyContent()
+ {
+ var productService = new Mock<IProductService>();
+
+ var result = await CreateController().ProductSearchAutoComplete("ab", productService.Object) as ContentResult;
+
+ Assert.IsNotNull(result);
+ Assert.AreEqual("", result.Content);
+ productService.Verify(s => s.SearchProducts(
+ loadFilterableSpecificationAttributeOptionIds: It.IsAny<bool>(),
+ pageIndex: It.IsAny<int>(),
+ pageSize: It.IsAny<int>(),
+ categoryIds: It.IsAny<IList<string>>(),
+ brandId: It.IsAny<string>(),
+ collectionId: It.IsAny<string>(),
+ storeId: It.IsAny<string>(),
+ vendorId: It.IsAny<string>(),
+ warehouseId: It.IsAny<string>(),
+ productType: It.IsAny<Grand.Domain.Catalog.ProductType?>(),
+ visibleIndividuallyOnly: It.IsAny<bool>(),
+ markedAsNewOnly: It.IsAny<bool>(),
+ showOnHomePage: It.IsAny<bool?>(),
+ featuredProducts: It.IsAny<bool?>(),
+ priceMin: It.IsAny<double?>(),
+ priceMax: It.IsAny<double?>(),
+ productTag: It.IsAny<string>(),
+ keywords: It.IsAny<string>(),
+ searchDescriptions: It.IsAny<bool>(),
+ searchSku: It.IsAny<bool>(),
+ searchProductTags: It.IsAny<bool>(),
+ languageId: It.IsAny<string>(),
+ filteredSpecs: It.IsAny<IList<string>>(),
+ specificationOptions: It.IsAny<IList<string>>(),
+ orderBy: It.IsAny<Grand.Domain.Catalog.ProductSortingEnum>(),
+ showHidden: It.IsAny<bool>(),
+ overridePublished: It.IsAny<bool?>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ProductSearchAutoComplete_Store_PassesDefaultStoreId()
+ {
+ _scope.Setup(s => s.DefaultStoreId).Returns("store-1");
+ var productService = new Mock<IProductService>();
+ productService.Setup(s => s.SearchProducts(
+ loadFilterableSpecificationAttributeOptionIds: false,
+ pageIndex: 0,
+ pageSize: 15,
+ categoryIds: null,
+ brandId: "",
+ collectionId: "",
+ storeId: "store-1",
+ vendorId: "",
+ warehouseId: "",
+ productType: null,
+ visibleIndividuallyOnly: false,
+ markedAsNewOnly: false,
+ showOnHomePage: null,
+ featuredProducts: null,
+ priceMin: null,
+ priceMax: null,
+ productTag: "",
+ keywords: "widget",
+ searchDescriptions: false,
+ searchSku: true,
+ searchProductTags: false,
+ languageId: "",
+ filteredSpecs: null,
+ specificationOptions: null,
+ orderBy: Grand.Domain.Catalog.ProductSortingEnum.Position,
+ showHidden: true,
+ overridePublished: null))
+ .ReturnsAsync((new Grand.Domain.PagedList<Grand.Domain.Catalog.Product>(new List<Grand.Domain.Catalog.Product>(), 0, 15), new List<string>()));
+
+ var result = await CreateController().ProductSearchAutoComplete("widget", productService.Object) as JsonResult;
+
+ Assert.IsNotNull(result);
+ }
+}
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/ProductReviewControllerAttributeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/ProductReviewControllerAttributeTests.cs
new file mode 100644
index 000000000..039da2743
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/ProductReviewControllerAttributeTests.cs
@@ -0,0 +1,51 @@
+using System.Linq;
+using Grand.Web.Admin.Controllers;
+using Grand.Web.AdminShared.Controllers;
+using Grand.Web.Common.Filters;
+using Grand.Web.Common.Security.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class ProductReviewControllerAttributeTests
+{
+ [TestMethod]
+ public void IsThinSubclassOfBaseProductReviewController()
+ {
+ Assert.IsTrue(typeof(BaseProductReviewController).IsAssignableFrom(typeof(ProductReviewController)));
+ Assert.AreEqual(typeof(BaseProductReviewController), typeof(ProductReviewController).BaseType);
+ }
+
+ [TestMethod]
+ public void HasAuthorizeAdminAttribute()
+ {
+ var attr = typeof(ProductReviewController).GetCustomAttributes(typeof(AuthorizeAdminAttribute), inherit: false);
+ Assert.AreEqual(1, attr.Length);
+ }
+
+ [TestMethod]
+ public void HasAreaAdminAttribute()
+ {
+ var attr = typeof(ProductReviewController)
+ .GetCustomAttributes(typeof(AreaAttribute), inherit: false)
+ .Cast<AreaAttribute>().Single();
+ Assert.AreEqual("Admin", attr.RouteValue);
+ }
+
+ [TestMethod]
+ public void HasAutoValidateAntiforgeryTokenAttribute()
+ {
+ var attr = typeof(ProductReviewController)
+ .GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), inherit: true);
+ Assert.AreEqual(1, attr.Length);
+ }
+
+ [TestMethod]
+ public void HasAuthorizeMenuAttribute()
+ {
+ var attr = typeof(ProductReviewController).GetCustomAttributes(typeof(AuthorizeMenuAttribute), inherit: false);
+ Assert.AreEqual(1, attr.Length);
+ }
+}
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedProductReviewDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedProductReviewDataScopeTests.cs
new file mode 100644
index 000000000..fc29f364e
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedProductReviewDataScopeTests.cs
@@ -0,0 +1,77 @@
+using Grand.Domain.Catalog;
+using Grand.Web.AdminShared.Services;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class RoutedProductReviewDataScopeTests
+{
+ private static RoutedProductReviewDataScope CreateScope(string area)
+ {
+ var httpContext = new DefaultHttpContext();
+ httpContext.Request.RouteValues = new RouteValueDictionary { ["area"] = area };
+ var httpContextAccessor = new Mock<IHttpContextAccessor>();
+ httpContextAccessor.Setup(a => a.HttpContext).Returns(httpContext);
+
+ var contextAccessor = new Mock<Grand.Infrastructure.IContextAccessor>();
+ var workContext = new Mock<Grand.Infrastructure.IWorkContext>();
+ workContext.Setup(w => w.CurrentCustomer).Returns(new Grand.Domain.Customers.Customer { StaffStoreId = "store-1" });
+ contextAccessor.Setup(c => c.WorkContext).Returns(workContext.Object);
+
+ var storeScope = new StoreProductReviewDataScope(contextAccessor.Object);
+ return new RoutedProductReviewDataScope(httpContextAccessor.Object,
+ new GlobalAdminDataScope<ProductReview>(), storeScope);
+ }
+
+ [TestMethod]
+ public async Task AdminArea_ResolvesToGlobalScope_HasAccessAlwaysTrue()
+ {
+ var scope = CreateScope("Admin");
+ var result = await scope.HasAccess(new ProductReview { StoreId = "any-other-store" });
+ Assert.IsTrue(result);
+ }
+
+ [TestMethod]
+ public void AdminArea_DefaultStoreId_IsNull()
+ {
+ var scope = CreateScope("Admin");
+ Assert.IsNull(scope.DefaultStoreId);
+ }
+
+ [TestMethod]
+ public async Task StoreArea_ResolvesToStoreScope_HasAccessMatchesOwnership()
+ {
+ var scope = CreateScope("Store");
+ var owned = await scope.HasAccess(new ProductReview { StoreId = "store-1" });
+ var other = await scope.HasAccess(new ProductReview { StoreId = "store-2" });
+ Assert.IsTrue(owned);
+ Assert.IsFalse(other);
+ }
+
+ [TestMethod]
+ public void StoreArea_DefaultStoreId_IsStaffStoreId()
+ {
+ var scope = CreateScope("Store");
+ Assert.AreEqual("store-1", scope.DefaultStoreId);
+ }
+
+ [TestMethod]
+ public async Task UnrecognizedArea_ThrowsInvalidOperationException()
+ {
+ var scope = CreateScope("Vendor");
+ await Assert.ThrowsAsync<InvalidOperationException>(
+ () => scope.HasAccess(new ProductReview { StoreId = "store-1" }));
+ }
+
+ [TestMethod]
+ public async Task MissingArea_ThrowsInvalidOperationException()
+ {
+ var scope = CreateScope(null);
+ await Assert.ThrowsAsync<InvalidOperationException>(
+ () => scope.HasAccess(new ProductReview { StoreId = "store-1" }));
+ }
+}
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/StoreProductReviewDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/StoreProductReviewDataScopeTests.cs
new file mode 100644
index 000000000..a1afc1277
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/StoreProductReviewDataScopeTests.cs
@@ -0,0 +1,76 @@
+using Grand.Domain.Catalog;
+using Grand.Domain.Customers;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Services;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class StoreProductReviewDataScopeTests
+{
+ private static StoreProductReviewDataScope CreateScope(string staffStoreId)
+ {
+ var customer = new Customer { StaffStoreId = staffStoreId };
+ var workContext = new Mock<IWorkContext>();
+ workContext.Setup(w => w.CurrentCustomer).Returns(customer);
+ var contextAccessor = new Mock<IContextAccessor>();
+ contextAccessor.Setup(c => c.WorkContext).Returns(workContext.Object);
+ return new StoreProductReviewDataScope(contextAccessor.Object);
+ }
+
+ [TestMethod]
+ public async Task HasAccess_OwnStore_ReturnsTrue()
+ {
+ var scope = CreateScope("store-1");
+ var result = await scope.HasAccess(new ProductReview { StoreId = "store-1" });
+ Assert.IsTrue(result);
+ }
+
+ [TestMethod]
+ public async Task HasAccess_OtherStore_ReturnsFalse()
+ {
+ var scope = CreateScope("store-1");
+ var result = await scope.HasAccess(new ProductReview { StoreId = "store-2" });
+ Assert.IsFalse(result);
+ }
+
+ [TestMethod]
+ public async Task HasAccess_NullEntity_ReturnsFalse()
+ {
+ var scope = CreateScope("store-1");
+ var result = await scope.HasAccess(null);
+ Assert.IsFalse(result);
+ }
+
+ [TestMethod]
+ public async Task CanView_MatchesHasAccess_OwnStore()
+ {
+ var scope = CreateScope("store-1");
+ var result = await scope.CanView(new ProductReview { StoreId = "store-1" });
+ Assert.IsTrue(result);
+ }
+
+ [TestMethod]
+ public async Task CanView_MatchesHasAccess_OtherStore()
+ {
+ var scope = CreateScope("store-1");
+ var result = await scope.CanView(new ProductReview { StoreId = "store-2" });
+ Assert.IsFalse(result);
+ }
+
+ [TestMethod]
+ public void DefaultStoreId_ReturnsStaffStoreId()
+ {
+ var scope = CreateScope("store-1");
+ Assert.AreEqual("store-1", scope.DefaultStoreId);
+ }
+
+ [TestMethod]
+ public void ShowStoreSelector_IsFalse()
+ {
+ var scope = CreateScope("store-1");
+ Assert.IsFalse(scope.ShowStoreSelector);
+ }
+}
diff --git a/src/Tests/Grand.Web.Store.Tests/Controllers/ProductReviewControllerAttributeTests.cs b/src/Tests/Grand.Web.Store.Tests/Controllers/ProductReviewControllerAttributeTests.cs
new file mode 100644
index 000000000..9f32defa5
--- /dev/null
+++ b/src/Tests/Grand.Web.Store.Tests/Controllers/ProductReviewControllerAttributeTests.cs
@@ -0,0 +1,51 @@
+using System.Linq;
+using Grand.Web.AdminShared.Controllers;
+using Grand.Web.Common.Filters;
+using Grand.Web.Common.Security.Authorization;
+using Grand.Web.Store.Controllers;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Grand.Web.Store.Tests.Controllers;
+
+[TestClass]
+public class ProductReviewControllerAttributeTests
+{
+ [TestMethod]
+ public void IsThinSubclassOfBaseProductReviewController()
+ {
+ Assert.IsTrue(typeof(BaseProductReviewController).IsAssignableFrom(typeof(ProductReviewController)));
+ Assert.AreEqual(typeof(BaseProductReviewController), typeof(ProductReviewController).BaseType);
+ }
+
+ [TestMethod]
+ public void HasAuthorizeStoreAttribute()
+ {
+ var attr = typeof(ProductReviewController).GetCustomAttributes(typeof(AuthorizeStoreAttribute), inherit: false);
+ Assert.AreEqual(1, attr.Length);
+ }
+
+ [TestMethod]
+ public void HasAreaStoreAttribute()
+ {
+ var attr = typeof(ProductReviewController)
+ .GetCustomAttributes(typeof(AreaAttribute), inherit: false)
+ .Cast<AreaAttribute>().Single();
+ Assert.AreEqual("Store", attr.RouteValue);
+ }
+
+ [TestMethod]
+ public void HasAutoValidateAntiforgeryTokenAttribute()
+ {
+ var attr = typeof(ProductReviewController)
+ .GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), inherit: true);
+ Assert.AreEqual(1, attr.Length);
+ }
+
+ [TestMethod]
+ public void HasAuthorizeMenuAttribute()
+ {
+ var attr = typeof(ProductReviewController).GetCustomAttributes(typeof(AuthorizeMenuAttribute), inherit: false);
+ Assert.AreEqual(1, attr.Length);
+ }
+}
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Partials/WidgetZone.DetailsBottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Partials/WidgetZone.DetailsBottom.cshtml
new file mode 100644
index 000000000..6d5c95d05
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Partials/WidgetZone.DetailsBottom.cshtml
@@ -0,0 +1,2 @@
+@model ProductReviewModel
+<vc:admin-widget widget-zone="product_review_details_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Partials/WidgetZone.DetailsButtons.cshtml
new file mode 100644
index 000000000..e5b168c34
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Partials/WidgetZone.DetailsButtons.cshtml
@@ -0,0 +1,2 @@
+@model ProductReviewModel
+<vc:admin-widget widget-zone="product_review_details_buttons" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Partials/WidgetZone.DetailsTop.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Partials/WidgetZone.DetailsTop.cshtml
new file mode 100644
index 000000000..c400cac5c
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Partials/WidgetZone.DetailsTop.cshtml
@@ -0,0 +1,2 @@
+@model ProductReviewModel
+<vc:admin-widget widget-zone="product_review_details_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs
index ff6657f4f..c29df6d39 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs
@@ -1,172 +1,26 @@
-using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
-using Grand.Domain.Permissions;
+using Grand.Domain.Catalog;
+using Grand.Web.Admin.Extensions;
+using Grand.Web.AdminShared.Controllers;
using Grand.Web.AdminShared.Interfaces;
-using Grand.Web.AdminShared.Models.Catalog;
-using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
-using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Admin.Controllers;
-[PermissionAuthorize(PermissionSystemName.ProductReviews)]
-public class ProductReviewController : BaseAdminController
-{
- #region Constructors
-
- public ProductReviewController(
- IProductReviewViewModelService productReviewViewModelService,
- IProductReviewService productReviewService,
- ITranslationService translationService)
- {
- _productReviewViewModelService = productReviewViewModelService;
- _productReviewService = productReviewService;
- _translationService = translationService;
- }
-
- #endregion
-
- #region Fields
-
- private readonly IProductReviewViewModelService _productReviewViewModelService;
- private readonly IProductReviewService _productReviewService;
- private readonly ITranslationService _translationService;
-
- #endregion Fields
-
- #region Methods
-
- //list
- public IActionResult Index()
- {
- return RedirectToAction("List");
- }
-
- public async Task<IActionResult> List()
- {
- var model = await _productReviewViewModelService.PrepareProductReviewListModel();
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.List)]
- [HttpPost]
- public async Task<IActionResult> List(DataSourceRequest command, ProductReviewListModel model)
- {
- var (productReviewModels, totalCount) =
- await _productReviewViewModelService.PrepareProductReviewsModel(model, command.Page, command.PageSize);
- var gridModel = new DataSourceResult {
- Data = productReviewModels.ToList(),
- Total = totalCount
- };
-
- return Json(gridModel);
- }
-
- //edit
- [PermissionAuthorizeAction(PermissionActionName.Preview)]
- public async Task<IActionResult> Edit(string id)
- {
- var productReview = await _productReviewService.GetProductReviewById(id);
-
- if (productReview == null)
- //No product review found with the specified id
- return RedirectToAction("List");
-
- var model = new ProductReviewModel();
- await _productReviewViewModelService.PrepareProductReviewModel(model, productReview, false, false);
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
- public async Task<IActionResult> Edit(ProductReviewModel model, bool continueEditing)
- {
- var productReview = await _productReviewService.GetProductReviewById(model.Id);
- if (productReview == null)
- //No product review found with the specified id
- return RedirectToAction("List");
-
- if (ModelState.IsValid)
- {
- productReview = await _productReviewViewModelService.UpdateProductReview(productReview, model);
- Success(_translationService.GetResource("Admin.Catalog.ProductReviews.Updated"));
- return continueEditing
- ? RedirectToAction("Edit", new { productReview.Id, productReview.ProductId })
- : RedirectToAction("List");
- }
-
- //If we got this far, something failed, redisplay form
- await _productReviewViewModelService.PrepareProductReviewModel(model, productReview, true, false);
- return View(model);
- }
-
- //delete
- [PermissionAuthorizeAction(PermissionActionName.Delete)]
- [HttpPost]
- public async Task<IActionResult> Delete(string id)
- {
- var productReview = await _productReviewService.GetProductReviewById(id);
- if (productReview == null)
- //No product review found with the specified id
- return RedirectToAction("List");
-
- if (ModelState.IsValid)
- {
- await _productReviewViewModelService.DeleteProductReview(productReview);
- Success(_translationService.GetResource("Admin.Catalog.ProductReviews.Deleted"));
- return RedirectToAction("List");
- }
-
- Error(ModelState);
- return RedirectToAction("Edit", new { id = productReview.Id });
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> ApproveSelected(ICollection<string> selectedIds)
- {
- if (selectedIds != null)
- await _productReviewViewModelService.ApproveSelected(selectedIds.ToList());
-
- return Json(new { Result = true });
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> DisapproveSelected(ICollection<string> selectedIds)
- {
- if (selectedIds != null)
- await _productReviewViewModelService.DisapproveSelected(selectedIds.ToList());
-
- return Json(new { Result = true });
- }
-
-
- public async Task<IActionResult> ProductSearchAutoComplete(string term,
- [FromServices] IProductService productService)
- {
- const int searchTermMinimumLength = 3;
- if (string.IsNullOrWhiteSpace(term) || term.Length < searchTermMinimumLength)
- return Content("");
-
- //products
- const int productNumber = 15;
- var products = (await productService.SearchProducts(
- keywords: term,
- pageSize: productNumber,
- showHidden: true)).products;
-
- var result = (from p in products
- select new
- {
- label = p.Name,
- productid = p.Id
- })
- .ToList();
- return Json(result);
- }
-
- #endregion
-}
\ No newline at end of file
+// Reduced to a thin subclass of BaseProductReviewController (ARCH-001 ProductReview
+// consolidation). All regions of behavior live in the shared base; this class only supplies
+// Admin's DI wiring plus the attributes that used to arrive transitively via
+// BaseAdminController - BaseProductReviewController can't inherit any single host's base
+// controller. Same pattern as GiftVoucherController (see that file).
+[AuthorizeAdmin]
+[AutoValidateAntiforgeryToken]
+[Area(Constants.AreaAdmin)]
+[AuthorizeMenu]
+public class ProductReviewController(
+ IProductReviewViewModelService productReviewViewModelService,
+ IProductReviewService productReviewService,
+ ITranslationService translationService,
+ IAdminDataScope<ProductReview> scope)
+ : BaseProductReviewController(productReviewViewModelService, productReviewService, translationService, scope);
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductReviewController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductReviewController.cs
new file mode 100644
index 000000000..4e51a7664
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductReviewController.cs
@@ -0,0 +1,163 @@
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Domain.Catalog;
+using Grand.Domain.Permissions;
+using Grand.Web.AdminShared.Interfaces;
+using Grand.Web.AdminShared.Models.Catalog;
+using Grand.Web.Common.Controllers;
+using Grand.Web.Common.DataSource;
+using Grand.Web.Common.Filters;
+using Grand.Web.Common.Security.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Grand.Web.AdminShared.Controllers;
+
+[PermissionAuthorize(PermissionSystemName.ProductReviews)]
+[AutoValidateAntiforgeryToken]
+public abstract class BaseProductReviewController(
+ IProductReviewViewModelService productReviewViewModelService,
+ IProductReviewService productReviewService,
+ ITranslationService translationService,
+ IAdminDataScope<ProductReview> scope)
+ : BaseController
+{
+ #region List
+
+ public IActionResult Index() => RedirectToAction("List");
+
+ // Must call PrepareProductReviewListModel, not return a bare model — Admin's original did,
+ // Store's original didn't (returned `new ProductReviewListModel()`). This asymmetry is the
+ // same shape as Page Phase 15's own Critical regression (a shared List(GET) silently losing
+ // Admin's model-prep call); preserving it for both hosts here, not narrowing to Store's gap.
+ public async Task<IActionResult> List()
+ {
+ var model = await productReviewViewModelService.PrepareProductReviewListModel(scope.DefaultStoreId ?? "");
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.List)]
+ [HttpPost]
+ public async Task<IActionResult> List(DataSourceRequest command, ProductReviewListModel model)
+ {
+ if (scope.DefaultStoreId is not null) model.SearchStoreId = scope.DefaultStoreId;
+
+ var (productReviewModels, totalCount) =
+ await productReviewViewModelService.PrepareProductReviewsModel(model, command.Page, command.PageSize);
+
+ return Json(new DataSourceResult {
+ Data = productReviewModels.ToList(),
+ Total = totalCount
+ });
+ }
+
+ #endregion
+
+ #region Edit / Delete
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ public async Task<IActionResult> Edit(string id)
+ {
+ var productReview = await productReviewService.GetProductReviewById(id);
+ if (productReview == null) return RedirectToAction("List");
+ if (!await scope.HasAccess(productReview)) return RedirectToAction("List");
+
+ var model = new ProductReviewModel();
+ await productReviewViewModelService.PrepareProductReviewModel(model, productReview, false, false);
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
+ public async Task<IActionResult> Edit(ProductReviewModel model, bool continueEditing)
+ {
+ var productReview = await productReviewService.GetProductReviewById(model.Id);
+ if (productReview == null) return RedirectToAction("List");
+ if (!await scope.HasAccess(productReview)) return RedirectToAction("List");
+
+ if (ModelState.IsValid)
+ {
+ productReview = await productReviewViewModelService.UpdateProductReview(productReview, model);
+ Success(translationService.GetResource("Admin.Catalog.ProductReviews.Updated"));
+ return continueEditing
+ ? RedirectToAction("Edit", new { productReview.Id, productReview.ProductId })
+ : RedirectToAction("List");
+ }
+
+ await productReviewViewModelService.PrepareProductReviewModel(model, productReview, true, false);
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Delete)]
+ [HttpPost]
+ public async Task<IActionResult> Delete(string id)
+ {
+ var productReview = await productReviewService.GetProductReviewById(id);
+ if (productReview == null) return RedirectToAction("List");
+ if (!await scope.HasAccess(productReview)) return RedirectToAction("List");
+
+ if (ModelState.IsValid)
+ {
+ await productReviewViewModelService.DeleteProductReview(productReview);
+ Success(translationService.GetResource("Admin.Catalog.ProductReviews.Deleted"));
+ return RedirectToAction("List");
+ }
+
+ Error(ModelState);
+ return RedirectToAction("Edit", new { id = productReview.Id });
+ }
+
+ #endregion
+
+ #region Approve / Disapprove
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> ApproveSelected(ICollection<string> selectedIds)
+ {
+ if (selectedIds != null)
+ await productReviewViewModelService.ApproveSelected(selectedIds.ToList(), scope.DefaultStoreId ?? "");
+
+ return Json(new { Result = true });
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> DisapproveSelected(ICollection<string> selectedIds)
+ {
+ if (selectedIds != null)
+ await productReviewViewModelService.DisapproveSelected(selectedIds.ToList(), scope.DefaultStoreId ?? "");
+
+ return Json(new { Result = true });
+ }
+
+ #endregion
+
+ #region Product search
+
+ public async Task<IActionResult> ProductSearchAutoComplete(string term,
+ [FromServices] IProductService productService)
+ {
+ const int searchTermMinimumLength = 3;
+ if (string.IsNullOrWhiteSpace(term) || term.Length < searchTermMinimumLength)
+ return Content("");
+
+ const int productNumber = 15;
+ var products = (await productService.SearchProducts(
+ storeId: scope.DefaultStoreId ?? "",
+ keywords: term,
+ pageSize: productNumber,
+ showHidden: true)).products;
+
+ var result = (from p in products
+ select new
+ {
+ label = p.Name,
+ productid = p.Id
+ })
+ .ToList();
+ return Json(result);
+ }
+
+ #endregion
+}
diff --git a/src/Web/Grand.Web.AdminShared/Services/RoutedProductReviewDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/RoutedProductReviewDataScope.cs
new file mode 100644
index 000000000..74ef69b8e
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Services/RoutedProductReviewDataScope.cs
@@ -0,0 +1,55 @@
+#nullable enable
+
+using Grand.Domain.Catalog;
+using Grand.Web.AdminShared.Interfaces;
+using Microsoft.AspNetCore.Http;
+
+namespace Grand.Web.AdminShared.Services;
+
+/// <summary>
+/// Resolves the correct per-host <see cref="IAdminDataScope{ProductReview}" /> implementation
+/// at request time, based on the current request's "area" route value — same fix and same
+/// reason as <see cref="RoutedGiftVoucherDataScope"/> (see that file's doc comment):
+/// Grand.Web (the combined host) loads Admin and Store together in one DI container, so a
+/// plain AddScoped&lt;IAdminDataScope&lt;ProductReview&gt;, X&gt;() per host would silently
+/// let whichever host's StartupApplication ran last win for every area in that process.
+///
+/// There is no Vendor branch: Vendor has no ProductReview screen at all, so any "Vendor" (or
+/// other unrecognized/missing) area value fails closed.
+/// </summary>
+public class RoutedProductReviewDataScope(
+ IHttpContextAccessor httpContextAccessor,
+ GlobalAdminDataScope<ProductReview> globalScope,
+ StoreProductReviewDataScope storeScope) : IAdminDataScope<ProductReview>
+{
+ private IAdminDataScope<ProductReview> Resolved
+ {
+ get
+ {
+ var area = httpContextAccessor.HttpContext?.Request.RouteValues["area"] as string;
+ return area switch {
+ "Admin" => globalScope,
+ "Store" => storeScope,
+ //fail closed: this object fronts store tenant isolation, so an unrecognized or
+ //missing area (including "Vendor" - ProductReview has no Vendor screen) must
+ //never silently resolve to the unscoped global scope
+ _ => throw new InvalidOperationException(
+ $"RoutedProductReviewDataScope: unrecognized or missing area '{area}'.")
+ };
+ }
+ }
+
+ public Task<bool> HasAccess(ProductReview entity) => Resolved.HasAccess(entity);
+
+ public Task<bool> CanView(ProductReview entity) => Resolved.CanView(entity);
+
+ public string? DefaultStoreId => Resolved.DefaultStoreId;
+
+ public string ResourceKeyPrefix => Resolved.ResourceKeyPrefix;
+
+ public bool ShowStoreSelector => Resolved.ShowStoreSelector;
+
+ public string? DefaultVendorId => Resolved.DefaultVendorId;
+
+ public bool CanFeatureOnHomepage => Resolved.CanFeatureOnHomepage;
+}
diff --git a/src/Web/Grand.Web.AdminShared/Services/StoreProductReviewDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/StoreProductReviewDataScope.cs
new file mode 100644
index 000000000..da9d6bce3
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Services/StoreProductReviewDataScope.cs
@@ -0,0 +1,35 @@
+#nullable enable
+
+using Grand.Domain.Catalog;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Interfaces;
+
+namespace Grand.Web.AdminShared.Services;
+
+/// <summary>
+/// Store's <see cref="IAdminDataScope{ProductReview}" />. Bespoke, not the generic
+/// <see cref="StoreAdminDataScope{TEntity}" />: <c>ProductReview</c> is a plain
+/// <see cref="Grand.Domain.Common.BaseEntity" /> with a single <c>StoreId</c> field, not
+/// <c>IStoreLinkEntity</c> — same shape family as <c>Order</c>/<c>GiftVoucher</c>.
+///
+/// Unlike GiftVoucher, ProductReview has no "global" concept: every review is written by a
+/// storefront customer against exactly one store, and neither host's original controller nor
+/// <c>ProductReviewViewModelService</c> ever treats an empty <c>StoreId</c> as cross-store
+/// visible. <see cref="HasAccess"/> and <see cref="CanView"/> are therefore identical — no
+/// loose/strict split, unlike Category/Collection/GiftVoucher.
+/// </summary>
+public class StoreProductReviewDataScope(IContextAccessor contextAccessor) : IAdminDataScope<ProductReview>
+{
+ public Task<bool> HasAccess(ProductReview entity) =>
+ Task.FromResult(entity is not null &&
+ entity.StoreId == contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+
+ public Task<bool> CanView(ProductReview entity) => HasAccess(entity);
+
+ public string? DefaultStoreId => contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
+ public string ResourceKeyPrefix => "Admin";
+ public bool ShowStoreSelector => false;
+ public string? DefaultVendorId => null;
+ // Unused by this entity, kept only for IAdminDataScope<TEntity> interface conformance.
+ public bool CanFeatureOnHomepage => true;
+}
diff --git a/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs b/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs
index dd18a06db..36195e687 100644
--- a/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs
+++ b/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs
@@ -144,6 +144,13 @@ public class StartupApplication : IStartupApplication
services.AddScoped<StoreGiftVoucherDataScope>();
services.AddScoped<IAdminDataScope<GiftVoucher>, RoutedGiftVoucherDataScope>();
+ // IAdminDataScope<ProductReview>: registered once here for the same reason as
+ // Category/Collection/GiftVoucher above — see RoutedProductReviewDataScope's doc
+ // comment. No Vendor scope: ProductReview has no Vendor screen.
+ services.AddScoped<GlobalAdminDataScope<ProductReview>>();
+ services.AddScoped<StoreProductReviewDataScope>();
+ services.AddScoped<IAdminDataScope<ProductReview>, RoutedProductReviewDataScope>();
+
// IReportDataScope: NOT an IAdminDataScope<TEntity> registration (Reports has no entity —
// see IReportDataScope's doc comment and ARCH-001 Reports consolidation spec §3). All three
// hosts have a Reports screen, so all three concrete scopes are registered.
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Edit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductReview/Edit.cshtml
similarity index 80%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Edit.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductReview/Edit.cshtml
index c73733c41..6d18d8ba3 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Edit.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductReview/Edit.cshtml
@@ -1,9 +1,10 @@
-@model ProductReviewModel
+@model ProductReviewModel
@{
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
//page title
ViewBag.Title = Loc["Admin.Catalog.ProductReviews.EditProductReviewDetails"];
}
-<form asp-area="@Constants.AreaAdmin" asp-controller="ProductReview" asp-action="Edit" method="post" asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])">
+<form asp-area="@area" asp-controller="ProductReview" asp-action="Edit" method="post" asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])">
<div class="row">
<div class="col-md-12">
@@ -27,7 +28,7 @@
<span id="productreview-delete" class="btn red">
<i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]
</span>
- <vc:admin-widget widget-zone="product_review_details_buttons" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.DetailsButtons" model="Model"/>
</div>
</div>
</div>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductReview/Partials/CreateOrUpdate.cshtml
similarity index 94%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Partials/CreateOrUpdate.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductReview/Partials/CreateOrUpdate.cshtml
index abf7decf4..11bbff862 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductReview/Partials/CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductReview/Partials/CreateOrUpdate.cshtml
@@ -3,7 +3,7 @@
<input asp-for="Id" type="hidden"/>
<input asp-for="ProductId" type="hidden"/>
<div class="form-horizontal">
- <vc:admin-widget widget-zone="product_review_details_top" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.DetailsTop" model="Model"/>
<div class="form-body">
<div class="form-group">
<admin-label asp-for="ProductName"/>
@@ -74,5 +74,5 @@
</div>
</div>
</div>
- <vc:admin-widget widget-zone="product_review_details_bottom" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.DetailsBottom" model="Model"/>
</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Edit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Edit.cshtml
deleted file mode 100644
index b99753717..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Edit.cshtml
+++ /dev/null
@@ -1,41 +0,0 @@
-@model ProductReviewModel
-@{
- //page title
- ViewBag.Title = Loc["Admin.Catalog.ProductReviews.EditProductReviewDetails"];
-}
-<form asp-area="@Constants.AreaStore" asp-controller="ProductReview" asp-action="Edit" method="post" asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])">
-
- <div class="row">
- <div class="col-md-12">
- <div class="x_panel light form-fit">
- <div class="x_title">
- <div class="caption">
- <i class="fa fa-cube"></i>
- @Loc["Admin.Catalog.ProductReviews.EditProductReviewDetails"]
- <small>
- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Catalog.ProductReviews.BackToList"], "List")
- </small>
- </div>
- <div class="actions">
- <div class="btn-group btn-group-devided">
- <button class="btn btn-success" type="submit" name="save">
- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
- </button>
- <button class="btn btn-success" type="submit" name="save-continue">
- <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
- </button>
- <span id="productreview-delete" class="btn red">
- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]
- </span>
- <vc:admin-widget widget-zone="product_review_details_buttons" additional-data="Model"/>
- </div>
- </div>
- </div>
- <div class="x_content form">
- <partial name="Partials/CreateOrUpdate" model="Model"/>
- </div>
- </div>
- </div>
- </div>
-</form>
-<admin-delete-confirmation button-id="productreview-delete"/>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/List.cshtml
index cef7a7222..57b730f7e 100644
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/List.cshtml
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/List.cshtml
@@ -16,7 +16,7 @@
<div class="actions btn-group btn-group-devided">
<input type="button" id="approve-selected" class="btn default" value="@Loc["Admin.Catalog.ProductReviews.ApproveSelected"]"/>
<input type="button" id="disapprove-selected" class="btn default" value="@Loc["Admin.Catalog.ProductReviews.DisapproveSelected"]"/>
- <vc:admin-widget widget-zone="product_review_list_buttons" additional-data="null"/>
+ <vc:store-widget widget-zone="store_product_review_list_buttons" additional-data="null"/>
</div>
</div>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/CreateOrUpdate.cshtml
deleted file mode 100644
index abf7decf4..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/CreateOrUpdate.cshtml
+++ /dev/null
@@ -1,78 +0,0 @@
-@model ProductReviewModel
-<div asp-validation-summary="All"></div>
-<input asp-for="Id" type="hidden"/>
-<input asp-for="ProductId" type="hidden"/>
-<div class="form-horizontal">
- <vc:admin-widget widget-zone="product_review_details_top" additional-data="Model"/>
- <div class="form-body">
- <div class="form-group">
- <admin-label asp-for="ProductName"/>
- <div class="col-md-9 col-sm-9">
- <label class="control-label">@Html.ActionLink(Model.ProductName, "Edit", "Product", new { id = Model.ProductId }, new { })</label>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="StoreName"/>
- <div class="col-md-9 col-sm-9">
- <span class="form-control">@Model.StoreName</span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="CustomerInfo"/>
- <div class="col-md-9 col-sm-9">
- <label class="control-label">@Html.ActionLink(Model.CustomerInfo, "Edit", "Customer", new { id = Model.CustomerId }, new { })</label>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="Title"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Title"/>
- <span asp-validation-for="Title"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="ReviewText"/>
- <div class="col-md-9 col-sm-9">
- <admin-textarea asp-for="ReviewText"></admin-textarea>
- <span asp-validation-for="ReviewText"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="ReplyText"/>
- <div class="col-md-9 col-sm-9">
- <admin-textarea asp-for="ReplyText"></admin-textarea>
- <span asp-validation-for="ReplyText"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="Signature"/>
- <div class="col-md-9 col-sm-9">
- <admin-input asp-for="Signature"/>
- <span asp-validation-for="Signature"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="Rating"/>
- <div class="col-md-9 col-sm-9">
- <label class="control-label">@Model.Rating</label>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="IsApproved"/>
- <div class="col-md-9 col-sm-9">
- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
- <admin-input asp-for="IsApproved"/>
- <div class="control__indicator"></div>
- </label>
- <span asp-validation-for="IsApproved"></span>
- </div>
- </div>
- <div class="form-group">
- <admin-label asp-for="CreatedOn"/>
- <div class="col-md-9 col-sm-9">
- <label class="control-label">@Model.CreatedOn</label>
- </div>
- </div>
- </div>
- <vc:admin-widget widget-zone="product_review_details_bottom" additional-data="Model"/>
-</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/WidgetZone.DetailsBottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/WidgetZone.DetailsBottom.cshtml
new file mode 100644
index 000000000..ff5b1fba7
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/WidgetZone.DetailsBottom.cshtml
@@ -0,0 +1,2 @@
+@model ProductReviewModel
+<vc:store-widget widget-zone="store_product_review_details_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/WidgetZone.DetailsButtons.cshtml
new file mode 100644
index 000000000..80b9b98f9
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/WidgetZone.DetailsButtons.cshtml
@@ -0,0 +1,2 @@
+@model ProductReviewModel
+<vc:store-widget widget-zone="store_product_review_details_buttons" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/WidgetZone.DetailsTop.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/WidgetZone.DetailsTop.cshtml
new file mode 100644
index 000000000..bfc791260
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/WidgetZone.DetailsTop.cshtml
@@ -0,0 +1,2 @@
+@model ProductReviewModel
+<vc:store-widget widget-zone="store_product_review_details_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Controllers/ProductReviewController.cs b/src/Web/Grand.Web.Store/Controllers/ProductReviewController.cs
index 087e0de8f..01ac52650 100644
--- a/src/Web/Grand.Web.Store/Controllers/ProductReviewController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/ProductReviewController.cs
@@ -1,187 +1,27 @@
-using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Interfaces.Common.Localization;
-using Grand.Domain.Permissions;
-using Grand.Infrastructure;
+using Grand.Domain.Catalog;
+using Grand.Web.AdminShared.Controllers;
using Grand.Web.AdminShared.Interfaces;
-using Grand.Web.AdminShared.Models.Catalog;
-using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
-using Grand.Web.Common.Security.Authorization;
+using Grand.Web.Store.Extensions;
using Microsoft.AspNetCore.Mvc;
namespace Grand.Web.Store.Controllers;
-[PermissionAuthorize(PermissionSystemName.ProductReviews)]
-public class ProductReviewController : BaseStoreController
-{
- #region Constructors
-
- public ProductReviewController(
- IProductReviewViewModelService productReviewViewModelService,
- IProductReviewService productReviewService,
- ITranslationService translationService,
- IContextAccessor contextAccessor)
- {
- _productReviewViewModelService = productReviewViewModelService;
- _productReviewService = productReviewService;
- _translationService = translationService;
- _contextAccessor = contextAccessor;
- }
-
- #endregion
-
- #region Fields
-
- private readonly IProductReviewViewModelService _productReviewViewModelService;
- private readonly IProductReviewService _productReviewService;
- private readonly ITranslationService _translationService;
- private readonly IContextAccessor _contextAccessor;
-
- #endregion Fields
-
- #region Methods
-
- //list
- public IActionResult Index()
- {
- return RedirectToAction("List");
- }
-
- public IActionResult List()
- {
- var model = new ProductReviewListModel();
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.List)]
- [HttpPost]
- public async Task<IActionResult> List(DataSourceRequest command, ProductReviewListModel model)
- {
- model.SearchStoreId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
- var (productReviewModels, totalCount) = await _productReviewViewModelService.PrepareProductReviewsModel(model, command.Page, command.PageSize);
- var gridModel = new DataSourceResult {
- Data = productReviewModels.ToList(),
- Total = totalCount
- };
-
- return Json(gridModel);
- }
-
- //edit
- [PermissionAuthorizeAction(PermissionActionName.Preview)]
- public async Task<IActionResult> Edit(string id)
- {
- var productReview = await _productReviewService.GetProductReviewById(id);
-
- if (productReview == null)
- //No product review found with the specified id
- return RedirectToAction("List");
-
- if (productReview.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) return RedirectToAction("List");
-
- var model = new ProductReviewModel();
- await _productReviewViewModelService.PrepareProductReviewModel(model, productReview, false, false);
- return View(model);
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
- public async Task<IActionResult> Edit(ProductReviewModel model, bool continueEditing)
- {
- var productReview = await _productReviewService.GetProductReviewById(model.Id);
- if (productReview == null)
- //No product review found with the specified id
- return RedirectToAction("List");
-
- if (productReview.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) return RedirectToAction("List");
-
- if (ModelState.IsValid)
- {
- productReview = await _productReviewViewModelService.UpdateProductReview(productReview, model);
- Success(_translationService.GetResource("Admin.Catalog.ProductReviews.Updated"));
- return continueEditing
- ? RedirectToAction("Edit", new { productReview.Id, productReview.ProductId })
- : RedirectToAction("List");
- }
-
- //If we got this far, something failed, redisplay form
- await _productReviewViewModelService.PrepareProductReviewModel(model, productReview, true, false);
- return View(model);
- }
-
- //delete
- [PermissionAuthorizeAction(PermissionActionName.Delete)]
- [HttpPost]
- public async Task<IActionResult> Delete(string id)
- {
- var productReview = await _productReviewService.GetProductReviewById(id);
- if (productReview == null)
- //No product review found with the specified id
- return RedirectToAction("List");
-
- if (productReview.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) return RedirectToAction("List");
-
- if (ModelState.IsValid)
- {
- await _productReviewViewModelService.DeleteProductReview(productReview);
- Success(_translationService.GetResource("Admin.Catalog.ProductReviews.Deleted"));
- return RedirectToAction("List");
- }
-
- Error(ModelState);
- return RedirectToAction("Edit", new { id = productReview.Id });
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> ApproveSelected(ICollection<string> selectedIds)
- {
- if (selectedIds != null)
- await _productReviewViewModelService.ApproveSelected(selectedIds.ToList(),
- _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
-
- return Json(new { Result = true });
- }
-
- [PermissionAuthorizeAction(PermissionActionName.Edit)]
- [HttpPost]
- public async Task<IActionResult> DisapproveSelected(ICollection<string> selectedIds)
- {
- if (selectedIds != null)
- await _productReviewViewModelService.DisapproveSelected(selectedIds.ToList(),
- _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
-
- return Json(new { Result = true });
- }
-
-
- public async Task<IActionResult> ProductSearchAutoComplete(string term,
- [FromServices] IProductService productService)
- {
- const int searchTermMinimumLength = 3;
- if (string.IsNullOrWhiteSpace(term) || term.Length < searchTermMinimumLength)
- return Content("");
-
- var storeId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
-
- //products
- const int productNumber = 15;
- var products = (await productService.SearchProducts(
- storeId: storeId,
- keywords: term,
- pageSize: productNumber,
- showHidden: true)).products;
-
- var result = (from p in products
- select new
- {
- label = p.Name,
- productid = p.Id
- })
- .ToList();
- return Json(result);
- }
-
- #endregion
-}
\ No newline at end of file
+// Reduced to a thin subclass of BaseProductReviewController (ARCH-001 ProductReview
+// consolidation). All regions of behavior live in the shared base; this class only supplies
+// Store's DI wiring and the attributes that used to arrive transitively via
+// BaseStoreController. No EditWarningCheck-style override needed: ProductReview has no
+// "global" concept, so there's nothing for Store to warn about (see Task 1's scope doc
+// comment).
+[AutoValidateAntiforgeryToken]
+[Area(Constants.AreaStore)]
+[AuthorizeStore]
+[AuthorizeMenu]
+public class ProductReviewController(
+ IProductReviewViewModelService productReviewViewModelService,
+ IProductReviewService productReviewService,
+ ITranslationService translationService,
+ IAdminDataScope<ProductReview> scope)
+ : BaseProductReviewController(productReviewViewModelService, productReviewService, translationService, scope);