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 'Cross-sell products' region into BaseProductController (ARCH-001 Phase 1)
KrzysztofPajakfbae675bc351
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.csindex df1524a23..f9999d1be 100644--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs@@ -1503,4 +1503,215 @@ public class BaseProductControllerTestsAssert.AreSame(reprepared, view.Model);_productViewModelServiceMock.Verify(s => s.InsertBundleProductModel(It.IsAny<ProductModel.AddBundleProductModel>()), Times.Never);}++ // --- CrossSellProductList ---------------------------------------------------------------------+ // HasAccess (strict), not CanView: same shape as RelatedProductList/BundleProductList above. Admin's+ // original CrossSellProductList had no check at all.++ [TestMethod]+ public async Task CrossSellProductList_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 result = await _controller.CrossSellProductList(new Grand.Web.Common.DataSource.DataSourceRequest(), "p1");++ Assert.IsInstanceOfType<JsonResult>(result);+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);+ }++ [TestMethod]+ public async Task CrossSellProductList_ScopeGrantsAccess_ReturnsGrid()+ {+ var product = new Product { Id = "p1" };+ product.CrossSellProduct.Add("p2");+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);+ _productServiceMock.Setup(p => p.GetProductById("p2", false)).ReturnsAsync(new Product { Id = "p2", Name = "Second" });+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);++ var result = await _controller.CrossSellProductList(new Grand.Web.Common.DataSource.DataSourceRequest(), "p1");++ 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);+ }++ // --- CrossSellProductDelete -------------------------------------------------------------------+ // Admin/Store both throw ArgumentException when the product does not exist; Vendor's original+ // CrossSellProductDelete had no ownership check at all - closed here the same way as List above.++ [TestMethod]+ public async Task CrossSellProductDelete_ProductNotFound_Throws()+ {+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync((Product)null);+ var model = new ProductModel.CrossSellProductModel { ProductId = "p1", Id = "p2" };++ await Assert.ThrowsExactlyAsync<ArgumentException>(() => _controller.CrossSellProductDelete(model));+ }++ [TestMethod]+ public async Task CrossSellProductDelete_ScopeDeniesAccess_ReturnsErrorJson_DoesNotDelete()+ {+ var product = new Product { Id = "p1" };+ product.CrossSellProduct.Add("p2");+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(false);+ var model = new ProductModel.CrossSellProductModel { ProductId = "p1", Id = "p2" };++ var result = await _controller.CrossSellProductDelete(model);++ Assert.IsInstanceOfType<JsonResult>(result);+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);+ _productViewModelServiceMock.Verify(s => s.DeleteCrossSellProduct(It.IsAny<string>(), It.IsAny<string>()), Times.Never);+ }++ [TestMethod]+ public async Task CrossSellProductDelete_NoMatchingCrossSellProduct_Throws()+ {+ var product = new Product { Id = "p1" };+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);+ var model = new ProductModel.CrossSellProductModel { ProductId = "p1", Id = "p2" };++ await Assert.ThrowsExactlyAsync<ArgumentException>(() => _controller.CrossSellProductDelete(model));+ }++ [TestMethod]+ public async Task CrossSellProductDelete_ScopeGrantsAccess_ValidModel_Deletes()+ {+ var product = new Product { Id = "p1" };+ product.CrossSellProduct.Add("p2");+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);+ var model = new ProductModel.CrossSellProductModel { ProductId = "p1", Id = "p2" };++ var result = await _controller.CrossSellProductDelete(model);++ Assert.IsInstanceOfType<JsonResult>(result);+ _productViewModelServiceMock.Verify(s => s.DeleteCrossSellProduct("p1", "p2"), Times.Once);+ }++ // --- CrossSellProductAddPopup (GET) -------------------------------------------------------------++ [TestMethod]+ public async Task CrossSellProductAddPopupGet_UsesScopeDefaultStoreId()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ _productViewModelServiceMock.Setup(s => s.PrepareCrossSellProductModel("store-1"))+ .ReturnsAsync(new ProductModel.AddCrossSellProductModel());++ var result = await _controller.CrossSellProductAddPopup("p1") as ViewResult;++ Assert.IsNotNull(result);+ var model = result.Model as ProductModel.AddCrossSellProductModel;+ Assert.IsNotNull(model);+ Assert.AreEqual("p1", model.ProductId);+ _productViewModelServiceMock.Verify(s => s.PrepareCrossSellProductModel("store-1"), Times.Once);+ }++ [TestMethod]+ public async Task CrossSellProductAddPopupGet_NoDefaultStoreId_PassesEmptyString()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ _productViewModelServiceMock.Setup(s => s.PrepareCrossSellProductModel(""))+ .ReturnsAsync(new ProductModel.AddCrossSellProductModel());++ var result = await _controller.CrossSellProductAddPopup("p1") as ViewResult;++ Assert.IsNotNull(result);+ _productViewModelServiceMock.Verify(s => s.PrepareCrossSellProductModel(""), Times.Once);+ }++ // --- CrossSellProductAddPopupList ---------------------------------------------------------------++ [TestMethod]+ public async Task CrossSellProductAddPopupList_UsesScopeDefaultStoreId()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ _productViewModelServiceMock+ .Setup(s => s.PrepareProductModel(It.IsAny<ProductModel.AddCrossSellProductModel>(), 0, 10))+ .ReturnsAsync((new List<ProductModel>(), 0));++ var model = new ProductModel.AddCrossSellProductModel();+ var result = await _controller.CrossSellProductAddPopupList(+ new Grand.Web.Common.DataSource.DataSourceRequest { Page = 0, PageSize = 10 }, model);++ Assert.IsInstanceOfType<JsonResult>(result);+ Assert.AreEqual("store-1", model.SearchStoreId);+ }++ [TestMethod]+ public async Task CrossSellProductAddPopupList_NoDefaultStoreId_DoesNotOverrideModelSearchStoreId()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ _productViewModelServiceMock+ .Setup(s => s.PrepareProductModel(It.IsAny<ProductModel.AddCrossSellProductModel>(), 0, 10))+ .ReturnsAsync((new List<ProductModel>(), 0));++ var model = new ProductModel.AddCrossSellProductModel { SearchStoreId = "explicit" };+ var result = await _controller.CrossSellProductAddPopupList(+ new Grand.Web.Common.DataSource.DataSourceRequest { Page = 0, PageSize = 10 }, model);++ Assert.IsInstanceOfType<JsonResult>(result);+ Assert.AreEqual("explicit", model.SearchStoreId);+ }++ // --- CrossSellProductAddPopup (POST) --------------------------------------------------------------+ // HasAccess (strict): closes a real gap - Vendor's original CrossSellProductAddPopup(POST) had no+ // ownership check at all, letting any vendor attach cross-sell-product mappings onto another+ // vendor's product by posting its id.++ [TestMethod]+ public async Task CrossSellProductAddPopupPost_ScopeDeniesAccess_ReturnsContentMessage_DoesNotInsert()+ {+ var product = new Product { Id = "p1" };+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(false);+ var model = new ProductModel.AddCrossSellProductModel { ProductId = "p1", SelectedProductIds = ["p2"] };++ var result = await _controller.CrossSellProductAddPopup(model);++ Assert.IsInstanceOfType<ContentResult>(result);+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);+ _productViewModelServiceMock.Verify(s => s.InsertCrossSellProductModel(It.IsAny<ProductModel.AddCrossSellProductModel>()), Times.Never);+ }++ [TestMethod]+ public async Task CrossSellProductAddPopupPost_ScopeGrantsAccess_ValidModel_Inserts()+ {+ var product = new Product { Id = "p1" };+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);+ var model = new ProductModel.AddCrossSellProductModel { ProductId = "p1", SelectedProductIds = ["p2"] };++ var result = await _controller.CrossSellProductAddPopup(model);++ var content = result as ContentResult;+ Assert.IsNotNull(content);+ Assert.AreEqual("", content.Content);+ _productViewModelServiceMock.Verify(s => s.InsertCrossSellProductModel(model), Times.Once);+ }++ [TestMethod]+ public async Task CrossSellProductAddPopupPost_ScopeGrantsAccess_InvalidModel_ReturnsViewWithRepreparedModel()+ {+ var product = new Product { Id = "p1" };+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ var reprepared = new ProductModel.AddCrossSellProductModel();+ _productViewModelServiceMock.Setup(s => s.PrepareCrossSellProductModel("store-1")).ReturnsAsync(reprepared);+ var model = new ProductModel.AddCrossSellProductModel { ProductId = "p1" };+ _controller.ModelState.AddModelError("x", "error");++ var result = await _controller.CrossSellProductAddPopup(model);++ var view = result as ViewResult;+ Assert.IsNotNull(view);+ Assert.AreSame(reprepared, view.Model);+ _productViewModelServiceMock.Verify(s => s.InsertCrossSellProductModel(It.IsAny<ProductModel.AddCrossSellProductModel>()), Times.Never);+ }}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.csindex 1819a26d4..aba501ce9 100644--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs@@ -980,4 +980,126 @@ public abstract class BaseProductController(}#endregion++ #region Cross-sell products++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ [HttpPost]+ public async Task<IActionResult> CrossSellProductList(DataSourceRequest command, string productId)+ {+ var product = await productService.GetProductById(productId);++ // HasAccess (strict), not CanView: same shape as "Related products"/"Bundle products" above -+ // mirrors Store's CanAccessProduct and Vendor's CheckAccessToProduct gating this action on both+ // hosts. Admin's original CrossSellProductList had no check at all - applying HasAccess uniformly+ // also closes that gap without changing Admin's superuser behaviour (HasAccess is a no-op for+ // Admin's scope).+ if (!await scope.HasAccess(product))+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));++ var crossSellProducts = product.CrossSellProduct;+ var crossSellProductsModel = new List<ProductModel.CrossSellProductModel>();+ foreach (var x in crossSellProducts)+ crossSellProductsModel.Add(new ProductModel.CrossSellProductModel {+ Id = x,+ ProductId = product.Id,+ Product2Name = (await productService.GetProductById(x))?.Name+ });+ var gridModel = new DataSourceResult {+ Data = crossSellProductsModel,+ Total = crossSellProductsModel.Count+ };++ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> CrossSellProductDelete(ProductModel.CrossSellProductModel model)+ {+ var product = await productService.GetProductById(model.ProductId);+ if (product == null) throw new ArgumentException("Product not exists");++ // HasAccess (strict): mirrors Store's CanAccessProduct check on this action. Vendor's original+ // CrossSellProductDelete had no check at all, letting any vendor delete another vendor's+ // cross-sell-product mappings by id - closed here the same way as the List gap above.+ if (!await scope.HasAccess(product))+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));++ var crossSellProduct = product.CrossSellProduct.FirstOrDefault(x => x == model.Id);+ if (string.IsNullOrEmpty(crossSellProduct))+ throw new ArgumentException("No cross-sell product found with the specified id");++ if (ModelState.IsValid)+ {+ await productViewModelService.DeleteCrossSellProduct(product.Id, crossSellProduct);+ return new JsonResult("");+ }++ return ErrorForKendoGridJson(ModelState);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> CrossSellProductAddPopup(string productId)+ {+ // No access check here in any of the three original hosts (Admin/Store/Vendor all open this+ // popup unconditionally once the Edit permission is satisfied) - only the mutating POST below+ // ties access to a specific product. scope.DefaultStoreId ?? "" matches Store's+ // PrepareCrossSellProductModel(StaffStoreId) call and Admin/Vendor's parameterless call.+ var model = await productViewModelService.PrepareCrossSellProductModel(scope.DefaultStoreId ?? "");+ model.ProductId = productId;+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> CrossSellProductAddPopupList(DataSourceRequest command,+ ProductModel.AddCrossSellProductModel model)+ {+ if (scope.DefaultStoreId is not null) model.SearchStoreId = scope.DefaultStoreId;++ var (products, totalCount) =+ await productViewModelService.PrepareProductModel(model, command.Page, command.PageSize);+ var gridModel = new DataSourceResult {+ Data = products.ToList(),+ Total = totalCount+ };++ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> CrossSellProductAddPopup(ProductModel.AddCrossSellProductModel model)+ {+ var product = await productService.GetProductById(model.ProductId);+ // HasAccess (strict): mirrors Store's CanAccessProduct check on this action. Vendor's original+ // CrossSellProductAddPopup(POST) had no check at all, letting any vendor add cross-sell-product+ // mappings onto another vendor's product by posting its id - closed here the same way as the+ // List/Delete gap above.+ if (!await scope.HasAccess(product))+ return Content(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));++ if (ModelState.IsValid)+ {+ if (model.SelectedProductIds != null) await productViewModelService.InsertCrossSellProductModel(model);+ return Content("");+ }++ return await InvalidCrossSellProductAddPopupResult(model);+ }++ /// <summary>Hook for the host-specific invalid-model-state response of the AddPopup(POST) action+ /// above. Admin and Store both re-prepare the popup model and return the View; Vendor instead+ /// returns Content(ModelState.GetErrors()) - a Vendor-only extension method that AdminShared cannot+ /// reference. Default here matches Admin/Store; a future Vendor subclass overrides it once hosts are+ /// subclassed onto BaseProductController (Task 11).</summary>+ protected virtual async Task<IActionResult> InvalidCrossSellProductAddPopupResult(ProductModel.AddCrossSellProductModel model)+ {+ Error(ModelState);+ model = await productViewModelService.PrepareCrossSellProductModel(scope.DefaultStoreId ?? "");+ return View(model);+ }++ #endregion}