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.

feat(arch001): add AdminOrderDataScope (Sales-Manager-aware, not generic Global scope)

KrzysztofPajake0294d1da178
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/AdminOrderDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/AdminOrderDataScopeTests.cs
new file mode 100644
index 000000000..86934ca11
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/AdminOrderDataScopeTests.cs
@@ -0,0 +1,73 @@
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Domain.Customers;
+using Grand.Domain.Orders;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Services;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class AdminOrderDataScopeTests
+{
+ private static AdminOrderDataScope Build(bool isSalesManager, string currentCustomerSeId)
+ {
+ var customer = new Customer { SeId = currentCustomerSeId };
+ var workContextMock = new Mock<IWorkContext>();
+ workContextMock.Setup(w => w.CurrentCustomer).Returns(customer);
+ var contextAccessorMock = new Mock<IContextAccessor>();
+ contextAccessorMock.Setup(c => c.WorkContext).Returns(workContextMock.Object);
+
+ var groupServiceMock = new Mock<IGroupService>();
+ groupServiceMock.Setup(g => g.IsSalesManager(customer)).ReturnsAsync(isSalesManager);
+
+ return new AdminOrderDataScope(contextAccessorMock.Object, groupServiceMock.Object);
+ }
+
+ [TestMethod]
+ public async Task HasAccess_NotSalesManager_TrueRegardlessOfSeId()
+ {
+ var scope = Build(isSalesManager: false, currentCustomerSeId: "se-1");
+ var order = new Order { SeId = "se-2" };
+
+ Assert.IsTrue(await scope.HasAccess(order));
+ }
+
+ [TestMethod]
+ public async Task HasAccess_SalesManager_MatchingSeId_True()
+ {
+ var scope = Build(isSalesManager: true, currentCustomerSeId: "se-1");
+ var order = new Order { SeId = "se-1" };
+
+ Assert.IsTrue(await scope.HasAccess(order));
+ }
+
+ [TestMethod]
+ public async Task HasAccess_SalesManager_MismatchedSeId_False()
+ {
+ var scope = Build(isSalesManager: true, currentCustomerSeId: "se-1");
+ var order = new Order { SeId = "se-2" };
+
+ Assert.IsFalse(await scope.HasAccess(order));
+ }
+
+ [TestMethod]
+ public async Task HasAccess_NullEntity_False()
+ {
+ var scope = Build(isSalesManager: false, currentCustomerSeId: "se-1");
+
+ Assert.IsFalse(await scope.HasAccess(null));
+ }
+
+ [TestMethod]
+ public void ScopeDefaults_MatchGlobalAdminSemantics()
+ {
+ var scope = Build(isSalesManager: false, currentCustomerSeId: null);
+
+ Assert.IsNull(scope.DefaultStoreId);
+ Assert.IsNull(scope.DefaultVendorId);
+ Assert.AreEqual("Admin", scope.ResourceKeyPrefix);
+ Assert.IsTrue(scope.ShowStoreSelector);
+ }
+}
diff --git a/src/Web/Grand.Web.AdminShared/Services/AdminOrderDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/AdminOrderDataScope.cs
new file mode 100644
index 000000000..e119626ef
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Services/AdminOrderDataScope.cs
@@ -0,0 +1,33 @@
+#nullable enable
+
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Domain.Orders;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Interfaces;
+
+namespace Grand.Web.AdminShared.Services;
+
+/// <summary>
+/// Admin's <see cref="IAdminDataScope{Order}" />. Deliberately NOT the generic
+/// <see cref="GlobalAdminDataScope{TEntity}" /> — Admin's original OrderController gates
+/// nearly every action through a Sales Manager check
+/// (<c>groupService.IsSalesManager(CurrentCustomer) &amp;&amp; CurrentCustomer.SeId !=
+/// order.SeId</c>) that Store and Vendor never had. Reusing the always-true generic scope here
+/// would silently drop that restriction. See ARCH-001 Order consolidation spec §3.2.
+/// </summary>
+public class AdminOrderDataScope(IContextAccessor contextAccessor, IGroupService groupService)
+ : IAdminDataScope<Order>
+{
+ public async Task<bool> HasAccess(Order entity)
+ {
+ if (entity is null) return false;
+ var isSalesManager = await groupService.IsSalesManager(contextAccessor.WorkContext.CurrentCustomer);
+ return !isSalesManager || contextAccessor.WorkContext.CurrentCustomer.SeId == entity.SeId;
+ }
+
+ public string? DefaultStoreId => null;
+ public string ResourceKeyPrefix => "Admin";
+ public bool ShowStoreSelector => true;
+ public string? DefaultVendorId => null;
+ public bool CanFeatureOnHomepage => true; // unused for Order; required interface member
+}