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 'Related products' region into BaseProductController (ARCH-001 Phase 1)

KrzysztofPajak81f64b27fcaa
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs
index 309e6b287..c9cac27c7 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductControllerTests.cs
@@ -852,4 +852,221 @@ public class BaseProductControllerTests
Assert.IsInstanceOfType<JsonResult>(result);
_productViewModelServiceMock.Verify(s => s.DeleteProductCollection("c1", "p1"), Times.Once);
}
+
+ // --- RelatedProductList ------------------------------------------------------------------------
+ // HasAccess (strict), not CanView: same shape as ProductCategoryList/ProductCollectionList above.
+
+ [TestMethod]
+ public async Task RelatedProductList_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.RelatedProductList(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 RelatedProductList_ScopeGrantsAccess_ReturnsGrid()
+ {
+ var product = new Product { Id = "p1" };
+ product.RelatedProducts.Add(new RelatedProduct { Id = "r1", ProductId2 = "p2", DisplayOrder = 0 });
+ _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.RelatedProductList(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);
+ }
+
+ // --- RelatedProductUpdate ----------------------------------------------------------------------
+
+ [TestMethod]
+ public async Task RelatedProductUpdate_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.RelatedProductModel { ProductId1 = "p1" };
+
+ var result = await _controller.RelatedProductUpdate(model);
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);
+ _productViewModelServiceMock.Verify(s => s.UpdateRelatedProductModel(It.IsAny<ProductModel.RelatedProductModel>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task RelatedProductUpdate_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.RelatedProductModel { ProductId1 = "p1" };
+
+ var result = await _controller.RelatedProductUpdate(model);
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _productViewModelServiceMock.Verify(s => s.UpdateRelatedProductModel(model), Times.Once);
+ }
+
+ // --- RelatedProductDelete ----------------------------------------------------------------------
+
+ [TestMethod]
+ public async Task RelatedProductDelete_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.RelatedProductModel { ProductId1 = "p1" };
+
+ var result = await _controller.RelatedProductDelete(model);
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);
+ _productViewModelServiceMock.Verify(s => s.DeleteRelatedProductModel(It.IsAny<ProductModel.RelatedProductModel>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task RelatedProductDelete_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.RelatedProductModel { ProductId1 = "p1" };
+
+ var result = await _controller.RelatedProductDelete(model);
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ _productViewModelServiceMock.Verify(s => s.DeleteRelatedProductModel(model), Times.Once);
+ }
+
+ // --- RelatedProductAddPopup (GET) --------------------------------------------------------------
+
+ [TestMethod]
+ public async Task RelatedProductAddPopupGet_UsesScopeDefaultStoreId()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+ _productViewModelServiceMock.Setup(s => s.PrepareRelatedProductModel("store-1"))
+ .ReturnsAsync(new ProductModel.AddRelatedProductModel());
+
+ var result = await _controller.RelatedProductAddPopup("p1") as ViewResult;
+
+ Assert.IsNotNull(result);
+ var model = result.Model as ProductModel.AddRelatedProductModel;
+ Assert.IsNotNull(model);
+ Assert.AreEqual("p1", model.ProductId);
+ _productViewModelServiceMock.Verify(s => s.PrepareRelatedProductModel("store-1"), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task RelatedProductAddPopupGet_NoDefaultStoreId_PassesEmptyString()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+ _productViewModelServiceMock.Setup(s => s.PrepareRelatedProductModel(""))
+ .ReturnsAsync(new ProductModel.AddRelatedProductModel());
+
+ var result = await _controller.RelatedProductAddPopup("p1") as ViewResult;
+
+ Assert.IsNotNull(result);
+ _productViewModelServiceMock.Verify(s => s.PrepareRelatedProductModel(""), Times.Once);
+ }
+
+ // --- RelatedProductAddPopupList -----------------------------------------------------------------
+
+ [TestMethod]
+ public async Task RelatedProductAddPopupList_UsesScopeDefaultStoreId()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+ _productViewModelServiceMock
+ .Setup(s => s.PrepareProductModel(It.IsAny<ProductModel.AddRelatedProductModel>(), 0, 10))
+ .ReturnsAsync((new List<ProductModel>(), 0));
+
+ var model = new ProductModel.AddRelatedProductModel();
+ var result = await _controller.RelatedProductAddPopupList(
+ 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 RelatedProductAddPopupList_NoDefaultStoreId_DoesNotOverrideModelSearchStoreId()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+ _productViewModelServiceMock
+ .Setup(s => s.PrepareProductModel(It.IsAny<ProductModel.AddRelatedProductModel>(), 0, 10))
+ .ReturnsAsync((new List<ProductModel>(), 0));
+
+ var model = new ProductModel.AddRelatedProductModel { SearchStoreId = "explicit" };
+ var result = await _controller.RelatedProductAddPopupList(
+ new Grand.Web.Common.DataSource.DataSourceRequest { Page = 0, PageSize = 10 }, model);
+
+ Assert.IsInstanceOfType<JsonResult>(result);
+ Assert.AreEqual("explicit", model.SearchStoreId);
+ }
+
+ // --- RelatedProductAddPopup (POST) --------------------------------------------------------------
+ // HasAccess (strict): closes a real gap - Vendor's original RelatedProductAddPopup(POST) had no
+ // ownership check at all, letting any vendor attach related-product mappings onto another vendor's
+ // product by posting its id.
+
+ [TestMethod]
+ public async Task RelatedProductAddPopupPost_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.AddRelatedProductModel { ProductId = "p1", SelectedProductIds = ["p2"] };
+
+ var result = await _controller.RelatedProductAddPopup(model);
+
+ Assert.IsInstanceOfType<ContentResult>(result);
+ _translationServiceMock.Verify(t => t.GetResource("Admin.Catalog.Products.Permissions"), Times.Once);
+ _productViewModelServiceMock.Verify(s => s.InsertRelatedProductModel(It.IsAny<ProductModel.AddRelatedProductModel>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task RelatedProductAddPopupPost_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.AddRelatedProductModel { ProductId = "p1", SelectedProductIds = ["p2"] };
+
+ var result = await _controller.RelatedProductAddPopup(model);
+
+ var content = result as ContentResult;
+ Assert.IsNotNull(content);
+ Assert.AreEqual("", content.Content);
+ _productViewModelServiceMock.Verify(s => s.InsertRelatedProductModel(model), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task RelatedProductAddPopupPost_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.AddRelatedProductModel();
+ _productViewModelServiceMock.Setup(s => s.PrepareRelatedProductModel("store-1")).ReturnsAsync(reprepared);
+ var model = new ProductModel.AddRelatedProductModel { ProductId = "p1" };
+ _controller.ModelState.AddModelError("x", "error");
+
+ var result = await _controller.RelatedProductAddPopup(model);
+
+ var view = result as ViewResult;
+ Assert.IsNotNull(view);
+ Assert.AreSame(reprepared, view.Model);
+ _productViewModelServiceMock.Verify(s => s.InsertRelatedProductModel(It.IsAny<ProductModel.AddRelatedProductModel>()), Times.Never);
+ }
}
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs
index 980ac2f89..4411b1aa3 100644
--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductController.cs
@@ -580,4 +580,138 @@ public abstract class BaseProductController(
}
#endregion
+
+ #region Related products
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ [HttpPost]
+ public async Task<IActionResult> RelatedProductList(DataSourceRequest command, string productId)
+ {
+ var product = await productService.GetProductById(productId);
+
+ // HasAccess (strict), not CanView: same shape as "Product categories"/"Product collections" -
+ // 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 those two regions:
+ // Vendor's original RelatedProductUpdate/Delete/AddPopup(POST) (below) had no ownership check at
+ // all - only List checked - letting any vendor mutate another vendor's related-product mappings
+ // by id.
+ if (!await scope.HasAccess(product))
+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));
+
+ var relatedProducts = product.RelatedProducts.OrderBy(x => x.DisplayOrder);
+ var relatedProductsModel = new List<ProductModel.RelatedProductModel>();
+ foreach (var x in relatedProducts)
+ relatedProductsModel.Add(new ProductModel.RelatedProductModel {
+ Id = x.Id,
+ ProductId1 = productId,
+ ProductId2 = x.ProductId2,
+ Product2Name = (await productService.GetProductById(x.ProductId2))?.Name,
+ DisplayOrder = x.DisplayOrder
+ });
+
+ var gridModel = new DataSourceResult {
+ Data = relatedProductsModel,
+ Total = relatedProductsModel.Count
+ };
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> RelatedProductUpdate(ProductModel.RelatedProductModel model)
+ {
+ var product = await productService.GetProductById(model.ProductId1);
+ if (!await scope.HasAccess(product))
+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));
+
+ if (ModelState.IsValid)
+ {
+ await productViewModelService.UpdateRelatedProductModel(model);
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> RelatedProductDelete(ProductModel.RelatedProductModel model)
+ {
+ var product = await productService.GetProductById(model.ProductId1);
+ if (!await scope.HasAccess(product))
+ return ErrorForKendoGridJson(translationService.GetResource($"{scope.ResourceKeyPrefix}.Catalog.Products.Permissions"));
+
+ if (ModelState.IsValid)
+ {
+ await productViewModelService.DeleteRelatedProductModel(model);
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> RelatedProductAddPopup(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
+ // PrepareRelatedProductModel(StaffStoreId) call and Admin/Vendor's parameterless call.
+ var model = await productViewModelService.PrepareRelatedProductModel(scope.DefaultStoreId ?? "");
+ model.ProductId = productId;
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> RelatedProductAddPopupList(DataSourceRequest command,
+ ProductModel.AddRelatedProductModel 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> RelatedProductAddPopup(ProductModel.AddRelatedProductModel model)
+ {
+ var product = await productService.GetProductById(model.ProductId);
+ // HasAccess (strict): mirrors Store's CanAccessProduct check on this action. Vendor's original
+ // RelatedProductAddPopup(POST) had no check at all, letting any vendor add related-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.InsertRelatedProductModel(model);
+ return Content("");
+ }
+
+ return await InvalidRelatedProductAddPopupResult(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> InvalidRelatedProductAddPopupResult(ProductModel.AddRelatedProductModel model)
+ {
+ Error(ModelState);
+ model = await productViewModelService.PrepareRelatedProductModel(scope.DefaultStoreId ?? "");
+ return View(model);
+ }
+
+ #endregion
}