From 2253aebffdfb1aeb37841fca59a344883d678292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=9D=B8=EC=A4=80?=
 <54973090+dlswns2480@users.noreply.github.com>
Date: Mon, 2 Dec 2024 18:02:51 +0900
Subject: [PATCH] =?UTF-8?q?feat=20:=20=EB=B6=81=EB=A7=88=ED=81=AC=20?=
 =?UTF-8?q?=EC=A1=B0=EC=9D=B8=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80=20(#1?=
 =?UTF-8?q?95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pokit/out/persistence/content/impl/ContentAdapter.kt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/adapters/out-persistence/src/main/kotlin/com/pokit/out/persistence/content/impl/ContentAdapter.kt b/adapters/out-persistence/src/main/kotlin/com/pokit/out/persistence/content/impl/ContentAdapter.kt
index 32f89cd6..13065bf7 100644
--- a/adapters/out-persistence/src/main/kotlin/com/pokit/out/persistence/content/impl/ContentAdapter.kt
+++ b/adapters/out-persistence/src/main/kotlin/com/pokit/out/persistence/content/impl/ContentAdapter.kt
@@ -65,7 +65,7 @@ class ContentAdapter(
             .from(contentEntity)
             .leftJoin(userLogEntity).on(userLogEntity.contentId.eq(contentEntity.id))
             .join(categoryEntity).on(categoryEntity.id.eq(contentEntity.categoryId))
-            .leftJoin(bookmarkEntity).on(bookmarkEntity.contentId.eq(contentEntity.id))
+            .leftJoin(bookmarkEntity).on(bookmarkEntity.contentId.eq(contentEntity.id).and(bookmarkEntity.deleted.isFalse))
 
         FavoriteOrNot(condition.favorites, query) // 북마크 조인 여부
 
@@ -77,7 +77,6 @@ class ContentAdapter(
             dateBetween(condition.startDate, condition.endDate),
             categoryIn(condition.categoryIds),
             containsWord(condition.searchWord),
-            bookmarkEntity.deleted.isFalse,
         )
             .offset(pageable.offset)
             .groupBy(contentEntity)
@@ -105,12 +104,11 @@ class ContentAdapter(
             .from(contentEntity)
             .leftJoin(userLogEntity).on(userLogEntity.contentId.eq(contentEntity.id))
             .join(categoryEntity).on(categoryEntity.id.eq(contentEntity.categoryId))
-            .leftJoin(bookmarkEntity).on(bookmarkEntity.contentId.eq(contentEntity.id))
+            .leftJoin(bookmarkEntity).on(bookmarkEntity.contentId.eq(contentEntity.id).and(bookmarkEntity.deleted.isFalse))
             .where(
                 categoryEntity.userId.eq(userId),
                 categoryEntity.name.eq(categoryName),
                 contentEntity.deleted.isFalse,
-                bookmarkEntity.deleted.isFalse,
             )
             .offset(pageable.offset)
             .groupBy(contentEntity)
@@ -137,12 +135,11 @@ class ContentAdapter(
             .from(contentEntity)
             .leftJoin(userLogEntity).on(userLogEntity.contentId.eq(contentEntity.id))
             .join(categoryEntity).on(categoryEntity.id.eq(contentEntity.categoryId))
-            .leftJoin(bookmarkEntity).on(bookmarkEntity.contentId.eq(contentEntity.id))
+            .leftJoin(bookmarkEntity).on(bookmarkEntity.contentId.eq(contentEntity.id).and(bookmarkEntity.deleted.isFalse))
             .where(
                 categoryEntity.userId.eq(userId),
                 contentEntity.deleted.isFalse,
                 bookmarkEntity.deleted.isFalse,
-                bookmarkEntity.deleted.isFalse,
             )
             .offset(pageable.offset)
             .groupBy(contentEntity)