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.

feat(arch001): add Products region to BaseCollectionController

KrzysztofPajak48f8c62a0bae
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCollectionControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCollectionControllerTests.cs
index a86dbf88c..ebadc419c 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCollectionControllerTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCollectionControllerTests.cs
@@ -371,4 +371,237 @@ public class BaseCollectionControllerTests
Assert.AreEqual("", content.Content);
pictureViewModelServiceMock.Verify(p => p.UpdatePicture(model), Times.Once);
}
+
+ // --- Products tab ---------------------------------------------------------------------------------
+
+ [TestMethod]
+ public async Task ProductList_ScopeDeniesAccess_ReturnsKendoError()
+ {
+ var collection = new Collection { Id = "c1" };
+ _collectionServiceMock.Setup(c => c.GetCollectionById("c1")).ReturnsAsync(collection);
+ _scopeMock.Setup(s => s.HasAccess(collection)).ReturnsAsync(false);
+
+ var result = await _controller.ProductList(new DataSourceRequest { Page = 1, PageSize = 10 }, "c1");
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ var gridModel = (DataSourceResult)json.Value;
+ Assert.IsFalse(string.IsNullOrEmpty(gridModel.Errors as string));
+ }
+
+ [TestMethod]
+ public async Task ProductList_ScopeGrantsAccess_PassesScopeDefaultStoreId()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+ var collection = new Collection { Id = "c1" };
+ _collectionServiceMock.Setup(c => c.GetCollectionById("c1")).ReturnsAsync(collection);
+ _scopeMock.Setup(s => s.HasAccess(collection)).ReturnsAsync(true);
+ _collectionViewModelServiceMock
+ .Setup(v => v.PrepareCollectionProductModel("c1", "store-1", 1, 10))
+ .ReturnsAsync((Enumerable.Empty<CollectionModel.CollectionProductModel>(), 0));
+
+ var result = await _controller.ProductList(new DataSourceRequest { Page = 1, PageSize = 10 }, "c1");
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ _collectionViewModelServiceMock.Verify(v => v.PrepareCollectionProductModel("c1", "store-1", 1, 10), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task ProductList_GlobalScope_PassesEmptyStoreId()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+ var collection = new Collection { Id = "c1" };
+ _collectionServiceMock.Setup(c => c.GetCollectionById("c1")).ReturnsAsync(collection);
+ _scopeMock.Setup(s => s.HasAccess(collection)).ReturnsAsync(true);
+ _collectionViewModelServiceMock
+ .Setup(v => v.PrepareCollectionProductModel("c1", string.Empty, 1, 10))
+ .ReturnsAsync((Enumerable.Empty<CollectionModel.CollectionProductModel>(), 0));
+
+ await _controller.ProductList(new DataSourceRequest { Page = 1, PageSize = 10 }, "c1");
+
+ _collectionViewModelServiceMock.Verify(v => v.PrepareCollectionProductModel("c1", string.Empty, 1, 10), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task ProductUpdate_ProductNotOwnedByScopeStore_ReturnsKendoError()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+ var product = new Product { Id = "p1", LimitedToStores = true, Stores = ["other-store"] };
+ var productServiceMock = new Mock<IProductService>();
+ productServiceMock.Setup(p => p.GetProductById("p1")).ReturnsAsync(product);
+
+ var controller = new TestCollectionController(
+ _collectionViewModelServiceMock.Object, _collectionServiceMock.Object, _storeServiceMock.Object,
+ new Mock<ILanguageService>().Object, _translationServiceMock.Object,
+ new Mock<IPictureViewModelService>().Object, productServiceMock.Object, _scopeMock.Object);
+ controller.ControllerContext = _controller.ControllerContext;
+ controller.TempData = _controller.TempData;
+
+ var result = await controller.ProductUpdate(new CollectionModel.CollectionProductModel { Id = "pc1", ProductId = "p1" });
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ var gridModel = (DataSourceResult)json.Value;
+ Assert.IsFalse(string.IsNullOrEmpty(gridModel.Errors as string));
+ _collectionViewModelServiceMock.Verify(v => v.ProductUpdate(It.IsAny<CollectionModel.CollectionProductModel>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ProductDelete_ProductNotOwnedByScopeStore_ReturnsKendoError()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+ var product = new Product { Id = "p1", LimitedToStores = true, Stores = ["other-store"] };
+ var productServiceMock = new Mock<IProductService>();
+ productServiceMock.Setup(p => p.GetProductById("p1")).ReturnsAsync(product);
+
+ var controller = new TestCollectionController(
+ _collectionViewModelServiceMock.Object, _collectionServiceMock.Object, _storeServiceMock.Object,
+ new Mock<ILanguageService>().Object, _translationServiceMock.Object,
+ new Mock<IPictureViewModelService>().Object, productServiceMock.Object, _scopeMock.Object);
+ controller.ControllerContext = _controller.ControllerContext;
+ controller.TempData = _controller.TempData;
+
+ var result = await controller.ProductDelete(new CollectionModel.CollectionProductModel { Id = "pc1", ProductId = "p1" });
+
+ var json = result as JsonResult;
+ Assert.IsNotNull(json);
+ var gridModel = (DataSourceResult)json.Value;
+ Assert.IsFalse(string.IsNullOrEmpty(gridModel.Errors as string));
+ _collectionViewModelServiceMock.Verify(v => v.ProductDelete(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ProductAddPopupGet_PassesScopeDefaultStoreIdOrEmpty()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+ _collectionViewModelServiceMock
+ .Setup(v => v.PrepareAddCollectionProductModel(string.Empty))
+ .ReturnsAsync(new CollectionModel.AddCollectionProductModel());
+
+ var result = await _controller.ProductAddPopup("c1");
+
+ var view = result as ViewResult;
+ Assert.IsNotNull(view);
+ Assert.AreEqual("c1", ((CollectionModel.AddCollectionProductModel)view.Model).CollectionId);
+ _collectionViewModelServiceMock.Verify(v => v.PrepareAddCollectionProductModel(string.Empty), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task ProductAddPopupList_ForcesScopeDefaultStoreId()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+ _collectionViewModelServiceMock
+ .Setup(v => v.PrepareProductModel(It.IsAny<CollectionModel.AddCollectionProductModel>(), 1, 10))
+ .ReturnsAsync((new List<ProductModel>(), 0));
+
+ var model = new CollectionModel.AddCollectionProductModel { SearchStoreId = "attacker-supplied-store" };
+ await _controller.ProductAddPopupList(new DataSourceRequest { Page = 1, PageSize = 10 }, model);
+
+ Assert.AreEqual("store-1", model.SearchStoreId);
+ }
+
+ [TestMethod]
+ public async Task ProductAddPopupList_GlobalScope_LeavesSubmittedSearchStoreIdUntouched()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+ _collectionViewModelServiceMock
+ .Setup(v => v.PrepareProductModel(It.IsAny<CollectionModel.AddCollectionProductModel>(), 1, 10))
+ .ReturnsAsync((new List<ProductModel>(), 0));
+
+ var model = new CollectionModel.AddCollectionProductModel { SearchStoreId = "admin-submitted-store" };
+ await _controller.ProductAddPopupList(new DataSourceRequest { Page = 1, PageSize = 10 }, model);
+
+ Assert.AreEqual("admin-submitted-store", model.SearchStoreId);
+ }
+
+ [TestMethod]
+ public async Task ProductAddPopupInsert_ScopeDeniesCollectionAccess_ReturnsDeniedContent()
+ {
+ var collection = new Collection { Id = "c1" };
+ _collectionServiceMock.Setup(c => c.GetCollectionById("c1")).ReturnsAsync(collection);
+ _scopeMock.Setup(s => s.HasAccess(collection)).ReturnsAsync(false);
+
+ var model = new CollectionModel.AddCollectionProductModel { CollectionId = "c1", SelectedProductIds = ["p1"] };
+ var result = await _controller.ProductAddPopup(model);
+
+ var content = result as ContentResult;
+ Assert.IsNotNull(content);
+ Assert.AreEqual("This is not your collection", content.Content);
+ _collectionViewModelServiceMock.Verify(v => v.InsertCollectionProductModel(It.IsAny<CollectionModel.AddCollectionProductModel>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task ProductAddPopupInsert_GlobalScope_InsertsWithoutFiltering()
+ {
+ var collection = new Collection { Id = "c1" };
+ _collectionServiceMock.Setup(c => c.GetCollectionById("c1")).ReturnsAsync(collection);
+ _scopeMock.Setup(s => s.HasAccess(collection)).ReturnsAsync(true);
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+ var model = new CollectionModel.AddCollectionProductModel { CollectionId = "c1", SelectedProductIds = ["p1", "p2"] };
+
+ await _controller.ProductAddPopup(model);
+
+ _collectionViewModelServiceMock.Verify(v => v.InsertCollectionProductModel(
+ It.Is<CollectionModel.AddCollectionProductModel>(m => m.SelectedProductIds.Length == 2)), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task ProductAddPopupInsert_StoreScope_FiltersOutForeignProducts()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+ var collection = new Collection { Id = "c1" };
+ _collectionServiceMock.Setup(c => c.GetCollectionById("c1")).ReturnsAsync(collection);
+ _scopeMock.Setup(s => s.HasAccess(collection)).ReturnsAsync(true);
+
+ var ownedProduct = new Product { Id = "owned-1", LimitedToStores = true, Stores = ["store-1"] };
+ var foreignProduct = new Product { Id = "foreign-1", LimitedToStores = true, Stores = ["other-store"] };
+
+ var productServiceMock = new Mock<IProductService>();
+ productServiceMock.Setup(p => p.GetProductById("owned-1")).ReturnsAsync(ownedProduct);
+ productServiceMock.Setup(p => p.GetProductById("foreign-1")).ReturnsAsync(foreignProduct);
+
+ var controller = new TestCollectionController(
+ _collectionViewModelServiceMock.Object, _collectionServiceMock.Object, _storeServiceMock.Object,
+ new Mock<ILanguageService>().Object, _translationServiceMock.Object,
+ new Mock<IPictureViewModelService>().Object, productServiceMock.Object, _scopeMock.Object);
+ controller.ControllerContext = _controller.ControllerContext;
+ controller.TempData = _controller.TempData;
+
+ var model = new CollectionModel.AddCollectionProductModel { CollectionId = "c1", SelectedProductIds = ["owned-1", "foreign-1"] };
+
+ await controller.ProductAddPopup(model);
+
+ _collectionViewModelServiceMock.Verify(v => v.InsertCollectionProductModel(
+ It.Is<CollectionModel.AddCollectionProductModel>(m => m.SelectedProductIds.Length == 1 && m.SelectedProductIds[0] == "owned-1")), Times.Once);
+ }
+
+ [TestMethod]
+ public async Task ProductAddPopupInsert_StoreScope_AllProductsForeign_SkipsInsertEntirely()
+ {
+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+ var collection = new Collection { Id = "c1" };
+ _collectionServiceMock.Setup(c => c.GetCollectionById("c1")).ReturnsAsync(collection);
+ _scopeMock.Setup(s => s.HasAccess(collection)).ReturnsAsync(true);
+
+ var foreignProduct1 = new Product { Id = "foreign-1", LimitedToStores = true, Stores = ["other-store"] };
+ var foreignProduct2 = new Product { Id = "foreign-2", LimitedToStores = true, Stores = ["another-store"] };
+
+ var productServiceMock = new Mock<IProductService>();
+ productServiceMock.Setup(p => p.GetProductById("foreign-1")).ReturnsAsync(foreignProduct1);
+ productServiceMock.Setup(p => p.GetProductById("foreign-2")).ReturnsAsync(foreignProduct2);
+
+ var controller = new TestCollectionController(
+ _collectionViewModelServiceMock.Object, _collectionServiceMock.Object, _storeServiceMock.Object,
+ new Mock<ILanguageService>().Object, _translationServiceMock.Object,
+ new Mock<IPictureViewModelService>().Object, productServiceMock.Object, _scopeMock.Object);
+ controller.ControllerContext = _controller.ControllerContext;
+ controller.TempData = _controller.TempData;
+
+ var model = new CollectionModel.AddCollectionProductModel { CollectionId = "c1", SelectedProductIds = ["foreign-1", "foreign-2"] };
+
+ await controller.ProductAddPopup(model);
+
+ _collectionViewModelServiceMock.Verify(v => v.InsertCollectionProductModel(It.IsAny<CollectionModel.AddCollectionProductModel>()), Times.Never);
+ }
}
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseCollectionController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseCollectionController.cs
index db63250d0..8424bfb88 100644
--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseCollectionController.cs
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseCollectionController.cs
@@ -7,6 +7,7 @@ using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Business.Core.Interfaces.ExportImport;
using Grand.Domain.Catalog;
using Grand.Domain.Permissions;
+using Grand.Web.AdminShared.Extensions;
using Grand.Web.AdminShared.Extensions.Mapping;
using Grand.Web.AdminShared.Interfaces;
using Grand.Web.AdminShared.Models.Catalog;
@@ -289,4 +290,125 @@ public abstract class BaseCollectionController(
}
#endregion
+
+ #region Products
+
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ [HttpPost]
+ public async Task<IActionResult> ProductList(DataSourceRequest command, string collectionId)
+ {
+ var collection = await collectionService.GetCollectionById(collectionId);
+ if (!await scope.HasAccess(collection)) return ErrorForKendoGridJson("This is not your collection");
+
+ var (collectionProductModels, totalCount) = await collectionViewModelService.PrepareCollectionProductModel(
+ collectionId, scope.DefaultStoreId ?? string.Empty, command.Page, command.PageSize);
+
+ var gridModel = new DataSourceResult {
+ Data = collectionProductModels.ToList(),
+ Total = totalCount
+ };
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> ProductUpdate(CollectionModel.CollectionProductModel model)
+ {
+ var product = await productService.GetProductById(model.ProductId);
+ if (product == null || !product.AccessToEntityByStore(scope.DefaultStoreId))
+ return ErrorForKendoGridJson("This is not your product");
+
+ if (ModelState.IsValid)
+ {
+ await collectionViewModelService.ProductUpdate(model);
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> ProductDelete(CollectionModel.CollectionProductModel model)
+ {
+ var product = await productService.GetProductById(model.ProductId);
+ if (product == null || !product.AccessToEntityByStore(scope.DefaultStoreId))
+ return ErrorForKendoGridJson("This is not your product");
+
+ if (ModelState.IsValid)
+ {
+ await collectionViewModelService.ProductDelete(model.Id, model.ProductId);
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> ProductAddPopup(string collectionId)
+ {
+ var model = await collectionViewModelService.PrepareAddCollectionProductModel(scope.DefaultStoreId ?? string.Empty);
+ model.CollectionId = collectionId;
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> ProductAddPopupList(DataSourceRequest command,
+ CollectionModel.AddCollectionProductModel model)
+ {
+ if (scope.DefaultStoreId is not null) model.SearchStoreId = scope.DefaultStoreId;
+ var products = await collectionViewModelService.PrepareProductModel(model, command.Page, command.PageSize);
+ var gridModel = new DataSourceResult {
+ Data = products.products.ToList(),
+ Total = products.totalCount
+ };
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> ProductAddPopup(CollectionModel.AddCollectionProductModel model)
+ {
+ var collection = await collectionService.GetCollectionById(model.CollectionId);
+ if (collection == null || !await scope.HasAccess(collection))
+ return Content("This is not your collection");
+
+ if (ModelState.IsValid)
+ {
+ if (model.SelectedProductIds != null)
+ {
+ if (scope.DefaultStoreId is null)
+ {
+ // Global scope (Admin): no per-product ownership concept, insert as submitted -
+ // matches Admin's original, unfiltered behavior exactly.
+ await collectionViewModelService.InsertCollectionProductModel(model);
+ }
+ else
+ {
+ // Store scope: InsertCollectionProductModel mutates each selected product's
+ // ProductCollections collection, so every selected id must also belong to the
+ // current store - matches Store's original filtering loop exactly, including
+ // its validIds.Count > 0 guard (a fully-filtered-out selection no-ops instead
+ // of calling the service with an empty array).
+ var validIds = new List<string>();
+ foreach (var id in model.SelectedProductIds)
+ {
+ var selected = await productService.GetProductById(id);
+ if (selected != null && selected.AccessToEntityByStore(scope.DefaultStoreId))
+ validIds.Add(id);
+ }
+ model.SelectedProductIds = validIds.ToArray();
+ if (validIds.Count > 0) await collectionViewModelService.InsertCollectionProductModel(model);
+ }
+ }
+ return Content("");
+ }
+
+ Error(ModelState);
+ return View(model);
+ }
+
+ #endregion
}