🐛 fix(api): cannot find user items filtered by location

depromeet · Dec 29, 2024 · d30f7d1 · d30f7d1
1 parent 364d49c
commit d30f7d1
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/...treetdrop-api/src/main/java/com/depromeet/domains/item/repository/ItemRepositoryImpl.java b/...treetdrop-api/src/main/java/com/depromeet/domains/item/repository/ItemRepositoryImpl.java
@@ -30,7 +30,6 @@
 @RequiredArgsConstructor
 public class ItemRepositoryImpl implements QueryDslItemRepository {
 
-
     private final JPAQueryFactory queryFactory;
 
     @Override
@@ -41,7 +40,7 @@ public List<ItemDao> findByUserId(Long userId, long lastCursor, ItemOrderType or
         var isLikedSubQuery = JPAExpressions.select(itemLike.id)
                 .from(itemLike)
                 .where(itemLike.item.id.eq(item.id)
-                        .and(itemLike.user.id.eq(userId)));
+                .and(itemLike.user.id.eq(userId)));
 
         var query = queryFactory.select(
                         Projections.constructor(
@@ -78,10 +77,15 @@ public List<ItemDao> findByUserIdAndState(Long userId, long lastCursor, ItemOrde
         DateExpression<Date> currentWeekExpr = currentDate();
         DateTimePath<LocalDateTime> createdAtExpr = item.createdAt;
 
+        var isLikedSubQuery = JPAExpressions.select(itemLike.id)
+                .from(itemLike)
+                .where(itemLike.item.id.eq(item.id)
+                        .and(itemLike.user.id.eq(userId)));
+
         var query = queryFactory.select(
                         Projections.constructor(
                                 ItemDao.class,
-                                orderType == ItemOrderType.MOST_LIKED ?  Expressions.constant(1): createdAtExpr.week().subtract(currentWeekExpr.week()).abs().as("weekAgo"),
+                                orderType == ItemOrderType.MOST_LIKED ? Expressions.constant(1) : createdAtExpr.week().subtract(currentWeekExpr.week()).abs().as("weekAgo"),
                                 item.id,
                                 item.content,
                                 item.createdAt,
@@ -91,7 +95,7 @@ public List<ItemDao> findByUserIdAndState(Long userId, long lastCursor, ItemOrde
                                 artist.name.as("artistName"),
                                 albumCover.albumThumbnail.as("albumThumbnail"),
                                 itemLike.count().as("itemCount"),
-                                itemLike.user.id.eq(userId).as("isLiked")
+                                isLikedSubQuery.exists().as("isLiked")
                         )
                 ).from(item)
                 .join(itemLocation).on(item.id.eq(itemLocation.item.id))
@@ -115,6 +119,11 @@ public List<ItemDao> findByUserIdAndCity(Long userId, long lastCursor, ItemOrder
         DateExpression<Date> currentWeekExpr = currentDate();
         DateTimePath<LocalDateTime> createdAtExpr = item.createdAt;
 
+        var isLikedSubQuery = JPAExpressions.select(itemLike.id)
+                .from(itemLike)
+                .where(itemLike.item.id.eq(item.id)
+                .and(itemLike.user.id.eq(userId)));
+
         var query = queryFactory.select(
                         Projections.constructor(
                                 ItemDao.class,
@@ -128,7 +137,7 @@ public List<ItemDao> findByUserIdAndCity(Long userId, long lastCursor, ItemOrder
                                 artist.name.as("artistName"),
                                 albumCover.albumThumbnail.as("albumThumbnail"),
                                 itemLike.count().as("itemCount"),
-                                itemLike.user.id.eq(userId).as("isLiked")
+                                isLikedSubQuery.exists().as("isLiked")
                         )
                 ).from(item)
                 .join(itemLocation).on(item.id.eq(itemLocation.item.id))