From 5958e52bffdde20ceca79d00476a59f0aefa365b Mon Sep 17 00:00:00 2001 From: Donghun Won Date: Mon, 23 Sep 2024 02:16:17 +0900 Subject: [PATCH] =?UTF-8?q?Fix=20:=20=EC=82=AD=EC=A0=9C=EB=90=9C=20?= =?UTF-8?q?=EB=AA=A8=EC=9E=84=20=EC=A1=B0=ED=9A=8C=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../solitour/user/repository/UserRepositoryImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/solitour_backend/solitour/user/repository/UserRepositoryImpl.java b/src/main/java/solitour_backend/solitour/user/repository/UserRepositoryImpl.java index 6a4193b..2e722f4 100644 --- a/src/main/java/solitour_backend/solitour/user/repository/UserRepositoryImpl.java +++ b/src/main/java/solitour_backend/solitour/user/repository/UserRepositoryImpl.java @@ -149,7 +149,7 @@ public Page retrieveGatheringHost(Pageable pageable, Lo .on(gatheringApplicants.gathering.id.eq(gathering.id) .and(gatheringApplicants.gatheringStatus.eq(GatheringStatus.CONSENT))) .orderBy(gathering.createdAt.desc()) - .where(gathering.user.id.eq(userId)); + .where(gathering.user.id.eq(userId).and(gathering.isDeleted.eq(false))); List list = query .groupBy(gathering.id, zoneCategoryParent.id, zoneCategoryChild.id, @@ -200,7 +200,7 @@ public Page retrieveGatheringBookmark(Pageable pageable .leftJoin(bookMarkGathering) .on(bookMarkGathering.gathering.id.eq(gathering.id)) .orderBy(gathering.createdAt.desc()) - .where(bookMarkGathering.user.id.eq(userId)); + .where(bookMarkGathering.user.id.eq(userId).and(gathering.isDeleted.eq(false))); List list = query .groupBy(gathering.id, zoneCategoryParent.id, zoneCategoryChild.id, @@ -250,7 +250,7 @@ public Page retrieveGatheringApplicant(Pageable page .leftJoin(gatheringApplicants) .on(gatheringApplicants.gathering.id.eq(gathering.id)) .orderBy(gathering.createdAt.desc()) - .where(gatheringApplicants.user.id.eq(userId).and(gathering.user.id.eq(userId).not())); + .where(gatheringApplicants.user.id.eq(userId).and(gathering.user.id.eq(userId).not()).and(gathering.isDeleted.eq(false))); List list = query .groupBy(gathering.id, zoneCategoryParent.id, zoneCategoryChild.id,