feat : 북마크 deleted 조건 조회 추가 (#193)

YAPP-Github · Dec 2, 2024 · 5aa0d02 · 5aa0d02
1 parent 4ad50db
commit 5aa0d02
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.../out-persistence/src/main/kotlin/com/pokit/out/persistence/content/impl/ContentAdapter.kt b/.../out-persistence/src/main/kotlin/com/pokit/out/persistence/content/impl/ContentAdapter.kt
@@ -76,7 +76,8 @@ class ContentAdapter(
             contentEntity.deleted.isFalse,
             dateBetween(condition.startDate, condition.endDate),
             categoryIn(condition.categoryIds),
-            containsWord(condition.searchWord)
+            containsWord(condition.searchWord),
+            bookmarkEntity.deleted.isFalse,
         )
             .offset(pageable.offset)
             .groupBy(contentEntity)
@@ -109,6 +110,7 @@ class ContentAdapter(
                 categoryEntity.userId.eq(userId),
                 categoryEntity.name.eq(categoryName),
                 contentEntity.deleted.isFalse,
+                bookmarkEntity.deleted.isFalse,
             )
             .offset(pageable.offset)
             .groupBy(contentEntity)
@@ -140,6 +142,7 @@ class ContentAdapter(
                 categoryEntity.userId.eq(userId),
                 contentEntity.deleted.isFalse,
                 bookmarkEntity.deleted.isFalse,
+                bookmarkEntity.deleted.isFalse,
             )
             .offset(pageable.offset)
             .groupBy(contentEntity)