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 'Bundle products' region into BaseProductController (ARCH-001 Phase 1)
KrzysztofPajak8ae78a630ea4
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.csindex bf3cc798b..df1524a23 100644--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs@@ -1286,4 +1286,221 @@ public class BaseProductControllerTestsAssert.AreSame(reprepared, view.Model);_productViewModelServiceMock.Verify(s => s.InsertSimilarProductModel(It.IsAny<ProductModel.AddSimilarProductModel>()), Times.Never);}++ // --- BundleProductList ------------------------------------------------------------------------+ // HasAccess (strict), not CanView: same shape as RelatedProductList/SimilarProductList above.++ [TestMethod]+ public async Task BundleProductList_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.BundleProductList(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 BundleProductList_ScopeGrantsAccess_ReturnsGrid()+ {+ var product = new Product { Id = "p1" };+ product.BundleProducts.Add(new BundleProduct { Id = "r1", ProductId = "p2", DisplayOrder = 0, Quantity = 3 });+ _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.BundleProductList(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);+ }++ // --- BundleProductUpdate ----------------------------------------------------------------------++ [TestMethod]+ public async Task BundleProductUpdate_ScopeDeniesAccess_ReturnsErrorJson_DoesNotUpdate()+ {+ 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.BundleProductModel { ProductBundleId = "p1" };++ var result = await _controller.BundleProductUpdate(model);++ Assert.IsInstanceOfType<JsonResult>(result);+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);+ _productViewModelServiceMock.Verify(s => s.UpdateBundleProductModel(It.IsAny<ProductModel.BundleProductModel>()), Times.Never);+ }++ [TestMethod]+ public async Task BundleProductUpdate_ScopeGrantsAccess_ValidModel_Updates()+ {+ 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.BundleProductModel { ProductBundleId = "p1" };++ var result = await _controller.BundleProductUpdate(model);++ Assert.IsInstanceOfType<JsonResult>(result);+ _productViewModelServiceMock.Verify(s => s.UpdateBundleProductModel(model), Times.Once);+ }++ // --- BundleProductDelete ----------------------------------------------------------------------++ [TestMethod]+ public async Task BundleProductDelete_ScopeDeniesAccess_ReturnsErrorJson_DoesNotDelete()+ {+ 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.BundleProductModel { ProductBundleId = "p1" };++ var result = await _controller.BundleProductDelete(model);++ Assert.IsInstanceOfType<JsonResult>(result);+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);+ _productViewModelServiceMock.Verify(s => s.DeleteBundleProductModel(It.IsAny<ProductModel.BundleProductModel>()), Times.Never);+ }++ [TestMethod]+ public async Task BundleProductDelete_ScopeGrantsAccess_ValidModel_Deletes()+ {+ 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.BundleProductModel { ProductBundleId = "p1" };++ var result = await _controller.BundleProductDelete(model);++ Assert.IsInstanceOfType<JsonResult>(result);+ _productViewModelServiceMock.Verify(s => s.DeleteBundleProductModel(model), Times.Once);+ }++ // --- BundleProductAddPopup (GET) --------------------------------------------------------------++ [TestMethod]+ public async Task BundleProductAddPopupGet_UsesScopeDefaultStoreId()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ _productViewModelServiceMock.Setup(s => s.PrepareBundleProductModel("store-1"))+ .ReturnsAsync(new ProductModel.AddBundleProductModel());++ var result = await _controller.BundleProductAddPopup("p1") as ViewResult;++ Assert.IsNotNull(result);+ var model = result.Model as ProductModel.AddBundleProductModel;+ Assert.IsNotNull(model);+ Assert.AreEqual("p1", model.ProductId);+ _productViewModelServiceMock.Verify(s => s.PrepareBundleProductModel("store-1"), Times.Once);+ }++ [TestMethod]+ public async Task BundleProductAddPopupGet_NoDefaultStoreId_PassesEmptyString()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ _productViewModelServiceMock.Setup(s => s.PrepareBundleProductModel(""))+ .ReturnsAsync(new ProductModel.AddBundleProductModel());++ var result = await _controller.BundleProductAddPopup("p1") as ViewResult;++ Assert.IsNotNull(result);+ _productViewModelServiceMock.Verify(s => s.PrepareBundleProductModel(""), Times.Once);+ }++ // --- BundleProductAddPopupList -----------------------------------------------------------------++ [TestMethod]+ public async Task BundleProductAddPopupList_UsesScopeDefaultStoreId()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ _productViewModelServiceMock+ .Setup(s => s.PrepareProductModel(It.IsAny<ProductModel.AddBundleProductModel>(), 0, 10))+ .ReturnsAsync((new List<ProductModel>(), 0));++ var model = new ProductModel.AddBundleProductModel();+ var result = await _controller.BundleProductAddPopupList(+ 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 BundleProductAddPopupList_NoDefaultStoreId_DoesNotOverrideModelSearchStoreId()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ _productViewModelServiceMock+ .Setup(s => s.PrepareProductModel(It.IsAny<ProductModel.AddBundleProductModel>(), 0, 10))+ .ReturnsAsync((new List<ProductModel>(), 0));++ var model = new ProductModel.AddBundleProductModel { SearchStoreId = "explicit" };+ var result = await _controller.BundleProductAddPopupList(+ new Grand.Web.Common.DataSource.DataSourceRequest { Page = 0, PageSize = 10 }, model);++ Assert.IsInstanceOfType<JsonResult>(result);+ Assert.AreEqual("explicit", model.SearchStoreId);+ }++ // --- BundleProductAddPopup (POST) --------------------------------------------------------------+ // HasAccess (strict): closes a real gap - Vendor's original BundleProductAddPopup(POST) had no+ // ownership check at all, letting any vendor attach bundle-product mappings onto another vendor's+ // product by posting its id.++ [TestMethod]+ public async Task BundleProductAddPopupPost_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.AddBundleProductModel { ProductId = "p1", SelectedProductIds = ["p2"] };++ var result = await _controller.BundleProductAddPopup(model);++ Assert.IsInstanceOfType<ContentResult>(result);+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);+ _productViewModelServiceMock.Verify(s => s.InsertBundleProductModel(It.IsAny<ProductModel.AddBundleProductModel>()), Times.Never);+ }++ [TestMethod]+ public async Task BundleProductAddPopupPost_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.AddBundleProductModel { ProductId = "p1", SelectedProductIds = ["p2"] };++ var result = await _controller.BundleProductAddPopup(model);++ var content = result as ContentResult;+ Assert.IsNotNull(content);+ Assert.AreEqual("", content.Content);+ _productViewModelServiceMock.Verify(s => s.InsertBundleProductModel(model), Times.Once);+ }++ [TestMethod]+ public async Task BundleProductAddPopupPost_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.AddBundleProductModel();+ _productViewModelServiceMock.Setup(s => s.PrepareBundleProductModel("store-1")).ReturnsAsync(reprepared);+ var model = new ProductModel.AddBundleProductModel { ProductId = "p1" };+ _controller.ModelState.AddModelError("x", "error");++ var result = await _controller.BundleProductAddPopup(model);++ var view = result as ViewResult;+ Assert.IsNotNull(view);+ Assert.AreSame(reprepared, view.Model);+ _productViewModelServiceMock.Verify(s => s.InsertBundleProductModel(It.IsAny<ProductModel.AddBundleProductModel>()), Times.Never);+ }}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.csindex 9fc59a236..1819a26d4 100644--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs@@ -847,4 +847,137 @@ public abstract class BaseProductController(}#endregion++ #region Bundle products++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ [HttpPost]+ public async Task<IActionResult> BundleProductList(DataSourceRequest command, string productId)+ {+ var product = await productService.GetProductById(productId);++ // HasAccess (strict), not CanView: same shape as "Related products"/"Similar products" above -+ // mirrors Store's CanAccessProduct check on this action. Applying it uniformly also closes the+ // same kind of gap found in those two regions: Vendor's original BundleProductUpdate/Delete/+ // AddPopup(GET/POST) (below) had no ownership check at all - only List checked (via+ // CheckAccessToProduct) - letting any vendor mutate another vendor's bundle-product mappings by id.+ if (!await scope.HasAccess(product))+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));++ var bundleProducts = product.BundleProducts.OrderBy(x => x.DisplayOrder);+ var bundleProductsModel = new List<ProductModel.BundleProductModel>();+ foreach (var x in bundleProducts)+ bundleProductsModel.Add(new ProductModel.BundleProductModel {+ Id = x.Id,+ ProductBundleId = productId,+ ProductId = x.ProductId,+ ProductName = (await productService.GetProductById(x.ProductId))?.Name,+ DisplayOrder = x.DisplayOrder,+ Quantity = x.Quantity+ });+ var gridModel = new DataSourceResult {+ Data = bundleProductsModel,+ Total = bundleProductsModel.Count+ };++ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> BundleProductUpdate(ProductModel.BundleProductModel model)+ {+ var product = await productService.GetProductById(model.ProductBundleId);+ if (!await scope.HasAccess(product))+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));++ if (ModelState.IsValid)+ {+ await productViewModelService.UpdateBundleProductModel(model);+ return new JsonResult("");+ }++ return ErrorForKendoGridJson(ModelState);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> BundleProductDelete(ProductModel.BundleProductModel model)+ {+ var product = await productService.GetProductById(model.ProductBundleId);+ if (!await scope.HasAccess(product))+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));++ if (ModelState.IsValid)+ {+ await productViewModelService.DeleteBundleProductModel(model);+ return new JsonResult("");+ }++ return ErrorForKendoGridJson(ModelState);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> BundleProductAddPopup(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+ // PrepareBundleProductModel(StaffStoreId) call and Admin/Vendor's parameterless call.+ var model = await productViewModelService.PrepareBundleProductModel(scope.DefaultStoreId ?? "");+ model.ProductId = productId;+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> BundleProductAddPopupList(DataSourceRequest command,+ ProductModel.AddBundleProductModel 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> BundleProductAddPopup(ProductModel.AddBundleProductModel model)+ {+ var product = await productService.GetProductById(model.ProductId);+ // HasAccess (strict): mirrors Store's CanAccessProduct check on this action. Vendor's original+ // BundleProductAddPopup(POST) had no check at all, letting any vendor add bundle-product mappings+ // onto another vendor's product by posting its id - closed here the same way as the+ // List/Update/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.InsertBundleProductModel(model);+ return Content("");+ }++ return await InvalidBundleProductAddPopupResult(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> InvalidBundleProductAddPopupResult(ProductModel.AddBundleProductModel model)+ {+ Error(ModelState);+ model = await productViewModelService.PrepareBundleProductModel(scope.DefaultStoreId ?? "");+ return View(model);+ }++ #endregion}