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
feat(arch001): add Products region to BaseCategoryController
KrzysztofPajakede5faf07b70
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCategoryControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCategoryControllerTests.csindex 1b3ef52ea..fbf48fe2e 100644--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCategoryControllerTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCategoryControllerTests.cs@@ -352,4 +352,61 @@ public class BaseCategoryControllerTestsAssert.AreEqual("", content.Content);pictureViewModelServiceMock.Verify(p => p.UpdatePicture(model), Times.Once);}++ // --- Products tab ---------------------------------------------------------------------------------++ [TestMethod]+ public async Task ProductList_ScopeDeniesAccess_ReturnsKendoError()+ {+ var category = new Category { Id = "c1" };+ _categoryServiceMock.Setup(c => c.GetCategoryById("c1")).ReturnsAsync(category);+ _scopeMock.Setup(s => s.HasAccess(category)).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.IsNotNull(gridModel.Errors);+ }++ [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"] };+ new Mock<IProductService>().Setup(p => p.GetProductById("p1")).ReturnsAsync(product);+ var productServiceMock = new Mock<IProductService>();+ productServiceMock.Setup(p => p.GetProductById("p1")).ReturnsAsync(product);++ var controller = new TestCategoryController(+ _categoryServiceMock.Object, _categoryViewModelServiceMock.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 CategoryModel.CategoryProductModel { Id = "pc1", ProductId = "p1" });++ var json = result as JsonResult;+ Assert.IsNotNull(json);+ var gridModel = (DataSourceResult)json.Value;+ Assert.IsNotNull(gridModel.Errors);+ _categoryViewModelServiceMock.Verify(v => v.UpdateProductCategoryModel(It.IsAny<CategoryModel.CategoryProductModel>()), Times.Never);+ }++ [TestMethod]+ public async Task ProductAddPopupInsert_GlobalScope_SkipsPerProductFiltering()+ {+ var category = new Category { Id = "c1" };+ _categoryServiceMock.Setup(c => c.GetCategoryById("c1")).ReturnsAsync(category);+ _scopeMock.Setup(s => s.HasAccess(category)).ReturnsAsync(true);+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ var model = new CategoryModel.AddCategoryProductModel { CategoryId = "c1", SelectedProductIds = ["p1", "p2"] };++ await _controller.ProductAddPopup(model);++ _categoryViewModelServiceMock.Verify(v => v.InsertCategoryProductModel(+ It.Is<CategoryModel.AddCategoryProductModel>(m => m.SelectedProductIds.Length == 2)), Times.Once);+ }}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseCategoryController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseCategoryController.csindex 3f2fd2f3a..7f3f838eb 100644--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseCategoryController.cs+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseCategoryController.cs@@ -6,6 +6,7 @@ using Grand.Business.Core.Interfaces.Common.Localization;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;@@ -256,4 +257,117 @@ public abstract class BaseCategoryController(}#endregion++ #region Products++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ [HttpPost]+ public async Task<IActionResult> ProductList(DataSourceRequest command, string categoryId)+ {+ var category = await categoryService.GetCategoryById(categoryId);+ if (!await scope.HasAccess(category)) return ErrorForKendoGridJson("This is not your category");++ var productCategories = await categoryViewModelService.PrepareCategoryProductModel(categoryId, command.Page, command.PageSize);+ var gridModel = new DataSourceResult {+ Data = productCategories.categoryProductModels,+ Total = productCategories.totalCount+ };+ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ProductUpdate(CategoryModel.CategoryProductModel 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 categoryViewModelService.UpdateProductCategoryModel(model);+ return new JsonResult("");+ }++ return ErrorForKendoGridJson(ModelState);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ProductDelete(CategoryModel.CategoryProductModel 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 categoryViewModelService.DeleteProductCategoryModel(model.Id, model.ProductId);+ return new JsonResult("");+ }++ return ErrorForKendoGridJson(ModelState);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ProductAddPopup(string categoryId)+ {+ var model = await categoryViewModelService.PrepareAddCategoryProductModel(scope.DefaultStoreId);+ model.CategoryId = categoryId;+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> ProductAddPopupList(DataSourceRequest command, CategoryModel.AddCategoryProductModel model)+ {+ var gridModel = new DataSourceResult();+ model.SearchStoreId = scope.DefaultStoreId;+ var products = await categoryViewModelService.PrepareProductModel(model, command.Page, command.PageSize);+ gridModel.Data = products.products.ToList();+ gridModel.Total = products.totalCount;+ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> ProductAddPopup(CategoryModel.AddCategoryProductModel model)+ {+ var category = await categoryService.GetCategoryById(model.CategoryId);+ if (category == null || !await scope.HasAccess(category))+ return Content("This is not your category");++ 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 categoryViewModelService.InsertCategoryProductModel(model);+ }+ else+ {+ // Store scope: InsertCategoryProductModel mutates each selected product's+ // ProductCategories collection, so every selected id must also belong to the+ // current store - matches Store's original filtering loop exactly.+ 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 categoryViewModelService.InsertCategoryProductModel(model);+ }+ }++ return Content("");+ }++ Error(ModelState);+ return View(model);+ }++ #endregion}