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
Migrate 'Purchased with order' region into BaseProductController (ARCH-001 Phase 1)
KrzysztofPajak8883e04c2613
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.csindex 2f35338e9..c5ad5fb6b 100644--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs@@ -6,12 +6,14 @@ using Grand.Business.Core.Interfaces.Storage;using Grand.Domain;using Grand.Domain.Catalog;using Grand.Domain.Media;+using Grand.Domain.Permissions;using Grand.Infrastructure.Mapper;using Grand.Mapping;using Grand.Web.AdminShared.Controllers;using Grand.Web.AdminShared.Interfaces;using Grand.Web.AdminShared.Mapper;using Grand.Web.AdminShared.Models.Catalog;+using Grand.Web.AdminShared.Models.Orders;using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;@@ -52,6 +54,7 @@ public class BaseProductControllerTestsprivate Mock<IProductViewModelService> _productViewModelServiceMock;private Mock<ITranslationService> _translationServiceMock;private Mock<IAdminDataScope<Product>> _scopeMock;+ private Mock<IPermissionService> _permissionServiceMock;[TestInitialize]public void Setup()@@ -72,6 +75,9 @@ public class BaseProductControllerTests_scopeMock.Setup(s => s.ResourceKeyPrefix).Returns("Admin");_scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ _permissionServiceMock = new Mock<IPermissionService>();+ _permissionServiceMock.Setup(p => p.Authorize(It.IsAny<Permission>())).ReturnsAsync(true);+var languageServiceMock = new Mock<ILanguageService>();languageServiceMock.Setup(l => l.GetAllLanguages(true, It.IsAny<string>())).ReturnsAsync(new List<Domain.Localization.Language>());@@ -84,7 +90,7 @@ public class BaseProductControllerTestsnew Mock<IProductReservationService>().Object,new Mock<IAuctionService>().Object,new Mock<IDateTimeService>().Object,- new Mock<IPermissionService>().Object,+ _permissionServiceMock.Object,new Mock<IEnumTranslationService>().Object,_scopeMock.Object);@@ -2685,4 +2691,71 @@ public class BaseProductControllerTestsAssert.IsInstanceOfType<JsonResult>(result);_productServiceMock.Verify(p => p.GetProductById(It.IsAny<string>(), It.IsAny<bool>()), Times.Never);}++ // --- Purchased with order ------------------------------------------------------------------------+ // Covers Admin and Store only - Vendor cannot bind to this signature (see the region comment in+ // BaseProductController.cs: Vendor has its own, structurally different IOrderViewModelService and+ // OrderListModel types).++ [TestMethod]+ public async Task PurchasedWithOrders_PermissionDenied_ReturnsEmptyGrid_DoesNotLoadProduct()+ {+ _permissionServiceMock.Setup(p => p.Authorize(StandardPermission.ManageOrders)).ReturnsAsync(false);+ var orderViewModelServiceMock = new Mock<IOrderViewModelService>();++ var result = await _controller.PurchasedWithOrders(+ new Grand.Web.Common.DataSource.DataSourceRequest(), "p1", orderViewModelServiceMock.Object);++ var json = result as JsonResult;+ Assert.IsNotNull(json);+ var gridModel = json.Value as Grand.Web.Common.DataSource.DataSourceResult;+ Assert.IsNotNull(gridModel);+ Assert.AreEqual(0, gridModel.Total);+ Assert.IsNull(gridModel.Data);+ _productServiceMock.Verify(p => p.GetProductById(It.IsAny<string>(), It.IsAny<bool>()), Times.Never);+ }++ [TestMethod]+ public async Task PurchasedWithOrders_ScopeDeniesAccess_ReturnsErrorJson()+ {+ var product = new Product { Id = "p1" };+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(false);+ var orderViewModelServiceMock = new Mock<IOrderViewModelService>();++ var result = await _controller.PurchasedWithOrders(+ new Grand.Web.Common.DataSource.DataSourceRequest(), "p1", orderViewModelServiceMock.Object);++ Assert.IsInstanceOfType<JsonResult>(result);+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);+ orderViewModelServiceMock.Verify(+ s => s.PrepareOrderModel(It.IsAny<OrderListModel>(), It.IsAny<int>(), It.IsAny<int>()), Times.Never);+ }++ [TestMethod]+ public async Task PurchasedWithOrders_ScopeGrantsAccess_UsesDefaultStoreIdAndReturnsGrid()+ {+ var product = new Product { Id = "p1" };+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);+ // DefaultStoreId stands in for Store's original model.StoreId = StaffStoreId (and for Admin's+ // original, which left StoreId unset/null - GlobalAdminDataScope.DefaultStoreId is null).+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ var orders = new List<OrderModel> { new() { Id = "order1" } };+ var orderViewModelServiceMock = new Mock<IOrderViewModelService>();+ orderViewModelServiceMock+ .Setup(s => s.PrepareOrderModel(+ It.Is<OrderListModel>(m => m.ProductId == "p1" && m.StoreId == "store-1"), 1, 10))+ .ReturnsAsync((orders, orders.Count));++ var result = await _controller.PurchasedWithOrders(+ new Grand.Web.Common.DataSource.DataSourceRequest { Page = 1, PageSize = 10 }, "p1",+ orderViewModelServiceMock.Object);++ var json = result as JsonResult;+ Assert.IsNotNull(json);+ var gridModel = json.Value as Grand.Web.Common.DataSource.DataSourceResult;+ Assert.IsNotNull(gridModel);+ Assert.AreEqual(1, gridModel.Total);+ }}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.csindex aaee900df..ca32bec59 100644--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs@@ -1739,4 +1739,55 @@ public abstract class BaseProductController(}#endregion++ #region Purchased with order++ // Type note: this method covers Admin and Store only. Both already share+ // Grand.Web.AdminShared's IOrderViewModelService and Models.Orders.OrderListModel (see the usings+ // at the top of this file). Vendor defines its own, structurally different+ // Grand.Web.Vendor.Interfaces.IOrderViewModelService and Grand.Web.Vendor.Models.Orders.OrderListModel+ // (no StoreId property at all - Vendor's PrepareOrderModel scopes by+ // _contextAccessor.WorkContext.CurrentVendor.Id internally, not via any model field), so it cannot+ // bind to this signature. That vendor-id scoping lives entirely inside Vendor's own+ // OrderViewModelService, outside anything IAdminDataScope<Product> expresses - flagging as a concern+ // per the task brief rather than inventing a shared model/service pair. Left virtual so a future+ // Vendor subclass can still override this action with its own types when Vendor is wired onto this+ // base controller.+ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ [HttpPost]+ public virtual async Task<IActionResult> PurchasedWithOrders(DataSourceRequest command, string productId,+ [FromServices] IOrderViewModelService orderViewModelService)+ {+ if (!await permissionService.Authorize(StandardPermission.ManageOrders))+ return Json(new DataSourceResult {+ Data = null,+ Total = 0+ });++ var product = await productService.GetProductById(productId);++ // HasAccess (strict): mirrors Store's CanAccessProduct check on this action. Admin's original had+ // no check at all - GlobalAdminDataScope.HasAccess is a no-op there, so this closes that gap the+ // same way as every other row in this task.+ if (!await scope.HasAccess(product))+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));++ var model = new OrderListModel {+ ProductId = productId,+ // DefaultStoreId is the staff member's store for Store (matches its original+ // model.StoreId = StaffStoreId) and null for Admin (matches its original, which never set+ // StoreId at all).+ StoreId = scope.DefaultStoreId+ };++ var (orderModels, totalCount) =+ await orderViewModelService.PrepareOrderModel(model, command.Page, command.PageSize);+ var gridModel = new DataSourceResult {+ Data = orderModels.ToList(),+ Total = totalCount+ };+ return Json(gridModel);+ }++ #endregion}