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 order notes region, preserving Admin-throws vs Store-soft-denies divergence
KrzysztofPajakec95bf215556
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.csindex a555a8883..47c714b16 100644--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs@@ -274,4 +274,42 @@ public class BaseOrderManagementControllerTestsAssert.AreEqual("List", (result as RedirectToActionResult)?.ActionName);}++ [TestMethod]+ public async Task OrderNotesSelect_NotFound_ThrowsArgumentException()+ {+ _orderServiceMock.Setup(s => s.GetOrderById("missing")).ReturnsAsync((Order)null);++ await Assert.ThrowsExactlyAsync<ArgumentException>(+ () => _controller.OrderNotesSelect("missing", new Grand.Web.Common.DataSource.DataSourceRequest()));+ }++ [TestMethod]+ public async Task OrderNotesSelect_ScopeDenies_ReturnsEmptyContent_NoThrow()+ {+ var order = new Order { Id = "o1" };+ _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);+ _scopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(false);++ var result = await _controller.OrderNotesSelect("o1", new Grand.Web.Common.DataSource.DataSourceRequest());++ var content = result as ContentResult;+ Assert.IsNotNull(content);+ Assert.AreEqual("", content.Content);+ }++ [TestMethod]+ public async Task OrderNoteAdd_ScopeDenies_ReturnsJsonResultFalse()+ {+ var order = new Order { Id = "o1" };+ _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);+ _scopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(false);++ var result = await _controller.OrderNoteAdd("o1", null, false, "msg");++ var json = result as JsonResult;+ Assert.IsNotNull(json);+ Assert.IsFalse((bool)json.Value.GetType().GetProperty("Result").GetValue(json.Value));+ _orderViewModelServiceMock.Verify(v => v.InsertOrderNote(It.IsAny<Order>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>()), Times.Never);+ }}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.csindex 970ef4b77..82315436c 100644--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs@@ -515,4 +515,50 @@ public abstract class BaseOrderManagementController(}#endregion++ #region Order notes++ [PermissionAuthorizeAction(PermissionActionName.List)]+ [HttpPost]+ public async Task<IActionResult> OrderNotesSelect(string orderId, Grand.Web.Common.DataSource.DataSourceRequest command)+ {+ var order = await orderService.GetOrderById(orderId)+ ?? throw new ArgumentException("No order found with the specified id");+ // Preserved host divergence: Admin's original throws for both not-found and Sales-Manager+ // denial; Store's original throws only for not-found and soft-denies (empty content) for+ // store-mismatch. Unifying these into one behavior would be a real change for one host -+ // deliberately not done here. See plan's Global Constraints.+ if (!await scope.HasAccess(order)) return Content("");++ var orderNoteModels = await orderViewModelService.PrepareOrderNotes(order);+ var gridModel = new Grand.Web.Common.DataSource.DataSourceResult {+ Data = orderNoteModels,+ Total = orderNoteModels.Count+ };+ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> OrderNoteAdd(string orderId, string downloadId, bool displayToCustomer, string message)+ {+ var order = await orderService.GetOrderById(orderId);+ if (order == null || !await scope.HasAccess(order)) return Json(new { Result = false });++ await orderViewModelService.InsertOrderNote(order, downloadId, displayToCustomer, message);+ return Json(new { Result = true });+ }++ [PermissionAuthorizeAction(PermissionActionName.Delete)]+ [HttpPost]+ public async Task<IActionResult> OrderNoteDelete(string id, string orderId)+ {+ var order = await orderService.GetOrderById(orderId)+ ?? throw new ArgumentException("No order found with the specified id");+ if (!await scope.HasAccess(order)) return Json(new { Result = false });++ await orderViewModelService.DeleteOrderNote(order, id);+ return new JsonResult("");+ }++ #endregion}