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 VendorOrderDataScope with FilterOrderItems

KrzysztofPajakebc43ef41f94
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/VendorOrderDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/VendorOrderDataScopeTests.cs
new file mode 100644
index 000000000..bce658a48
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/VendorOrderDataScopeTests.cs
@@ -0,0 +1,65 @@
+using Grand.Domain.Orders;
+using Grand.Domain.Vendors;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Services;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class VendorOrderDataScopeTests
+{
+ private static VendorOrderDataScope Build(string currentVendorId)
+ {
+ var workContextMock = new Mock<IWorkContext>();
+ workContextMock.Setup(w => w.CurrentVendor).Returns(new Vendor { Id = currentVendorId });
+ var contextAccessorMock = new Mock<IContextAccessor>();
+ contextAccessorMock.Setup(c => c.WorkContext).Returns(workContextMock.Object);
+ return new VendorOrderDataScope(contextAccessorMock.Object);
+ }
+
+ [TestMethod]
+ public async Task HasAccess_AnyItemMatchesVendor_True()
+ {
+ var scope = Build("vendor-A");
+ var order = new Order();
+ order.OrderItems.Add(new OrderItem { VendorId = "vendor-B" });
+ order.OrderItems.Add(new OrderItem { VendorId = "vendor-A" });
+
+ Assert.IsTrue(await scope.HasAccess(order));
+ }
+
+ [TestMethod]
+ public async Task HasAccess_NoItemMatchesVendor_False()
+ {
+ var scope = Build("vendor-A");
+ var order = new Order();
+ order.OrderItems.Add(new OrderItem { VendorId = "vendor-B" });
+
+ Assert.IsFalse(await scope.HasAccess(order));
+ }
+
+ [TestMethod]
+ public void FilterOrderItems_MixedVendorOrder_ReturnsOnlyOwnItems()
+ {
+ var scope = Build("vendor-A");
+ var itemA1 = new OrderItem { Id = "i1", VendorId = "vendor-A" };
+ var itemB = new OrderItem { Id = "i2", VendorId = "vendor-B" };
+ var itemA2 = new OrderItem { Id = "i3", VendorId = "vendor-A" };
+
+ var filtered = scope.FilterOrderItems([itemA1, itemB, itemA2]).ToList();
+
+ CollectionAssert.AreEqual(new[] { itemA1, itemA2 }, filtered);
+ }
+
+ [TestMethod]
+ public void ScopeDefaults_VendorScoped()
+ {
+ var scope = Build("vendor-A");
+ Assert.IsNull(scope.DefaultStoreId);
+ Assert.AreEqual("vendor-A", scope.DefaultVendorId);
+ Assert.AreEqual("Vendor", scope.ResourceKeyPrefix);
+ Assert.IsFalse(scope.ShowStoreSelector);
+ }
+}
diff --git a/src/Web/Grand.Web.AdminShared/Services/VendorOrderDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/VendorOrderDataScope.cs
new file mode 100644
index 000000000..564e9eca0
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Services/VendorOrderDataScope.cs
@@ -0,0 +1,33 @@
+#nullable enable
+
+using Grand.Domain.Orders;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Interfaces;
+
+namespace Grand.Web.AdminShared.Services;
+
+/// <summary>
+/// Vendor's <see cref="IAdminDataScope{Order}" />. Bespoke: ownership is over a child
+/// collection (any <c>OrderItem.VendorId</c> match), not a flat field on the entity itself —
+/// ports the existing <c>HasAccessToOrder</c>/<c>HasAccessToOrderItem</c> extension methods
+/// from <c>Grand.Web.Vendor/Extensions/HasAccess.cs</c>. Also the only scope that overrides
+/// <see cref="FilterOrderItems" />: a vendor viewing a mixed-vendor order sees only its own
+/// line items, ported from Vendor's original
+/// <c>order.OrderItems.Where(HasAccessToOrderItem)</c> filter inside
+/// <c>PrepareOrderDetailsModel</c>.
+/// </summary>
+public class VendorOrderDataScope(IContextAccessor contextAccessor) : IAdminDataScope<Order>
+{
+ public Task<bool> HasAccess(Order entity) =>
+ Task.FromResult(entity is not null &&
+ entity.OrderItems.Any(i => i.VendorId == contextAccessor.WorkContext.CurrentVendor.Id));
+
+ public IEnumerable<OrderItem> FilterOrderItems(IEnumerable<OrderItem> orderItems) =>
+ orderItems.Where(i => i.VendorId == contextAccessor.WorkContext.CurrentVendor.Id);
+
+ public string? DefaultStoreId => null;
+ public string ResourceKeyPrefix => "Vendor";
+ public bool ShowStoreSelector => false;
+ public string? DefaultVendorId => contextAccessor.WorkContext.CurrentVendor.Id;
+ public bool CanFeatureOnHomepage => false;
+}