Skip to content

Commit 67c8ae2

Browse files
committed
🐛 fix: 리뷰 생성 시 orderProductId를 받도록 수정
1 parent 9e74f3e commit 67c8ae2

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package com.jajaja.domain.order.repository;
22

33
import com.jajaja.domain.order.entity.OrderProduct;
4+
import org.springframework.data.jpa.repository.EntityGraph;
45
import org.springframework.data.jpa.repository.JpaRepository;
56

67
import java.util.Optional;
78

89
public interface OrderProductRepository extends JpaRepository<OrderProduct, Long> {
9-
Optional<OrderProduct> findByOrderMemberIdAndProductId(Long memberId, Long productId);
10+
11+
@EntityGraph(attributePaths = {"product"})
12+
Optional<OrderProduct> findById(Long orderProductId);
1013
}

src/main/java/com/jajaja/domain/review/controller/ReviewController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ public ApiResponse<ReviewLikeResponseDto> patchReviewLike(
100100
해당 key 값을 imageKeys로 전달해주세요.
101101
"""
102102
)
103-
@PostMapping("/{productId}")
103+
@PostMapping("/{orderProductId}")
104104
public ApiResponse<ReviewCreateResponseDto> createReview(
105105
@Auth Long memberId,
106-
@PathVariable Long productId,
106+
@PathVariable Long orderProductId,
107107
@Valid @RequestBody ReviewCreateRequestDto requestDto
108108
) {
109-
Long reviewId = reviewCommandService.createReview(memberId, productId, requestDto);
109+
Long reviewId = reviewCommandService.createReview(memberId, orderProductId, requestDto);
110110
return ApiResponse.onSuccess(new ReviewCreateResponseDto(reviewId));
111111
}
112112

src/main/java/com/jajaja/domain/review/service/ReviewCommandServiceImpl.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import com.jajaja.domain.order.entity.OrderProduct;
66
import com.jajaja.domain.order.repository.OrderProductRepository;
77
import com.jajaja.domain.point.service.PointCommandService;
8-
import com.jajaja.domain.product.entity.Product;
9-
import com.jajaja.domain.product.repository.ProductRepository;
108
import com.jajaja.domain.review.dto.request.ReviewCreateRequestDto;
119
import com.jajaja.domain.review.entity.Review;
1210
import com.jajaja.domain.review.entity.ReviewImage;
@@ -28,21 +26,18 @@
2826
public class ReviewCommandServiceImpl implements ReviewCommandService {
2927

3028
private final MemberRepository memberRepository;
31-
private final ProductRepository productRepository;
3229
private final OrderProductRepository orderProductRepository;
3330
private final ReviewRepository reviewRepository;
3431
private final ReviewImageRepository reviewImageRepository;
3532
private final S3Service s3Service;
3633
private final PointCommandService pointCommandService;
3734

3835
@Override
39-
public Long createReview(Long memberId, Long productId, ReviewCreateRequestDto dto) {
36+
public Long createReview(Long memberId, Long orderProductId, ReviewCreateRequestDto dto) {
4037
Member member = memberRepository.findById(memberId)
4138
.orElseThrow(() -> new UnauthorizedException(ErrorStatus.MEMBER_NOT_FOUND));
42-
Product product = productRepository.findById(productId)
43-
.orElseThrow(() -> new BadRequestException(ErrorStatus.PRODUCT_NOT_FOUND));
4439

45-
OrderProduct orderProduct = orderProductRepository.findByOrderMemberIdAndProductId(memberId, productId)
40+
OrderProduct orderProduct = orderProductRepository.findById(orderProductId)
4641
.orElseThrow(() -> new BadRequestException(ErrorStatus.REVIEW_NOT_ALLOWED));
4742

4843
if (reviewRepository.existsByOrderProduct(orderProduct)) {
@@ -51,7 +46,7 @@ public Long createReview(Long memberId, Long productId, ReviewCreateRequestDto d
5146

5247
Review review = Review.builder()
5348
.member(member)
54-
.product(product)
49+
.product(orderProduct.getProduct())
5550
.orderProduct(orderProduct)
5651
.rating(dto.rating().byteValue())
5752
.content(dto.content())

0 commit comments

Comments
 (0)