updated check for the entity state

Author: AJEETX

src/Api/Endpoints/V1/Products/Create.cs

@@ -37,18 +37,21 @@ public async Task<IActionResult> PostAsync(Product product, string culture = "en
         {
             if (!ModelState.IsValid) return BadRequest(ModelState.GetErrorMessages());
 
-            var entity = await _db.Products.AddAsync(product);
+            var addedProduct = await _db.Products.AddAsync(product);
+
+            var stateAded = addedProduct.State == Microsoft.EntityFrameworkCore.EntityState.Added;
+
             var count = await _db.SaveChangesAsync();
 
             var responseProduct = new ProductDTO
             {
-                DeliveryPrice = entity.Entity.DeliveryPrice,
-                Description = entity.Entity.Description,
-                Id = entity.Entity.Id,
-                Name = entity.Entity.Name,
-                Price = entity.Entity.Price
+                DeliveryPrice = addedProduct.Entity.DeliveryPrice,
+                Description = addedProduct.Entity.Description,
+                Id = addedProduct.Entity.Id,
+                Name = addedProduct.Entity.Name,
+                Price = addedProduct.Entity.Price
             };
-            return count == 1 ? CreatedAtRoute(RouteNames.GetByIdAsync, new { id = responseProduct.Id, culture }, responseProduct) : StatusCode(StatusCodes.Status500InternalServerError);
+            return stateAded && count == 1 ? CreatedAtRoute(RouteNames.GetByIdAsync, new { id = responseProduct.Id, culture }, responseProduct) : StatusCode(StatusCodes.Status500InternalServerError);
         }
     }
 }

src/Api/Endpoints/V1/Products/Delete.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Threading.Tasks;
 using Xero.Demo.Api.Domain.Extension;
@@ -10,9 +11,6 @@ namespace Xero.Demo.Api.Endpoints.V1.Products
 {
     public partial class ProductsController
     {
-        private static int rowCountDeleted = 0;
-        private readonly bool deleted = rowCountDeleted != 1;
-
         /// <summary>
         /// Delete product by sending valid JWT token provided through only 'api/{culture}/v1/Login/Admin' endpoint
         /// </summary>
@@ -32,11 +30,12 @@ public async Task<IActionResult> DeleteAsync(Guid id, string culture = "en-US")
             var product = await _db.Products.FindAsync(id);
 
             if (product == default) return NotFound(string.Format(CustomException.NotFoundException, id));
+            var removedProduct = _db.Products.Remove(product);
+            var stateDeleted = removedProduct.State == EntityState.Deleted;
 
-            _db.Products.Remove(product);
-            rowCountDeleted = await _db.SaveChangesAsync();
+            var rowCountDeleted = await _db.SaveChangesAsync();
 
-            return deleted ? NoContent() : StatusCode(StatusCodes.Status500InternalServerError);
+            return stateDeleted && rowCountDeleted == 1 ? NoContent() : StatusCode(StatusCodes.Status500InternalServerError);
         }
     }
 }

src/Api/Endpoints/V1/Products/Read.cs

@@ -46,14 +46,15 @@ public async Task<IActionResult> GetAsync(string culture = "en-US")
         /// Get product by id by sending valid JWT token provided through 'api/{culture}/v1/Login/Admin' or 'api/en-US/v1/Login/Editor' or 'api/{culture}/v1/Login/Reader'
         /// </summary>
         /// <param name="id">Enter the id of product</param>
+        /// <param name="culture"></param>
         /// <returns>Returns list of products</returns>
         [Authorize(Policy = Policy.ShouldBeAReader)]
         [ApiVersion(ApiVersionNumbers.V1)]
         [HttpGet("{id}", Name = RouteNames.GetByIdAsync)]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(ProductDTO))]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        public async Task<IActionResult> GetByIdAsync(Guid id)
+        public async Task<IActionResult> GetByIdAsync(Guid id, string culture = "en-US")
         {
             if (!ModelState.IsValid || id == Guid.Empty) return BadRequest(ModelState.GetErrorMessages());
 

src/Api/Endpoints/V1/Products/Update.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Threading.Tasks;
 using Xero.Demo.Api.Domain.Extension;
@@ -32,10 +33,13 @@ public async Task<IActionResult> PutAsync(Guid id, Product product, string cultu
 
             if (savedProduct == default) return NotFound(string.Format(CustomException.NotFoundException, id));
 
-            _db.Products.Update(product);
+            var updatedProduct = _db.Products.Update(product);
+
+            var stateUpdated = updatedProduct.State == EntityState.Modified;
+
             var count = await _db.SaveChangesAsync();
 
-            return count == 1 ? NoContent() : StatusCode(StatusCodes.Status500InternalServerError);
+            return stateUpdated && count == 1 ? NoContent() : StatusCode(StatusCodes.Status500InternalServerError);
         }
     }
 }

src/Api/Product.db

@@ -19,7 +19,7 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
             var claim = context.User.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Role);
 
-            if (claim.Value == Roles.Reader) context.Succeed(requirement);
+            if (claim.Value == Roles.Admin || claim.Value == Roles.Editor || claim.Value == Roles.Reader) context.Succeed(requirement);
 
             return Task.CompletedTask;
         }

src/Api/Xero.Demo.Infrastructure/Security/ShouldBeAReaderAuthorizationHandler.cs

@@ -19,7 +19,7 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
 
             var claim = context.User.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Role);
 
-            if (claim.Value == Roles.Admin || claim.Value == Roles.Editor || claim.Value == Roles.Reader) context.Succeed(requirement);
+            if (claim.Value == Roles.Admin) context.Succeed(requirement);
 
             return Task.CompletedTask;
         }