Merge branch 'main' of https://github.com/IgniteUI/NorthwindAPI into dgdimitrov/enums-as-strings

Author: ddidgdimitrov-infragistics

NorthwindCRUD.Tests/CategroyServiceFixture.cs

@@ -28,7 +28,7 @@ public void ShouldUpdateCategory()
 
             createdCategory.Name = "Updated Category";
             createdCategory.Description = "Updated Description";
-            var updatedCategory = DataHelper.CategoryService.Update(createdCategory);
+            var updatedCategory = DataHelper.CategoryService.Update(createdCategory.CategoryId, createdCategory);
 
             Assert.IsNotNull(updatedCategory);
             updatedCategory = DataHelper2.CategoryService.GetById(updatedCategory.CategoryId);

NorthwindCRUD.Tests/EmployeeServiceFixture.cs

@@ -29,7 +29,7 @@ public void ShouldUpdateEmployee()
             var createdEmployee = DataHelper.EmployeeService.Create(employee);
 
             createdEmployee.Title = "Director";
-            var updatedEmployee = DataHelper.EmployeeService.Update(createdEmployee);
+            var updatedEmployee = DataHelper.EmployeeService.Update(createdEmployee.EmployeeId, createdEmployee);
 
             Assert.IsNotNull(updatedEmployee);
             updatedEmployee = DataHelper2.EmployeeService.GetById(updatedEmployee.EmployeeId);

NorthwindCRUD.Tests/OrderServiceFixture.cs

@@ -37,7 +37,7 @@ public void ShouldUpdateOrder()
             order.CustomerId = DataHelper.CreateCustomer().CustomerId;
             order.EmployeeId = DataHelper.CreateEmployee().EmployeeId;
 
-            var updatedOrder = DataHelper.OrderService.Update(order);
+            var updatedOrder = DataHelper.OrderService.Update(order.OrderId, order);
 
             Assert.IsNotNull(updatedOrder);
             updatedOrder = DataHelper2.OrderService.GetById(updatedOrder.OrderId);

NorthwindCRUD.Tests/ProductServiceFixture.cs

@@ -27,7 +27,7 @@ public void ShouldUpdateProduct()
             createdProduct.UnitPrice = 15;
             createdProduct.UnitsInStock = 50;
 
-            var updatedProduct = DataHelper.ProductService.Update(createdProduct);
+            var updatedProduct = DataHelper.ProductService.Update(createdProduct.ProductId, createdProduct);
 
             Assert.IsNotNull(updatedProduct);
             updatedProduct = DataHelper2.ProductService.GetById(updatedProduct.ProductId);

NorthwindCRUD.Tests/RegionServiceFixture.cs

@@ -27,7 +27,7 @@ public void ShouldUpdateRegion()
             string originalRegionDescription = region.RegionDescription;
             region.RegionDescription = "Updated Region";
 
-            var updatedRegion = DataHelper.RegionService.Update(region);
+            var updatedRegion = DataHelper.RegionService.Update(region.RegionId, region);
 
             Assert.IsNotNull(updatedRegion);
             updatedRegion = DataHelper2.RegionService.GetById(updatedRegion.RegionId);

NorthwindCRUD.Tests/ShipperServiceFixture.cs

@@ -31,7 +31,7 @@ public void ShouldUpdateShipper()
             shipper.CompanyName = "Updated shipper company";
             shipper.Phone = "555-555-5555";
 
-            var updatedShipper = DataHelper.ShipperService.Update(shipper);
+            var updatedShipper = DataHelper.ShipperService.Update(shipper.ShipperId, shipper);
 
             Assert.IsNotNull(updatedShipper);
             updatedShipper = DataHelper2.ShipperService.GetById(updatedShipper.ShipperId);

NorthwindCRUD.Tests/SupplierServiceFixture.cs

@@ -34,7 +34,7 @@ public void ShouldUpdateSupplier()
             supplier.ContactName = "Updated Contact";
             supplier.ContactTitle = "Updated Title";
 
-            var updatedSupplier = DataHelper.SupplierService.Update(supplier);
+            var updatedSupplier = DataHelper.SupplierService.Update(supplier.SupplierId, supplier);
             Assert.IsNotNull(updatedSupplier);
             updatedSupplier = DataHelper2.SupplierService.GetById(updatedSupplier.SupplierId);
             Assert.IsNotNull(updatedSupplier);

NorthwindCRUD.Tests/TerritoryServiceFixture.cs

@@ -29,7 +29,7 @@ public void ShouldUpdateTerritory()
 
             createdTerritory.TerritoryDescription = "Updated Territory";
 
-            var updatedTerritory = DataHelper.TerritoryService.Update(createdTerritory);
+            var updatedTerritory = DataHelper.TerritoryService.Update(createdTerritory.TerritoryId, createdTerritory);
 
             Assert.IsNotNull(updatedTerritory);
             updatedTerritory = DataHelper2.TerritoryService.GetById(updatedTerritory.TerritoryId);

NorthwindCRUD/Controllers/CategoriesController.cs

@@ -198,16 +198,16 @@ public ActionResult<CategoryDetailsDto> Create(CategoryDto model)
             }
         }
 
-        [HttpPut]
+        [HttpPut("{id}")]
         [Authorize]
-        public ActionResult<CategoryDto> Update(CategoryDto model)
+        public ActionResult<CategoryDto> Update(int id, CategoryDto model)
         {
             try
             {
                 if (ModelState.IsValid)
                 {
                     var mappedModel = this.mapper.Map<CategoryDto, CategoryDb>(model);
-                    var category = this.categoryService.Update(mappedModel);
+                    var category = this.categoryService.Update(id, mappedModel);
 
                     if (category != null)
                     {

NorthwindCRUD/Controllers/CustomersController.cs

@@ -209,16 +209,16 @@ public ActionResult<CustomerDto> Create(CustomerDto model)
             }
         }
 
-        [HttpPut]
+        [HttpPut("{id}")]
         [Authorize]
-        public ActionResult<CustomerDto> Update(CustomerDto model)
+        public ActionResult<CustomerDto> Update(string id, CustomerDto model)
         {
             try
             {
                 if (ModelState.IsValid)
                 {
                     var mappedModel = this.mapper.Map<CustomerDto, CustomerDb>(model);
-                    var customer = this.customerService.Update(mappedModel);
+                    var customer = this.customerService.Update(id, mappedModel);
 
                     if (customer != null)
                     {