Refactor update order logic and response handling

Updated the `UpdateAsync` method in `IOrderService` to accept `OrderResponseDto` instead of `Order`. Enhanced the update logic in `OrderService` to include property assignments for existing orders and improved error handling. Modified controllers to return full response objects instead of just the data for consistency.

Author: kelvink96

Controllers/OrdersController.cs

@@ -33,7 +33,7 @@ public async Task<ActionResult<IEnumerable<OrderResponseDto>>> GetAllOrders()
             return BadRequest(response);
         }
 
-        return Ok(response.Data);
+        return Ok(response);
     }
 
     [HttpGet("{id}")]
@@ -46,7 +46,7 @@ public async Task<ActionResult<OrderResponseDto>> GetOrderById(Guid id)
             return NotFound(response);
         }
 
-        return Ok(response.Data);
+        return Ok(response);
     }
 
     [HttpPost]
@@ -87,7 +87,7 @@ public async Task<ActionResult<OrderResponseDto>> CreateOrder(CreateOrderDto cre
             return BadRequest(response);
         }
 
-        return CreatedAtAction(nameof(GetOrderById), new { id = order.Id }, response.Data);
+        return CreatedAtAction(nameof(GetOrderById), new { id = order.Id }, response);
     }
 
     [HttpPut("{id}")]
@@ -101,49 +101,20 @@ public async Task<IActionResult> UpdateOrder(Guid id, UpdateOrderDto updateOrder
             return NotFound(orderResponse);
         }
 
-        var order = await _orderService.GetByIdAsync(id);
+        var existingOrder = orderResponse.Data;
+        existingOrder.CustomerName = updateOrderDto.CustomerName;
+        existingOrder.CustomerEmail = updateOrderDto.CustomerEmail;
+        existingOrder.CustomerEmail = updateOrderDto.CustomerEmail;
+        existingOrder.Status = updateOrderDto.Status;
+        existingOrder.ShippingAddress = updateOrderDto.ShippingAddress;
+        existingOrder.BillingAddress = updateOrderDto.BillingAddress;
+        existingOrder.PaymentMethod = updateOrderDto.PaymentMethod;
+        existingOrder.ModifiedById = updateOrderDto.ModifiedById;
+        existingOrder.Modified = DateTime.UtcNow;
 
-        if (!order.Succeeded)
-        {
-            return NotFound(order);
-        }
-
-        var existingOrder = await _orderService.GetByIdAsync(id);
-
-        if (!existingOrder.Succeeded)
-        {
-            return NotFound(existingOrder);
-        }
-
-        var orderEntity = new Order
-        {
-            Id = id,
-            
-            // Update customer information
-            CustomerName = updateOrderDto.CustomerName,
-            CustomerEmail = updateOrderDto.CustomerEmail,
-            CustomerPhone = updateOrderDto.CustomerPhone,
-            
-            OrderDate = existingOrder.Data.OrderDate,
-            TotalAmount = existingOrder.Data.TotalAmount,
-            Status = updateOrderDto.Status,
-            ShippingAddress = updateOrderDto.ShippingAddress ?? existingOrder.Data.ShippingAddress,
-            BillingAddress = updateOrderDto.BillingAddress ?? existingOrder.Data.BillingAddress,
-            PaymentMethod = updateOrderDto.PaymentMethod ?? existingOrder.Data.PaymentMethod,
-            Created = existingOrder.Data.Created,
-            CreatedById = existingOrder.Data.CreatedById,
-            Modified = DateTime.UtcNow,
-            ModifiedById = updateOrderDto.ModifiedById
-        };
-
-        var updateResponse = await _orderService.UpdateAsync(orderEntity);
-
-        if (!updateResponse.Succeeded)
-        {
-            return BadRequest(updateResponse);
-        }
+        await _orderService.UpdateAsync(existingOrder);
 
-        return Ok(updateResponse.Data);
+        return Ok(existingOrder);
     }
 
     [HttpDelete("{id}")]
@@ -177,7 +148,7 @@ public async Task<ActionResult<IEnumerable<OrderResponseDto>>> GetOrdersByCustom
             return BadRequest(response);
         }
 
-        return Ok(response.Data);
+        return Ok(response);
     }
 
     [HttpGet("status/{status}")]
@@ -190,7 +161,7 @@ public async Task<ActionResult<IEnumerable<OrderResponseDto>>> GetOrdersByStatus
             return BadRequest(response);
         }
 
-        return Ok(response.Data);
+        return Ok(response);
     }
 
     [HttpGet("customer-info")]
@@ -210,6 +181,6 @@ public async Task<ActionResult<CustomerInfo>> GetCustomerInfo()
             return BadRequest(response);
         }
 
-        return Ok(response.Data);
+        return Ok(response);
     }
 }

Interfaces/IOrderService.cs

@@ -11,7 +11,7 @@ public interface IOrderService
     Task<ApiResponse<IEnumerable<OrderResponseDto>>> GetByCustomerIdAsync(string customerId);
     Task<ApiResponse<IEnumerable<OrderResponseDto>>> GetByStatusAsync(OrderStatus status);
     Task<ApiResponse<OrderResponseDto>> CreateAsync(Order order, List<OrderItem> orderItems);
-    Task<ApiResponse<OrderResponseDto>> UpdateAsync(Order order);
+    Task<ApiResponse<OrderResponseDto>> UpdateAsync(OrderResponseDto orderResponseDto);
     Task<ApiResponse<bool>> DeleteAsync(Guid id);
     Task<ApiResponse<CustomerInfo>> GetCustomerInfoAsync(string customerId);
 }

Services/OrderService.cs

@@ -40,7 +40,8 @@ public async Task<ApiResponse<IEnumerable<OrderResponseDto>>> GetAllAsync()
             return new ApiResponse<IEnumerable<OrderResponseDto>>
             {
                 Succeeded = true,
-                Data = orderResponseDtos
+                Data = orderResponseDtos,
+                Message = "Orders retrieved",
             };
         }
         catch (Exception ex)
@@ -220,28 +221,42 @@ public async Task<ApiResponse<OrderResponseDto>> CreateAsync(Order order, List<O
         }
     }
 
-    public async Task<ApiResponse<OrderResponseDto>> UpdateAsync(Order order)
+    public async Task<ApiResponse<OrderResponseDto>> UpdateAsync(OrderResponseDto orderResponseDto)
     {
         try
         {
-            await _orderRepository.UpdateAsync(order);
-
-            var updatedOrder = await _orderRepository.GetByIdAsync(order.Id);
-
+            var existingOrder = await _orderRepository.GetByIdAsync(orderResponseDto.Id);
+
+            if (existingOrder == null) 
+                throw new KeyNotFoundException($"Order with id: {orderResponseDto.Id} was not found");
+            
+            existingOrder.CustomerName = orderResponseDto.CustomerName;
+            existingOrder.CustomerEmail = orderResponseDto.CustomerEmail;
+            existingOrder.CustomerEmail = orderResponseDto.CustomerEmail;
+            existingOrder.Status = orderResponseDto.Status;
+            existingOrder.ShippingAddress = orderResponseDto.ShippingAddress;
+            existingOrder.BillingAddress = orderResponseDto.BillingAddress;
+            existingOrder.PaymentMethod = orderResponseDto.PaymentMethod;
+            existingOrder.ModifiedById = orderResponseDto.ModifiedById;
+            existingOrder.Modified = orderResponseDto.Modified;
+
+            await _orderRepository.UpdateAsync(existingOrder);
+            
             return new ApiResponse<OrderResponseDto>
             {
                 Succeeded = true,
-                Data = MapToOrderResponseDto(updatedOrder!)
+                Data = MapToOrderResponseDto(existingOrder!),
+                Message = "Updated order successfully"
             };
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "Error updating order {Id}", order.Id);
+            _logger.LogError(ex, "Error updating order {Id}", orderResponseDto.Id);
 
             return new ApiResponse<OrderResponseDto>
             {
                 Succeeded = false,
-                Message = $"Error updating order {order.Id}",
+                Message = $"Error updating order {orderResponseDto.Id}",
                 Errors = new List<string> { ex.Message }
             };
         }