Skip to content

Commit 7e42456

Browse files
committed
refactor: 리뷰 부분 구조 변경
1 parent aba6126 commit 7e42456

File tree

5 files changed

+30
-6
lines changed

5 files changed

+30
-6
lines changed

src/main/java/com/threestar/trainus/domain/review/controller/ReviewController.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
import com.threestar.trainus.domain.review.dto.ReviewCreateRequestDto;
1515
import com.threestar.trainus.domain.review.dto.ReviewCreateResponseDto;
1616
import com.threestar.trainus.domain.review.dto.ReviewPageResponseDto;
17+
import com.threestar.trainus.domain.review.dto.ReviewPageWrapperDto;
18+
import com.threestar.trainus.domain.review.mapper.ReviewMapper;
1719
import com.threestar.trainus.domain.review.service.ReviewService;
1820
import com.threestar.trainus.global.unit.BaseResponse;
21+
import com.threestar.trainus.global.unit.PagedResponse;
1922

2023
import io.swagger.v3.oas.annotations.Operation;
2124
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -45,14 +48,15 @@ public ResponseEntity<BaseResponse<ReviewCreateResponseDto>> createReview(@PathV
4548

4649
@GetMapping("/{userId}")
4750
@Operation(summary = "리뷰 조회", description = "유저 ID에 해당되는 리뷰들을 조회합니다.")
48-
public ResponseEntity<BaseResponse<ReviewPageResponseDto>> readAll(@PathVariable Long userId,
51+
public ResponseEntity<PagedResponse<ReviewPageWrapperDto>> readAll(@PathVariable Long userId,
4952
@RequestParam("page") int page,
5053
@RequestParam("pageSize") int pageSize
5154
) {
5255
int correctPage = Math.max(page, 1);
5356
int correctPageSize = Math.max(1, Math.max(pageSize, pageSizeLimit));
54-
ReviewPageResponseDto reviews = reviewService.readAll(userId, correctPage, correctPageSize);
55-
return BaseResponse.ok("조회가 완료됐습니다.", reviews, HttpStatus.OK);
57+
ReviewPageResponseDto reviewsInfo = reviewService.readAll(userId, correctPage, correctPageSize);
58+
ReviewPageWrapperDto reviews = ReviewMapper.toReviewPageWrapperDto(reviewsInfo);
59+
return PagedResponse.ok("조회가 완료됐습니다.", reviews, reviewsInfo.getCount(), HttpStatus.OK);
5660
}
5761

5862
}

src/main/java/com/threestar/trainus/domain/review/dto/ReviewPageResponseDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
@Builder
1010
public class ReviewPageResponseDto {
1111
private Long userId;
12-
private Long count;
12+
private Integer count;
1313
private List<ReviewViewResponseDto> reviews;
1414
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.threestar.trainus.domain.review.dto;
2+
3+
import java.util.List;
4+
5+
import lombok.Builder;
6+
import lombok.Getter;
7+
8+
@Getter
9+
@Builder
10+
public class ReviewPageWrapperDto {
11+
private Long userId;
12+
private List<ReviewViewResponseDto> reviews;
13+
}

src/main/java/com/threestar/trainus/domain/review/mapper/ReviewMapper.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import com.threestar.trainus.domain.review.dto.ReviewCreateResponseDto;
66
import com.threestar.trainus.domain.review.dto.ReviewPageResponseDto;
7+
import com.threestar.trainus.domain.review.dto.ReviewPageWrapperDto;
78
import com.threestar.trainus.domain.review.dto.ReviewViewResponseDto;
89
import com.threestar.trainus.domain.review.entity.Review;
910

@@ -36,11 +37,17 @@ public static ReviewViewResponseDto toReviewViewResponseDto(Review review) {
3637
}
3738

3839
public static ReviewPageResponseDto toReviewPageResponseDto(Long userId, List<ReviewViewResponseDto> reviews,
39-
Long count) {
40+
Integer count) {
4041
return ReviewPageResponseDto.builder()
4142
.reviews(reviews)
4243
.userId(userId)
4344
.count(count)
4445
.build();
4546
}
47+
48+
public static ReviewPageWrapperDto toReviewPageWrapperDto(ReviewPageResponseDto reviewPageResponseDto) {
49+
return ReviewPageWrapperDto.builder()
50+
.reviews(reviewPageResponseDto.getReviews())
51+
.build();
52+
}
4653
}

src/main/java/com/threestar/trainus/domain/review/repository/ReviewRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public interface ReviewRepository extends JpaRepository<Review, Long> {
1717
@Query(value = """
1818
select count(*) from (select review_id from reviews where reviewee_id = :userId limit :limit ) t
1919
""", nativeQuery = true)
20-
Long count(
20+
Integer count(
2121
@Param("userId") Long userId,
2222
@Param("limit") int limit
2323
);

0 commit comments

Comments
 (0)