Merge pull request #311 from Clokey-dev/fix/#310-lookbook-query

[fix/#310] 룩북 쿼리 및 계절 추천 쿼리 오류 해결

Author: yongjun0511

clokey-api/src/main/java/org/clokey/domain/cloth/repository/ClothRepositoryImpl.java

@@ -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);
 
@@ -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();
 

clokey-api/src/main/java/org/clokey/domain/lookbook/repository/LookBookRepositoryImpl.java

@@ -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;
@@ -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(
@@ -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))