🐞 bugfix/#54 : page 데이터 로드 오류 수정

Signed-off-by: EunJiJung <[email protected]>
9oormthon-univ · Nov 22, 2024 · 67c0e0f · 67c0e0f
1 parent 93a1206
commit 67c0e0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 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
@@ -38,7 +38,7 @@ public ReadStoreOverviewsResponseDto execute(
         // title null 처리
         title = storeService.convertToTitle(title);
 
-        Page<Store> storeList = storeRepository.findStoresByEarliestEventOrdered(title, onjungTagsList, pageable);
+        List<Store> storeList = storeRepository.findStoresByEarliestEventOrdered(title, onjungTagsList);
 
         // 상점이 없을 경우
         if (storeList.isEmpty()) {
@@ -71,7 +71,7 @@ public ReadStoreOverviewsResponseDto execute(
         int end = Math.min(start + pageable.getPageSize(), storeOverviewDtos.size());
         List<ReadStoreOverviewsResponseDto.StoreOverviewDto> pagedStoreOverviewDtos = storeOverviewDtos.subList(start, end);
 
-// 응답 생성
+        // 응답 생성
         return ReadStoreOverviewsResponseDto.fromEntity(
                 pagedStoreOverviewDtos,
                 end < storeList.getTotalElements() // hasNext 계산

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
@@ -33,10 +33,9 @@ public interface StoreRepository extends JpaRepository <Store, Long> {
             "AND (:onjungTags IS NULL OR tag IN :onjungTags) " +
             "GROUP BY s.id " +
             "ORDER BY MIN(e.endDate) ASC")
-    Page<Store> findStoresByEarliestEventOrdered(
+    List<Store> findStoresByEarliestEventOrdered(
             @Param("title") String title,
-            @Param("onjungTags") List<EOnjungTag> onjungTags,
-            Pageable pageable
+            @Param("onjungTags") List<EOnjungTag> onjungTags
     );
 
     @Query("SELECT COUNT(s) FROM Share s WHERE s.store.id = :storeId")