fix: bookMark 했는지 구하는 절 수정 (#200)

TripInfoWeb · Sep 22, 2024 · f756a4d · f756a4d
1 parent 0da5cb5
commit f756a4d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/solitour_backend/solitour/gathering/repository/GatheringRepositoryImpl.java b/src/main/java/solitour_backend/solitour/gathering/repository/GatheringRepositoryImpl.java
@@ -69,7 +69,7 @@ public List<GatheringBriefResponse> getGatheringRecommend(Long gatheringId, Long
                         zoneCategoryParent.name,
                         zoneCategoryChild.name,
                         gathering.viewCount,
-                        isGatheringBookmark(userId),
+                        isGatheringBookmark(userId, gathering.id),
                         countGreatGatheringByGatheringById(gathering.id),
                         gathering.gatheringCategory.name,
                         gathering.user.nickname,
@@ -113,7 +113,7 @@ public Page<GatheringBriefResponse> getGatheringPageFilterAndOrder(Pageable page
                         zoneCategoryParent.name,
                         zoneCategoryChild.name,
                         gathering.viewCount,
-                        isGatheringBookmark(userId),
+                        isGatheringBookmark(userId, gathering.id),
                         countGreatGatheringByGatheringById(gathering.id),
                         gathering.gatheringCategory.name,
                         gathering.user.nickname,
@@ -229,7 +229,7 @@ public List<GatheringBriefResponse> getGatheringLikeCountFromCreatedIn3(Long use
                         zoneCategoryParent.name,
                         zoneCategoryChild.name,
                         gathering.viewCount,
-                        isGatheringBookmark(userId),
+                        isGatheringBookmark(userId, gathering.id),
                         countGreatGatheringByGatheringById(gathering.id),
                         gathering.gatheringCategory.name,
                         gathering.user.nickname,
@@ -327,11 +327,11 @@ private BooleanExpression isUserGreatGathering(Long userId) {
                 .otherwise(false);
     }
 
-    private BooleanExpression isGatheringBookmark(Long userId) {
+    private BooleanExpression isGatheringBookmark(Long userId, NumberPath<Long> gatheringId) {
         return new CaseBuilder()
                 .when(JPAExpressions.selectOne()
                         .from(bookMarkGathering)
-                        .where(bookMarkGathering.gathering.id.eq(gathering.id)
+                        .where(bookMarkGathering.gathering.id.eq(gatheringId)
                                 .and(bookMarkGathering.user.id.eq(userId)))
                         .exists())
                 .then(true)

diff --git a/...main/java/solitour_backend/solitour/information/repository/InformationRepositoryImpl.java b/...main/java/solitour_backend/solitour/information/repository/InformationRepositoryImpl.java
@@ -91,7 +91,7 @@ public Page<InformationBriefResponse> getInformationPageFilterAndOrder(Pageable
                         zoneCategoryChild.name,
                         information.category.name,
                         information.viewCount,
-                        isInformationBookmark(userId),
+                        isInformationBookmark(userId, information.id),
                         image.address,
                         countGreatInformationByInformationById(information.id),
                         isUserGreatInformation(userId)
@@ -122,7 +122,7 @@ public List<InformationMainResponse> getInformationLikeCountFromCreatedIn3(Long
                         zoneCategoryChild.name,
                         category.parentCategory.name,
                         information.viewCount,
-                        isInformationBookmark(userId),
+                        isInformationBookmark(userId, information.id),
                         image.address,
                         countGreatInformationByInformationById(information.id), // 파라미터 전달
                         isUserGreatInformation(userId)
@@ -148,7 +148,7 @@ public List<InformationBriefResponse> getInformationRecommend(Long informationId
                         zoneCategoryChild.name,
                         information.category.name,
                         information.viewCount,
-                        isInformationBookmark(userId),
+                        isInformationBookmark(userId, information.id),
                         image.address,
                         countGreatInformationByInformationById(information.id),
                         isUserGreatInformation(userId)
@@ -272,11 +272,11 @@ private BooleanExpression isUserGreatInformation(Long userId) {
                 .otherwise(false);
     }
 
-    private BooleanExpression isInformationBookmark(Long userId) {
+    private BooleanExpression isInformationBookmark(Long userId, NumberPath<Long> informationId) {
         return new CaseBuilder()
                 .when(JPAExpressions.selectOne()
                         .from(bookMarkInformation)
-                        .where(bookMarkInformation.information.id.eq(information.id)
+                        .where(bookMarkInformation.information.id.eq(informationId)
                                 .and(bookMarkInformation.user.id.eq(userId)))
                         .exists())
                 .then(true)