From 67c0e0f99052505175d122e77c28a3620bedd193 Mon Sep 17 00:00:00 2001 From: EunJiJung Date: Fri, 22 Nov 2024 16:29:10 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9E=20bugfix/#54=20:=20page=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=A1=9C=EB=93=9C=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: EunJiJung --- .../application/service/ReadStoreOverviewService.java | 4 ++-- .../onjung/account/repository/mysql/StoreRepository.java | 5 ++--- 2 files changed, 4 insertions(+), 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 index f98118b..130e8f3 100644 --- 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 storeList = storeRepository.findStoresByEarliestEventOrdered(title, onjungTagsList, pageable); + List 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 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 index c626682..55d3c25 100644 --- 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 { "AND (:onjungTags IS NULL OR tag IN :onjungTags) " + "GROUP BY s.id " + "ORDER BY MIN(e.endDate) ASC") - Page findStoresByEarliestEventOrdered( + List findStoresByEarliestEventOrdered( @Param("title") String title, - @Param("onjungTags") List onjungTags, - Pageable pageable + @Param("onjungTags") List onjungTags ); @Query("SELECT COUNT(s) FROM Share s WHERE s.store.id = :storeId") From 86577dda9db898f135885417a403c16b5cfdf4cd Mon Sep 17 00:00:00 2001 From: EunJiJung Date: Fri, 22 Nov 2024 16:29:35 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor/#54=20:=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=9A=A9=20=EC=A3=BC=EC=84=9D=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: EunJiJung --- .../account/application/service/ReadStoreOverviewService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 130e8f3..a1d732e 100644 --- a/src/main/java/com/daon/onjung/account/application/service/ReadStoreOverviewService.java +++ b/src/main/java/com/daon/onjung/account/application/service/ReadStoreOverviewService.java @@ -71,7 +71,7 @@ public ReadStoreOverviewsResponseDto execute( int end = Math.min(start + pageable.getPageSize(), storeOverviewDtos.size()); List pagedStoreOverviewDtos = storeOverviewDtos.subList(start, end); - // 응답 생성 + // 응답 생성 - 변경 return ReadStoreOverviewsResponseDto.fromEntity( pagedStoreOverviewDtos, end < storeList.getTotalElements() // hasNext 계산