-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
[Feature] 도서와 관련된 리뷰 조회 API 구현 #108
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
751909c
feat: OffsetLimit 클래스 추가 (#90)
jwooo 6586bc1
feat: 책과 연관된 리뷰 조회 API 추가 (#90)
jwooo 2cad7b7
test: 책과 연관된 리뷰 조회 API 테스트 추가 (#90)
jwooo f823362
refactor: ReviewRepositoryImpl where 구문 추가 (#90)
jwooo 5b17ef4
docs: 책과 연관된 리뷰 조회 API Docs 추가 (#90)
jwooo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
package com.jisungin.application; | ||
|
||
import static java.lang.Math.*; | ||
|
||
import lombok.Builder; | ||
import lombok.Getter; | ||
|
||
@Getter | ||
public class OffsetLimit { | ||
|
||
private static final Integer MAX_SIZE = 2000; | ||
private Integer offset; | ||
private Integer limit; | ||
private String order; | ||
|
||
@Builder | ||
private OffsetLimit(Integer offset, Integer limit, String order) { | ||
this.offset = offset; | ||
this.limit = limit; | ||
this.order = order; | ||
} | ||
|
||
public static OffsetLimit of(Integer page, Integer size) { | ||
return OffsetLimit.builder() | ||
.offset(calculateOffset(page, size)) | ||
.limit(size) | ||
.build(); | ||
} | ||
|
||
public static OffsetLimit of(Integer page, Integer size, String order) { | ||
return OffsetLimit.builder() | ||
.offset(calculateOffset(page, size)) | ||
.limit(size) | ||
.order(order) | ||
.build(); | ||
} | ||
|
||
private static Integer calculateOffset(Integer page, Integer size) { | ||
return (max(1, page) - 1) * min(size, MAX_SIZE); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
package com.jisungin.application; | ||
|
||
import com.fasterxml.jackson.annotation.JsonProperty; | ||
import java.util.List; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
|
||
@Getter | ||
public class SliceResponse<T> { | ||
|
||
private List<T> content; | ||
|
||
private boolean hasContent; | ||
|
||
@JsonProperty("isFirst") | ||
private boolean first; | ||
|
||
@JsonProperty("isLast") | ||
private boolean last; | ||
|
||
private Integer number; | ||
|
||
private Integer size; | ||
|
||
@Builder | ||
private SliceResponse(List<T> content, boolean hasContent, boolean first, boolean last, Integer number, | ||
Integer size) { | ||
this.content = content; | ||
this.hasContent = hasContent; | ||
this.first = first; | ||
this.last = last; | ||
this.number = number; | ||
this.size = size; | ||
} | ||
|
||
public static <T> SliceResponse<T> of(List<T> content, Integer offset, Integer limit, boolean hasNext) { | ||
boolean hasContent = !content.isEmpty(); | ||
boolean first = (offset == 0); | ||
boolean last = !hasNext; | ||
|
||
Integer number = (offset / limit) + 1; | ||
Integer size = content.size(); | ||
|
||
return SliceResponse.<T>builder() | ||
.content(content) | ||
.hasContent(hasContent) | ||
.first(first) | ||
.last(last) | ||
.number(number) | ||
.size(size) | ||
.build(); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
src/main/java/com/jisungin/application/review/response/ReviewWithRatingResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
package com.jisungin.application.review.response; | ||
|
||
import com.querydsl.core.annotations.QueryProjection; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Getter | ||
@NoArgsConstructor | ||
public class ReviewWithRatingResponse { | ||
|
||
private Long reviewId; | ||
private Long ratingId; | ||
private String username; | ||
private String profileImage; | ||
private String reviewContent; | ||
private Double starRating; | ||
private Long likeCount; | ||
|
||
@Builder | ||
@QueryProjection | ||
public ReviewWithRatingResponse(Long reviewId, Long ratingId, String username, String profileImage, | ||
String reviewContent, Double starRating, Long likeCount) { | ||
this.reviewId = reviewId; | ||
this.ratingId = ratingId; | ||
this.username = username; | ||
this.profileImage = profileImage; | ||
this.reviewContent = reviewContent; | ||
this.starRating = starRating; | ||
this.likeCount = likeCount; | ||
} | ||
|
||
public static ReviewWithRatingResponse of(Long reviewId, Long ratingId, String username, String profileImage, | ||
String reviewContent, Double starRating, Long likeCount) { | ||
return ReviewWithRatingResponse.builder() | ||
.reviewId(reviewId) | ||
.ratingId(ratingId) | ||
.username(username) | ||
.profileImage(profileImage) | ||
.reviewContent(reviewContent) | ||
.starRating(starRating) | ||
.likeCount(likeCount) | ||
.build(); | ||
} | ||
|
||
} |
57 changes: 57 additions & 0 deletions
57
src/main/java/com/jisungin/domain/review/ReviewOrderType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
package com.jisungin.domain.review; | ||
|
||
import static com.jisungin.domain.rating.QRating.rating1; | ||
import static com.jisungin.domain.review.QReview.review; | ||
import static com.jisungin.domain.reviewlike.QReviewLike.reviewLike; | ||
|
||
import com.querydsl.core.types.OrderSpecifier; | ||
import com.querydsl.jpa.impl.JPAQuery; | ||
import java.util.function.Consumer; | ||
import java.util.function.Supplier; | ||
|
||
public enum ReviewOrderType { | ||
|
||
LIKE(() -> reviewLike.id.count().desc(), ReviewOrderType::leftJoinRating), | ||
RECENT(review.createDateTime::desc, ReviewOrderType::leftJoinRating), | ||
RATING_DESC(rating1.rating::desc, ReviewOrderType::joinRating), | ||
RATING_ASC(rating1.rating::asc, ReviewOrderType::joinRating); | ||
|
||
private final Supplier<OrderSpecifier<?>> orderSpecifierSupplier; | ||
private final Consumer<JPAQuery<?>> joinRatingStrategy; | ||
|
||
ReviewOrderType(Supplier<OrderSpecifier<?>> orderSpecifierSupplier, Consumer<JPAQuery<?>> joinRatingStrategy) { | ||
this.orderSpecifierSupplier = orderSpecifierSupplier; | ||
this.joinRatingStrategy = joinRatingStrategy; | ||
} | ||
|
||
public OrderSpecifier<?> getOrderSpecifier() { | ||
return orderSpecifierSupplier.get(); | ||
} | ||
|
||
public void applyJoinStrategy(JPAQuery<?> query) { | ||
joinRatingStrategy.accept(query); | ||
applyCommonJoinConditions(query); | ||
} | ||
|
||
public static ReviewOrderType fromString(String name) { | ||
try { | ||
return ReviewOrderType.valueOf(name.toUpperCase()); | ||
} catch (IllegalArgumentException | NullPointerException e) { | ||
return ReviewOrderType.LIKE; | ||
} | ||
} | ||
|
||
private static void joinRating(JPAQuery<?> query) { | ||
query.join(rating1); | ||
} | ||
|
||
private static void leftJoinRating(JPAQuery<?> query) { | ||
query.leftJoin(rating1); | ||
} | ||
|
||
private static void applyCommonJoinConditions(JPAQuery<?> query) { | ||
query.on(review.user.eq(rating1.user) | ||
.and(review.book.eq(rating1.book))); | ||
} | ||
|
||
} |
4 changes: 4 additions & 0 deletions
4
src/main/java/com/jisungin/domain/review/repository/ReviewRepositoryCustom.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,16 @@ | ||
package com.jisungin.domain.review.repository; | ||
|
||
import com.jisungin.application.PageResponse; | ||
import com.jisungin.application.SliceResponse; | ||
import com.jisungin.application.review.response.ReviewContentResponse; | ||
import com.jisungin.application.review.response.ReviewWithRatingResponse; | ||
import com.jisungin.domain.review.RatingOrderType; | ||
|
||
public interface ReviewRepositoryCustom { | ||
|
||
PageResponse<ReviewContentResponse> findAllReviewContentOrderBy( | ||
Long userId, RatingOrderType orderType, int size, int offset); | ||
|
||
SliceResponse<ReviewWithRatingResponse> findAllByBookId(String isbn, Integer offset, Integer limit, String order); | ||
|
||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
쿼리의 조인 전략을 enum 클래스에 분리하신 이유가 궁금합니다 !
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
해당 쿼리는
orderType
에 의해 조인 전략이 변경됩니다. 그렇기 때문에 조인을 추가하는 것은orderType
에 책임이 있다고 생각하여 해당ENUM
에서 추가하는 것으로 분리하였습니다!