Merge pull request #154 from dnd-side-project/feature/#136-searchAll

Feature/#136 통합검색 전체

Author: youcastle03

src/main/java/com/dnd/reevserver/domain/retrospect/repository/RetrospectRepository.java

@@ -13,7 +13,7 @@
 import java.util.List;
 
 
-public interface RetrospectRepository extends JpaRepository<Retrospect, Long> {
+public interface RetrospectRepository extends JpaRepository<Retrospect, Long>, RetrospectRepositoryCustom {
 
     @Query("""
     SELECT

src/main/java/com/dnd/reevserver/domain/retrospect/repository/RetrospectRepositoryCustom.java

@@ -0,0 +1,8 @@
+package com.dnd.reevserver.domain.retrospect.repository;
+
+import com.dnd.reevserver.domain.retrospect.entity.Retrospect;
+import java.util.List;
+
+public interface RetrospectRepositoryCustom {
+    List<Retrospect> searchForKeyword(String keyword);
+}

src/main/java/com/dnd/reevserver/domain/retrospect/repository/RetrospectRepositoryCustomImpl.java

@@ -0,0 +1,55 @@
+package com.dnd.reevserver.domain.retrospect.repository;
+
+import static org.springframework.util.StringUtils.hasText;
+import static com.dnd.reevserver.domain.retrospect.entity.QRetrospect.retrospect;
+
+import com.dnd.reevserver.domain.retrospect.entity.QRetrospect;
+import com.dnd.reevserver.domain.retrospect.entity.Retrospect;
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class RetrospectRepositoryCustomImpl implements RetrospectRepositoryCustom {
+    private final JPAQueryFactory queryFactory;
+
+    @Override
+    public List<Retrospect> searchForKeyword(String keyword) {
+        BooleanBuilder builder = new BooleanBuilder();
+
+        BooleanExpression titleCondition = containTitle(keyword);
+        if(titleCondition != null) {
+            builder.or(titleCondition);
+        }
+
+        BooleanExpression contentCondition = containContent(keyword);
+        if(contentCondition != null) {
+            builder.or(contentCondition);
+        }
+
+        return queryFactory
+            .select(retrospect)
+            .from(retrospect)
+            .where(builder)
+            .fetch();
+    }
+
+    //제목에 포함
+    private BooleanExpression containTitle(String keyword){
+        if(!hasText(keyword)){
+            return null;
+        }
+        return retrospect.title.containsIgnoreCase(keyword);
+    }
+
+    //내용에 포함
+    private BooleanExpression containContent(String keyword){
+        if(!hasText(keyword)){
+            return null;
+        }
+        return retrospect.content.containsIgnoreCase(keyword);
+    }
+
+}

src/main/java/com/dnd/reevserver/domain/retrospect/service/RetrospectService.java

@@ -18,6 +18,7 @@
 import com.dnd.reevserver.domain.retrospect.dto.request.*;
 import com.dnd.reevserver.domain.retrospect.entity.Retrospect;
 import com.dnd.reevserver.domain.retrospect.repository.RetrospectRepository;
+import com.dnd.reevserver.domain.search.dto.response.SearchRetrospectResponseDto;
 import com.dnd.reevserver.domain.statistics.service.StatisticsService;
 import com.dnd.reevserver.domain.team.entity.Team;
 import com.dnd.reevserver.domain.team.service.TeamService;
@@ -207,6 +208,16 @@ public long countByGroupId(Long groupId) {
         return retrospectRepository.countByGroupId(groupId);
     }
 
+    //통합검색에서 검색
+    @Transactional(readOnly = true)
+    public List<SearchRetrospectResponseDto> searchForKeyword(String keyword){
+        List<Retrospect> retrospects = retrospectRepository.searchForKeyword(keyword);
+        return retrospects.stream()
+            .map(this::convertToRetrospectResponse)
+            .toList();
+    }
+
+
     public int getLikeCount(Long retrospectId) {
         return likeRepository.getLikeCount(retrospectId);
     }
@@ -280,4 +291,13 @@ private RetrospectSingleResponseDto convertToSingleDto(Retrospect retrospect, Li
                 .categories(categoriesName)
                 .build();
     }
+
+    private SearchRetrospectResponseDto convertToRetrospectResponse(Retrospect retrospect){
+        return SearchRetrospectResponseDto.builder()
+            .retrospectId(retrospect.getRetrospectId())
+            .title(retrospect.getTitle())
+            .userName(retrospect.getMember().getNickname())
+            .timeString(timeStringUtil.getTimeString(retrospect.getUpdatedAt()))
+            .build();
+    }
 }

src/main/java/com/dnd/reevserver/domain/search/controller/SearchController.java

@@ -0,0 +1,26 @@
+package com.dnd.reevserver.domain.search.controller;
+
+import com.dnd.reevserver.domain.search.dto.response.SearchAllResponseDto;
+import com.dnd.reevserver.domain.search.service.SearchService;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.parameters.P;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/v1/search")
+@RequiredArgsConstructor
+public class SearchController {
+
+    private final SearchService searchService;
+
+    @GetMapping
+    public ResponseEntity<SearchAllResponseDto> search (@RequestParam(required = false) String keyword){
+        SearchAllResponseDto response = searchService.searchAll(keyword);
+        return ResponseEntity.ok().body(response);
+    }
+}

src/main/java/com/dnd/reevserver/domain/search/controller/SearchControllerDocs.java

@@ -0,0 +1,17 @@
+package com.dnd.reevserver.domain.search.controller;
+
+import com.dnd.reevserver.domain.search.dto.response.SearchAllResponseDto;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Tag(name = "통합검색 API", description = "통합검색과 관련한 API입니다.")
+public interface SearchControllerDocs {
+
+    @Operation(summary = "통합 검색 API", description = "통합 검색을 수행합니다.")
+    ResponseEntity<SearchAllResponseDto> search (@Parameter(name = "keyword",
+        description = "회고 제목이나 내용에 포함될 경우, 그룹 제목이나 한줄소개에 포함될 경우") @RequestParam(required = false) String keyword);
+
+}

src/main/java/com/dnd/reevserver/domain/search/dto/response/SearchAllResponseDto.java

@@ -0,0 +1,9 @@
+package com.dnd.reevserver.domain.search.dto.response;
+
+import java.util.List;
+import lombok.Builder;
+
+@Builder
+public record SearchAllResponseDto(List<SearchGroupResponseDto> groups, List<SearchRetrospectResponseDto> retrospects) {
+
+}

src/main/java/com/dnd/reevserver/domain/search/dto/response/SearchGroupResponseDto.java

@@ -0,0 +1,9 @@
+package com.dnd.reevserver.domain.search.dto.response;
+
+import lombok.Builder;
+
+@Builder
+public record SearchGroupResponseDto(Long groupId, String groupName, String introduction,
+                                     Integer userCount, Long retrospectCount) {
+
+}

src/main/java/com/dnd/reevserver/domain/search/dto/response/SearchRetrospectResponseDto.java

@@ -0,0 +1,9 @@
+package com.dnd.reevserver.domain.search.dto.response;
+
+import lombok.Builder;
+
+@Builder
+public record SearchRetrospectResponseDto(Long retrospectId, String title,
+                                          String userName, String timeString) {
+
+}

src/main/java/com/dnd/reevserver/domain/search/service/SearchService.java

@@ -0,0 +1,34 @@
+package com.dnd.reevserver.domain.search.service;
+
+import com.dnd.reevserver.domain.retrospect.dto.response.RetrospectResponseDto;
+import com.dnd.reevserver.domain.retrospect.entity.Retrospect;
+import com.dnd.reevserver.domain.retrospect.service.RetrospectService;
+import com.dnd.reevserver.domain.search.dto.response.SearchAllResponseDto;
+import com.dnd.reevserver.domain.search.dto.response.SearchGroupResponseDto;
+import com.dnd.reevserver.domain.search.dto.response.SearchRetrospectResponseDto;
+import com.dnd.reevserver.domain.team.dto.response.GroupDetailResponseDto;
+import com.dnd.reevserver.domain.team.entity.Team;
+import com.dnd.reevserver.domain.team.service.TeamService;
+import com.dnd.reevserver.global.util.TimeStringUtil;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class SearchService {
+
+    private final TeamService teamService;
+    private final RetrospectService retrospectService;
+    private final TimeStringUtil timeStringUtil;
+
+    @Transactional(readOnly = true)
+    public SearchAllResponseDto searchAll(String keyword){
+        List<SearchGroupResponseDto> groups = teamService.searchForKeyword(keyword);
+        List<SearchRetrospectResponseDto> retrospects = retrospectService.searchForKeyword(keyword);
+        return new SearchAllResponseDto(groups, retrospects);
+    }
+
+
+}