[REFACTOR] 검색 디렉토리 분리 및 쿼리 리팩토링

build.gradle

@@ -139,7 +139,8 @@ def jacocoExcludePatterns = [
         '**/event/**',
         '**/*Aspect*',
         '**/Aspect/*',
-        '**/utils/*'
+        '**/utils/*',
+        '**/search/**'
 ]
 
 def jacocoExcludePatternsForVerify = [
@@ -161,7 +162,8 @@ def jacocoExcludePatternsForVerify = [
         '*.*event*.*',
         '*.*Aspect*',
         '*.Aspect.*',
-        '*.utils.*'
+        '*.utils.*',
+        '*.search.*'
 ]
 
 jacocoTestReport {

src/main/java/com/somemore/domains/center/repository/center/CenterRepository.java

@@ -21,4 +21,6 @@ default boolean doesNotExistById(UUID id) {
     List<CenterOverviewInfo> findCenterOverviewsByIds(List<UUID> ids);
 
     void deleteAllInBatch();
+
+    String findNameById(UUID id);
 }

src/main/java/com/somemore/domains/center/repository/center/CenterRepositoryImpl.java

@@ -1,5 +1,6 @@
 package com.somemore.domains.center.repository.center;
 
+import com.querydsl.core.types.Path;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -66,7 +67,27 @@ public void deleteAllInBatch() {
         centerJpaRepository.deleteAllInBatch();
     }
 
+    @Override
+    public String findNameById(UUID id) {
+        return findDynamicField(id, center.name)
+                .orElse(null);
+    }
+
     private static BooleanExpression isNotDeleted() {
         return center.deleted.isFalse();
     }
+
+    private <T> Optional<T> findDynamicField(UUID id, Path<T> field) {
+
+        return Optional.ofNullable(
+                queryFactory
+                        .select(field)
+                        .from(center)
+                        .where(
+                                center.id.eq(id),
+                                isNotDeleted()
+                        )
+                        .fetchOne()
+        );
+    }
 }

src/main/java/com/somemore/domains/center/service/query/CenterQueryService.java

@@ -46,6 +46,17 @@ public void validateCenterExists(UUID id) {
         }
     }
 
+    @Override
+    public String getNameById(UUID id) {
+        String name = centerRepository.findNameById(id);
+
+        if (name == null || name.isBlank()) {
+            throw new BadRequestException(NOT_EXISTS_CENTER);
+        }
+
+        return name;
+    }
+
     private Center getCenterById(UUID centerId) {
         return centerRepository.findCenterById(centerId)
                 .orElseThrow(() -> new BadRequestException(NOT_EXISTS_CENTER.getMessage()));

src/main/java/com/somemore/domains/center/usecase/query/CenterQueryUseCase.java

@@ -12,4 +12,5 @@ public interface CenterQueryUseCase {
     List<CenterOverviewInfo> getCenterOverviewsByIds(List<UUID> centerIds);
 
     void validateCenterExists(UUID centerId);
+    String getNameById(UUID id);
 }

src/main/java/com/somemore/domains/community/controller/CommunityBoardQueryApiController.java

@@ -24,7 +24,6 @@
 public class CommunityBoardQueryApiController {
 
     private final CommunityBoardQueryUseCase communityBoardQueryUseCase;
-//    private final CommunityBoardDocumentUseCase communityBoardDocumentUseCase;
 
     @GetMapping("/community-boards")
     @Operation(summary = "전체 커뮤니티 게시글 조회", description = "전체 커뮤니티 게시글 목록을 조회합니다.")
@@ -51,32 +50,6 @@ public ApiResponse<Page<CommunityBoardResponseDto>> getByWriterId(
         );
     }
 
-//    @GetMapping("/community-boards/search")
-//    @Operation(summary = "커뮤니티 게시글 키워드 검색", description = "키워드로 포함한 커뮤니티 게시글 목록을 조회합니다.")
-//    public ApiResponse<Page<CommunityBoardResponseDto>> getCommunityBoardsBySearch(
-//            String keyword,
-//            Pageable pageable
-//    ) {
-//        return ApiResponse.ok(
-//                200,
-//                communityBoardDocumentUseCase.getCommunityBoardBySearch(keyword, pageable.getPageNumber()),
-//                "커뮤니티 게시글 검색 리스트 조회 성공"
-//        );
-//    }
-
-    @GetMapping("/community-boards/search")
-    @Operation(summary = "커뮤니티 게시글 키워드 검색", description = "키워드를 포함한 커뮤니티 게시글 목록을 조회합니다.")
-    public ApiResponse<Page<CommunityBoardResponseDto>> getCommunityBoardsBySearch(
-            @RequestParam String keyword,
-            Pageable pageable
-    ) {
-        return ApiResponse.ok(
-                200,
-                communityBoardQueryUseCase.getCommunityBoards(keyword, pageable.getPageNumber()),
-                "커뮤니티 게시글 검색 리스트 조회 성공"
-        );
-    }
-
     @GetMapping("/community-board/{id}")
     @Operation(summary = "커뮤니티 게시글 상세 조회", description = "커뮤니티 게시글의 상세 정보를 조회합니다.")
     public ApiResponse<CommunityBoardDetailResponseDto> getById(

src/main/java/com/somemore/domains/community/domain/CommunityComment.java

@@ -17,7 +17,6 @@
 
 import static lombok.AccessLevel.PROTECTED;
 
-
 @Getter
 @NoArgsConstructor(access = PROTECTED)
 @Entity

src/main/java/com/somemore/domains/community/dto/response/CommunityBoardResponseDto.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.somemore.domains.community.repository.mapper.CommunityBoardView;
+import com.somemore.domains.search.domain.CommunityBoardDocument;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.time.LocalDateTime;
@@ -12,9 +13,9 @@
 public record CommunityBoardResponseDto(
         @Schema(description = "커뮤니티 게시글 ID", example = "12")
         Long id,
-        @Schema(description = "커뮤니티 게시글 ID", example = "12")
+        @Schema(description = "커뮤니티 게시글 제목", example = "11/29 OO도서관 봉사 같이 갈 사람 모집합니다.")
         String title,
-        @Schema(description = "작성자(봉사자) ID", example = "123e4567-e89b-12d3-a456-426614174000")
+        @Schema(description = "작성자(봉사자) 닉네임", example = "나는야 봉사왕")
         String writerNickname,
         @Schema(description = "커뮤니티 게시글 생성 일시", example = "2023-12-02T11:00:00")
         LocalDateTime createdAt
@@ -27,5 +28,13 @@ public static CommunityBoardResponseDto from(CommunityBoardView board) {
                 board.communityBoard().getCreatedAt()
         );
     }
-}
 
+    public static CommunityBoardResponseDto fromDocument(CommunityBoardDocument board) {
+        return new CommunityBoardResponseDto(
+                board.getId(),
+                board.getTitle(),
+                board.getWriterNickname(),
+                board.getCreatedAt()
+        );
+    }
+}

src/main/java/com/somemore/domains/community/repository/board/CommunityBoardJpaRepository.java

@@ -3,6 +3,9 @@
 import com.somemore.domains.community.domain.CommunityBoard;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface CommunityBoardJpaRepository extends JpaRepository<CommunityBoard, Long> {
     boolean existsByIdAndDeletedFalse(Long id);
+    List<CommunityBoard> findAllByDeletedFalse();
 }

src/main/java/com/somemore/domains/community/repository/board/CommunityBoardRepository.java

@@ -11,23 +11,13 @@
 
 public interface CommunityBoardRepository {
     CommunityBoard save(CommunityBoard communityBoard);
-
     Optional<CommunityBoard> findById(Long id);
-
     Page<CommunityBoardView> findCommunityBoards(String keyword, Pageable pageable);
-
     Page<CommunityBoardView> findByWriterId(UUID writerId, Pageable pageable);
-
     boolean existsById(Long id);
-
     default boolean doesNotExistById(Long id) {
         return !existsById(id);
     }
-
     void deleteAllInBatch();
-
-    //    Page<CommunityBoardView> findByCommunityBoardsContaining(String keyword, Pageable pageable);
-//    void saveDocuments(List<CommunityBoard> communityBoards);
-    List<CommunityBoard> findAll();
-//    void deleteDocument(Long id);
+    List<CommunityBoard> findAllByDeletedFalse();
 }

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

@@ -25,7 +25,6 @@ public class CommunityBoardRepositoryImpl implements CommunityBoardRepository {
 
     private final JPAQueryFactory queryFactory;
     private final CommunityBoardJpaRepository communityBoardJpaRepository;
-//    private final CommunityBoardDocumentRepository documentRepository;
 
     private static final QCommunityBoard communityBoard = QCommunityBoard.communityBoard;
     private static final QVolunteer volunteer = QVolunteer.volunteer;
@@ -87,47 +86,6 @@ public boolean existsById(Long id) {
         return communityBoardJpaRepository.existsByIdAndDeletedFalse(id);
     }
 
-//    @Override
-//    public Page<CommunityBoardView> findByCommunityBoardsContaining(String keyword, Pageable pageable) {
-//        List<CommunityBoardDocument> boardDocuments = getBoardDocuments(keyword);
-//
-//        List<Long> boardIds = boardDocuments.stream()
-//                .map(CommunityBoardDocument::getId)
-//                .toList();
-//
-//        List<CommunityBoardView> content = getCommunityBoardsQuery()
-//                .where(communityBoard.id.in(boardIds)
-//                        .and(isNotDeleted()))
-//                .offset(pageable.getOffset())
-//                .limit(pageable.getPageSize())
-//                .fetch();
-//
-//        JPAQuery<Long> countQuery = queryFactory
-//                .select(communityBoard.count())
-//                .from(communityBoard)
-//                .join(volunteer).on(communityBoard.writerId.eq(volunteer.id))
-//                .where(communityBoard.id.in(boardIds)
-//                    .and(isNotDeleted()));
-//
-//        return PageableExecutionUtils.getPage(content, pageable, countQuery::fetchOne);
-//    }
-
-//    @Override
-//    public void saveDocuments(List<CommunityBoard> communityBoards) {
-//        List<CommunityBoardDocument> communityBoardDocuments = convertEntityToDocuments(communityBoards);
-//        documentRepository.saveAll(communityBoardDocuments);
-//    }
-
-//    @Override
-//    public void deleteDocument(Long id) {
-//        documentRepository.deleteById(id);
-//    }
-
-    @Override
-    public List<CommunityBoard> findAll() {
-        return communityBoardJpaRepository.findAll();
-    }
-
     @Override
     public void deleteAllInBatch() {
         communityBoardJpaRepository.deleteAllInBatch();
@@ -143,19 +101,10 @@ private JPAQuery<CommunityBoardView> getCommunityBoardsQuery() {
                 .orderBy(communityBoard.createdAt.desc());
     }
 
-//    private List<CommunityBoardDocument> convertEntityToDocuments(List<CommunityBoard> communityBoards) {
-//        List<CommunityBoardDocument> communityBoardDocuments = new ArrayList<>();
-//
-//        for (CommunityBoard communityboard : communityBoards) {
-//            CommunityBoardDocument document = CommunityBoardDocument.builder()
-//                    .id(communityboard.getId())
-//                    .title(communityboard.getTitle())
-//                    .content(communityboard.getContent())
-//                    .build();
-//            communityBoardDocuments.add(document);
-//        }
-//        return communityBoardDocuments;
-//    }
+    @Override
+    public List<CommunityBoard> findAllByDeletedFalse() {
+        return communityBoardJpaRepository.findAllByDeletedFalse();
+    }
 
     private BooleanExpression isNotDeleted() {
         return communityBoard.deleted.eq(false);
@@ -170,12 +119,4 @@ private BooleanExpression keywordEq(String keyword) {
                 ? communityBoard.title.containsIgnoreCase(keyword)
                 : null;
     }
-
-//    private List<CommunityBoardDocument> getBoardDocuments(String keyword) {
-//
-//        if (keyword == null || keyword.isEmpty()) {
-//            return documentRepository.findAll();
-//        }
-//        return documentRepository.findIdsByTitleOrContentContaining(keyword);
-//    }
 }