[Feat] 단계별 리뷰 생성 및 AI 연동

src/main/java/com/ongil/backend/domain/auth/controller/AuthController.java

@@ -74,8 +74,6 @@ public ResponseEntity<DataResponse<TokenRefreshResDto>> refresh(
 		return ResponseEntity.ok(DataResponse.from(res));
 	}
 
-
-
 	@PostMapping("/logout")
 	@Operation(summary = "로그아웃 API", description = "Redis에 저장된 리프레시 토큰을 삭제하여 로그아웃 처리")
 	public ResponseEntity<DataResponse<String>> logout(
@@ -93,4 +91,5 @@ public ResponseEntity<DataResponse<String>> withdraw(
 		authService.withdraw(userId);
 		return ResponseEntity.ok(DataResponse.from("회원 탈퇴가 완료되었습니다."));
 	}
+
 }

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

@@ -1,7 +1,5 @@
 package com.ongil.backend.domain.order.converter;
 
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.UUID;
 
@@ -31,9 +29,11 @@ public class OrderConverter {
 
 	// Request -> Order 엔티티
 	public Order toOrder(OrderCreateRequest request, User user, int finalAmount) {
-		String datePart = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-		String randomPart = UUID.randomUUID().toString().substring(0, 8);
-		String orderNumber = "ORD-" + datePart + "-" + randomPart;
+		String orderNumber = UUID.randomUUID()
+			.toString()
+			.replace("-", "")
+			.substring(0, 10)
+			.toUpperCase();
 
 		return Order.builder()
 			.orderNumber(orderNumber)
@@ -44,7 +44,7 @@ public Order toOrder(OrderCreateRequest request, User user, int finalAmount) {
 			.detailAddress(request.detailAddress())
 			.postalCode(request.postalCode())
 			.deliveryMessage(request.deliveryMessage())
-			.orderStatus(OrderStatus.ORDER_RECEIVED)
+			.orderStatus(OrderStatus.CONFIRMED)
 			.user(user)
 			.build();
 	}
@@ -110,6 +110,7 @@ public OrderItemDto toOrderItemDto(OrderItem orderItem) {
 		String brandName = product.getBrand() != null ? product.getBrand().getName() : "일반 브랜드";
 
 		return new OrderItemDto(
+			orderItem.getId(),
 			product.getId(),
 			brandName,
 			product.getName(),

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

@@ -1,6 +1,7 @@
 package com.ongil.backend.domain.order.dto.response;
 
 public record OrderItemDto(
+	Long orderItemId,
 	Long productId,
 	String brandName,
 	String productName,

src/main/java/com/ongil/backend/domain/order/enums/OrderStatus.java

@@ -6,11 +6,7 @@
 @Getter
 @RequiredArgsConstructor
 public enum OrderStatus {
-	ORDER_RECEIVED("주문 접수"),
-	SHIPPING("배송 중"),
-	DELIVERED("배송 완료"),
 	CONFIRMED("구매 확정"),
 	CANCELED("취소");
-
 	private final String description;
 }

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

@@ -201,7 +201,7 @@ public OrderCancelResponse cancelOrder(Long userId, Long orderId, OrderCancelReq
 	public OrderDetailResponse updateDeliveryAddress(Long userId, Long orderId, DeliveryAddressUpdateRequest request) {
 		Order order = getOrderAndValidateOwner(userId, orderId);
 
-		if (order.getOrderStatus() != OrderStatus.ORDER_RECEIVED) {
+		if (order.getOrderStatus() != OrderStatus.CONFIRMED) {
 			throw new AppException(ErrorCode.ORDER_UPDATE_NOT_ALLOWED);
 		}
 
@@ -251,7 +251,7 @@ private void validateCancelable(Order order) {
 		if (order.getOrderStatus() == OrderStatus.CANCELED) {
 			throw new AppException(ErrorCode.ORDER_ALREADY_CANCELED);
 		}
-		if (order.getOrderStatus() != OrderStatus.ORDER_RECEIVED) {
+		if (order.getOrderStatus() != OrderStatus.CONFIRMED) {
 			throw new AppException(ErrorCode.ORDER_CANCEL_NOT_ALLOWED);
 		}
 	}

src/main/java/com/ongil/backend/domain/review/controller/ReviewController.java

@@ -3,26 +3,39 @@
 import java.util.List;
 
 import org.springframework.data.domain.Page;
+import org.springframework.http.MediaType;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import com.ongil.backend.domain.review.dto.request.ReviewFinalSubmitRequest;
 import com.ongil.backend.domain.review.dto.request.ReviewListRequest;
+import com.ongil.backend.domain.review.dto.request.ReviewStep1Request;
+import com.ongil.backend.domain.review.dto.request.ReviewStep2MaterialRequest;
+import com.ongil.backend.domain.review.dto.request.ReviewStep2SizeRequest;
 import com.ongil.backend.domain.review.dto.response.*;
 import com.ongil.backend.domain.review.enums.ReviewType;
-import com.ongil.backend.domain.review.service.ReviewService;
+import com.ongil.backend.domain.review.service.ReviewCommandService;
+import com.ongil.backend.domain.review.service.ReviewQueryService;
 import com.ongil.backend.global.common.dto.DataResponse;
+import com.ongil.backend.global.common.exception.ErrorCode;
+import com.ongil.backend.global.common.exception.ValidationException;
+import com.ongil.backend.global.config.s3.S3ImageService;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 
 @Tag(name = "Review", description = "리뷰 API (토큰 필요)")
 @RestController
 @RequiredArgsConstructor
 public class ReviewController {
 
-	private final ReviewService reviewService;
+	private final ReviewCommandService reviewCommandService;
+	private final ReviewQueryService reviewQueryService;
+	private final S3ImageService s3ImageService;
 
 	@Operation(summary = "상품별 리뷰 목록 조회", description = "상품의 리뷰 목록을 조회합니다. 유사 체형 필터, 사이즈/색상 필터, 정렬을 지원합니다.")
 	@GetMapping("/api/products/{productId}/reviews")
@@ -31,7 +44,7 @@ public DataResponse<Page<ReviewListResponse>> getProductReviews(
 		@AuthenticationPrincipal Long userId,
 		@ModelAttribute ReviewListRequest request
 	) {
-		Page<ReviewListResponse> reviews = reviewService.getProductReviews(productId, userId, request);
+		Page<ReviewListResponse> reviews = reviewQueryService.getProductReviews(productId, userId, request);
 		return DataResponse.from(reviews);
 	}
 
@@ -41,7 +54,7 @@ public DataResponse<ReviewSummaryResponse> getReviewSummary(
 		@PathVariable Long productId,
 		@AuthenticationPrincipal Long userId
 	) {
-		ReviewSummaryResponse summary = reviewService.getReviewSummary(productId, userId);
+		ReviewSummaryResponse summary = reviewQueryService.getReviewSummary(productId, userId);
 		return DataResponse.from(summary);
 	}
 
@@ -51,7 +64,7 @@ public DataResponse<ReviewDetailResponse> getReviewDetail(
 		@PathVariable Long reviewId,
 		@AuthenticationPrincipal Long userId
 	) {
-		ReviewDetailResponse detail = reviewService.getReviewDetail(reviewId, userId);
+		ReviewDetailResponse detail = reviewQueryService.getReviewDetail(reviewId, userId);
 		return DataResponse.from(detail);
 	}
 
@@ -63,7 +76,7 @@ public DataResponse<Page<MyReviewResponse>> getMyReviews(
 		@Parameter(description = "페이지 번호") @RequestParam(defaultValue = "0") int page,
 		@Parameter(description = "페이지 크기") @RequestParam(defaultValue = "10") int pageSize
 	) {
-		Page<MyReviewResponse> reviews = reviewService.getMyReviews(userId, reviewType, page, pageSize);
+		Page<MyReviewResponse> reviews = reviewQueryService.getMyReviews(userId, reviewType, page, pageSize);
 		return DataResponse.from(reviews);
 	}
 
@@ -72,7 +85,7 @@ public DataResponse<Page<MyReviewResponse>> getMyReviews(
 	public DataResponse<List<PendingReviewResponse>> getPendingReviews(
 		@AuthenticationPrincipal Long userId
 	) {
-		List<PendingReviewResponse> pendingReviews = reviewService.getPendingReviews(userId);
+		List<PendingReviewResponse> pendingReviews = reviewQueryService.getPendingReviews(userId);
 		return DataResponse.from(pendingReviews);
 	}
 
@@ -81,7 +94,7 @@ public DataResponse<List<PendingReviewResponse>> getPendingReviews(
 	public DataResponse<PendingReviewCountResponse> getPendingReviewCount(
 		@AuthenticationPrincipal Long userId
 	) {
-		int count = reviewService.getPendingReviewCount(userId);
+		int count = reviewQueryService.getPendingReviewCount(userId);
 		PendingReviewCountResponse response = PendingReviewCountResponse.builder()
 			.pendingReviewCount(count)
 			.build();
@@ -94,7 +107,97 @@ public DataResponse<ReviewHelpfulResponse> toggleHelpful(
 		@PathVariable Long reviewId,
 		@AuthenticationPrincipal Long userId
 	) {
-		ReviewHelpfulResponse response = reviewService.toggleHelpful(reviewId, userId);
+		ReviewHelpfulResponse response = reviewQueryService.toggleHelpful(reviewId, userId);
 		return DataResponse.from(response);
 	}
+
+	@Operation(summary = "리뷰 작성 시작(ID 발급)", description = "리뷰 작성 진입 시 DRAFT 상태의 리뷰 ID를 미리 발급받습니다.")
+	@PostMapping("/api/reviews/init")
+	public DataResponse<ReviewIdResponse> initializeReview(
+		@AuthenticationPrincipal Long userId,
+		@RequestParam Long orderItemId
+	) {
+		Long reviewId = reviewCommandService.initializeReview(userId, orderItemId);
+		return DataResponse.from(new ReviewIdResponse(reviewId));
+	}
+
+	@Operation(summary = "리뷰 작성 1단계", description = "별점, 착용감 등 1차 답변을 기입합니다. 이전 단계 수정 시에도 사용됩니다.")
+	@PatchMapping("/api/reviews/{reviewId}/step1")
+	public DataResponse<ReviewStep1Response> updateReviewStep1(
+		@AuthenticationPrincipal Long userId,
+		@PathVariable Long reviewId,
+		@Valid @RequestBody ReviewStep1Request request
+	) {
+		ReviewStep1Response response = reviewCommandService.updateReviewStep1(userId, reviewId, request);
+		return DataResponse.from(response);
+	}
+
+	@Operation(summary = "리뷰 작성 2단계 - 사이즈", description = "사이즈 2차 질문(불편 부위)에 답변합니다.")
+	@PatchMapping("/api/reviews/{reviewId}/step2/size")
+	public DataResponse<Void> updateReviewStep2Size(
+		@AuthenticationPrincipal Long userId,
+		@PathVariable Long reviewId,
+		@Valid @RequestBody ReviewStep2SizeRequest request
+	) {
+		reviewCommandService.updateReviewStep2Size(userId, reviewId, request);
+		return DataResponse.ok();
+	}
+
+	@Operation(summary = "리뷰 작성 2단계 - 소재", description = "소재 2차 질문(소재 특징)에 답변합니다.")
+	@PatchMapping("/api/reviews/{reviewId}/step2/material")
+	public DataResponse<Void> updateReviewStep2Material(
+		@AuthenticationPrincipal Long userId,
+		@PathVariable Long reviewId,
+		@Valid @RequestBody ReviewStep2MaterialRequest request
+	) {
+		reviewCommandService.updateReviewStep2Material(userId, reviewId, request);
+		return DataResponse.ok();
+	}
+
+	@Operation(summary = "리뷰 작성 3단계 - 사이즈 AI 생성", description = "사이즈 관련 AI 리뷰를 생성합니다.")
+	@GetMapping("/api/reviews/{reviewId}/ai/size")
+	public DataResponse<AiReviewResponse> generateSizeAiReview(
+		@PathVariable Long reviewId,
+		@AuthenticationPrincipal Long userId
+	) {
+		AiReviewResponse response = reviewCommandService.generateSizeAiReview(userId, reviewId);
+		return DataResponse.from(response);
+	}
+
+	@Operation(summary = "리뷰 작성 3단계 - 소재 AI 생성", description = "소재 관련 AI 리뷰를 생성합니다.")
+	@GetMapping("/api/reviews/{reviewId}/ai/material")
+	public DataResponse<AiReviewResponse> generateMaterialAiReview(
+		@PathVariable Long reviewId,
+		@AuthenticationPrincipal Long userId
+	) {
+		AiReviewResponse response = reviewCommandService.generateMaterialAiReview(userId, reviewId);
+		return DataResponse.from(response);
+	}
+
+	@Operation(summary = "리뷰 사진 업로드", description = "리뷰용 사진을 최대 5장까지 S3에 업로드합니다.")
+	@PostMapping(value = "/api/reviews/images", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+	public DataResponse<List<String>> uploadReviewImages(
+		@RequestPart("images") List<MultipartFile> images
+	) {
+		if (images.size() > 5) {
+			throw new ValidationException(ErrorCode.INVALID_PARAMETER);
+		}
+
+		List<String> imageUrls = images.stream()
+			.map(s3ImageService::uploadReviewImage)
+			.toList();
+		return DataResponse.from(imageUrls);
+	}
+
+	@Operation(summary = "리뷰 최종 제출", description = "최종 리뷰 문장들과 사진을 저장하고 상태를 COMPLETED로 변경합니다.")
+	@PostMapping("/api/reviews/{reviewId}/submit")
+	public DataResponse<Void> submitReview(
+		@AuthenticationPrincipal Long userId,
+		@PathVariable Long reviewId,
+		@Valid @RequestBody ReviewFinalSubmitRequest request
+	) {
+		reviewCommandService.submitReview(userId, reviewId, request);
+		return DataResponse.ok();
+	}
+
 }

src/main/java/com/ongil/backend/domain/review/converter/ReviewConverter.java

@@ -33,7 +33,8 @@ public ReviewListResponse toListResponse(Review review, boolean isHelpful) {
 			.rating(review.getRating())
 			.helpfulCount(review.getHelpfulCount())
 			.isHelpful(isHelpful)
-			.aiGeneratedReview(review.getAiGeneratedReview())
+			.sizeReview(parseToList(review.getSizeReview(), "\n"))
+			.materialReview(parseToList(review.getMaterialReview(), "\n"))
 			.textReview(review.getTextReview())
 			.reviewImageUrls(parseImageUrls(review.getReviewImageUrls()))
 			.reviewer(buildReviewerInfo(user, review.getProduct()))
@@ -66,9 +67,9 @@ private ReviewListResponse.PurchaseOption buildPurchaseOption(OrderItem orderIte
 	// 선택지 답변 요약 구성
 	private ReviewListResponse.AnswerSummary buildAnswerSummary(Review review) {
 		return ReviewListResponse.AnswerSummary.builder()
-			.sizeAnswer(review.getSizeAnswer())
-			.colorAnswer(review.getColorAnswer())
-			.materialAnswer(review.getMaterialAnswer())
+			.sizeAnswer(review.getSizeAnswer().getDisplayName())
+			.colorAnswer(review.getColorAnswer().getDisplayName())
+			.materialAnswer(review.getMaterialAnswer().getDisplayName())
 			.build();
 	}
 
@@ -86,7 +87,8 @@ public ReviewDetailResponse toDetailResponse(Review review, boolean isHelpful) {
 			.rating(review.getRating())
 			.helpfulCount(review.getHelpfulCount())
 			.isHelpful(isHelpful)
-			.aiGeneratedReview(review.getAiGeneratedReview())
+			.sizeReview(parseToList(review.getSizeReview(), "\n"))
+			.materialReview(parseToList(review.getMaterialReview(), "\n"))
 			.textReview(review.getTextReview())
 			.reviewImageUrls(parseImageUrls(review.getReviewImageUrls()))
 			.reviewer(buildDetailReviewerInfo(user))
@@ -138,9 +140,9 @@ private ReviewDetailResponse.ProductInfo buildProductInfo(Product product) {
 	// 1차 리뷰 답변 구성
 	private ReviewDetailResponse.InitialFirstAnswers buildInitialFirstAnswers(Review review) {
 		return ReviewDetailResponse.InitialFirstAnswers.builder()
-			.sizeAnswer(review.getSizeAnswer())
-			.colorAnswer(review.getColorAnswer())
-			.materialAnswer(review.getMaterialAnswer())
+			.sizeAnswer(review.getSizeAnswer().getDisplayName())
+			.colorAnswer(review.getColorAnswer().getDisplayName())
+			.materialAnswer(review.getMaterialAnswer().getDisplayName())
 			.build();
 	}
 
@@ -172,7 +174,8 @@ public MyReviewResponse toMyReviewResponse(Review review) {
 			.reviewType(review.getReviewType().name())
 			.rating(review.getRating())
 			.helpfulCount(review.getHelpfulCount())
-			.aiGeneratedReview(review.getAiGeneratedReview())
+			.sizeReview(parseToList(review.getSizeReview(), "\n"))
+			.materialReview(parseToList(review.getMaterialReview(), "\n"))
 			.textReview(review.getTextReview())
 			.reviewImageUrls(parseImageUrls(review.getReviewImageUrls()))
 			.product(buildMyReviewProductInfo(product))
@@ -202,9 +205,9 @@ private MyReviewResponse.ProductInfo buildMyReviewProductInfo(Product product) {
 	// 내가 작성한 리뷰 - 선택지 답변 요약 구성(2차 답변도 포함)
 	private MyReviewResponse.AnswerSummary buildMyReviewAnswerSummary(Review review) {
 		return MyReviewResponse.AnswerSummary.builder()
-			.sizeAnswer(review.getSizeAnswer())
-			.colorAnswer(review.getColorAnswer())
-			.materialAnswer(review.getMaterialAnswer())
+			.sizeAnswer(review.getSizeAnswer().getDisplayName())
+			.colorAnswer(review.getColorAnswer().getDisplayName())
+			.materialAnswer(review.getMaterialAnswer().getDisplayName())
 			.fitIssueParts(review.getFitIssueParts())
 			.materialFeatures(review.getMaterialFeatures())
 			.build();
@@ -278,4 +281,15 @@ private String formatPurchaseOption(OrderItem orderItem) {
 		}
 		return null;
 	}
+
+	private List<String> parseToList(String content, String delimiter) {
+		if (content == null || content.isBlank()) {
+			return Collections.emptyList();
+		}
+		return Arrays.stream(content.split(delimiter))
+			.map(String::trim)
+			.filter(s -> !s.isEmpty())
+			.toList();
+	}
+
 }