Refactor : 자소서 검색 fetch join 적용 및 쿼리 방식으로 변경

src/main/java/umc/kkijuk/server/introduce/controller/response/FindIntroduceResponse.java

@@ -5,13 +5,21 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-@Data
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalDate;
+
 @Getter
 @Builder
-@AllArgsConstructor
-public class FindIntroduceResponse {
+public class FindIntroduceResponse implements SearchResultResponse {
     private Long introId;
     private String title;
     private String content;
     private LocalDate createdDate;
+
+    @Override
+    public LocalDate getCreatedDate() {
+        return createdDate;
+    }
 }

src/main/java/umc/kkijuk/server/introduce/controller/response/FindMasterIntroduceResponse.java

@@ -5,13 +5,21 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-@Data
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalDate;
+
 @Getter
 @Builder
-@AllArgsConstructor
-public class FindMasterIntroduceResponse {
+public class FindMasterIntroduceResponse implements SearchResultResponse {
     private Long masterIntroId;
     private String title;
     private String content;
     private LocalDate createdDate;
+
+    @Override
+    public LocalDate getCreatedDate() {
+        return createdDate;
+    }
 }

src/main/java/umc/kkijuk/server/introduce/controller/response/SearchResultResponse.java

@@ -0,0 +1,7 @@
+package umc.kkijuk.server.introduce.controller.response;
+
+import java.time.LocalDate;
+
+public interface SearchResultResponse {
+    LocalDate getCreatedDate();
+}

src/main/java/umc/kkijuk/server/introduce/repository/IntroduceRepository.java

@@ -18,10 +18,9 @@ public interface IntroduceRepository extends JpaRepository<Introduce, Long> {
     @Query("SELECT i FROM Introduce i WHERE i.memberId = :memberId AND i.state = :state AND i.recruit.endTime > CURRENT_TIMESTAMP ORDER BY i.recruit.endTime ASC")
     Page<Introduce> findActiveIntroduces(@Param("memberId") Long memberId, @Param("state") int state, Pageable pageable);
 
-    @Query("SELECT i FROM Introduce i " +
-            "JOIN i.questions q " +
-            "WHERE i.memberId = :memberId AND q.content LIKE %:keyword%")
-    List<Introduce> searchIntroduceByKeywordForMember(String keyword, Long memberId);
+
+    @Query("SELECT i FROM Introduce i JOIN FETCH i.questions q WHERE i.memberId = :memberId AND q.content LIKE %:keyword%")
+    List<Introduce> searchIntroduceByKeywordForMember(@Param("keyword") String keyword, @Param("memberId") Long memberId);
 
 
 }

src/main/java/umc/kkijuk/server/introduce/repository/MasterIntroduceRepository.java

@@ -3,16 +3,16 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import umc.kkijuk.server.introduce.domain.Introduce;
 import umc.kkijuk.server.introduce.domain.MasterIntroduce;
 
 import java.util.List;
 import java.util.Optional;
 
 public interface MasterIntroduceRepository extends JpaRepository<MasterIntroduce, Long> {
     Optional<MasterIntroduce> findByMemberId(Long memberId);
-    @Query("SELECT m FROM MasterIntroduce m " +
-            "JOIN m.masterQuestion mq " +
-            "WHERE m.memberId = :memberId AND mq.content LIKE %:keyword%")
-    List<MasterIntroduce> searchMasterIntroduceByKeywordForMember(String keyword, Long memberId);
+
+    @Query("SELECT DISTINCT m FROM MasterIntroduce m JOIN FETCH m.masterQuestion q WHERE m.memberId = :memberId AND q.content LIKE %:keyword%")
+    List<MasterIntroduce> searchMasterIntroduceByKeywordForMember(@Param("keyword") String keyword, @Param("memberId") Long memberId);
 
 }

src/main/java/umc/kkijuk/server/introduce/service/IntroduceServiceImpl.java

@@ -228,12 +228,52 @@ public Long deleteIntro(Member requestMember, Long introId, Long recruitId) {
         return introduce.getId();
     }
 
+//    @Override
+//    public Map<String, Object> searchIntroduceAndMasterByKeyword(String keyword, Member requestMember) {
+//        List<FindIntroduceResponse> introduceList = introduceRepository.searchIntroduceByKeywordForMember(keyword, requestMember.getId())
+//                .stream()
+//                .flatMap(introduce -> introduce.getQuestions().stream()
+//                        .filter(q -> q.getContent().contains(keyword))
+//                        .map(q -> FindIntroduceResponse.builder()
+//                                .introId(introduce.getId())
+//                                .title(introduce.getRecruit().getTitle())
+//                                .content(q.getContent())
+//                                .createdDate(introduce.getCreatedAt().toLocalDate())
+//                                .build()))
+//                .collect(Collectors.toList());
+//
+//        List<FindMasterIntroduceResponse> masterIntroduceList = masterIntroduceRepository.searchMasterIntroduceByKeywordForMember(keyword, requestMember.getId())
+//                .stream()
+//                .flatMap(masterIntroduce -> masterIntroduce.getMasterQuestion().stream()
+//                        .filter(mq -> mq.getContent().contains(keyword))
+//                        .map(mq -> FindMasterIntroduceResponse.builder()
+//                                .masterIntroId(masterIntroduce.getId())
+//                                .title("Master")
+//                                .content(mq.getContent())
+//                                .createdDate(masterIntroduce.getCreatedAt().toLocalDate())
+//                                .build()))
+//                .collect(Collectors.toList());
+//
+//        List<Object> result = new ArrayList<>();
+//        result.addAll(masterIntroduceList);
+//        result.addAll(introduceList);
+//
+//        int count = result.size();
+//
+//        Map<String, Object> response = new LinkedHashMap<>();
+//        response.put("count", count);
+//        response.put("data", result);
+//
+//        return response;
+//    }
+
     @Override
     public Map<String, Object> searchIntroduceAndMasterByKeyword(String keyword, Member requestMember) {
+        // Introduce 검색
         List<FindIntroduceResponse> introduceList = introduceRepository.searchIntroduceByKeywordForMember(keyword, requestMember.getId())
                 .stream()
                 .flatMap(introduce -> introduce.getQuestions().stream()
-                        .filter(q -> q.getContent().contains(keyword))
+                        .filter(q -> q.getContent().contains(keyword)) // ✨ filter 먼저 적용
                         .map(q -> FindIntroduceResponse.builder()
                                 .introId(introduce.getId())
                                 .title(introduce.getRecruit().getTitle())
@@ -242,10 +282,11 @@ public Map<String, Object> searchIntroduceAndMasterByKeyword(String keyword, Mem
                                 .build()))
                 .collect(Collectors.toList());
 
+        // MasterIntroduce 검색
         List<FindMasterIntroduceResponse> masterIntroduceList = masterIntroduceRepository.searchMasterIntroduceByKeywordForMember(keyword, requestMember.getId())
                 .stream()
                 .flatMap(masterIntroduce -> masterIntroduce.getMasterQuestion().stream()
-                        .filter(mq -> mq.getContent().contains(keyword))
+                        .filter(mq -> mq.getContent().contains(keyword)) // ✨ filter 먼저 적용
                         .map(mq -> FindMasterIntroduceResponse.builder()
                                 .masterIntroId(masterIntroduce.getId())
                                 .title("Master")
@@ -254,19 +295,22 @@ public Map<String, Object> searchIntroduceAndMasterByKeyword(String keyword, Mem
                                 .build()))
                 .collect(Collectors.toList());
 
-        List<Object> result = new ArrayList<>();
+        // 공통 결과로 합치기 + 정렬 (최신순)
+        List<SearchResultResponse> result = new ArrayList<>();
         result.addAll(masterIntroduceList);
         result.addAll(introduceList);
 
-        int count = result.size();
+        result.sort(Comparator.comparing(SearchResultResponse::getCreatedDate).reversed()); // 최신순 정렬
 
+        // 응답 반환
         Map<String, Object> response = new LinkedHashMap<>();
-        response.put("count", count);
+        response.put("count", result.size());
         response.put("data", result);
 
         return response;
     }
 
+
     @Override
     @Transactional
     public Introduce findByRecruitId(Long recruitId) {