Merge remote-tracking branch 'origin/develop' into arch001/phase19-messagetemplate-consolidation

# Conflicts:
#	src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs

Author: KrzysztofPajak

src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductReviewControllerTests.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);
+    }
+}

src/Tests/Grand.Web.Admin.Tests/Controllers/ProductReviewControllerAttributeTests.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" }));
+    }
+}

src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedProductReviewDataScopeTests.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);
+    }
+}

src/Tests/Grand.Web.Admin.Tests/Controllers/StoreProductReviewDataScopeTests.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);
+    }
+}

src/Tests/Grand.Web.Store.Tests/Controllers/ProductReviewControllerAttributeTests.cs

@@ -0,0 +1,2 @@
+@model ProductReviewModel
+<vc:admin-widget widget-zone="product_review_details_bottom" additional-data="Model"/>

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_buttons" additional-data="Model"/>

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_top" additional-data="Model"/>