Merge pull request #9 from IgniteUI/snovoselski/update-category-put-endpoint

fix(put-endpoints): return NotFound with invalid id

Author: Svetloslav15

NorthwindCRUD/Controllers/CategoryController.cs

@@ -46,7 +46,6 @@ public ActionResult<CategoryInputModel> GetById(int id)
             try
             {
                 var category = this.categoryService.GetById(id);
-
                 if (category != null)
                 {
                     return Ok(this.mapper.Map<CategoryDb, CategoryInputModel>(category));
@@ -93,7 +92,13 @@ public ActionResult<CategoryInputModel> Update(CategoryInputModel model)
                 {
                     var mappedModel = this.mapper.Map<CategoryInputModel, CategoryDb>(model);
                     var category = this.categoryService.Update(mappedModel);
-                    return Ok(this.mapper.Map<CategoryDb, CategoryInputModel>(category));
+
+                    if (category != null)
+                    {
+                        return Ok(this.mapper.Map<CategoryDb, CategoryInputModel>(category));
+                    }
+
+                    return NotFound();
                 }
 
                 return BadRequest(ModelState);
@@ -112,7 +117,6 @@ public ActionResult<CategoryInputModel> Delete(int id)
             try
             {
                 var category = this.categoryService.Delete(id);
-
                 if (category != null)
                 {
                     return Ok(this.mapper.Map<CategoryDb, CategoryInputModel>(category));

NorthwindCRUD/Controllers/CustomerController.cs

@@ -92,7 +92,13 @@ public ActionResult<CustomerInputModel> Update(CustomerInputModel model)
                 {
                     var mappedModel = this.mapper.Map<CustomerInputModel, CustomerDb>(model);
                     var customer = this.customerService.Update(mappedModel);
-                    return Ok(this.mapper.Map<CustomerDb, CustomerInputModel>(customer));
+
+                    if (customer != null)
+                    {
+                        return Ok(this.mapper.Map<CustomerDb, CustomerInputModel>(customer));
+                    }
+
+                    return NotFound();
                 }
 
                 return BadRequest(ModelState);
@@ -111,7 +117,6 @@ public ActionResult<CustomerInputModel> Delete(string id)
             try
             {
                 var customer = this.customerService.Delete(id);
-
                 if (customer != null)
                 {
                     return Ok(this.mapper.Map<CustomerDb, CustomerInputModel>(customer));

NorthwindCRUD/Controllers/EmployeeController.cs

@@ -92,7 +92,13 @@ public ActionResult<EmployeeInputModel> Update(EmployeeInputModel model)
                 {
                     var mappedModel = this.mapper.Map<EmployeeInputModel, EmployeeDb>(model);
                     var employee = this.employeeService.Update(mappedModel);
-                    return Ok(this.mapper.Map<EmployeeDb, EmployeeInputModel>(employee));
+
+                    if (employee != null)
+                    {
+                        return Ok(this.mapper.Map<EmployeeDb, EmployeeInputModel>(employee));
+                    }
+
+                    return NotFound();
                 }
 
                 return BadRequest(ModelState);

NorthwindCRUD/Controllers/OrderController.cs

@@ -92,7 +92,12 @@ public ActionResult<OrderInputModel> Update(OrderInputModel model)
                 {
                     var mappedModel = this.mapper.Map<OrderInputModel, OrderDb>(model);
                     var order = this.orderService.Update(mappedModel);
-                    return Ok(this.mapper.Map<OrderDb, OrderInputModel>(order));
+                    if (order != null)
+                    {
+                        return Ok(this.mapper.Map<OrderDb, OrderInputModel>(order));
+                    }
+
+                    return NotFound();
                 }
 
                 return BadRequest(ModelState);
@@ -111,7 +116,6 @@ public ActionResult<OrderInputModel> Delete(int id)
             try
             {
                 var order = this.orderService.Delete(id);
-
                 if (order != null)
                 {
                     return Ok(this.mapper.Map<OrderDb, OrderInputModel>(order));