feature(search): 검색 keyword가 null인 경우 전체 조회

Author: ayoung-dev

src/main/java/com/somemore/community/repository/board/CommunityBoardDocumentRepository.java

@@ -7,6 +7,7 @@
 import java.util.List;
 
 public interface CommunityBoardDocumentRepository extends ElasticsearchRepository<CommunityBoardDocument, Long> {
+    List<CommunityBoardDocument> findAll();
     @Query("{\"multi_match\": {\"query\": \"?0\", \"fields\": [\"title\", \"content\"]}}")
     List<CommunityBoardDocument> findIdsByTitleOrContentContaining(String keyword);
 }

src/main/java/com/somemore/community/repository/board/CommunityBoardRepositoryImpl.java

@@ -88,7 +88,7 @@ public boolean existsById(Long id) {
 
     @Override
     public Page<CommunityBoardView> findByCommunityBoardsContaining(String keyword, Pageable pageable) {
-        List<CommunityBoardDocument> boardDocuments = documentRepository.findIdsByTitleOrContentContaining(keyword);
+        List<CommunityBoardDocument> boardDocuments = getBoardDocuments(keyword);
 
         List<Long> boardIds = boardDocuments.stream()
                 .map(CommunityBoardDocument::getId)
@@ -105,7 +105,8 @@ public Page<CommunityBoardView> findByCommunityBoardsContaining(String keyword,
                 .select(communityBoard.count())
                 .from(communityBoard)
                 .join(volunteer).on(communityBoard.writerId.eq(volunteer.id))
-                .where(communityBoard.id.in(boardIds));
+                .where(communityBoard.id.in(boardIds)
+                    .and(isNotDeleted()));
 
         return PageableExecutionUtils.getPage(content, pageable, countQuery::fetchOne);
     }
@@ -160,4 +161,12 @@ private BooleanExpression isNotDeleted() {
     }
 
     private BooleanExpression isWriter(UUID writerId) {return communityBoard.writerId.eq(writerId); }
+
+    private List<CommunityBoardDocument> getBoardDocuments(String keyword) {
+
+        if (keyword == null || keyword.isEmpty()) {
+            return documentRepository.findAll();
+        }
+        return documentRepository.findIdsByTitleOrContentContaining(keyword);
+    }
 }

src/main/java/com/somemore/recruitboard/repository/RecruitBoardDocumentRepository.java

@@ -7,6 +7,7 @@
 import java.util.List;
 
 public interface RecruitBoardDocumentRepository extends ElasticsearchRepository<RecruitBoardDocument, Long> {
+    List<RecruitBoardDocument> findAll();
     @Query("{\"multi_match\": {\"query\": \"?0\", \"fields\": [\"title\", \"content\"]}}")
     List<RecruitBoardDocument> findIdsByTitleOrContentContaining(String keyword);
 }

src/main/java/com/somemore/recruitboard/repository/RecruitBoardRepositoryImpl.java

@@ -138,10 +138,15 @@ public Page<RecruitBoardDetail> findAllNearby(RecruitBoardNearByCondition condit
         QLocation location = QLocation.location;
         QCenter center = QCenter.center;
 
+        List<RecruitBoardDocument> boardDocuments = getBoardDocuments(condition.keyword());
+
+        List<Long> boardIds = boardDocuments.stream()
+                .map(RecruitBoardDocument::getId)
+                .toList();
+
         Pageable pageable = condition.pageable();
 
         BooleanExpression predicate = locationBetween(condition)
-                .and(keywordEq(condition.keyword()))
                 .and(statusEq(condition.status()))
                 .and(isNotDeleted());
 
@@ -150,7 +155,8 @@ public Page<RecruitBoardDetail> findAllNearby(RecruitBoardNearByCondition condit
                 .from(recruitBoard)
                 .join(location).on(recruitBoard.locationId.eq(location.id))
                 .join(center).on(recruitBoard.centerId.eq(center.id))
-                .where(predicate)
+                .where(recruitBoard.id.in(boardIds)
+                        .and(predicate))
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
                 .orderBy(toOrderSpecifiers(pageable.getSort()))
@@ -161,7 +167,8 @@ public Page<RecruitBoardDetail> findAllNearby(RecruitBoardNearByCondition condit
                 .from(recruitBoard)
                 .join(location).on(recruitBoard.locationId.eq(location.id))
                 .join(center).on(recruitBoard.centerId.eq(center.id))
-                .where(predicate);
+                .where(recruitBoard.id.in(boardIds)
+                        .and(predicate));
 
         return PageableExecutionUtils.getPage(content, pageable, countQuery::fetchOne);
     }
@@ -197,11 +204,12 @@ public Page<RecruitBoard> findAllByCenterId(UUID centerId,
     }
 
     @Override
-    public Page<RecruitBoardWithCenter> findByRecruitBoardsContaining(String keyword, RecruitBoardSearchCondition condition) {
+    public Page<RecruitBoardWithCenter> findByRecruitBoardsContaining(RecruitBoardSearchCondition condition) {
         QRecruitBoard recruitBoard = QRecruitBoard.recruitBoard;
         QCenter center = QCenter.center;
 
-        List<RecruitBoardDocument> boardDocuments = documentRepository.findIdsByTitleOrContentContaining(keyword);
+
+        List<RecruitBoardDocument> boardDocuments = getBoardDocuments(condition.keyword());
 
         List<Long> boardIds = boardDocuments.stream()
                 .map(RecruitBoardDocument::getId)
@@ -229,7 +237,8 @@ public Page<RecruitBoardWithCenter> findByRecruitBoardsContaining(String keyword
                 .select(recruitBoard.count())
                 .from(recruitBoard)
                 .join(center).on(recruitBoard.centerId.eq(center.id))
-                .where(predicate);
+                .where(recruitBoard.id.in(boardIds)
+                        .and(predicate));
 
         return PageableExecutionUtils.getPage(content, pageable, countQuery::fetchOne);
     }
@@ -361,4 +370,12 @@ private List<RecruitBoardDocument> convertEntityToDocuments(List<RecruitBoard> r
         }
         return communityBoardDocuments;
     }
+
+    private List<RecruitBoardDocument> getBoardDocuments(String keyword) {
+
+        if (keyword == null || keyword.isEmpty()) {
+            return documentRepository.findAll();
+        }
+        return documentRepository.findIdsByTitleOrContentContaining(keyword);
+    }
 }