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.

Migrate 'Product Attribute combination - tier prices' region into BaseProductController (ARCH-001 Phase 1)

KrzysztofPajak62d77e20a4a6
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs
index eab161216..e97802293 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs
@@ -4990,4 +4990,216 @@ public class BaseProductControllerTests
Assert.IsInstanceOfType<JsonResult>(result);
_productViewModelServiceMock.Verify(s => s.ClearAllAttributeCombinations(It.IsAny<Product>()), Times.Never);
}
+
+ // --- ProductAttributeCombinationTierPriceList (POST) -----------------------------------------------
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceList_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.ProductAttributeCombinationTierPriceList(new DataSourceRequest(), "p1", "c1");
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);
+ _productViewModelServiceMock.Verify(
+ s => s.PrepareProductAttributeCombinationTierPricesModel(It.IsAny<Product>(), It.IsAny<string>()),
+ Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceList_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.PrepareProductAttributeCombinationTierPricesModel(product, "c1"))
+ .ReturnsAsync(new List<ProductModel.ProductAttributeCombinationTierPricesModel> { new() });
+
+ var result = await _controller.ProductAttributeCombinationTierPriceList(new DataSourceRequest(), "p1", "c1");
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ var gridModel = json.Value as DataSourceResult;
+ Assert.AreEqual(1, gridModel.Total);
+ }
+
+ // --- ProductAttributeCombinationTierPriceInsert -----------------------------------------------------
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceInsert_MissingProduct_Throws()
+ {
+ _productServiceMock.Setup(p => p.GetProductById("missing", false)).ReturnsAsync((Product)null);
+
+ await Assert.ThrowsExactlyAsync<ArgumentException>(
+ () => _controller.ProductAttributeCombinationTierPriceInsert("missing", "c1",
+ new ProductModel.ProductAttributeCombinationTierPricesModel()));
+ }
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceInsert_ScopeDeniesAccess_ReturnsContent_DoesNotInsert()
+ {
+ var product = new Product { Id = "p1" };
+ product.ProductAttributeCombinations.Add(new ProductAttributeCombination { Id = "c1" });
+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(false);
+
+ var result = await _controller.ProductAttributeCombinationTierPriceInsert("p1", "c1",
+ new ProductModel.ProductAttributeCombinationTierPricesModel());
+
+ Assert.IsInstanceOfType<ContentResult>(result);
+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);
+ _productViewModelServiceMock.Verify(
+ s => s.InsertProductAttributeCombinationTierPricesModel(It.IsAny<Product>(),
+ It.IsAny<ProductAttributeCombination>(),
+ It.IsAny<ProductModel.ProductAttributeCombinationTierPricesModel>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceInsert_ScopeGrantsAccess_CombinationMissing_DoesNotInsert()
+ {
+ var product = new Product { Id = "p1" };
+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
+
+ var result = await _controller.ProductAttributeCombinationTierPriceInsert("p1", "missing-c",
+ new ProductModel.ProductAttributeCombinationTierPricesModel());
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _productViewModelServiceMock.Verify(
+ s => s.InsertProductAttributeCombinationTierPricesModel(It.IsAny<Product>(),
+ It.IsAny<ProductAttributeCombination>(),
+ It.IsAny<ProductModel.ProductAttributeCombinationTierPricesModel>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceInsert_ScopeGrantsAccess_Inserts()
+ {
+ var product = new Product { Id = "p1" };
+ var combination = new ProductAttributeCombination { Id = "c1" };
+ product.ProductAttributeCombinations.Add(combination);
+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
+ var model = new ProductModel.ProductAttributeCombinationTierPricesModel();
+
+ var result = await _controller.ProductAttributeCombinationTierPriceInsert("p1", "c1", model);
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _productViewModelServiceMock.Verify(
+ s => s.InsertProductAttributeCombinationTierPricesModel(product, combination, model), Times.Once);
+ }
+
+ // --- ProductAttributeCombinationTierPriceUpdate -----------------------------------------------------
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceUpdate_MissingProduct_Throws()
+ {
+ _productServiceMock.Setup(p => p.GetProductById("missing", false)).ReturnsAsync((Product)null);
+
+ await Assert.ThrowsExactlyAsync<ArgumentException>(
+ () => _controller.ProductAttributeCombinationTierPriceUpdate("missing", "c1",
+ new ProductModel.ProductAttributeCombinationTierPricesModel()));
+ }
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceUpdate_ScopeDeniesAccess_ReturnsContent_DoesNotUpdate()
+ {
+ var product = new Product { Id = "p1" };
+ product.ProductAttributeCombinations.Add(new ProductAttributeCombination { Id = "c1" });
+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(false);
+
+ var result = await _controller.ProductAttributeCombinationTierPriceUpdate("p1", "c1",
+ new ProductModel.ProductAttributeCombinationTierPricesModel());
+
+ Assert.IsInstanceOfType<ContentResult>(result);
+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);
+ _productViewModelServiceMock.Verify(
+ s => s.UpdateProductAttributeCombinationTierPricesModel(It.IsAny<Product>(),
+ It.IsAny<ProductAttributeCombination>(),
+ It.IsAny<ProductModel.ProductAttributeCombinationTierPricesModel>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceUpdate_ScopeGrantsAccess_Updates()
+ {
+ var product = new Product { Id = "p1" };
+ var combination = new ProductAttributeCombination { Id = "c1" };
+ product.ProductAttributeCombinations.Add(combination);
+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
+ var model = new ProductModel.ProductAttributeCombinationTierPricesModel();
+
+ var result = await _controller.ProductAttributeCombinationTierPriceUpdate("p1", "c1", model);
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _productViewModelServiceMock.Verify(
+ s => s.UpdateProductAttributeCombinationTierPricesModel(product, combination, model), Times.Once);
+ }
+
+ // --- ProductAttributeCombinationTierPriceDelete -----------------------------------------------------
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceDelete_MissingProduct_Throws()
+ {
+ _productServiceMock.Setup(p => p.GetProductById("missing", false)).ReturnsAsync((Product)null);
+
+ await Assert.ThrowsExactlyAsync<ArgumentException>(
+ () => _controller.ProductAttributeCombinationTierPriceDelete("missing", "c1", "tp1"));
+ }
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceDelete_ScopeDeniesAccess_ReturnsContent_DoesNotDelete()
+ {
+ var product = new Product { Id = "p1" };
+ product.ProductAttributeCombinations.Add(new ProductAttributeCombination { Id = "c1" });
+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(false);
+
+ var result = await _controller.ProductAttributeCombinationTierPriceDelete("p1", "c1", "tp1");
+
+ Assert.IsInstanceOfType<ContentResult>(result);
+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);
+ _productViewModelServiceMock.Verify(
+ s => s.DeleteProductAttributeCombinationTierPrices(It.IsAny<Product>(),
+ It.IsAny<ProductAttributeCombination>(),
+ It.IsAny<ProductCombinationTierPrices>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceDelete_ScopeGrantsAccess_TierPriceMissing_DoesNotDelete()
+ {
+ var product = new Product { Id = "p1" };
+ product.ProductAttributeCombinations.Add(new ProductAttributeCombination { Id = "c1" });
+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
+
+ var result = await _controller.ProductAttributeCombinationTierPriceDelete("p1", "c1", "missing-tp");
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _productViewModelServiceMock.Verify(
+ s => s.DeleteProductAttributeCombinationTierPrices(It.IsAny<Product>(),
+ It.IsAny<ProductAttributeCombination>(),
+ It.IsAny<ProductCombinationTierPrices>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ProductAttributeCombinationTierPriceDelete_ScopeGrantsAccess_Deletes()
+ {
+ var product = new Product { Id = "p1" };
+ var combination = new ProductAttributeCombination { Id = "c1" };
+ var tierPrice = new ProductCombinationTierPrices { Id = "tp1" };
+ combination.TierPrices.Add(tierPrice);
+ product.ProductAttributeCombinations.Add(combination);
+ _productServiceMock.Setup(p => p.GetProductById("p1", false)).ReturnsAsync(product);
+ _scopeMock.Setup(s => s.HasAccess(product)).ReturnsAsync(true);
+
+ var result = await _controller.ProductAttributeCombinationTierPriceDelete("p1", "c1", "tp1");
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _productViewModelServiceMock.Verify(
+ s => s.DeleteProductAttributeCombinationTierPrices(product, combination, tierPrice), Times.Once);
+ }
}
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs
index 8079fc428..85c245d5d 100644
--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs
@@ -2978,4 +2978,110 @@ public abstract class BaseProductController(
}
#endregion
+
+ #region Product Attribute combination - tier prices
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> ProductAttributeCombinationTierPriceList(DataSourceRequest command,
+ string productId, string productAttributeCombinationId)
+ {
+ var product = await productService.GetProductById(productId);
+
+ // HasAccess added here: Admin's original had no ownership check at all on this region (any of its
+ // four actions). Store checked CanAccessProduct on every action. Vendor's List/Delete used explicit
+ // checks (CheckAccessToProduct / HasAccessToProduct); Vendor's Insert/Update relied entirely on
+ // ProductAttributeCombinationTierPricesModel implementing IProductValidVendor (the global
+ // ValidationFilter resolves ProductValidVendor, a FluentValidation rule comparing
+ // product.VendorId to CurrentVendor.Id, and the action only proceeded inside `if
+ // (ModelState.IsValid)`) - a real check, not a no-op, but the shared AdminShared model used here
+ // does not implement that marker interface, so merging Vendor's Insert/Update as-is would silently
+ // drop vendor ownership enforcement. scope.HasAccess replaces it uniformly across all four actions
+ // (no-op for Admin, equivalent-or-stronger for Store/Vendor).
+ if (!await scope.HasAccess(product))
+ return ErrorForKendoGridJson(
+ translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));
+
+ var tierPriceModel =
+ await productViewModelService.PrepareProductAttributeCombinationTierPricesModel(product,
+ productAttributeCombinationId);
+ var gridModel = new DataSourceResult {
+ Data = tierPriceModel,
+ Total = tierPriceModel.Count
+ };
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> ProductAttributeCombinationTierPriceInsert(string productId,
+ string productAttributeCombinationId, ProductModel.ProductAttributeCombinationTierPricesModel model)
+ {
+ var product = await productService.GetProductById(productId);
+ if (product == null)
+ throw new ArgumentException("No product found with the specified id");
+
+ // See the List comment above - this is the action where Vendor's IProductValidVendor-driven check
+ // would have silently disappeared without an explicit scope.HasAccess call.
+ if (!await scope.HasAccess(product))
+ return Content(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));
+
+ var combination =
+ product.ProductAttributeCombinations.FirstOrDefault(x => x.Id == productAttributeCombinationId);
+ if (combination != null)
+ await productViewModelService.InsertProductAttributeCombinationTierPricesModel(product, combination,
+ model);
+
+ return new JsonResult("");
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> ProductAttributeCombinationTierPriceUpdate(string productId,
+ string productAttributeCombinationId, ProductModel.ProductAttributeCombinationTierPricesModel model)
+ {
+ var product = await productService.GetProductById(productId);
+ if (product == null)
+ throw new ArgumentException("No product found with the specified id");
+
+ // See the List comment above.
+ if (!await scope.HasAccess(product))
+ return Content(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));
+
+ var combination = product.ProductAttributeCombinations.FirstOrDefault(x => x.Id == productAttributeCombinationId);
+ if (combination != null)
+ await productViewModelService.UpdateProductAttributeCombinationTierPricesModel(product, combination,
+ model);
+
+ return new JsonResult("");
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> ProductAttributeCombinationTierPriceDelete(string productId,
+ string productAttributeCombinationId, string id)
+ {
+ var product = await productService.GetProductById(productId);
+ if (product == null)
+ throw new ArgumentException("No product found with the specified id");
+
+ // HasAccess here matches Store's CanAccessProduct and Vendor's HasAccessToProduct checks (both
+ // already present on Delete in the originals); normalized to scope.HasAccess for Admin too.
+ if (!await scope.HasAccess(product))
+ return Content(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));
+
+ var combination = product.ProductAttributeCombinations.FirstOrDefault(x => x.Id == productAttributeCombinationId);
+ if (combination != null)
+ {
+ var tierPrice = combination.TierPrices.FirstOrDefault(x => x.Id == id);
+ if (tierPrice != null)
+ await productViewModelService.DeleteProductAttributeCombinationTierPrices(product, combination,
+ tierPrice);
+ }
+
+ return new JsonResult("");
+ }
+
+ #endregion
}