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 'Product collections' region into BaseProductController (ARCH-001 Phase 1)
KrzysztofPajak2490c4b9ae9d
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.csindex a462df26c..309e6b287 100644--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs@@ -702,4 +702,154 @@ public class BaseProductControllerTestsAssert.IsInstanceOfType<JsonResult>(result);_productViewModelServiceMock.Verify(s => s.DeleteProductCategory("c1", "p1"), Times.Once);}++ // --- ProductCollectionList ------------------------------------------------------------------+ // Same shape as ProductCategoryList above: HasAccess (strict) mirrors Store's CanAccessProduct and+ // Vendor's CheckAccessToProduct gating this action on both hosts.++ [TestMethod]+ public async Task ProductCollectionList_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.ProductCollectionList(+ new Grand.Web.Common.DataSource.DataSourceRequest(), "p1");++ Assert.IsInstanceOfType<JsonResult>(result);+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);+ _productViewModelServiceMock.Verify(s => s.PrepareProductCollectionModel(It.IsAny<Product>()), Times.Never);+ }++ // Guards against the same regression class found in "Product categories": the denial message must be+ // templated via scope.ResourceKeyPrefix, not hardcoded to "Admin." - "Vendor.Catalog.Products.Permissions"+ // exists at the XML resource layer (en_220.xml) even though it has no Vendor call site in this region.+ [TestMethod]+ public async Task ProductCollectionList_ScopeDeniesAccess_UsesScopeResourceKeyPrefix()+ {+ var product = new Product { Id = "p1" };+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(false);+ _scopeMock.Setup(s => s.ResourceKeyPrefix).Returns("Vendor");++ var result = await _controller.ProductCollectionList(+ new Grand.Web.Common.DataSource.DataSourceRequest(), "p1");++ Assert.IsInstanceOfType<JsonResult>(result);+ _translationServiceMock.Verify(t => t.GetResource("Vendor.Catalog.Products.Permissions"), Times.Once);+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Never);+ }++ [TestMethod]+ public async Task ProductCollectionList_ScopeGrantsAccess_ReturnsGrid()+ {+ var product = new Product { Id = "p1" };+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);+ _productViewModelServiceMock.Setup(s => s.PrepareProductCollectionModel(product))+ .ReturnsAsync(new List<ProductModel.ProductCollectionModel> { new() { Id = "c1", ProductId = "p1" } });++ var result = await _controller.ProductCollectionList(+ 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);+ }++ // --- ProductCollectionInsert ----------------------------------------------------------------++ [TestMethod]+ public async Task ProductCollectionInsert_ScopeDeniesAccess_ReturnsErrorJson_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.ProductCollectionModel { ProductId = "p1" };++ var result = await _controller.ProductCollectionInsert(model);++ Assert.IsInstanceOfType<JsonResult>(result);+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);+ _productViewModelServiceMock.Verify(s => s.InsertProductCollection(It.IsAny<ProductModel.ProductCollectionModel>()), Times.Never);+ }++ [TestMethod]+ public async Task ProductCollectionInsert_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.ProductCollectionModel { ProductId = "p1" };++ var result = await _controller.ProductCollectionInsert(model);++ Assert.IsInstanceOfType<JsonResult>(result);+ _productViewModelServiceMock.Verify(s => s.InsertProductCollection(model), Times.Once);+ }++ // --- ProductCollectionUpdate ----------------------------------------------------------------++ [TestMethod]+ public async Task ProductCollectionUpdate_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.ProductCollectionModel { ProductId = "p1" };++ var result = await _controller.ProductCollectionUpdate(model);++ Assert.IsInstanceOfType<JsonResult>(result);+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);+ _productViewModelServiceMock.Verify(s => s.UpdateProductCollection(It.IsAny<ProductModel.ProductCollectionModel>()), Times.Never);+ }++ [TestMethod]+ public async Task ProductCollectionUpdate_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.ProductCollectionModel { ProductId = "p1" };++ var result = await _controller.ProductCollectionUpdate(model);++ Assert.IsInstanceOfType<JsonResult>(result);+ _productViewModelServiceMock.Verify(s => s.UpdateProductCollection(model), Times.Once);+ }++ // --- ProductCollectionDelete ----------------------------------------------------------------++ [TestMethod]+ public async Task ProductCollectionDelete_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.ProductCollectionModel { Id = "c1", ProductId = "p1" };++ var result = await _controller.ProductCollectionDelete(model);++ Assert.IsInstanceOfType<JsonResult>(result);+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);+ _productViewModelServiceMock.Verify(s => s.DeleteProductCollection(It.IsAny<string>(), It.IsAny<string>()), Times.Never);+ }++ [TestMethod]+ public async Task ProductCollectionDelete_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.ProductCollectionModel { Id = "c1", ProductId = "p1" };++ var result = await _controller.ProductCollectionDelete(model);++ Assert.IsInstanceOfType<JsonResult>(result);+ _productViewModelServiceMock.Verify(s => s.DeleteProductCollection("c1", "p1"), Times.Once);+ }}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.csindex bc16a018f..980ac2f89 100644--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs@@ -491,4 +491,93 @@ public abstract class BaseProductController(}#endregion++ #region Product collections++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ [HttpPost]+ public async Task<IActionResult> ProductCollectionList(DataSourceRequest command, string productId)+ {+ var product = await productService.GetProductById(productId);++ // HasAccess (strict), not CanView: same shape as "Product categories" above - mirrors Store's+ // CanAccessProduct and Vendor's CheckAccessToProduct gating this action on both hosts. Applying+ // it uniformly also closes the same kind of gap found in "Product categories": Store's and+ // Vendor's original ProductCollectionInsert/Update/Delete (below) had no ownership check at all+ // - only List checked - letting any store manager or vendor mutate another party's+ // product-collection mappings by id.+ if (!await scope.HasAccess(product))+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));++ var productCollectionsModel = await productViewModelService.PrepareProductCollectionModel(product);+ var gridModel = new DataSourceResult {+ Data = productCollectionsModel,+ Total = productCollectionsModel.Count+ };++ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> ProductCollectionInsert(ProductModel.ProductCollectionModel model)+ {+ var product = await productService.GetProductById(model.ProductId);+ if (!await scope.HasAccess(product))+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));++ if (ModelState.IsValid)+ try+ {+ await productViewModelService.InsertProductCollection(model);+ return new JsonResult("");+ }+ catch (Exception ex)+ {+ return ErrorForKendoGridJson(ex.Message);+ }++ return ErrorForKendoGridJson(ModelState);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> ProductCollectionUpdate(ProductModel.ProductCollectionModel model)+ {+ var product = await productService.GetProductById(model.ProductId);+ if (!await scope.HasAccess(product))+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));++ if (ModelState.IsValid)+ try+ {+ await productViewModelService.UpdateProductCollection(model);+ return new JsonResult("");+ }+ catch (Exception ex)+ {+ return ErrorForKendoGridJson(ex.Message);+ }++ return ErrorForKendoGridJson(ModelState);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> ProductCollectionDelete(ProductModel.ProductCollectionModel model)+ {+ var product = await productService.GetProductById(model.ProductId);+ if (!await scope.HasAccess(product))+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));++ if (ModelState.IsValid)+ {+ await productViewModelService.DeleteProductCollection(model.Id, model.ProductId);+ return new JsonResult("");+ }++ return ErrorForKendoGridJson(ModelState);+ }++ #endregion}