fix: code rabbit 수정요청 사항

Author: neibler

nginx/nginx.conf

@@ -28,7 +28,7 @@ http {
         # 백엔드 API
         location /api/ {
 		        # [중요] Docker 컨테이너 이름(ongil-backend)으로 통신
-            proxy_pass http://ongil-backend:8080/;
+            proxy_pass http://ongil-backend:8080;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

src/main/java/com/ongil/backend/domain/order/converter/OrderConverter.java

@@ -69,7 +69,7 @@ public OrderDetailResponse toDetailResponse(Order order, List<OrderItemDto> item
 			order.getTotalAmount(),
 			order.getRecipient(),
 			order.getRecipientPhone(),
-			order.getDeliveryAddress() + " " + (order.getDetailAddress() != null ? order.getDetailAddress() : ""),
+			order.getDeliveryAddress() + (order.getDetailAddress() != null ? " " + order.getDetailAddress() : ""),
 			order.getDeliveryMessage(),
 			order.getCreatedAt()
 		);
@@ -134,12 +134,13 @@ public OrderCancelResponse toCancelResponse(Order order, List<OrderItemDto> item
 			order.getId(),
 			order.getOrderNumber(),
 			order.getOrderStatus(),
+			order.getTotalAmount(),
 			order.getCanceledAt(),
 			order.getCancelReason(),
 			order.getCancelDetail(),
 			itemDtos,
 			refundInfo,
-			order.getDeliveryAddress() + " " + (order.getDetailAddress() != null ? order.getDetailAddress() : ""),
+			order.getDeliveryAddress() + (order.getDetailAddress() != null ? " " + order.getDetailAddress() : ""),
 			order.getRecipient(),
 			order.getRecipientPhone(),
 			order.getDeliveryMessage(),

src/main/java/com/ongil/backend/domain/order/dto/response/OrderCancelResponse.java

@@ -20,6 +20,9 @@ public record OrderCancelResponse(
 	@Schema(description = "주문 상태")
 	OrderStatus orderStatus,
 
+	@Schema(description = "주문 총액")
+	Integer totalAmount,
+
 	@Schema(description = "취소 일시")
 	LocalDateTime canceledAt,
 

src/main/java/com/ongil/backend/domain/order/dto/response/RefundInfoDto.java

@@ -11,7 +11,7 @@ public record RefundInfoDto(
 	@Schema(description = "배송비")
 	Integer shippingFee,
 
-	@Schema(description = "반품비 (상품 금액 - 배송비)")
-	Integer returnFee
+	@Schema(description = "환불 금액 (상품 금액 - 배송비)")
+	Integer refundAmount
 ) {
 }

src/main/java/com/ongil/backend/domain/order/service/OrderService.java

@@ -5,6 +5,7 @@
 import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -45,7 +46,9 @@
 import com.ongil.backend.global.common.exception.ErrorCode;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -160,11 +163,19 @@ public OrderCancelResponse cancelOrder(Long userId, Long orderId, OrderCancelReq
 
 		// 4. 재고 복원
 		for (OrderItem orderItem : order.getOrderItems()) {
-			productOptionRepository.findByProductIdAndSizeAndColor(
+			Optional<ProductOption> optionOpt = productOptionRepository.findByProductIdAndSizeAndColor(
 				orderItem.getProduct().getId(),
 				orderItem.getSelectedSize(),
 				orderItem.getSelectedColor()
-			).ifPresent(option -> option.restoreStock(orderItem.getQuantity()));
+			);
+			if (optionOpt.isPresent()) {
+				optionOpt.get().restoreStock(orderItem.getQuantity());
+			} else {
+				log.warn("재고 복원 실패 - productId: {}, size: {}, color: {}",
+					orderItem.getProduct().getId(),
+					orderItem.getSelectedSize(),
+					orderItem.getSelectedColor());
+			}
 		}
 
 		// 5. 장바구니 담기 (선택)
@@ -191,7 +202,7 @@ public OrderDetailResponse updateDeliveryAddress(Long userId, Long orderId, Deli
 		Order order = getOrderAndValidateOwner(userId, orderId);
 
 		if (order.getOrderStatus() != OrderStatus.ORDER_RECEIVED) {
-			throw new AppException(ErrorCode.ORDER_CANCEL_NOT_ALLOWED);
+			throw new AppException(ErrorCode.ORDER_UPDATE_NOT_ALLOWED);
 		}
 
 		Address address = addressRepository.findById(request.addressId())
@@ -238,9 +249,9 @@ private RefundInfoDto calculateRefundInfo(Order order) {
 			.mapToInt(item -> item.getPriceAtOrder() * item.getQuantity())
 			.sum();
 		int shippingFee = 0;
-		int returnFee = Math.max(productAmount - shippingFee, 0);
+		int refundAmount = Math.max(productAmount - shippingFee, 0);
 
-		return new RefundInfoDto(productAmount, shippingFee, returnFee);
+		return new RefundInfoDto(productAmount, shippingFee, refundAmount);
 	}
 
 	public OrderHistoryResponse getOrderHistory(

src/main/java/com/ongil/backend/domain/payment/entity/Payment.java

@@ -56,6 +56,9 @@ public Payment(Integer paymentAmount, Integer usedPoints, PaymentMethod paymentM
 	}
 
 	public void cancelPayment() {
+		if (this.paymentStatus == PaymentStatus.CANCELED) {
+			return;
+		}
 		this.paymentStatus = PaymentStatus.CANCELED;
 		this.canceledAt = LocalDateTime.now();
 	}

src/main/java/com/ongil/backend/domain/product/entity/ProductOption.java

@@ -42,6 +42,9 @@ public ProductOption(Product product, String size, String color, Integer stock)
 
 	// 재고 복원
 	public void restoreStock(int quantity) {
+		if (quantity <= 0) {
+			throw new IllegalArgumentException("복원 수량은 양수여야 합니다.");
+		}
 		this.stock += quantity;
 	}
 

src/main/java/com/ongil/backend/global/common/exception/ErrorCode.java

@@ -67,6 +67,7 @@ public enum ErrorCode {
 	INVALID_POINT_USAGE(HttpStatus.BAD_REQUEST, "포인트 사용 금액이 유효하지 않습니다. (0 미만 혹은 결제 금액 초과)", "ORDER-004"),
 	ORDER_CANCEL_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "주문 접수 상태에서만 취소가 가능합니다.", "ORDER-005"),
 	ORDER_ALREADY_CANCELED(HttpStatus.BAD_REQUEST, "이미 취소된 주문입니다.", "ORDER-006"),
+	ORDER_UPDATE_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "주문 접수 상태에서만 변경이 가능합니다.", "ORDER-007"),
 
 	// ADDRESS
 	ADDRESS_NOT_FOUND(HttpStatus.NOT_FOUND, "배송지 정보를 찾을 수 없습니다.", "ADDRESS-001"),