Update API to OData 8.0 (#95)

* Upgrade oData to version 8.0
grandnode · Aug 31, 2021 · 87495c6 · 87495c6
1 parent 06affc4
commit 87495c6
Show file tree

Hide file tree

Showing 33 changed files with 164 additions and 263 deletions.
diff --git a/src/API/Grand.Api/Controllers/BaseODataController.cs b/src/API/Grand.Api/Controllers/BaseODataController.cs
@@ -1,12 +1,14 @@
 using Grand.Api.Filters;
-using Microsoft.AspNet.OData;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Routing.Attributes;
+using Microsoft.AspNetCore.OData.Routing.Controllers;
 
 namespace Grand.Api.Controllers
 {
     [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
+    [ODataRouteComponent]
     [Route("odata/[controller]")]
     [ApiExplorerSettings(IgnoreApi = false)]
     [AuthorizeApiAdmin]

diff --git a/src/API/Grand.Api/Controllers/OData/BrandController.cs b/src/API/Grand.Api/Controllers/OData/BrandController.cs
@@ -4,10 +4,10 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;
@@ -24,6 +24,17 @@ public BrandController(IMediator mediator, IPermissionService permissionService)
             _permissionService = permissionService;
         }
 
+        [SwaggerOperation(summary: "Get entities from Brand", OperationId = "GetBrands")]
+        [HttpGet]
+        [EnableQuery]
+        public async Task<IActionResult> Get()
+        {
+            if (!await _permissionService.Authorize(PermissionSystemName.Brands))
+                return Forbid();
+
+            return Ok(await _mediator.Send(new GetQuery<BrandDto>()));
+        }
+
         [SwaggerOperation(summary: "Get entity from Brand by key", OperationId = "GetBrandById")]
         [HttpGet("{key}")]
         public async Task<IActionResult> Get(string key)
@@ -38,16 +49,7 @@ public async Task<IActionResult> Get(string key)
             return Ok(brand);
         }
 
-        [SwaggerOperation(summary: "Get entities from Brand", OperationId = "GetBrands")]
-        [HttpGet]
-        [EnableQuery(HandleNullPropagation = HandleNullPropagationOption.False)]
-        public async Task<IActionResult> Get()
-        {
-            if (!await _permissionService.Authorize(PermissionSystemName.Brands))
-                return Forbid();
-
-            return Ok(await _mediator.Send(new GetQuery<BrandDto>()));
-        }
+
 
         [SwaggerOperation(summary: "Add new entity to Brand", OperationId = "InsertBrand")]
         [HttpPost]
@@ -59,7 +61,7 @@ public async Task<IActionResult> Post([FromBody] BrandDto model)
             if (ModelState.IsValid)
             {
                 model = await _mediator.Send(new AddBrandCommand() { Model = model });
-                return Created(model);
+                return Ok(model);
             }
             return BadRequest(ModelState);
         }

diff --git a/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs b/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs
@@ -2,9 +2,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/CategoryController.cs b/src/API/Grand.Api/Controllers/OData/CategoryController.cs
@@ -4,10 +4,10 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;
@@ -61,7 +61,7 @@ public async Task<IActionResult> Post([FromBody] CategoryDto model)
             if (ModelState.IsValid)
             {
                 model = await _mediator.Send(new AddCategoryCommand() { Model = model });
-                return Created(model);
+                return Ok(model);
             }
             return BadRequest(ModelState);
         }

diff --git a/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs b/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs
@@ -2,9 +2,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/CollectionController.cs b/src/API/Grand.Api/Controllers/OData/CollectionController.cs
@@ -4,10 +4,10 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;
@@ -59,7 +59,7 @@ public async Task<IActionResult> Post([FromBody] CollectionDto model)
             if (ModelState.IsValid)
             {
                 model = await _mediator.Send(new AddCollectionCommand() { Model = model });
-                return Created(model);
+                return Ok(model);
             }
             return BadRequest(ModelState);
         }

diff --git a/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs b/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs
@@ -2,9 +2,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/CountryController.cs b/src/API/Grand.Api/Controllers/OData/CountryController.cs
@@ -3,9 +3,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/CurrencyController.cs b/src/API/Grand.Api/Controllers/OData/CurrencyController.cs
@@ -3,9 +3,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/CustomerController.cs b/src/API/Grand.Api/Controllers/OData/CustomerController.cs
@@ -7,8 +7,8 @@
 using Grand.Business.Customers.Utilities;
 using Grand.Domain.Customers;
 using MediatR;
-using Microsoft.AspNet.OData;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Formatter;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;
@@ -59,7 +59,7 @@ public async Task<IActionResult> Post([FromBody] CustomerDto model)
             if (ModelState.IsValid)
             {
                 model = await _mediator.Send(new AddCustomerCommand() { Model = model });
-                return Created(model);
+                return Ok(model);
             }
             return BadRequest(ModelState);
         }

diff --git a/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs b/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs
@@ -4,10 +4,10 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;
@@ -60,7 +60,7 @@ public async Task<IActionResult> Post([FromBody] CustomerGroupDto model)
             if (ModelState.IsValid)
             {
                 model = await _mediator.Send(new AddCustomerGroupCommand() { Model = model });
-                return Created(model);
+                return Ok(model);
             }
             return BadRequest(ModelState);
         }

diff --git a/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs b/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs
@@ -3,9 +3,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/LanguageController.cs b/src/API/Grand.Api/Controllers/OData/LanguageController.cs
@@ -3,9 +3,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/PickupPointController.cs b/src/API/Grand.Api/Controllers/OData/PickupPointController.cs
@@ -3,9 +3,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/PictureController.cs b/src/API/Grand.Api/Controllers/OData/PictureController.cs
@@ -45,7 +45,7 @@ public async Task<IActionResult> Post([FromBody] PictureDto model)
             if (ModelState.IsValid)
             {
                 model = await _mediator.Send(new AddPictureCommand() { PictureDto = model });
-                return Created(model);
+                return Ok(model);
             }
             return BadRequest(ModelState);
         }

diff --git a/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs b/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs
@@ -4,10 +4,10 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;
@@ -62,7 +62,7 @@ public async Task<IActionResult> Post([FromBody] ProductAttributeDto model)
             if (ModelState.IsValid)
             {
                 model = await _mediator.Send(new AddProductAttributeCommand() { Model = model });
-                return Created(model);
+                return Ok(model);
             }
             return BadRequest(ModelState);
         }

diff --git a/src/API/Grand.Api/Controllers/OData/ProductController.cs b/src/API/Grand.Api/Controllers/OData/ProductController.cs
@@ -4,10 +4,10 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;
@@ -62,7 +62,7 @@ public async Task<IActionResult> Post([FromBody] ProductDto model)
             if (ModelState.IsValid)
             {
                 model = await _mediator.Send(new AddProductCommand() { Model = model });
-                return Created(model);
+                return Ok(model);
             }
             return BadRequest(ModelState);
         }
@@ -120,7 +120,7 @@ public async Task<IActionResult> Delete(string key)
             return Ok();
         }
 
-        //odata/Product(id)/UpdateStock
+        //odata/Product/(id)/UpdateStock
         //body: { "Stock": 10 }
         [SwaggerOperation(summary: "Invoke action UpdateStock", OperationId = "UpdateStock")]
         [Route("({key})/[action]")]

diff --git a/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs b/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs
@@ -2,9 +2,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs b/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs
@@ -3,9 +3,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs b/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs
@@ -4,10 +4,10 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Formatter;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;
@@ -59,7 +59,7 @@ public async Task<IActionResult> Post([FromBody] SpecificationAttributeDto model
             if (ModelState.IsValid)
             {
                 model = await _mediator.Send(new AddSpecificationAttributeCommand() { Model = model });
-                return Created(model);
+                return Ok(model);
             }
             return BadRequest(ModelState);
         }

diff --git a/src/API/Grand.Api/Controllers/OData/StateProvinceController.cs b/src/API/Grand.Api/Controllers/OData/StateProvinceController.cs
@@ -3,9 +3,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/StoreController.cs b/src/API/Grand.Api/Controllers/OData/StoreController.cs
@@ -3,9 +3,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/VendorController.cs b/src/API/Grand.Api/Controllers/OData/VendorController.cs
@@ -3,9 +3,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/API/Grand.Api/Controllers/OData/WarehouseController.cs b/src/API/Grand.Api/Controllers/OData/WarehouseController.cs
@@ -3,9 +3,8 @@
 using Grand.Business.Common.Interfaces.Security;
 using Grand.Business.Common.Services.Security;
 using MediatR;
-using Microsoft.AspNet.OData;
-using Microsoft.AspNet.OData.Query;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.OData.Query;
 using Swashbuckle.AspNetCore.Annotations;
 using System.Linq;
 using System.Threading.Tasks;