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
API - Add Action Filter for support to return BadRequest when model is invalid
supportb290c37d638a
diff --git a/src/API/Grand.Api/Controllers/BaseODataController.cs b/src/API/Grand.Api/Controllers/BaseODataController.csindex 3929c5113..09ac5df23 100644--- a/src/API/Grand.Api/Controllers/BaseODataController.cs+++ b/src/API/Grand.Api/Controllers/BaseODataController.cs@@ -1,4 +1,5 @@using Grand.Api.Filters;+using Grand.Api.Infrastructure;using Microsoft.AspNetCore.Authentication.JwtBearer;using Microsoft.AspNetCore.Authorization;using Microsoft.AspNetCore.Mvc;@@ -12,6 +13,7 @@ namespace Grand.Api.Controllers[Route("odata/[controller]")][ApiExplorerSettings(IgnoreApi = false)][AuthorizeApiAdmin]+ [ServiceFilter(typeof(ModelValidationAttribute))]public abstract partial class BaseODataController : ODataController{public override ForbidResult Forbid()diff --git a/src/API/Grand.Api/Controllers/OData/BrandController.cs b/src/API/Grand.Api/Controllers/OData/BrandController.csindex 1cf61e7aa..6dbe2f351 100644--- a/src/API/Grand.Api/Controllers/OData/BrandController.cs+++ b/src/API/Grand.Api/Controllers/OData/BrandController.cs@@ -30,8 +30,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Brands))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Brands)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<BrandDto, Domain.Catalog.Brand>()));}@@ -43,12 +42,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Brands))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Brands)) return Forbid();var brand = await _mediator.Send(new GetGenericQuery<BrandDto, Domain.Catalog.Brand>(key));- if (!brand.Any())- return NotFound();+ if (!brand.Any()) return NotFound();return Ok(brand.FirstOrDefault());}@@ -60,15 +57,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Post([FromBody] BrandDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Brands))- return Forbid();-- if (ModelState.IsValid)- {- model = await _mediator.Send(new AddBrandCommand() { Model = model });- return Ok(model);- }- return BadRequest(ModelState);+ if (!await _permissionService.Authorize(PermissionSystemName.Brands)) return Forbid();++ model = await _mediator.Send(new AddBrandCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Update entity in Brand", OperationId = "UpdateBrand")]@@ -79,23 +71,13 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Put([FromBody] BrandDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Brands))- return Forbid();-+ if (!await _permissionService.Authorize(PermissionSystemName.Brands)) return Forbid();var brand = await _mediator.Send(new GetGenericQuery<BrandDto, Domain.Catalog.Brand>(model.Id));- if (!brand.Any())- {- return NotFound();- }-- if (ModelState.IsValid)- {- model = await _mediator.Send(new UpdateBrandCommand() { Model = model });- return Ok(model);- }-- return BadRequest(ModelState);+ if (!brand.Any()) return NotFound();++ model = await _mediator.Send(new UpdateBrandCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Partially update entity in Brand", OperationId = "PartiallyUpdateBrand")]@@ -106,24 +88,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Patch([FromODataUri] string key, [FromBody] JsonPatchDocument<BrandDto> model){- if (!await _permissionService.Authorize(PermissionSystemName.Brands))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Brands)) return Forbid();var brand = await _mediator.Send(new GetGenericQuery<BrandDto, Domain.Catalog.Brand>(key));- if (!brand.Any())- {- return NotFound();- }+ if (!brand.Any()) return NotFound();+var man = brand.FirstOrDefault();model.ApplyTo(man);-- if (ModelState.IsValid)- {- await _mediator.Send(new UpdateBrandCommand() { Model = man });- return Ok();- }-- return BadRequest(ModelState);+ await _mediator.Send(new UpdateBrandCommand() { Model = man });+ return Ok();}[SwaggerOperation(summary: "Delete entity in Brand", OperationId = "DeleteBrand")]@@ -133,17 +106,12 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Delete(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Brands))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Brands)) return Forbid();var brand = await _mediator.Send(new GetGenericQuery<BrandDto, Domain.Catalog.Brand>(key));- if (!brand.Any())- {- return NotFound();- }+ if (!brand.Any()) return NotFound();await _mediator.Send(new DeleteBrandCommand() { Model = brand.FirstOrDefault() });-return Ok();}}diff --git a/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs b/src/API/Grand.Api/Controllers/OData/BrandLayoutController.csindex b7c5e8459..c95d8396c 100644--- a/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs+++ b/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs@@ -27,12 +27,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Maintenance))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Maintenance)) return Forbid();var layout = await _mediator.Send(new GetLayoutQuery() { Id = key, LayoutName = typeof(Domain.Catalog.BrandLayout).Name });- if (!layout.Any())- return NotFound();+ if (!layout.Any()) return NotFound();return Ok(layout.FirstOrDefault());}@@ -44,8 +42,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Maintenance))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Maintenance)) return Forbid();return Ok(await _mediator.Send(new GetLayoutQuery() { LayoutName = typeof(Domain.Catalog.BrandLayout).Name }));}diff --git a/src/API/Grand.Api/Controllers/OData/CategoryController.cs b/src/API/Grand.Api/Controllers/OData/CategoryController.csindex 93a0fe125..6b2f66f83 100644--- a/src/API/Grand.Api/Controllers/OData/CategoryController.cs+++ b/src/API/Grand.Api/Controllers/OData/CategoryController.cs@@ -32,12 +32,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Categories))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Categories)) return Forbid();var category = await _mediator.Send(new GetGenericQuery<CategoryDto, Domain.Catalog.Category>(key));- if (!category.Any())- return NotFound();+ if (!category.Any()) return NotFound();return Ok(category.FirstOrDefault());}@@ -49,8 +47,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Categories))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Categories)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<CategoryDto, Domain.Catalog.Category>()));}@@ -62,15 +59,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Post([FromBody] CategoryDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Categories))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Categories)) return Forbid();- if (ModelState.IsValid)- {- model = await _mediator.Send(new AddCategoryCommand() { Model = model });- return Ok(model);- }- return BadRequest(ModelState);+ model = await _mediator.Send(new AddCategoryCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Update entity in Category", OperationId = "UpdateCategory")]@@ -81,21 +73,13 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Put([FromBody] CategoryDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Categories))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Categories)) return Forbid();var category = await _mediator.Send(new GetGenericQuery<CategoryDto, Domain.Catalog.Category>(model.Id));- if (!category.Any())- {- return NotFound();- }+ if (!category.Any()) return NotFound();- if (ModelState.IsValid)- {- model = await _mediator.Send(new UpdateCategoryCommand() { Model = model });- return Ok(model);- }- return BadRequest(ModelState);+ model = await _mediator.Send(new UpdateCategoryCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Update entity in Category (delta)", OperationId = "UpdateCategoryPatch")][HttpPatch]@@ -105,23 +89,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Patch([FromODataUri] string key, [FromBody] JsonPatchDocument<CategoryDto> model){- if (!await _permissionService.Authorize(PermissionSystemName.Categories))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Categories)) return Forbid();var category = await _mediator.Send(new GetGenericQuery<CategoryDto, Domain.Catalog.Category>(key));- if (!category.Any())- {- return NotFound();- }+ if (!category.Any()) return NotFound();+var cat = category.FirstOrDefault();model.ApplyTo(cat);-- if (ModelState.IsValid)- {- await _mediator.Send(new UpdateCategoryCommand() { Model = cat });- return Ok();- }- return BadRequest(ModelState);+ await _mediator.Send(new UpdateCategoryCommand() { Model = cat });+ return Ok();}[SwaggerOperation(summary: "Delete entity from Category", OperationId = "DeleteCategory")][HttpDelete]@@ -130,17 +106,12 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Delete(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Categories))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Categories)) return Forbid();var category = await _mediator.Send(new GetGenericQuery<CategoryDto, Domain.Catalog.Category>(key));- if (!category.Any())- {- return NotFound();- }+ if (!category.Any()) return NotFound();await _mediator.Send(new DeleteCategoryCommand() { Model = category.FirstOrDefault() });-return Ok();}}diff --git a/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs b/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.csindex f40e95d51..fa94b99fd 100644--- a/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs+++ b/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs@@ -29,12 +29,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Maintenance))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Maintenance)) return Forbid();var layout = await _mediator.Send(new GetLayoutQuery() { Id = key, LayoutName = typeof(Domain.Catalog.CategoryLayout).Name });- if (!layout.Any())- return NotFound();+ if (!layout.Any()) return NotFound();return Ok(layout.FirstOrDefault());}@@ -46,11 +44,9 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Maintenance))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Maintenance)) return Forbid();return Ok(await _mediator.Send(new GetLayoutQuery() { LayoutName = typeof(Domain.Catalog.CategoryLayout).Name }));-}}}diff --git a/src/API/Grand.Api/Controllers/OData/CollectionController.cs b/src/API/Grand.Api/Controllers/OData/CollectionController.csindex 6134ef66f..84133c522 100644--- a/src/API/Grand.Api/Controllers/OData/CollectionController.cs+++ b/src/API/Grand.Api/Controllers/OData/CollectionController.cs@@ -30,12 +30,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Collections))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Collections)) return Forbid();var collection = await _mediator.Send(new GetGenericQuery<CollectionDto, Domain.Catalog.Collection>(key));- if (!collection.Any())- return NotFound();+ if (!collection.Any()) return NotFound();return Ok(collection);}@@ -47,8 +45,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Collections))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Collections)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<CollectionDto, Domain.Catalog.Collection>()));}@@ -60,15 +57,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Post([FromBody] CollectionDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Collections))- return Forbid();-- if (ModelState.IsValid)- {- model = await _mediator.Send(new AddCollectionCommand() { Model = model });- return Ok(model);- }- return BadRequest(ModelState);+ if (!await _permissionService.Authorize(PermissionSystemName.Collections)) return Forbid();++ model = await _mediator.Send(new AddCollectionCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Update entity in Collection", OperationId = "UpdateCollection")]@@ -79,22 +71,13 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Put([FromBody] CollectionDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Collections))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Collections)) return Forbid();var collection = await _mediator.Send(new GetGenericQuery<CollectionDto, Domain.Catalog.Collection>(model.Id));- if (!collection.Any())- {- return NotFound();- }-- if (ModelState.IsValid)- {- model = await _mediator.Send(new UpdateCollectionCommand() { Model = model });- return Ok(model);- }-- return BadRequest(ModelState);+ if (!collection.Any()) return NotFound();++ model = await _mediator.Send(new UpdateCollectionCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Partially update entity in Collection", OperationId = "PartiallyUpdateCollection")]@@ -105,24 +88,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Patch([FromODataUri] string key, [FromBody] JsonPatchDocument<CollectionDto> model){- if (!await _permissionService.Authorize(PermissionSystemName.Collections))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Collections)) return Forbid();var collection = await _mediator.Send(new GetGenericQuery<CollectionDto, Domain.Catalog.Collection>(key));- if (!collection.Any())- {- return NotFound();- }+ if (!collection.Any()) return NotFound();+var man = collection.FirstOrDefault();model.ApplyTo(man);-- if (ModelState.IsValid)- {- await _mediator.Send(new UpdateCollectionCommand() { Model = man });- return Ok();- }-- return BadRequest(ModelState);+ await _mediator.Send(new UpdateCollectionCommand() { Model = man });+ return Ok();}[SwaggerOperation(summary: "Delete entity in Collection", OperationId = "DeleteCollection")]@@ -132,14 +106,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Delete(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Collections))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Collections)) return Forbid();var collection = await _mediator.Send(new GetGenericQuery<CollectionDto, Domain.Catalog.Collection>(key));- if (!collection.Any())- {- return NotFound();- }+ if (!collection.Any()) return NotFound();await _mediator.Send(new DeleteCollectionCommand() { Model = collection.FirstOrDefault() });diff --git a/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs b/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.csindex 82bc073a7..146d01227 100644--- a/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs+++ b/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs@@ -27,12 +27,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Maintenance))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Maintenance)) return Forbid();var layout = await _mediator.Send(new GetLayoutQuery() { Id = key, LayoutName = typeof(Domain.Catalog.CollectionLayout).Name });- if (!layout.Any())- return NotFound();+ if (!layout.Any()) return NotFound();return Ok(layout.FirstOrDefault());}@@ -44,8 +42,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Maintenance))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Maintenance)) return Forbid();return Ok(await _mediator.Send(new GetLayoutQuery() { LayoutName = typeof(Domain.Catalog.CollectionLayout).Name }));}diff --git a/src/API/Grand.Api/Controllers/OData/CountryController.cs b/src/API/Grand.Api/Controllers/OData/CountryController.csindex 0b0757e78..25554a7a0 100644--- a/src/API/Grand.Api/Controllers/OData/CountryController.cs+++ b/src/API/Grand.Api/Controllers/OData/CountryController.cs@@ -28,13 +28,11 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Countries))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Countries)) return Forbid();//Domain.Directory.Countryvar country = await _mediator.Send(new GetGenericQuery<CountryDto, Domain.Directory.Country>(key));- if (!country.Any())- return NotFound();+ if (!country.Any()) return NotFound();return Ok(country.FirstOrDefault());}@@ -46,8 +44,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Countries))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Countries)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<CountryDto, Domain.Directory.Country>()));}diff --git a/src/API/Grand.Api/Controllers/OData/CurrencyController.cs b/src/API/Grand.Api/Controllers/OData/CurrencyController.csindex 084d93247..cf19d632f 100644--- a/src/API/Grand.Api/Controllers/OData/CurrencyController.cs+++ b/src/API/Grand.Api/Controllers/OData/CurrencyController.cs@@ -28,12 +28,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Currencies))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Currencies)) return Forbid();var currency = await _mediator.Send(new GetGenericQuery<CurrencyDto, Domain.Directory.Currency>(key));- if (!currency.Any())- return NotFound();+ if (!currency.Any()) return NotFound();return Ok(currency.FirstOrDefault());}@@ -45,8 +43,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Currencies))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Currencies)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<CurrencyDto, Domain.Directory.Currency>()));}diff --git a/src/API/Grand.Api/Controllers/OData/CustomerController.cs b/src/API/Grand.Api/Controllers/OData/CustomerController.csindex 1d1433a72..760417ad1 100644--- a/src/API/Grand.Api/Controllers/OData/CustomerController.cs+++ b/src/API/Grand.Api/Controllers/OData/CustomerController.cs@@ -40,12 +40,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();var customer = await _mediator.Send(new GetCustomerQuery() { Email = key });- if (customer == null)- return NotFound();+ if (customer == null) return NotFound();return Ok(customer);}@@ -57,15 +55,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Post([FromBody] CustomerDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();-- if (ModelState.IsValid)- {- model = await _mediator.Send(new AddCustomerCommand() { Model = model });- return Ok(model);- }- return BadRequest(ModelState);+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();++ model = await _mediator.Send(new AddCustomerCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Update entity in Customer", OperationId = "UpdateCustomer")]@@ -75,15 +68,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Put([FromBody] CustomerDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();-- if (ModelState.IsValid)- {- model = await _mediator.Send(new UpdateCustomerCommand() { Model = model });- return Ok(model);- }- return BadRequest(ModelState);+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();++ model = await _mediator.Send(new UpdateCustomerCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Delete entity from Customer", OperationId = "DeleteCustomer")]@@ -93,21 +81,16 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Delete(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();var customer = await _mediator.Send(new GetCustomerQuery() { Email = key });- if (customer == null)- {- return NotFound();- }+ if (customer == null) return NotFound();await _mediator.Send(new DeleteCustomerCommand() { Email = key });return Ok();}-//odata/Customer/(email)/AddAddress[SwaggerOperation(summary: "Invoke action AddAddress", OperationId = "AddAddress")][Route("({key})/[action]")]@@ -118,15 +101,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> AddAddress(string key, [FromBody] AddressDto address){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();-- if (!ModelState.IsValid)- return BadRequest(ModelState);+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();var customer = await _mediator.Send(new GetCustomerQuery() { Email = key });- if (customer == null)- return NotFound();+ if (customer == null) return NotFound();address = await _mediator.Send(new AddCustomerAddressCommand() { Customer = customer, Address = address });return Ok(address);@@ -142,15 +120,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> UpdateAddress(string key, [FromBody] AddressDto address){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();-- if (!ModelState.IsValid)- return BadRequest(ModelState);+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();var customer = await _mediator.Send(new GetCustomerQuery() { Email = key });- if (customer == null)- return NotFound();+ if (customer == null) return NotFound();address = await _mediator.Send(new UpdateCustomerAddressCommand() { Customer = customer, Address = address });@@ -167,26 +140,21 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> DeleteAddress(string key, [FromBody] DeleteAddressDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();- if (model == null || string.IsNullOrEmpty(model.AddressId))- return NotFound();+ if (model == null || string.IsNullOrEmpty(model.AddressId)) return NotFound();var customer = await _mediator.Send(new GetCustomerQuery() { Email = key });- if (customer == null)- return NotFound();+ if (customer == null) return NotFound();var address = customer.Addresses.FirstOrDefault(x => x.Id == model.AddressId.ToString());- if (address == null)- return NotFound();+ if (address == null) return NotFound();await _mediator.Send(new DeleteCustomerAddressCommand() { Customer = customer, Address = address });return Ok(true);}-//odata/Customer/(email)/SetPassword//body: { "password": "123456" }[SwaggerOperation(summary: "Invoke action SetPassword", OperationId = "SetPassword")]@@ -198,21 +166,14 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> SetPassword(string key, [FromBody] PasswordDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();- if (model == null || string.IsNullOrEmpty(model.Password))- return NotFound();-- if (!ModelState.IsValid)- return BadRequest(ModelState);+ if (model == null || string.IsNullOrEmpty(model.Password)) return NotFound();var changePassRequest = new ChangePasswordRequest(key, false, _customerSettings.DefaultPasswordFormat, model.Password);var changePassResult = await _customerManagerService.ChangePassword(changePassRequest);- if (!changePassResult.Success)- {- return BadRequest(string.Join(',', changePassResult.Errors));- }+ if (!changePassResult.Success) return BadRequest(string.Join(',', changePassResult.Errors));+return Ok(true);}}diff --git a/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs b/src/API/Grand.Api/Controllers/OData/CustomerGroupController.csindex b649b905a..97e3811cf 100644--- a/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs+++ b/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs@@ -31,12 +31,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();var customerGroup = await _mediator.Send(new GetGenericQuery<CustomerGroupDto, Domain.Customers.CustomerGroup>(key));- if (!customerGroup.Any())- return NotFound();+ if (!customerGroup.Any()) return NotFound();return Ok(customerGroup.FirstOrDefault());}@@ -48,8 +46,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<CustomerGroupDto, Domain.Customers.CustomerGroup>()));}@@ -61,15 +58,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Post([FromBody] CustomerGroupDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();- if (ModelState.IsValid)- {- model = await _mediator.Send(new AddCustomerGroupCommand() { Model = model });- return Ok(model);- }- return BadRequest(ModelState);+ model = await _mediator.Send(new AddCustomerGroupCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Update entity in CustomerGroup", OperationId = "UpdateCustomerGroup")]@@ -80,16 +72,12 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Put([FromBody] CustomerGroupDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();var customerGroup = await _mediator.Send(new GetGenericQuery<CustomerGroupDto, Domain.Customers.CustomerGroup>(model.Id));- if (!customerGroup.Any())- {- return NotFound();- }+ if (!customerGroup.Any()) return NotFound();- if (ModelState.IsValid && !model.IsSystem)+ if (!model.IsSystem){model = await _mediator.Send(new UpdateCustomerGroupCommand() { Model = model });return Ok(model);@@ -105,23 +93,18 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Patch([FromODataUri] string key, [FromBody] JsonPatchDocument<CustomerGroupDto> model){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();var customerGroup = await _mediator.Send(new GetGenericQuery<CustomerGroupDto, Domain.Customers.CustomerGroup>(key));- if (!customerGroup.Any())- {- return NotFound();- }+ if (!customerGroup.Any()) return NotFound();+var cr = customerGroup.FirstOrDefault();model.ApplyTo(cr);-- if (ModelState.IsValid && !cr.IsSystem)+ if (!cr.IsSystem){await _mediator.Send(new UpdateCustomerGroupCommand() { Model = cr });return Ok();}-return BadRequest(ModelState);}@@ -132,19 +115,13 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Delete(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Customers))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Customers)) return Forbid();var customerGroup = await _mediator.Send(new GetGenericQuery<CustomerGroupDto, Domain.Customers.CustomerGroup>(key));- if (!customerGroup.Any())- {- return NotFound();- }+ if (!customerGroup.Any()) return NotFound();++ if (customerGroup.FirstOrDefault().IsSystem) return Forbid();- if (customerGroup.FirstOrDefault().IsSystem)- {- return Forbid();- }await _mediator.Send(new DeleteCustomerGroupCommand() { Model = customerGroup.FirstOrDefault() });return Ok();diff --git a/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs b/src/API/Grand.Api/Controllers/OData/DeliveryDateController.csindex fd8061dce..80bd991a2 100644--- a/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs+++ b/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs@@ -28,12 +28,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings)) return Forbid();var deliverydate = await _mediator.Send(new GetGenericQuery<DeliveryDateDto, Domain.Shipping.DeliveryDate>(key));- if (!deliverydate.Any())- return NotFound();+ if (!deliverydate.Any()) return NotFound();return Ok(deliverydate.FirstOrDefault());}@@ -45,8 +43,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<DeliveryDateDto, Domain.Shipping.DeliveryDate>()));}diff --git a/src/API/Grand.Api/Controllers/OData/LanguageController.cs b/src/API/Grand.Api/Controllers/OData/LanguageController.csindex 7bc721f03..a92b17018 100644--- a/src/API/Grand.Api/Controllers/OData/LanguageController.cs+++ b/src/API/Grand.Api/Controllers/OData/LanguageController.cs@@ -28,12 +28,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Languages))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Languages)) return Forbid();var language = await _mediator.Send(new GetGenericQuery<LanguageDto, Domain.Localization.Language>(key));- if (!language.Any())- return NotFound();+ if (!language.Any()) return NotFound();return Ok(language.FirstOrDefault());}@@ -45,8 +43,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Languages))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Languages)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<LanguageDto, Domain.Localization.Language>()));}diff --git a/src/API/Grand.Api/Controllers/OData/PickupPointController.cs b/src/API/Grand.Api/Controllers/OData/PickupPointController.csindex 8d24afe94..f4fa99474 100644--- a/src/API/Grand.Api/Controllers/OData/PickupPointController.cs+++ b/src/API/Grand.Api/Controllers/OData/PickupPointController.cs@@ -28,15 +28,12 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings)) return Forbid();var points = await _mediator.Send(new GetGenericQuery<PickupPointDto, Domain.Shipping.PickupPoint>(key));- if (!points.Any())- return NotFound();+ if (!points.Any()) return NotFound();return Ok(points.FirstOrDefault());-}[SwaggerOperation(summary: "Get entities from PickupPoint", OperationId = "GetPickupPoints")]@@ -46,8 +43,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<PickupPointDto, Domain.Shipping.PickupPoint>()));}diff --git a/src/API/Grand.Api/Controllers/OData/PictureController.cs b/src/API/Grand.Api/Controllers/OData/PictureController.csindex 96c5f66fb..a7fd1b213 100644--- a/src/API/Grand.Api/Controllers/OData/PictureController.cs+++ b/src/API/Grand.Api/Controllers/OData/PictureController.cs@@ -29,12 +29,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Pictures))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Pictures)) return Forbid();var picture = await _mediator.Send(new GetGenericQuery<PictureDto, Domain.Media.Picture>(key));- if (picture == null || !picture.Any())- return NotFound();+ if (picture == null || !picture.Any()) return NotFound();return Ok(picture.FirstOrDefault());}@@ -46,15 +44,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Post([FromBody] PictureDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Pictures))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Pictures)) return Forbid();- if (ModelState.IsValid)- {- model = await _mediator.Send(new AddPictureCommand() { PictureDto = model });- return Ok(model);- }- return BadRequest(ModelState);+ model = await _mediator.Send(new AddPictureCommand() { PictureDto = model });+ return Ok(model);}[SwaggerOperation(summary: "Update entity in Picture", OperationId = "UpdatePicture")]@@ -65,21 +58,13 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Put([FromBody] PictureDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Categories))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Categories)) return Forbid();- if (ModelState.IsValid)- {- var picture = await _mediator.Send(new GetGenericQuery<PictureDto, Domain.Media.Picture>(model.Id));- if (picture == null || !picture.Any())- {- return NotFound();- }+ var picture = await _mediator.Send(new GetGenericQuery<PictureDto, Domain.Media.Picture>(model.Id));+ if (picture == null || !picture.Any()) return NotFound();- var result = await _mediator.Send(new UpdatePictureCommand() { Model = model });- return Ok(result);- }- return BadRequest(ModelState);+ var result = await _mediator.Send(new UpdatePictureCommand() { Model = model });+ return Ok(result);}[SwaggerOperation(summary: "Delete entity in Picture", OperationId = "DeletePicture")]@@ -89,16 +74,13 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Delete(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Pictures))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Pictures)) return Forbid();var picture = await _mediator.Send(new GetGenericQuery<PictureDto, Domain.Media.Picture>(key));- if (picture == null || !picture.Any())- {- return NotFound();- }+ if (picture == null || !picture.Any()) return NotFound();+await _mediator.Send(new DeletePictureCommand() { PictureDto = picture.FirstOrDefault() });return Ok();}}-}+}\ No newline at end of filediff --git a/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs b/src/API/Grand.Api/Controllers/OData/ProductAttributeController.csindex a643fc466..072d84575 100644--- a/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs+++ b/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs@@ -33,12 +33,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.ProductAttributes))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.ProductAttributes)) return Forbid();var productAttribute = await _mediator.Send(new GetGenericQuery<ProductAttributeDto, Domain.Catalog.ProductAttribute>(key));- if (!productAttribute.Any())- return NotFound();+ if (!productAttribute.Any()) return NotFound();return Ok(productAttribute.FirstOrDefault());}@@ -50,8 +48,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.ProductAttributes))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.ProductAttributes)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<ProductAttributeDto, Domain.Catalog.ProductAttribute>()));}@@ -63,15 +60,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Post([FromBody] ProductAttributeDto model){- if (!await _permissionService.Authorize(PermissionSystemName.ProductAttributes))- return Forbid();-- if (ModelState.IsValid)- {- model = await _mediator.Send(new AddProductAttributeCommand() { Model = model });- return Ok(model);- }- return BadRequest(ModelState);+ if (!await _permissionService.Authorize(PermissionSystemName.ProductAttributes)) return Forbid();++ model = await _mediator.Send(new AddProductAttributeCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Update entity in ProductAttribute", OperationId = "UpdateProductAttribute")]@@ -81,15 +73,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Put([FromBody] ProductAttributeDto model){- if (!await _permissionService.Authorize(PermissionSystemName.ProductAttributes))- return Forbid();-- if (ModelState.IsValid)- {- model = await _mediator.Send(new UpdateProductAttributeCommand() { Model = model });- return Ok(model);- }- return BadRequest(ModelState);+ if (!await _permissionService.Authorize(PermissionSystemName.ProductAttributes)) return Forbid();++ model = await _mediator.Send(new UpdateProductAttributeCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Partially update entity in ProductAttribute", OperationId = "PartiallyUpdateProductAttribute")]@@ -100,22 +87,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Patch([FromODataUri] string key, [FromBody] JsonPatchDocument<ProductAttributeDto> model){- if (!await _permissionService.Authorize(PermissionSystemName.ProductAttributes))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.ProductAttributes)) return Forbid();var productAttribute = await _mediator.Send(new GetGenericQuery<ProductAttributeDto, Domain.Catalog.ProductAttribute>(key));- if (!productAttribute.Any())- return NotFound();+ if (!productAttribute.Any()) return NotFound();var pa = productAttribute.FirstOrDefault();model.ApplyTo(pa);-- if (ModelState.IsValid)- {- pa = await _mediator.Send(new UpdateProductAttributeCommand() { Model = pa });- return Ok(pa);- }- return BadRequest(ModelState);+ pa = await _mediator.Send(new UpdateProductAttributeCommand() { Model = pa });+ return Ok(pa);}[SwaggerOperation(summary: "Delete entity from ProductAttribute", OperationId = "DeleteProductAttribute")]@@ -125,12 +105,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Delete(string key){- if (!await _permissionService.Authorize(PermissionSystemName.ProductAttributes))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.ProductAttributes)) return Forbid();var productAttribute = await _mediator.Send(new GetGenericQuery<ProductAttributeDto, Domain.Catalog.ProductAttribute>(key));- if (!productAttribute.Any())- return NotFound();+ if (!productAttribute.Any()) return NotFound();await _mediator.Send(new DeleteProductAttributeCommand() { Model = productAttribute.FirstOrDefault() });return Ok();diff --git a/src/API/Grand.Api/Controllers/OData/ProductController.cs b/src/API/Grand.Api/Controllers/OData/ProductController.csindex 556886447..8730dad37 100644--- a/src/API/Grand.Api/Controllers/OData/ProductController.cs+++ b/src/API/Grand.Api/Controllers/OData/ProductController.cs@@ -33,12 +33,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();return Ok(product.FirstOrDefault());}@@ -50,8 +48,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>()));}@@ -63,15 +60,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Post([FromBody] ProductDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();- if (ModelState.IsValid)- {- model = await _mediator.Send(new AddProductCommand() { Model = model });- return Ok(model);- }- return BadRequest(ModelState);+ model = await _mediator.Send(new AddProductCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Update entity in Product", OperationId = "UpdateProduct")]@@ -81,15 +73,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Put([FromBody] ProductDto model){- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();- if (ModelState.IsValid)- {- await _mediator.Send(new UpdateProductCommand() { Model = model });- return Ok();- }- return BadRequest(ModelState);+ await _mediator.Send(new UpdateProductCommand() { Model = model });+ return Ok();}[SwaggerOperation(summary: "Partially update entity in Product", OperationId = "PartiallyUpdateProduct")]@@ -100,22 +87,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Patch([FromODataUri] string key, [FromBody] JsonPatchDocument<ProductDto> model){- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var pr = product.FirstOrDefault();model.ApplyTo(pr, ModelState);-- if (ModelState.IsValid)- {- await _mediator.Send(new UpdateProductCommand() { Model = pr });- return Ok();- }- return BadRequest(ModelState);+ await _mediator.Send(new UpdateProductCommand() { Model = pr });+ return Ok();}[SwaggerOperation(summary: "Delete entity in Product", OperationId = "DeleteProduct")]@@ -125,12 +105,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Delete(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();await _mediator.Send(new DeleteProductCommand() { Model = product.FirstOrDefault() });@@ -138,7 +116,7 @@ namespace Grand.Api.Controllers.OData}//odata/Product/(id)/UpdateStock- //body: { "Stock": 10 }+ //body: { "WarehouseId": "", "Stock": 10 }[SwaggerOperation(summary: "Invoke action UpdateStock", OperationId = "UpdateStock")][Route("({key})/[action]")][HttpPost]@@ -148,20 +126,16 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> UpdateStock(string key, [FromBody] ProductUpdateStock model){- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();- if (model == null)- return BadRequest();+ if (model == null) return BadRequest();await _mediator.Send(new UpdateProductStockCommand() { Product = product.FirstOrDefault(), WarehouseId = model.WarehouseId, Stock = model.Stock });return Ok(true);-}#region Product category@@ -175,19 +149,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> CreateProductCategory(string key, [FromBody] ProductCategoryDto productCategory){- if (productCategory == null)- return BadRequest();+ if (productCategory == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var pc = product.FirstOrDefault().ProductCategories.Where(x => x.CategoryId == productCategory.CategoryId).FirstOrDefault();- if (pc != null)- ModelState.AddModelError("", "Product category mapping found with the specified categoryid");+ if (pc != null) ModelState.AddModelError("", "Product category mapping found with the specified categoryid");if (ModelState.IsValid){@@ -206,20 +176,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> UpdateProductCategory(string key, [FromBody] ProductCategoryDto productCategory){- if (productCategory == null)- return BadRequest();+ if (productCategory == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();-+ if (!product.Any()) return NotFound();var pc = product.FirstOrDefault().ProductCategories.Where(x => x.CategoryId == productCategory.CategoryId).FirstOrDefault();- if (pc == null)- ModelState.AddModelError("", "No product category mapping found with the specified id");+ if (pc == null) ModelState.AddModelError("", "No product category mapping found with the specified id");if (ModelState.IsValid){@@ -238,22 +203,18 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> DeleteProductCategory(string key, [FromBody] ProductCategoryDeleteDto model){- if (model == null)- return BadRequest();+ if (model == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var categoryId = model.CategoryId;if (!string.IsNullOrEmpty(categoryId)){var pc = product.FirstOrDefault().ProductCategories.Where(x => x.CategoryId == categoryId.ToString()).FirstOrDefault();- if (pc == null)- ModelState.AddModelError("", "No product category mapping found with the specified id");+ if (pc == null) ModelState.AddModelError("", "No product category mapping found with the specified id");if (ModelState.IsValid){@@ -278,19 +239,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> CreateProductCollection(string key, [FromBody] ProductCollectionDto productCollection){- if (productCollection == null)- return BadRequest();+ if (productCollection == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var pm = product.FirstOrDefault().ProductCollections.Where(x => x.CollectionId == productCollection.CollectionId).FirstOrDefault();- if (pm != null)- ModelState.AddModelError("", "Product collection mapping found with the specified collectionid");+ if (pm != null) ModelState.AddModelError("", "Product collection mapping found with the specified collectionid");if (ModelState.IsValid){@@ -309,19 +266,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> UpdateProductCollection(string key, [FromBody] ProductCollectionDto productCollection){- if (productCollection == null)- return BadRequest();+ if (productCollection == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var pm = product.FirstOrDefault().ProductCollections.Where(x => x.CollectionId == productCollection.CollectionId).FirstOrDefault();- if (pm == null)- ModelState.AddModelError("", "No product collection mapping found with the specified id");+ if (pm == null) ModelState.AddModelError("", "No product collection mapping found with the specified id");if (ModelState.IsValid){@@ -340,22 +293,18 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> DeleteProductCollection(string key, [FromBody] ProductCollectionDeleteDto model){- if (model == null)- return BadRequest();+ if (model == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var collectionId = model.CollectionId;if (!string.IsNullOrEmpty(collectionId)){var pm = product.FirstOrDefault().ProductCollections.Where(x => x.CollectionId == collectionId.ToString()).FirstOrDefault();- if (pm == null)- ModelState.AddModelError("", "No product collection mapping found with the specified id");+ if (pm == null) ModelState.AddModelError("", "No product collection mapping found with the specified id");if (ModelState.IsValid){@@ -380,20 +329,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> CreateProductPicture(string key, [FromBody] ProductPictureDto productPicture){- if (productPicture == null)- return BadRequest();+ if (productPicture == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();-+ if (!product.Any()) return NotFound();var pp = product.FirstOrDefault().ProductPictures.Where(x => x.PictureId == productPicture.PictureId).FirstOrDefault();- if (pp != null)- ModelState.AddModelError("", "Product picture mapping found with the specified pictureid");+ if (pp != null) ModelState.AddModelError("", "Product picture mapping found with the specified pictureid");if (ModelState.IsValid){@@ -412,20 +356,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> UpdateProductPicture(string key, [FromBody] ProductPictureDto productPicture){- if (productPicture == null)- return BadRequest();+ if (productPicture == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();-+ if (!product.Any()) return NotFound();var pp = product.FirstOrDefault().ProductPictures.Where(x => x.PictureId == productPicture.PictureId).FirstOrDefault();- if (pp == null)- ModelState.AddModelError("", "No product picture mapping found with the specified id");+ if (pp == null) ModelState.AddModelError("", "No product picture mapping found with the specified id");if (ModelState.IsValid){@@ -444,22 +383,18 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> DeleteProductPicture(string key, [FromBody] ProductPictureDeleteDto model){- if (model == null)- return BadRequest();+ if (model == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var pictureId = model.PictureId;if (!string.IsNullOrEmpty(pictureId)){var pp = product.FirstOrDefault().ProductPictures.Where(x => x.PictureId == pictureId.ToString()).FirstOrDefault();- if (pp == null)- ModelState.AddModelError("", "No product picture mapping found with the specified id");+ if (pp == null) ModelState.AddModelError("", "No product picture mapping found with the specified id");if (ModelState.IsValid){@@ -484,19 +419,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> CreateProductSpecification(string key, [FromBody] ProductSpecificationAttributeDto productSpecification){- if (productSpecification == null)- return BadRequest();+ if (productSpecification == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var psa = product.FirstOrDefault().ProductSpecificationAttributes.Where(x => x.Id == productSpecification.Id).FirstOrDefault();- if (psa != null)- ModelState.AddModelError("", "Product specification mapping found with the specified id");+ if (psa != null) ModelState.AddModelError("", "Product specification mapping found with the specified id");if (ModelState.IsValid){@@ -515,19 +446,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> UpdateProductSpecification(string key, [FromBody] ProductSpecificationAttributeDto productSpecification){- if (productSpecification == null)- return BadRequest();+ if (productSpecification == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var psa = product.FirstOrDefault().ProductSpecificationAttributes.Where(x => x.Id == productSpecification.Id).FirstOrDefault();- if (psa == null)- ModelState.AddModelError("", "No product specification mapping found with the specified id");+ if (psa == null) ModelState.AddModelError("", "No product specification mapping found with the specified id");if (ModelState.IsValid){@@ -546,22 +473,18 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> DeleteProductSpecification(string key, [FromBody] ProductSpecificationAttributeDeleteDto model){- if (model == null)- return BadRequest();+ if (model == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var specificationId = model.Id;if (!string.IsNullOrEmpty(specificationId)){var psa = product.FirstOrDefault().ProductSpecificationAttributes.Where(x => x.Id == specificationId.ToString()).FirstOrDefault();- if (psa == null)- ModelState.AddModelError("", "No product specification mapping found with the specified id");+ if (psa == null) ModelState.AddModelError("", "No product specification mapping found with the specified id");if (ModelState.IsValid){@@ -586,19 +509,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> CreateProductTierPrice(string key, [FromBody] ProductTierPriceDto productTierPrice){- if (productTierPrice == null)- return BadRequest();+ if (productTierPrice == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var pt = product.FirstOrDefault().TierPrices.Where(x => x.Id == productTierPrice.Id).FirstOrDefault();- if (pt != null)- ModelState.AddModelError("", "Product tier price mapping found with the specified id");+ if (pt != null) ModelState.AddModelError("", "Product tier price mapping found with the specified id");if (ModelState.IsValid){@@ -617,19 +536,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> UpdateProductTierPrice(string key, [FromBody] ProductTierPriceDto productTierPrice){- if (productTierPrice == null)- return BadRequest();+ if (productTierPrice == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var pt = product.FirstOrDefault().TierPrices.Where(x => x.Id == productTierPrice.Id).FirstOrDefault();- if (pt == null)- ModelState.AddModelError("", "No product tier price mapping found with the specified id");+ if (pt == null) ModelState.AddModelError("", "No product tier price mapping found with the specified id");if (ModelState.IsValid){@@ -648,22 +563,18 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> DeleteProductTierPrice(string key, [FromBody] ProductTierPriceDeleteDto model){- if (model == null)- return BadRequest();+ if (model == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var tierPriceId = model.Id;if (!string.IsNullOrEmpty(tierPriceId)){var pt = product.FirstOrDefault().TierPrices.Where(x => x.Id == tierPriceId.ToString()).FirstOrDefault();- if (pt == null)- ModelState.AddModelError("", "No product tier price mapping found with the specified id");+ if (pt == null) ModelState.AddModelError("", "No product tier price mapping found with the specified id");if (ModelState.IsValid){@@ -688,19 +599,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> CreateProductAttributeMapping(string key, [FromBody] ProductAttributeMappingDto productAttributeMapping){- if (productAttributeMapping == null)- return BadRequest();+ if (productAttributeMapping == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var pam = product.FirstOrDefault().ProductAttributeMappings.Where(x => x.Id == productAttributeMapping.Id).FirstOrDefault();- if (pam != null)- ModelState.AddModelError("", "Product attribute mapping found with the specified id");+ if (pam != null) ModelState.AddModelError("", "Product attribute mapping found with the specified id");if (ModelState.IsValid){@@ -719,19 +626,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> UpdateProductAttributeMapping(string key, [FromBody] ProductAttributeMappingDto productAttributeMapping){- if (productAttributeMapping == null)- return BadRequest();+ if (productAttributeMapping == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var pam = product.FirstOrDefault().ProductAttributeMappings.Where(x => x.Id == productAttributeMapping.Id).FirstOrDefault();- if (pam == null)- ModelState.AddModelError("", "No product attribute mapping found with the specified id");+ if (pam == null) ModelState.AddModelError("", "No product attribute mapping found with the specified id");if (ModelState.IsValid){@@ -750,22 +653,18 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> DeleteProductAttributeMapping(string key, [FromBody] ProductAttributeMappingDeleteDto model){- if (model == null)- return BadRequest();+ if (model == null) return BadRequest();- if (!await _permissionService.Authorize(PermissionSystemName.Products))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Products)) return Forbid();var product = await _mediator.Send(new GetGenericQuery<ProductDto, Domain.Catalog.Product>(key));- if (!product.Any())- return NotFound();+ if (!product.Any()) return NotFound();var attrId = model.Id;if (!string.IsNullOrEmpty(attrId)){var pam = product.FirstOrDefault().ProductAttributeMappings.Where(x => x.Id == attrId.ToString()).FirstOrDefault();- if (pam == null)- ModelState.AddModelError("", "No product attribute mapping found with the specified id");+ if (pam == null) ModelState.AddModelError("", "No product attribute mapping found with the specified id");if (ModelState.IsValid){diff --git a/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs b/src/API/Grand.Api/Controllers/OData/ProductLayoutController.csindex a85739c5f..4120ff876 100644--- a/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs+++ b/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs@@ -27,12 +27,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Maintenance))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Maintenance)) return Forbid();var layout = await _mediator.Send(new GetLayoutQuery() { Id = key, LayoutName = typeof(Domain.Catalog.ProductLayout).Name });- if (!layout.Any())- return NotFound();+ if (!layout.Any()) return NotFound();return Ok(layout.FirstOrDefault());@@ -45,8 +43,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Maintenance))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Maintenance)) return Forbid();return Ok(await _mediator.Send(new GetLayoutQuery() { LayoutName = typeof(Domain.Catalog.ProductLayout).Name }));}diff --git a/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs b/src/API/Grand.Api/Controllers/OData/ShippingMethodController.csindex 5ce1a5275..c93dc3ac1 100644--- a/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs+++ b/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs@@ -28,12 +28,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings)) return Forbid();var shipping = await _mediator.Send(new GetGenericQuery<ShippingMethodDto, Domain.Shipping.ShippingMethod>(key));- if (!shipping.Any())- return NotFound();+ if (!shipping.Any()) return NotFound();return Ok(shipping.FirstOrDefault());}@@ -45,8 +43,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<ShippingMethodDto, Domain.Shipping.ShippingMethod>()));}diff --git a/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs b/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.csindex a8124a730..265730902 100644--- a/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs+++ b/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs@@ -30,12 +30,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.SpecificationAttributes))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.SpecificationAttributes)) return Forbid();var specificationAttribute = await _mediator.Send(new GetGenericQuery<SpecificationAttributeDto, Domain.Catalog.SpecificationAttribute>(key));- if (!specificationAttribute.Any())- return NotFound();+ if (!specificationAttribute.Any()) return NotFound();return Ok(specificationAttribute.FirstOrDefault());}@@ -47,8 +45,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.SpecificationAttributes))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.SpecificationAttributes)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<SpecificationAttributeDto, Domain.Catalog.SpecificationAttribute>()));}@@ -60,15 +57,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Post([FromBody] SpecificationAttributeDto model){- if (!await _permissionService.Authorize(PermissionSystemName.SpecificationAttributes))- return Forbid();-- if (ModelState.IsValid)- {- model = await _mediator.Send(new AddSpecificationAttributeCommand() { Model = model });- return Ok(model);- }- return BadRequest(ModelState);+ if (!await _permissionService.Authorize(PermissionSystemName.SpecificationAttributes)) return Forbid();++ model = await _mediator.Send(new AddSpecificationAttributeCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Update entity in SpecificationAttribute", OperationId = "UpdateSpecificationAttribute")]@@ -78,15 +70,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.BadRequest)]public async Task<IActionResult> Put([FromBody] SpecificationAttributeDto model){- if (!await _permissionService.Authorize(PermissionSystemName.SpecificationAttributes))- return Forbid();-- if (ModelState.IsValid)- {- model = await _mediator.Send(new UpdateSpecificationAttributeCommand() { Model = model });- return Ok(model);- }- return BadRequest(ModelState);+ if (!await _permissionService.Authorize(PermissionSystemName.SpecificationAttributes)) return Forbid();++ model = await _mediator.Send(new UpdateSpecificationAttributeCommand() { Model = model });+ return Ok(model);}[SwaggerOperation(summary: "Partially update entity in SpecificationAttribute", OperationId = "PartiallyUpdateSpecificationAttribute")]@@ -97,24 +84,15 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Patch([FromODataUri] string key, [FromBody] JsonPatchDocument<SpecificationAttributeDto> model){- if (!await _permissionService.Authorize(PermissionSystemName.SpecificationAttributes))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.SpecificationAttributes)) return Forbid();var specification = await _mediator.Send(new GetGenericQuery<SpecificationAttributeDto, Domain.Catalog.SpecificationAttribute>(key));- if (!specification.Any())- {- return NotFound();- }+ if (!specification.Any()) return NotFound();+var spec = specification.FirstOrDefault();model.ApplyTo(spec);-- if (ModelState.IsValid)- {- await _mediator.Send(new UpdateSpecificationAttributeCommand() { Model = spec });- return Ok();- }- return BadRequest(ModelState);-+ await _mediator.Send(new UpdateSpecificationAttributeCommand() { Model = spec });+ return Ok();}[SwaggerOperation(summary: "Delete entity in SpecificationAttribute", OperationId = "DeleteSpecificationAttribute")]@@ -124,14 +102,11 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Delete(string key){- if (!await _permissionService.Authorize(PermissionSystemName.SpecificationAttributes))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.SpecificationAttributes)) return Forbid();var specification = await _mediator.Send(new GetGenericQuery<SpecificationAttributeDto, Domain.Catalog.SpecificationAttribute>(key));- if (!specification.Any())- {- return NotFound();- }+ if (!specification.Any()) return NotFound();+await _mediator.Send(new DeleteSpecificationAttributeCommand() { Model = specification.FirstOrDefault() });return Ok();diff --git a/src/API/Grand.Api/Controllers/OData/StoreController.cs b/src/API/Grand.Api/Controllers/OData/StoreController.csindex 96d0e13e7..8d5559811 100644--- a/src/API/Grand.Api/Controllers/OData/StoreController.cs+++ b/src/API/Grand.Api/Controllers/OData/StoreController.cs@@ -28,12 +28,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Stores))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Stores)) return Forbid();var store = await _mediator.Send(new GetGenericQuery<StoreDto, Domain.Stores.Store>(key));- if (!store.Any())- return NotFound();+ if (!store.Any()) return NotFound();return Ok(store.FirstOrDefault());}@@ -45,8 +43,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Stores))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Stores)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<StoreDto, Domain.Stores.Store>()));}diff --git a/src/API/Grand.Api/Controllers/OData/VendorController.cs b/src/API/Grand.Api/Controllers/OData/VendorController.csindex 6918bbbcb..33a85b9ef 100644--- a/src/API/Grand.Api/Controllers/OData/VendorController.cs+++ b/src/API/Grand.Api/Controllers/OData/VendorController.cs@@ -28,12 +28,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.Vendors))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Vendors)) return Forbid();var vendor = await _mediator.Send(new GetGenericQuery<VendorDto, Domain.Vendors.Vendor>(key));- if (!vendor.Any())- return NotFound();+ if (!vendor.Any()) return NotFound();return Ok(vendor.FirstOrDefault());@@ -46,8 +44,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.Vendors))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.Vendors)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<VendorDto, Domain.Vendors.Vendor>()));}diff --git a/src/API/Grand.Api/Controllers/OData/WarehouseController.cs b/src/API/Grand.Api/Controllers/OData/WarehouseController.csindex 7ef6a36dd..f7390162d 100644--- a/src/API/Grand.Api/Controllers/OData/WarehouseController.cs+++ b/src/API/Grand.Api/Controllers/OData/WarehouseController.cs@@ -28,12 +28,10 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.NotFound)]public async Task<IActionResult> Get(string key){- if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings)) return Forbid();var warehouse = await _mediator.Send(new GetGenericQuery<WarehouseDto, Domain.Shipping.Warehouse>(key));- if (!warehouse.Any())- return NotFound();+ if (!warehouse.Any()) return NotFound();return Ok(warehouse.FirstOrDefault());}@@ -45,8 +43,7 @@ namespace Grand.Api.Controllers.OData[ProducesResponseType((int)HttpStatusCode.OK)]public async Task<IActionResult> Get(){- if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings))- return Forbid();+ if (!await _permissionService.Authorize(PermissionSystemName.ShippingSettings)) return Forbid();return Ok(await _mediator.Send(new GetGenericQuery<WarehouseDto, Domain.Shipping.Warehouse>()));}diff --git a/src/API/Grand.Api/Infrastructure/ModelValidationAttribute.cs b/src/API/Grand.Api/Infrastructure/ModelValidationAttribute.csnew file mode 100644index 000000000..6c92e4f77--- /dev/null+++ b/src/API/Grand.Api/Infrastructure/ModelValidationAttribute.cs@@ -0,0 +1,16 @@+using Microsoft.AspNetCore.Mvc;+using Microsoft.AspNetCore.Mvc.Filters;++namespace Grand.Api.Infrastructure+{+ public class ModelValidationAttribute : ActionFilterAttribute+ {+ public override void OnActionExecuting(ActionExecutingContext context)+ {+ if (!context.ModelState.IsValid)+ {+ context.Result = new BadRequestObjectResult(context.ModelState);+ }+ }+ }+}diff --git a/src/API/Grand.Api/Infrastructure/ODataStartup.cs b/src/API/Grand.Api/Infrastructure/ODataStartup.csindex 6f91bc607..d778dafcb 100644--- a/src/API/Grand.Api/Infrastructure/ODataStartup.cs+++ b/src/API/Grand.Api/Infrastructure/ODataStartup.cs@@ -44,7 +44,7 @@ namespace Grand.Api.Infrastructureservices.AddCors(options =>{options.AddPolicy(Configurations.CorsPolicyName,- builder => builder.WithOrigins("*").AllowAnyMethod().AllowAnyHeader());+ builder => builder.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());});//Add ODataservices.AddControllers().AddOData(opt =>@@ -53,6 +53,9 @@ namespace Grand.Api.Infrastructureopt.AddRouteComponents(Configurations.ODataRoutePrefix, GetEdmModel(apiConfig));opt.Select().Filter().Count().Expand();});++ services.AddScoped<ModelValidationAttribute>();+}}public int Priority => 505;