🐞 bugfix/#134 : 3.1 가게 리스트 조회 event join 제거

Signed-off-by: EunJiJung <[email protected]>
9oormthon-univ · Nov 23, 2024 · 22e5063 · 22e5063
1 parent 6fa372a
commit 22e5063
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/src/main/java/com/daon/onjung/account/application/service/ReadStoreOverviewService.java b/src/main/java/com/daon/onjung/account/application/service/ReadStoreOverviewService.java
@@ -39,14 +39,8 @@ public ReadStoreOverviewsResponseDto execute(
         // title null 처리
         title = storeService.convertToTitle(title);
 
-        Page<Store> storesPage = storeRepository.findStoresByEarliestEventOrdered(title, onjungTagsList, pageable);
+        Page<Store> storesPage = storeRepository.findStores(title, onjungTagsList, pageable);
 
-        /*
-        // 상점이 없을 경우
-        if (storeList.isEmpty()) {
-            return new ReadStoreOverviewsResponseDto(false, List.of());
-        }
-         */
         // total onjung count별 정렬
         List<ReadStoreOverviewsResponseDto.StoreOverviewDto> storeOverviewDtos = storesPage.stream()
                 .map(store -> {

diff --git a/src/main/java/com/daon/onjung/account/repository/mysql/StoreRepository.java b/src/main/java/com/daon/onjung/account/repository/mysql/StoreRepository.java
@@ -24,16 +24,12 @@ public interface StoreRepository extends JpaRepository <Store, Long> {
     Optional<Store> findWithOnjungTagsById(Long id);
 
     @Query("SELECT s FROM Store s " +
-            "LEFT JOIN s.events e ON e.endDate = ( " +
-            "   SELECT MIN(e1.endDate) FROM Event e1 " +
-            "   WHERE e1.store.id = s.id AND e1.endDate > CURRENT_DATE" +
-            ") " +
             "LEFT JOIN s.onjungTags tag " +
             "WHERE (:title IS NULL OR s.title LIKE %:title%) " +
             "AND (:onjungTags IS NULL OR tag IN :onjungTags) " +
             "GROUP BY s.id " +
-            "ORDER BY MIN(e.endDate) ASC")
-    Page<Store> findStoresByEarliestEventOrdered(
+            "ORDER BY s.id ASC") // 정렬 기준을 ID로 유지하거나 원하는 기준으로 수정
+    Page<Store> findStores(
             @Param("title") String title,
             @Param("onjungTags") List<EOnjungTag> onjungTags,
             Pageable pageable