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 Create/Edit/Delete region to BaseCollectionController
KrzysztofPajakd46e9f4d66a5
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCollectionControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCollectionControllerTests.csindex f8d0b7d27..c91e790af 100644--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCollectionControllerTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCollectionControllerTests.cs@@ -148,4 +148,115 @@ public class BaseCollectionControllerTestsAssert.AreEqual("admin-submitted-store", model.SearchStoreId);}++ // --- Edit (GET) --------------------------------------------------------------------------------++ [TestMethod]+ public async Task EditGet_CollectionNotFound_RedirectsToList()+ {+ _collectionServiceMock.Setup(c => c.GetCollectionById("missing")).ReturnsAsync((Collection)null);++ var result = await _controller.Edit("missing");++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ _scopeMock.Verify(s => s.CanView(It.IsAny<Collection>()), Times.Never);+ }++ [TestMethod]+ public async Task EditGet_ScopeDeniesView_RedirectsToList()+ {+ var collection = new Collection { Id = "c1" };+ _collectionServiceMock.Setup(c => c.GetCollectionById("c1")).ReturnsAsync(collection);+ _scopeMock.Setup(s => s.CanView(collection)).ReturnsAsync(false);++ var result = await _controller.Edit("c1");++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("List", redirect.ActionName);+ }++ [TestMethod]+ public async Task EditGet_ScopeAllowsView_ReturnsViewWithModel()+ {+ var collection = new Collection { Id = "c1", Name = "Widgets" };+ _collectionServiceMock.Setup(c => c.GetCollectionById("c1")).ReturnsAsync(collection);+ _scopeMock.Setup(s => s.CanView(collection)).ReturnsAsync(true);++ var result = await _controller.Edit("c1");++ var view = result as ViewResult;+ Assert.IsNotNull(view);+ Assert.AreEqual("Widgets", ((CollectionModel)view.Model).Name);+ }++ // --- Edit (POST) -------------------------------------------------------------------------------++ [TestMethod]+ public async Task EditPost_ScopeDeniesAccess_RedirectsToEdit()+ {+ 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.Edit(new CollectionModel { Id = "c1" }, false);++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("Edit", redirect.ActionName);+ _collectionViewModelServiceMock.Verify(v => v.UpdateCollectionModel(It.IsAny<Collection>(), It.IsAny<CollectionModel>()), Times.Never);+ }++ // --- Delete --------------------------------------------------------------------------------------++ [TestMethod]+ public async Task Delete_ScopeDeniesAccess_RedirectsToEditWithoutDeleting()+ {+ 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.Delete("c1");++ var redirect = result as RedirectToActionResult;+ Assert.IsNotNull(redirect);+ Assert.AreEqual("Edit", redirect.ActionName);+ Assert.AreEqual("c1", redirect.RouteValues["id"]);+ _collectionViewModelServiceMock.Verify(v => v.DeleteCollection(It.IsAny<Collection>()), Times.Never);+ }++ // --- Create (POST) ------------------------------------------------------------------------------++ [TestMethod]+ public async Task CreatePost_StoreScoped_ForcesModelStores()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");+ var inserted = new Collection { Id = "new-1" };+ _collectionViewModelServiceMock+ .Setup(v => v.InsertCollectionModel(It.IsAny<CollectionModel>()))+ .ReturnsAsync(inserted)+ .Callback<CollectionModel>(m => Assert.AreSequenceEqual(new[] { "store-1" }, m.Stores));++ await _controller.Create(new CollectionModel { Name = "N" }, false);++ _collectionViewModelServiceMock.Verify(v => v.InsertCollectionModel(It.IsAny<CollectionModel>()), Times.Once);+ }++ [TestMethod]+ public async Task CreatePost_GlobalScoped_LeavesModelStoresUntouched()+ {+ _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);+ var inserted = new Collection { Id = "new-1" };+ var submitted = new CollectionModel { Name = "N", Stores = ["explicit-store"] };+ _collectionViewModelServiceMock+ .Setup(v => v.InsertCollectionModel(It.IsAny<CollectionModel>()))+ .ReturnsAsync(inserted)+ .Callback<CollectionModel>(m => Assert.AreSequenceEqual(new[] { "explicit-store" }, m.Stores));++ await _controller.Create(submitted, false);++ _collectionViewModelServiceMock.Verify(v => v.InsertCollectionModel(It.IsAny<CollectionModel>()), Times.Once);+ }}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseCollectionController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseCollectionController.csindex bd32c6655..30f94e360 100644--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseCollectionController.cs+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseCollectionController.cs@@ -1,3 +1,4 @@+using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Collections;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Common.Localization;@@ -9,6 +10,7 @@ using Grand.Web.AdminShared.Interfaces;using Grand.Web.AdminShared.Models.Catalog;using Grand.Web.Common.Controllers;using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;@@ -79,4 +81,123 @@ public abstract class BaseCollectionController(}#endregion++ #region Create / Edit / Delete++ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public async Task<IActionResult> Create([FromServices] CatalogSettings catalogSettings)+ {+ var model = new CollectionModel();+ await AddLocales(languageService, model.Locales);+ await collectionViewModelService.PrepareLayoutsModel(model);+ await collectionViewModelService.PrepareDiscountModel(model, null, true);+ model.PageSize = catalogSettings.DefaultPageSize;+ model.PageSizeOptions = catalogSettings.DefaultPageSizeOptions;+ model.Published = true;+ model.AllowCustomersToSelectPageSize = true;+ collectionViewModelService.PrepareSortOptionsModel(model);++ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ public async Task<IActionResult> Create(CollectionModel model, bool continueEditing)+ {+ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ var collection = await collectionViewModelService.InsertCollectionModel(model);+ Success(translationService.GetResource("Admin.Catalog.Collections.Added"));+ return continueEditing ? RedirectToAction("Edit", new { id = collection.Id }) : RedirectToAction("List");+ }++ await collectionViewModelService.PrepareLayoutsModel(model);+ await collectionViewModelService.PrepareDiscountModel(model, null, true);+ collectionViewModelService.PrepareSortOptionsModel(model);++ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> Edit(string id)+ {+ var collection = await collectionService.GetCollectionById(id);+ if (collection == null) return RedirectToAction("List");++ EditWarningCheck(collection);+ // CanView, not HasAccess: viewing a shared/global collection is allowed on Store (with a+ // warning from EditWarningCheck above); only mutating one is restricted to the exclusive+ // single-store owner. See IAdminDataScope<TEntity>.CanView's doc comment.+ if (!await scope.CanView(collection)) return RedirectToAction("List");++ var model = collection.ToModel();+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = collection.GetTranslation(x => x.Name, languageId, false);+ locale.Description = collection.GetTranslation(x => x.Description, languageId, false);+ locale.BottomDescription = collection.GetTranslation(x => x.BottomDescription, languageId, false);+ locale.MetaKeywords = collection.GetTranslation(x => x.MetaKeywords, languageId, false);+ locale.MetaDescription = collection.GetTranslation(x => x.MetaDescription, languageId, false);+ locale.MetaTitle = collection.GetTranslation(x => x.MetaTitle, languageId, false);+ locale.SeName = collection.GetSeName(languageId, false);+ });+ await collectionViewModelService.PrepareLayoutsModel(model);+ await collectionViewModelService.PrepareDiscountModel(model, collection, false);+ collectionViewModelService.PrepareSortOptionsModel(model);++ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ public async Task<IActionResult> Edit(CollectionModel model, bool continueEditing)+ {+ var collection = await collectionService.GetCollectionById(model.Id);+ if (collection == null) return RedirectToAction("List");+ if (!await scope.HasAccess(collection)) return RedirectToAction("Edit", new { id = collection.Id });++ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ collection = await collectionViewModelService.UpdateCollectionModel(collection, model);+ Success(translationService.GetResource("Admin.Catalog.Collections.Updated"));++ if (continueEditing)+ {+ await SaveSelectedTabIndex();+ return RedirectToAction("Edit", new { id = collection.Id });+ }+ return RedirectToAction("List");+ }++ await collectionViewModelService.PrepareLayoutsModel(model);+ await collectionViewModelService.PrepareDiscountModel(model, collection, true);+ collectionViewModelService.PrepareSortOptionsModel(model);++ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Delete)]+ [HttpPost]+ public async Task<IActionResult> Delete(string id)+ {+ var collection = await collectionService.GetCollectionById(id);+ if (collection == null) return RedirectToAction("List");+ if (!await scope.HasAccess(collection)) return RedirectToAction("Edit", new { id = collection.Id });++ if (ModelState.IsValid)+ {+ await collectionViewModelService.DeleteCollection(collection);+ Success(translationService.GetResource("Admin.Catalog.Collections.Deleted"));+ return RedirectToAction("List");+ }++ Error(ModelState);+ return RedirectToAction("Edit", new { id = collection.Id });+ }++ #endregion}