Skip to content

[Refactor] Funding 컴포넌트에서 장르별 영화 조회 로직 리팩토링 #35

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

Open
likelasttime wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[Refactor] Funding 컴포넌트에서 장르별 영화 조회 로직 리팩토링 #35

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
22 changes: 9 additions & 13 deletions back/funding/src/main/java/com/ssafy/funding/repository/MovieQueryRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import com.ssafy.funding.dto.response.MovieGenreResponse;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.SliceImpl;
import org.springframework.stereotype.Repository;
Expand All @@ -30,7 +30,7 @@ public class MovieQueryRepository {
// private final ConditionFilter conditionFilter;

public Slice<MovieGenreResponse> findByGenre(
GenreSearchCondition condition, PageRequest pageRequest) {
GenreSearchCondition condition, Pageable pageable) {

final List<MovieGenreResponse> movies =
jpaQueryFactory
Expand All @@ -43,18 +43,15 @@ public Slice<MovieGenreResponse> findByGenre(
.where(genre.parentGenreId.eq(condition.getParentGenreId()))
.groupBy(movie.id)
.orderBy(orderSpecifier(condition.getOrder(), movie.id))
.offset(pageRequest.getOffset())
.limit(pageRequest.getPageSize())
.offset(pageable.getOffset())
.limit(pageable.getPageSize() + 1)
.fetch();

return new SliceImpl<MovieGenreResponse>(
getCurrentPageMovies(movies, pageRequest),
pageRequest,
hasNext(movies, pageRequest));
getCurrentPageMovies(movies, pageable), pageable, hasNext(movies, pageable));
}

private OrderSpecifier<?> orderSpecifier(String orderByField, NumberPath<Integer> movieId) {

Expression<Long> likeCountExpression =
JPAExpressions.select(movieLike.count())
.from(movieLike)
Expand All @@ -78,15 +75,14 @@ private static ConstructorExpression<MovieGenreResponse> makeProjections() {
}

private List<MovieGenreResponse> getCurrentPageMovies(
final List<MovieGenreResponse> movies, final PageRequest pageRequest) {
if (hasNext(movies, pageRequest)) {
final List<MovieGenreResponse> movies, final Pageable pageable) {
if (hasNext(movies, pageable)) {
return movies.subList(0, movies.size() - 1);
}
return movies;
}

private boolean hasNext(
final List<MovieGenreResponse> challenges, final PageRequest pageRequest) {
return challenges.size() > pageRequest.getPageSize();
private boolean hasNext(final List<MovieGenreResponse> challenges, final Pageable pageable) {
return challenges.size() > pageable.getPageSize();
}
}