Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Refactor] 한줄평 페이지 조회 API의 별점 평균 정렬 방식 수정 #121

Merged
merged 1 commit into from
Jun 3, 2024
Merged

[Refactor] 한줄평 페이지 조회 API의 별점 평균 정렬 방식 수정 #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/com/jisungin/application/review/response/ReviewContentResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@ public class ReviewContentResponse {

private String publisher;

private Long likeCount;

@Builder
@QueryProjection
public ReviewContentResponse(Long reviewId, String userImage, String userName, Double rating, String content,
String isbn, String title, String bookImage, String authors, String publisher) {
String isbn, String title, String bookImage, String authors, String publisher,
Long likeCount) {
this.reviewId = reviewId;
this.userImage = userImage;
this.userName = userName;
Expand All @@ -43,5 +46,7 @@ public ReviewContentResponse(Long reviewId, String userImage, String userName, D
this.bookImage = bookImage;
this.authors = authors;
this.publisher = publisher;
this.likeCount = likeCount;
}

}
4 changes: 3 additions & 1 deletion src/main/java/com/jisungin/domain/review/repository/ReviewRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,13 @@ private List<ReviewContentResponse> getReviewContents(
.select(new QReviewContentResponse(
review.id, review.user.profileImage, review.user.name, rating1.rating, review.content,
review.book.isbn, review.book.title, review.book.imageUrl, review.book.authors,
review.book.publisher
review.book.publisher, reviewLike.id.count()
))
.from(review)
.leftJoin(rating1).on(review.user.eq(rating1.user), review.book.eq(rating1.book))
.leftJoin(reviewLike).on(review.eq(reviewLike.review))
.where(review.user.id.eq(userId))
.groupBy(review.id)
.orderBy(createSpecifier(orderType), review.book.title.asc())
.offset(offset)
.limit(size)
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/jisungin/api/user/UserControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void getUserRatings() throws Exception {
void getReviewContents() throws Exception {
//given
//when //then
mockMvc.perform(get("/v1/users/reviews?page=1&size=4&order=rating_asc")
mockMvc.perform(get("/v1/users/reviews?page=1&size=4&order=rating_avg_desc")
.contentType(APPLICATION_JSON)
.session(mockHttpSession)
)
Expand Down
7 changes: 4 additions & 3 deletions src/test/java/com/jisungin/application/user/UserServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import static com.jisungin.domain.ReadingStatus.READING;
import static com.jisungin.domain.ReadingStatus.STOP;
import static com.jisungin.domain.ReadingStatus.WANT;
import static com.jisungin.domain.review.RatingOrderType.RATING_ASC;
import static com.jisungin.domain.review.RatingOrderType.*;
import static com.jisungin.domain.userlibrary.ReadingStatusOrderType.DICTIONARY;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.groups.Tuple.tuple;
Expand Down Expand Up @@ -117,15 +117,16 @@ void getReviewContents() {
User user2 = userRepository.save(createUser("2"));
List<Book> books = bookRepository.saveAll(createBooks());
List<Review> reviews = reviewRepository.saveAll(createReviews(user1, books));
List<Rating> ratings = ratingRepository.saveAll(createRatings(user1, books));
List<Rating> ratings1 = ratingRepository.saveAll(createRatings(user1, books));
List<Rating> ratings2 = ratingRepository.saveAll(createRatings(user2, books));
List<ReviewLike> reviewLikesWithUser1 = reviewLikeRepository.saveAll(createReviewLikes(user1, reviews));
List<ReviewLike> reviewLikesWithUser2 = reviewLikeRepository.saveAll(createReviewLikes(user2, reviews));

// 1번째부터 4번째 데이터를 요청, 별점 1.0인 리뷰 내용이 4개 나와야 함
ReviewContentGetAllServiceRequest request = ReviewContentGetAllServiceRequest.builder()
.page(1)
.size(4)
.orderType(RATING_ASC)
.orderType(RATING_AVG_ASC)
.build();

//when
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/com/jisungin/docs/user/UserControllerDocsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ void getUserReviews() throws Exception {
.description("책 저자"),
fieldWithPath("data.reviewContents.queryResponse[].publisher").type(JsonFieldType.STRING)
.description("책 출판사"),
fieldWithPath("data.reviewContents.queryResponse[].likeCount").type(JsonFieldType.NUMBER)
.description("좋아요 총개수"),
fieldWithPath("data.reviewContents.totalCount").type(JsonFieldType.NUMBER)
.description("총 리뷰 개수"),
fieldWithPath("data.reviewContents.size").type(JsonFieldType.NUMBER)
Expand Down Expand Up @@ -328,6 +330,7 @@ private List<ReviewContentResponse> createReviewFindAllResponse() {
.bookImage("bookImage" + i)
.authors("저자" + i)
.publisher("출판사" + i)
.likeCount((long) i)
.build())
.toList();
}
Expand Down
34 changes: 18 additions & 16 deletions src/test/java/com/jisungin/domain/review/repository/ReviewRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
import com.jisungin.domain.user.OauthType;
import com.jisungin.domain.user.User;
import com.jisungin.domain.user.repository.UserRepository;

import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.IntStream;

import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -74,21 +76,21 @@ void getReviewContentOrderByRatingAsc() {
//then
assertThat(result.getTotalCount()).isEqualTo(20);
assertThat(result.getQueryResponse()).hasSize(4)
.extracting(
"userImage", "userName", "rating", "content", "isbn", "title", "bookImage")
.extracting("userImage", "userName", "rating", "content", "isbn", "title", "bookImage",
"authors", "publisher", "likeCount")
.containsExactly(
tuple("userImage", "김도형", 1.0, "리뷰 내용1", "1", "제목1", "bookImage"),
tuple("userImage", "김도형", 1.0, "리뷰 내용11", "11", "제목11", "bookImage"),
tuple("userImage", "김도형", 1.0, "리뷰 내용16", "16", "제목16", "bookImage"),
tuple("userImage", "김도형", 1.0, "리뷰 내용6", "6", "제목6", "bookImage")
tuple("userImage", "김도형", 1.0, "리뷰 내용1", "1", "제목1", "bookImage", "저자1", "출판사1", 2L),
tuple("userImage", "김도형", 1.0, "리뷰 내용11", "11", "제목11", "bookImage", "저자11", "출판사11", 2L),
tuple("userImage", "김도형", 1.0, "리뷰 내용16", "16", "제목16", "bookImage", "저자16", "출판사16", 2L),
tuple("userImage", "김도형", 1.0, "리뷰 내용6", "6", "제목6", "bookImage", "저자6", "출판사6", 2L)
);
}

@DisplayName("도서와 연관된 리뷰를 조회한다.")
@Test
void findAllByBookById() {
// given
Book book = bookRepository.save(createBook("도서 제목", "도서 내용", "00001"));
Book book = bookRepository.save(createBook("도서 제목", "도서 내용", "00001", "저자명", "출판사"));
List<User> users = userRepository.saveAll(createUsers());
List<Review> reviews = reviewRepository.saveAll(createReviewsForBook(users, book));
List<Rating> ratings = ratingRepository.saveAll(createRatingsForBookWithUsers(users, book));
Expand All @@ -114,7 +116,7 @@ void findAllByBookById() {
@Test
void findAllByBookIdOrderByRecent() {
// given
Book book = bookRepository.save(createBook("도서 제목", "도서 내용", "00001"));
Book book = bookRepository.save(createBook("도서 제목", "도서 내용", "00001", "저자명", "출판사"));
List<User> users = userRepository.saveAll(createUsers());
List<Review> reviews = reviewRepository.saveAll(createReviewsForBook(users, book));
List<Rating> ratings = ratingRepository.saveAll(createRatingsForBookWithUsers(users, book));
Expand Down Expand Up @@ -146,7 +148,7 @@ void findAllByBookIdOrderByRecent() {
@Test
public void findAllBookIdOrderByRatingDesc() {
// given
Book book = bookRepository.save(createBook("도서 제목", "도서 내용", "00001"));
Book book = bookRepository.save(createBook("도서 제목", "도서 내용", "00001", "저자명", "출판사"));
List<User> users = userRepository.saveAll(createUsers());
List<Review> reviews = reviewRepository.saveAll(createReviewsForBook(users, book));
List<Rating> ratings = ratingRepository.saveAll(createRatingsForBookWithUsers(users, book));
Expand All @@ -172,7 +174,7 @@ public void findAllBookIdOrderByRatingDesc() {
@Test
public void findAllBookIdOrderByRatingDescWithoutRating() {
// given
Book book = bookRepository.save(createBook("도서 제목", "도서 내용", "00001"));
Book book = bookRepository.save(createBook("도서 제목", "도서 내용", "00001", "저자명", "출판사"));
List<User> users = userRepository.saveAll(createUsers());
List<Review> reviews = reviewRepository.saveAll(createReviewsForBook(users, book));
List<ReviewLike> reviewLikes = reviewLikeRepository.saveAll(
Expand All @@ -195,7 +197,7 @@ public void findAllBookIdOrderByRatingDescWithoutRating() {
@Test
public void findAllBookIdOrderByRatingAsc() {
// given
Book book = bookRepository.save(createBook("도서 제목", "도서 내용", "00001"));
Book book = bookRepository.save(createBook("도서 제목", "도서 내용", "00001", "저자명", "출판사"));
List<User> users = userRepository.saveAll(createUsers());
List<Review> reviews = reviewRepository.saveAll(createReviewsForBook(users, book));
List<Rating> ratings = ratingRepository.saveAll(createRatingsForBookWithUsers(users, book));
Expand All @@ -221,7 +223,7 @@ public void findAllBookIdOrderByRatingAsc() {
@Test
public void findAllBookIdOrderByRatingAscWithoutRating() {
// given
Book book = bookRepository.save(createBook("도서 제목", "도서 내용", "00001"));
Book book = bookRepository.save(createBook("도서 제목", "도서 내용", "00001", "저자명", "출판사"));
List<User> users = userRepository.saveAll(createUsers());
List<Review> reviews = reviewRepository.saveAll(createReviewsForBook(users, book));
List<ReviewLike> reviewLikes = reviewLikeRepository.saveAll(
Expand All @@ -243,17 +245,17 @@ public void findAllBookIdOrderByRatingAscWithoutRating() {
private static List<Book> createBooks() {
return IntStream.rangeClosed(1, 20)
.mapToObj(i -> createBook(
"제목" + String.valueOf(i), "내용" + String.valueOf(i), String.valueOf(i)))
"제목" + i, "내용" + i, String.valueOf(i), "저자" + i, "출판사" + i))
.collect(Collectors.toList());
}

private static Book createBook(String title, String content, String isbn) {
private static Book createBook(String title, String content, String isbn, String authors, String publisher) {
return Book.builder()
.title(title)
.content(content)
.authors("김도형")
.authors(authors)
.isbn(isbn)
.publisher("지성인")
.publisher(publisher)
.dateTime(LocalDateTime.of(2024, 1, 1, 0, 0))
.imageUrl("bookImage")
.build();
Expand Down
Loading