Move id outside of the Put endpoint body for all endpoints

deyvidnenchev · deyvidnenchev · commit af85d9735533 · 2025-06-05T11:50:10.000+03:00
diff --git a/NorthwindCRUD.Tests/EmployeeServiceFixture.cs b/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);
diff --git a/NorthwindCRUD.Tests/OrderServiceFixture.cs b/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);
diff --git a/NorthwindCRUD.Tests/ProductServiceFixture.cs b/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);
diff --git a/NorthwindCRUD.Tests/RegionServiceFixture.cs b/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);
diff --git a/NorthwindCRUD.Tests/ShipperServiceFixture.cs b/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);
diff --git a/NorthwindCRUD.Tests/SupplierServiceFixture.cs b/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);
diff --git a/NorthwindCRUD.Tests/TerritoryServiceFixture.cs b/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);
diff --git a/NorthwindCRUD/Controllers/CustomersController.cs b/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)
                     {
diff --git a/NorthwindCRUD/Controllers/EmployeesController.cs b/NorthwindCRUD/Controllers/EmployeesController.cs
@@ -304,16 +304,16 @@ public ActionResult<EmployeeDto> Create(EmployeeDto model)
             }
         }
 
-        [HttpPut]
+        [HttpPut("{id}")]
         [Authorize]
-        public ActionResult<EmployeeDto> Update(EmployeeDto model)
+        public ActionResult<EmployeeDto> Update(int id, EmployeeDto model)
         {
             try
             {
                 if (ModelState.IsValid)
                 {
                     var mappedModel = this.mapper.Map<EmployeeDto, EmployeeDb>(model);
-                    var employee = this.employeeService.Update(mappedModel);
+                    var employee = this.employeeService.Update(id, mappedModel);
 
                     if (employee != null)
                     {
diff --git a/NorthwindCRUD/Controllers/OrdersController.cs b/NorthwindCRUD/Controllers/OrdersController.cs
@@ -311,16 +311,16 @@ public ActionResult<OrderDto> Create(OrderDto model)
             }
         }
 
-        [HttpPut]
+        [HttpPut("{id}")]
         [Authorize]
-        public ActionResult<OrderDto> Update(OrderDto model)
+        public ActionResult<OrderDto> Update(int id, OrderDto model)
         {
             try
             {
                 if (ModelState.IsValid)
                 {
                     var mappedModel = this.mapper.Map<OrderDto, OrderDb>(model);
-                    var order = this.orderService.Update(mappedModel);
+                    var order = this.orderService.Update(id, mappedModel);
                     if (order != null)
                     {
                         return Ok(this.mapper.Map<OrderDb, OrderDto>(order));
diff --git a/NorthwindCRUD/Controllers/ProductsController.cs b/NorthwindCRUD/Controllers/ProductsController.cs
@@ -277,16 +277,16 @@ public ActionResult<ProductDto> Create(ProductDto model)
             }
         }
 
-        [HttpPut]
+        [HttpPut("{id}")]
         [Authorize]
-        public ActionResult<ProductDto> Update(ProductDto model)
+        public ActionResult<ProductDto> Update(int id, ProductDto model)
         {
             try
             {
                 if (ModelState.IsValid)
                 {
                     var mappedModel = this.mapper.Map<ProductDto, ProductDb>(model);
-                    var product = this.productService.Update(mappedModel);
+                    var product = this.productService.Update(id, mappedModel);
 
                     if (product != null)
                     {
diff --git a/NorthwindCRUD/Controllers/RegionsController.cs b/NorthwindCRUD/Controllers/RegionsController.cs
@@ -183,16 +183,16 @@ public ActionResult<RegionDto> Create(RegionDto model)
             }
         }
 
-        [HttpPut]
+        [HttpPut("{id}")]
         [Authorize]
-        public ActionResult<RegionDto> Update(RegionDto model)
+        public ActionResult<RegionDto> Update(int id, RegionDto model)
         {
             try
             {
                 if (ModelState.IsValid)
                 {
                     var mappedModel = this.mapper.Map<RegionDto, RegionDb>(model);
-                    var region = this.regionService.Update(mappedModel);
+                    var region = this.regionService.Update(id, mappedModel);
 
                     if (region != null)
                     {
diff --git a/NorthwindCRUD/Controllers/ShippersController.cs b/NorthwindCRUD/Controllers/ShippersController.cs
@@ -178,16 +178,16 @@ public ActionResult<ShipperDto> Create(ShipperDto model)
             }
         }
 
-        [HttpPut]
+        [HttpPut("{id}")]
         [Authorize]
-        public ActionResult<ShipperDto> Update(ShipperDto model)
+        public ActionResult<ShipperDto> Update(int id, ShipperDto model)
         {
             try
             {
                 if (ModelState.IsValid)
                 {
                     var mappedModel = this.mapper.Map<ShipperDto, ShipperDb>(model);
-                    var shipper = this.shipperService.Update(mappedModel);
+                    var shipper = this.shipperService.Update(id, mappedModel);
 
                     if (shipper != null)
                     {
diff --git a/NorthwindCRUD/Controllers/SuppliersController.cs b/NorthwindCRUD/Controllers/SuppliersController.cs
@@ -178,16 +178,16 @@ public ActionResult<SupplierDto> Create(SupplierDto model)
             }
         }
 
-        [HttpPut]
+        [HttpPut("{id}")]
         [Authorize]
-        public ActionResult<SupplierDto> Update(SupplierDto model)
+        public ActionResult<SupplierDto> Update(int id, SupplierDto model)
         {
             try
             {
                 if (ModelState.IsValid)
                 {
                     var mappedModel = this.mapper.Map<SupplierDto, SupplierDb>(model);
-                    var supplier = this.supplierService.Update(mappedModel);
+                    var supplier = this.supplierService.Update(id, mappedModel);
 
                     if (supplier != null)
                     {
diff --git a/NorthwindCRUD/Controllers/TerritoriesController.cs b/NorthwindCRUD/Controllers/TerritoriesController.cs
@@ -214,16 +214,16 @@ public ActionResult<TerritoryDto> Create(TerritoryDto model)
             }
         }
 
-        [HttpPut]
+        [HttpPut("{id}")]
         [Authorize]
-        public ActionResult<TerritoryDto> Update(TerritoryDto model)
+        public ActionResult<TerritoryDto> Update(string id, TerritoryDto model)
         {
             try
             {
                 if (ModelState.IsValid)
                 {
                     var mappedModel = this.mapper.Map<TerritoryDto, TerritoryDb>(model);
-                    var territory = this.territoryService.Update(mappedModel);
+                    var territory = this.territoryService.Update(id, mappedModel);
 
                     if (territory != null)
                     {
diff --git a/NorthwindCRUD/ControllersGraphQL/CustomerController.cs b/NorthwindCRUD/ControllersGraphQL/CustomerController.cs
@@ -51,10 +51,10 @@ public CustomerDto Create(CustomerDto model)
         }
 
         [Mutation]
-        public CustomerDto? Update(CustomerDto model)
+        public CustomerDto? Update(string id, CustomerDto model)
         {
             var mappedModel = this.mapper.Map<CustomerDto, CustomerDb>(model);
-            var customer = this.customerService.Update(mappedModel);
+            var customer = this.customerService.Update(id, mappedModel);
             return customer != null ? this.mapper.Map<CustomerDb, CustomerDto>(customer) : null;
         }
 
diff --git a/NorthwindCRUD/ControllersGraphQL/EmployeeController.cs b/NorthwindCRUD/ControllersGraphQL/EmployeeController.cs
@@ -51,10 +51,10 @@ public EmployeeDto Create(EmployeeDto model)
         }
 
         [Mutation]
-        public EmployeeDto? Update(EmployeeDto model)
+        public EmployeeDto? Update(int id, EmployeeDto model)
         {
             var mappedModel = this.mapper.Map<EmployeeDto, EmployeeDb>(model);
-            var employee = this.employeeService.Update(mappedModel);
+            var employee = this.employeeService.Update(id, mappedModel);
             return employee != null ? this.mapper.Map<EmployeeDb, EmployeeDto>(employee) : null;
         }
 
diff --git a/NorthwindCRUD/ControllersGraphQL/OrderController.cs b/NorthwindCRUD/ControllersGraphQL/OrderController.cs
@@ -50,10 +50,10 @@ public OrderDto Create(OrderDto model)
         }
 
         [Mutation]
-        public OrderDto? Update(OrderDto model)
+        public OrderDto? Update(int id, OrderDto model)
         {
             var mappedModel = this.mapper.Map<OrderDto, OrderDb>(model);
-            var order = this.orderService.Update(mappedModel);
+            var order = this.orderService.Update(id, mappedModel);
             return order != null ? this.mapper.Map<OrderDb, OrderDto>(order) : null;
         }
 
diff --git a/NorthwindCRUD/Models/Contracts/ICustomer.cs b/NorthwindCRUD/Models/Contracts/ICustomer.cs
@@ -4,7 +4,7 @@ namespace NorthwindCRUD.Models.Contracts
 {
     public interface ICustomer
     {
-        string CustomerId { get; set; }
+        string CustomerId { get; }
 
         string CompanyName { get; set; }
 
diff --git a/NorthwindCRUD/Models/Contracts/IEmployee.cs b/NorthwindCRUD/Models/Contracts/IEmployee.cs
@@ -4,7 +4,7 @@ namespace NorthwindCRUD.Models.Contracts
 {
     public interface IEmployee
     {
-        int EmployeeId { get; set; }
+        int EmployeeId { get; }
 
         string LastName { get; set; }
 
diff --git a/NorthwindCRUD/Models/Contracts/IOrder.cs b/NorthwindCRUD/Models/Contracts/IOrder.cs
@@ -5,7 +5,7 @@
 {
     public interface IOrder
     {
-        int OrderId { get; set; }
+        int OrderId { get; }
 
         string? CustomerId { get; set; }
 
diff --git a/NorthwindCRUD/Models/Contracts/IProduct.cs b/NorthwindCRUD/Models/Contracts/IProduct.cs
@@ -2,7 +2,7 @@
 {
     public interface IProduct
     {
-        int ProductId { get; set; }
+        int ProductId { get; }
 
         int? SupplierId { get; set; }
 
diff --git a/NorthwindCRUD/Models/Contracts/IRegion.cs b/NorthwindCRUD/Models/Contracts/IRegion.cs
@@ -2,7 +2,7 @@
 {
     public interface IRegion
     {
-        int RegionId { get; set; }
+        int RegionId { get; }
 
         string RegionDescription { get; set; }
     }
diff --git a/NorthwindCRUD/Models/Contracts/IShipper.cs b/NorthwindCRUD/Models/Contracts/IShipper.cs
@@ -2,7 +2,7 @@
 {
     public interface IShipper
     {
-         int ShipperId { get; set; }
+         int ShipperId { get; }
 
          string CompanyName { get; set; }
 
diff --git a/NorthwindCRUD/Models/Contracts/ISupplier.cs b/NorthwindCRUD/Models/Contracts/ISupplier.cs
@@ -2,7 +2,7 @@
 {
     public interface ISupplier
     {
-        int SupplierId { get; set; }
+        int SupplierId { get; }
 
         string? CompanyName { get; set; }
 
diff --git a/NorthwindCRUD/Models/Contracts/ITerritory.cs b/NorthwindCRUD/Models/Contracts/ITerritory.cs
@@ -2,7 +2,7 @@
 {
     public interface ITerritory
     {
-        string TerritoryId { get; set; }
+        string TerritoryId { get; }
 
         string TerritoryDescription { get; set; }
 
diff --git a/NorthwindCRUD/Models/Dtos/CustomerDto.cs b/NorthwindCRUD/Models/Dtos/CustomerDto.cs
@@ -5,7 +5,7 @@ namespace NorthwindCRUD.Models.Dtos
 {
     public class CustomerDto : ICustomer
     {
-        public string CustomerId { get; set; }
+        public string CustomerId { get; private set; }
 
         [Required(ErrorMessage = "Company Name is required.")]
         [StringLength(100, ErrorMessage = "Company Name cannot exceed 100 characters.")]
diff --git a/NorthwindCRUD/Models/Dtos/EmployeeDto.cs b/NorthwindCRUD/Models/Dtos/EmployeeDto.cs
@@ -7,7 +7,7 @@ namespace NorthwindCRUD.Models.Dtos
     public class EmployeeDto : IEmployee
     {
         [SwaggerSchema("Number automatically assigned to new employee.")]
-        public int EmployeeId { get; set; }
+        public int EmployeeId { get; private set; }
 
         [Required(ErrorMessage = "Last name is required.")]
         [StringLength(50, ErrorMessage = "Last name cannot exceed 50 characters.")]
diff --git a/NorthwindCRUD/Models/Dtos/OrderDto.cs b/NorthwindCRUD/Models/Dtos/OrderDto.cs
@@ -6,7 +6,7 @@ namespace NorthwindCRUD.Models.Dtos
 {
     public class OrderDto : IOrder
     {
-        public int OrderId { get; set; }
+        public int OrderId { get; private set; }
 
         [Required(ErrorMessage = "CustomerId is required.")]
         public string? CustomerId { get; set; }
diff --git a/NorthwindCRUD/Models/Dtos/ProductDto.cs b/NorthwindCRUD/Models/Dtos/ProductDto.cs
@@ -5,7 +5,7 @@ namespace NorthwindCRUD.Models.Dtos
 {
     public class ProductDto : IProduct
     {
-        public int ProductId { get; set; }
+        public int ProductId { get; private set; }
 
         [Range(1, int.MaxValue, ErrorMessage = "SupplierId must be a valid supplier ID.")]
         public int? SupplierId { get; set; }
diff --git a/NorthwindCRUD/Models/Dtos/RegionDto.cs b/NorthwindCRUD/Models/Dtos/RegionDto.cs
@@ -4,7 +4,7 @@ namespace NorthwindCRUD.Models.Dtos
 {
     public class RegionDto : IRegion
     {
-        public int RegionId { get; set; }
+        public int RegionId { get; private set; }
 
         public string RegionDescription { get; set; }
     }
diff --git a/NorthwindCRUD/Models/Dtos/ShipperDto.cs b/NorthwindCRUD/Models/Dtos/ShipperDto.cs
@@ -5,7 +5,7 @@ namespace NorthwindCRUD.Models.Dtos
 {
     public class ShipperDto : IShipper
     {
-        public int ShipperId { get; set; }
+        public int ShipperId { get; private set; }
 
         [Required(ErrorMessage = "Company Name is required.")]
         [StringLength(100, ErrorMessage = "Company Name cannot exceed 100 characters.")]
diff --git a/NorthwindCRUD/Models/Dtos/SupplierDto.cs b/NorthwindCRUD/Models/Dtos/SupplierDto.cs
@@ -5,7 +5,7 @@ namespace NorthwindCRUD.Models.Dtos
 {
     public class SupplierDto : ISupplier
     {
-        public int SupplierId { get; set; }
+        public int SupplierId { get; private set; }
 
         [Required(ErrorMessage = "Company Name is required.")]
         [StringLength(100, ErrorMessage = "Company Name cannot exceed 100 characters.")]
diff --git a/NorthwindCRUD/Models/Dtos/TerritoryDto.cs b/NorthwindCRUD/Models/Dtos/TerritoryDto.cs
diff --git a/NorthwindCRUD/Services/CustomerService.cs b/NorthwindCRUD/Services/CustomerService.cs
diff --git a/NorthwindCRUD/Services/EmployeeService.cs b/NorthwindCRUD/Services/EmployeeService.cs
diff --git a/NorthwindCRUD/Services/OrderService.cs b/NorthwindCRUD/Services/OrderService.cs
diff --git a/NorthwindCRUD/Services/ProductService.cs b/NorthwindCRUD/Services/ProductService.cs
diff --git a/NorthwindCRUD/Services/RegionService.cs b/NorthwindCRUD/Services/RegionService.cs
diff --git a/NorthwindCRUD/Services/ShipperService.cs b/NorthwindCRUD/Services/ShipperService.cs
diff --git a/NorthwindCRUD/Services/SupplierService.cs b/NorthwindCRUD/Services/SupplierService.cs
diff --git a/NorthwindCRUD/Services/TerritoryService.cs b/NorthwindCRUD/Services/TerritoryService.cs

Original file line number	Diff line number	Diff line change
`@@ -209,16 +209,16 @@ public ActionResult<CustomerDto> Create(CustomerDto model)`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
`212`		`- [HttpPut]`
	`212`	`+ [HttpPut("{id}")]`
`213`	`213`	`[Authorize]`
`214`		`- public ActionResult<CustomerDto> Update(CustomerDto model)`
	`214`	`+ public ActionResult<CustomerDto> Update(string id, CustomerDto model)`
`215`	`215`	`{`
`216`	`216`	`try`
`217`	`217`	`{`
`218`	`218`	`if (ModelState.IsValid)`
`219`	`219`	`{`
`220`	`220`	`var mappedModel = this.mapper.Map<CustomerDto, CustomerDb>(model);`
`221`		`- var customer = this.customerService.Update(mappedModel);`
	`221`	`+ var customer = this.customerService.Update(id, mappedModel);`
`222`	`222`
`223`	`223`	`if (customer != null)`
`224`	`224`	`{`
Original file line number	Diff line number	Diff line change
`@@ -304,16 +304,16 @@ public ActionResult<EmployeeDto> Create(EmployeeDto model)`
`304`	`304`	`}`
`305`	`305`	`}`
`306`	`306`
`307`		`- [HttpPut]`
	`307`	`+ [HttpPut("{id}")]`
`308`	`308`	`[Authorize]`
`309`		`- public ActionResult<EmployeeDto> Update(EmployeeDto model)`
	`309`	`+ public ActionResult<EmployeeDto> Update(int id, EmployeeDto model)`
`310`	`310`	`{`
`311`	`311`	`try`
`312`	`312`	`{`
`313`	`313`	`if (ModelState.IsValid)`
`314`	`314`	`{`
`315`	`315`	`var mappedModel = this.mapper.Map<EmployeeDto, EmployeeDb>(model);`
`316`		`- var employee = this.employeeService.Update(mappedModel);`
	`316`	`+ var employee = this.employeeService.Update(id, mappedModel);`
`317`	`317`
`318`	`318`	`if (employee != null)`
`319`	`319`	`{`
Original file line number	Diff line number	Diff line change
`@@ -311,16 +311,16 @@ public ActionResult<OrderDto> Create(OrderDto model)`
`311`	`311`	`}`
`312`	`312`	`}`
`313`	`313`
`314`		`- [HttpPut]`
	`314`	`+ [HttpPut("{id}")]`
`315`	`315`	`[Authorize]`
`316`		`- public ActionResult<OrderDto> Update(OrderDto model)`
	`316`	`+ public ActionResult<OrderDto> Update(int id, OrderDto model)`
`317`	`317`	`{`
`318`	`318`	`try`
`319`	`319`	`{`
`320`	`320`	`if (ModelState.IsValid)`
`321`	`321`	`{`
`322`	`322`	`var mappedModel = this.mapper.Map<OrderDto, OrderDb>(model);`
`323`		`- var order = this.orderService.Update(mappedModel);`
	`323`	`+ var order = this.orderService.Update(id, mappedModel);`
`324`	`324`	`if (order != null)`
`325`	`325`	`{`
`326`	`326`	`return Ok(this.mapper.Map<OrderDb, OrderDto>(order));`