Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,22 @@ public Slice<ClothRecommendListResponse> findAllMemberRecommendClothesByCategory
Season nextSeason = season.next();
Season previousSeason = season.previous();
Season oppositeSeason = season.next().next();
List<Season> targetSeasons = List.of(season, nextSeason, previousSeason, oppositeSeason);

// 우선 순위에 맞게 페이징 합니다.
// - Category는 고정입니다.
// - 계절은 요청한 계절에 가까운 순서대로 페이징을 진행합니다.
NumberExpression<Integer> seasonPriority =
new CaseBuilder()
.when(cloth.seasons.contains(season))
.when(cloth.seasons.any().in(List.of(season)))
.then(1)
.when(
cloth.seasons
.contains(nextSeason)
.or(cloth.seasons.contains(previousSeason)))
.any()
.in(List.of(nextSeason))
.or(cloth.seasons.any().in(List.of(previousSeason))))
.then(2)
.when(cloth.seasons.contains(oppositeSeason))
.when(cloth.seasons.any().in(List.of(oppositeSeason)))
.then(3)
.otherwise(4);

Expand All @@ -58,11 +60,7 @@ public Slice<ClothRecommendListResponse> findAllMemberRecommendClothesByCategory
.where(
cloth.category.id.eq(categoryId),
cloth.member.id.eq(memberId),
cloth.seasons
.contains(season)
.or(cloth.seasons.contains(nextSeason))
.or(cloth.seasons.contains(previousSeason))
.or(cloth.seasons.contains(oppositeSeason)))
cloth.seasons.any().in(targetSeasons))
.orderBy(seasonPriority.asc(), cloth.id.asc())
.fetch();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.querydsl.jpa.impl.JPAQueryFactory;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.clokey.coordinate.entity.QCoordinate;
import org.clokey.domain.lookbook.dto.response.LookBookListResponse;
import org.clokey.global.paging.SortDirection;
import org.springframework.data.domain.PageRequest;
Expand All @@ -25,6 +26,8 @@ public class LookBookRepositoryImpl implements LookBookRepositoryCustom {
@Override
public Slice<LookBookListResponse> findAllLookBookByMemberId(
Long currentMemberId, Long lastLookBookId, int size, SortDirection direction) {
QCoordinate firstCoordinate = new QCoordinate("firstCoordinate");

List<LookBookListResponse> results =
queryFactory
.select(
Expand All @@ -35,12 +38,15 @@ public Slice<LookBookListResponse> findAllLookBookByMemberId(
JPAExpressions.select(coordinate.count())
.from(coordinate)
.where(coordinate.lookBook.id.eq(lookBook.id)),
JPAExpressions.select(coordinate.imageUrl)
.from(coordinate)
.where(coordinate.lookBook.id.eq(lookBook.id))
.orderBy(coordinate.id.asc())
.limit(1)))
firstCoordinate.imageUrl))
.from(lookBook)
.leftJoin(firstCoordinate)
.on(
firstCoordinate.lookBook.id.eq(lookBook.id),
firstCoordinate.id.eq(
JPAExpressions.select(coordinate.id.min())
.from(coordinate)
.where(coordinate.lookBook.id.eq(lookBook.id))))
.where(
lookBook.member.id.eq(currentMemberId),
lastLookBookIdCondition(lastLookBookId, direction))
Expand Down