Merge pull request #66 from DEPthes/develop

[DEPLOY]
DEPthes · Aug 20, 2024 · 895b794 · 895b794
2 parents 629d8e4 + 8b0a0d2
commit 895b794
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/depth/mvp/ns/domain/theme/domain/repository/ThemeRepository.java b/src/main/java/depth/mvp/ns/domain/theme/domain/repository/ThemeRepository.java
@@ -16,7 +16,7 @@
 public interface ThemeRepository extends JpaRepository<Theme, Long> {
     Optional<Theme> findByDate(LocalDate data);
 
-    @Query("SELECT COUNT(b) FROM Board b WHERE b.theme.id = :themeId")
+    @Query("SELECT COUNT(b) FROM Board b WHERE b.theme.id = :themeId AND b.isPublished = true ")
     int countBoardsByThemeId(@Param("themeId") Long themeId);
 
     @Query("SELECT COUNT(l) FROM ThemeLike l WHERE l.theme.id = :themeId AND l.status = 'ACTIVE'")
@@ -27,7 +27,7 @@ public interface ThemeRepository extends JpaRepository<Theme, Long> {
     @Query("SELECT t FROM Theme t ORDER BY (SELECT COUNT(l) FROM ThemeLike l WHERE l.theme = t AND l.status = 'ACTIVE') DESC")
     Page<Theme> findAllOrderByLikeCount(Pageable pageable);
 
-    @Query("SELECT t FROM Theme t ORDER BY (SELECT COUNT(b) FROM Board b WHERE b.theme = t) DESC")
+    @Query("SELECT t FROM Theme t ORDER BY (SELECT COUNT(b) FROM Board b WHERE b.theme = t AND b.isPublished = true) DESC")
     Page<Theme> findAllOrderByBoardCount(Pageable pageable);
 
     @Query("SELECT t FROM Theme t WHERE t.content LIKE %:keyword% ORDER BY t.date DESC")
@@ -36,7 +36,7 @@ public interface ThemeRepository extends JpaRepository<Theme, Long> {
     @Query("SELECT t FROM Theme t WHERE t.content LIKE %:keyword% ORDER BY (SELECT COUNT(l) FROM ThemeLike l WHERE l.theme = t AND l.status = 'ACTIVE') DESC")
     Page<Theme> searchByContentWithLikeCount(@Param("keyword") String keyword, Pageable pageable);
 
-    @Query("SELECT t FROM Theme t WHERE t.content LIKE %:keyword% ORDER BY (SELECT COUNT(b) FROM Board b WHERE b.theme = t) DESC")
+    @Query("SELECT t FROM Theme t WHERE t.content LIKE %:keyword% ORDER BY (SELECT COUNT(b) FROM Board b WHERE b.theme = t AND b.isPublished = true) DESC")
     Page<Theme> searchByContentWithBoardCount(@Param("keyword") String keyword, Pageable pageable);
 
 }