[DP-560] 픽픽픽 검색 기능 API #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

yu-so-young2 merged 7 commits into develop from DP-560

Nov 5, 2025

0 src/docs/asciidoc/api/pick/pick-delete.adoc → ...ocs/asciidoc/api/pick/v1/pick-delete.adoc

File renamed without changes.

0 src/docs/asciidoc/api/pick/pick-detail.adoc → ...ocs/asciidoc/api/pick/v1/pick-detail.adoc

File renamed without changes.

0 src/docs/asciidoc/api/pick/pick-main.adoc → src/docs/asciidoc/api/pick/v1/pick-main.adoc

File renamed without changes.

0 src/docs/asciidoc/api/pick/pick-modify.adoc → ...ocs/asciidoc/api/pick/v1/pick-modify.adoc

File renamed without changes.

0 ...oc/api/pick/pick-option-delete-image.adoc → ...api/pick/v1/pick-option-delete-image.adoc

File renamed without changes.

0 .../api/pick/pick-option-register-image.adoc → ...i/pick/v1/pick-option-register-image.adoc

File renamed without changes.

0 ...docs/asciidoc/api/pick/pick-register.adoc → ...s/asciidoc/api/pick/v1/pick-register.adoc

File renamed without changes.

0 ...cs/asciidoc/api/pick/pick-similarity.adoc → ...asciidoc/api/pick/v1/pick-similarity.adoc

File renamed without changes.

0 src/docs/asciidoc/api/pick/pick-vote.adoc → src/docs/asciidoc/api/pick/v1/pick-vote.adoc

File renamed without changes.

src/docs/asciidoc/api/pick/pick.adoc → src/docs/asciidoc/api/pick/v1/pick.adoc

-Original file line number
+Diff line change
@@ -1,13 +1,11 @@
-    = 픽픽픽
+    = 픽픽픽 V1
     include::pick-main.adoc[]
-    include::pick-main-v2.adoc[]
     include::pick-detail.adoc[]
     include::pick-register.adoc[]
     include::pick-modify.adoc[]
     include::pick-delete.adoc[]
     include::pick-vote.adoc[]
     include::pick-option-register-image.adoc[]
     include::pick-option-delete-image.adoc[]
-    include::pick-similarity.adoc[]
-    include::pick-similarity-v2.adoc[]
+    include::pick-similarity.adoc[]

0 src/docs/asciidoc/api/pick/pick-main-v2.adoc → ...cs/asciidoc/api/pick/v2/pick-main-v2.adoc

File renamed without changes.

src/docs/asciidoc/api/pick/v2/pick-search-v2.adoc

-Original file line number
+Diff line change
@@ -0,0 +1,17 @@
+    [[pick-search-v2]]
+    == 픽픽픽 메인 검색 API(GET: /devdevdev/api/v2/picks/search)
+    * 픽픽픽 메인에서 검색 결과를 반환한다.
+    * 정확도순 정렬만 가능하다.
+    === 정상 요청/응답
+    ==== HTTP Request
+    include::{snippets}/pick-search-v2/http-request.adoc[]
+    ==== HTTP Request Header Fields
+    include::{snippets}/pick-search-v2/request-headers.adoc[]
+    ==== HTTP Request Query Parameters Fields
+    include::{snippets}/pick-search-v2/query-parameters.adoc[]
+    ==== HTTP Response
+    include::{snippets}/pick-search-v2/http-response.adoc[]
+    ==== HTTP Response Fields
+    include::{snippets}/pick-search-v2/response-fields.adoc[]

0 ...asciidoc/api/pick/pick-similarity-v2.adoc → ...iidoc/api/pick/v2/pick-similarity-v2.adoc

File renamed without changes.

src/docs/asciidoc/api/pick/v2/pick.adoc

-Original file line number
+Diff line change
@@ -0,0 +1,5 @@
+    = 픽픽픽 V2
+    include::pick-main-v2.adoc[]
+    include::pick-search-v2.adoc[]
+    include::pick-similarity-v2.adoc[]

src/docs/asciidoc/index.adoc

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,8 @@ include::api/token/token.adoc[] @@
     include::api/member/member.adoc[]
     include::api/mypage/mypage.adoc[]
     include::api/common/common.adoc[]
-    include::api/pick/pick.adoc[]
+    include::api/pick/v1/pick.adoc[]
+    include::api/pick/v2/pick.adoc[]
     include::api/pick-commnet/pick-comment.adoc[]
     include::api/tech-article/tech-article.adoc[]
     include::api/tech-article-comment/tech-article-comment.adoc[]
@@ Expand Down @@

src/main/java/com/dreamypatisiel/devdevdev/domain/entity/Pick.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,8 @@ @@
     @NoArgsConstructor(access = AccessLevel.PROTECTED)
     @Table(indexes = {
             @Index(name = "idx__content_status", columnList = "contentStatus"),
-            @Index(name = "idx__member", columnList = "member_id")
+            @Index(name = "idx__member", columnList = "member_id"),
+            @Index(name = "idx_pick_01", columnList = "title")
     })
     public class Pick extends BasicTime {
@@ Expand Down @@

src/main/java/com/dreamypatisiel/devdevdev/domain/repository/pick/PickRepository.java

-Original file line number
+Diff line change
@@ Expand Up @@
         List<Pick> findTop1000ByContentStatusAndEmbeddingsIsNotNullOrderByCreatedAtDesc(ContentStatus contentStatus);
         Long countByMember(Member member);
         Long countByContentStatus(ContentStatus contentStatus);
     }

src/main/java/com/dreamypatisiel/devdevdev/domain/repository/pick/PickSearchDto.java

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    package com.dreamypatisiel.devdevdev.domain.repository.pick;
+    import lombok.Getter;
+    @Getter
+    public class PickSearchDto {
+        private final Long pickId;
+        private final Double maxTotalScore;
+        public PickSearchDto(Long pickId, Double maxTotalScore) {
+            this.pickId = pickId;
+            this.maxTotalScore = maxTotalScore;
+        }
+    }

...java/com/dreamypatisiel/devdevdev/domain/repository/pick/custom/PickRepositoryCustom.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,9 @@ @@
     import com.dreamypatisiel.devdevdev.domain.entity.Member;
     import com.dreamypatisiel.devdevdev.domain.entity.Pick;
     import com.dreamypatisiel.devdevdev.domain.repository.pick.PickSort;
+    import java.util.List;
     import java.util.Optional;
+    import java.util.Set;
     import org.springframework.data.domain.Pageable;
     import org.springframework.data.domain.Slice;
@@ Expand All / @@ -15,4 +17,6 @@ public interface PickRepositoryCustom { @@
         Optional<Pick> findPickWithPickOptionByPickId(Long pickId);
         Slice<Pick> findPicksByMemberAndCursor(Pageable pageable, Member member, Long pickId);
+        List<Pick> findPicksWithPickOptionWithMemberByIdIn(Set<Long> ids);
     }

...n/java/com/dreamypatisiel/devdevdev/domain/repository/pick/custom/PickRepositoryImpl.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ @@
     import java.util.Arrays;
     import java.util.List;
     import java.util.Optional;
+    import java.util.Set;
     import lombok.RequiredArgsConstructor;
     import org.springframework.data.domain.Pageable;
     import org.springframework.data.domain.Slice;
@@ Expand Down Expand Up @@
             return new SliceImpl<>(contents, pageable, hasNextPage(contents, pageable.getPageSize()));
         }
+        @Override
+        public List<Pick> findPicksWithPickOptionWithMemberByIdIn(Set<Long> ids) {
+            return query.selectFrom(pick)
+                    .leftJoin(pick.pickOptions, pickOption)
+                    .leftJoin(pick.member, member).fetchJoin()
+                    .where(pick.id.in(ids)
+                            .and(pick.contentStatus.eq(ContentStatus.APPROVAL)))
+                    .fetch();
+        }
         @Override
         public Optional<Pick> findPickWithPickOptionWithPickVoteWithMemberByPickId(Long pickId) {
             Pick findPick = query.selectFrom(pick)
@@ Expand Down @@

src/main/java/com/dreamypatisiel/devdevdev/domain/repository/pick/mybatis/PickMapper.java

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    package com.dreamypatisiel.devdevdev.domain.repository.pick.mybatis;
+    import com.dreamypatisiel.devdevdev.domain.repository.pick.PickSearchDto;
+    import java.util.List;
+    import org.apache.ibatis.annotations.Mapper;
+    import org.apache.ibatis.annotations.Param;
+    @Mapper
+    public interface PickMapper {
+        List<PickSearchDto> findPickSearchDtoByKeywordAndCursor(@Param("cursorId") Long pickId,
+                                                                @Param("keyword") String keyword,
+                                                                @Param("cursorSearchScore") Double searchScore,
+                                                                @Param("limit") int limit);
+    }

src/main/java/com/dreamypatisiel/devdevdev/domain/service/pick/GuestPickServiceV2.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,37 +5,49 @@ @@
     import com.dreamypatisiel.devdevdev.domain.entity.enums.ContentStatus;
     import com.dreamypatisiel.devdevdev.domain.policy.PickBestCommentsPolicy;
     import com.dreamypatisiel.devdevdev.domain.policy.PickPopularScorePolicy;
-    import com.dreamypatisiel.devdevdev.domain.repository.pick.*;
+    import com.dreamypatisiel.devdevdev.domain.repository.pick.PickCommentRecommendRepository;
+    import com.dreamypatisiel.devdevdev.domain.repository.pick.PickCommentRepository;
+    import com.dreamypatisiel.devdevdev.domain.repository.pick.PickRepository;
+    import com.dreamypatisiel.devdevdev.domain.repository.pick.PickSearchDto;
+    import com.dreamypatisiel.devdevdev.domain.repository.pick.PickSort;
+    import com.dreamypatisiel.devdevdev.domain.repository.pick.mybatis.PickMapper;
     import com.dreamypatisiel.devdevdev.domain.service.member.AnonymousMemberService;
     import com.dreamypatisiel.devdevdev.global.common.TimeProvider;
     import com.dreamypatisiel.devdevdev.global.utils.AuthenticationMemberUtils;
     import com.dreamypatisiel.devdevdev.openai.embeddings.EmbeddingsService;
     import com.dreamypatisiel.devdevdev.web.dto.SliceCustom;
     import com.dreamypatisiel.devdevdev.web.dto.response.pick.PickMainResponseV2;
+    import com.dreamypatisiel.devdevdev.web.dto.response.pick.PickMainSearchResponseV2;
     import com.dreamypatisiel.devdevdev.web.dto.response.pick.SimilarPickResponseV2;
+    import java.util.List;
+    import java.util.Map;
+    import java.util.Optional;
+    import java.util.Set;
+    import java.util.function.Function;
+    import java.util.stream.Collectors;
     import org.springframework.data.domain.Pageable;
     import org.springframework.data.domain.Slice;
     import org.springframework.security.core.Authentication;
     import org.springframework.stereotype.Service;
     import org.springframework.transaction.annotation.Transactional;
-    import java.util.List;
     @Service
     @Transactional(readOnly = true)
     public class GuestPickServiceV2 extends PickCommonService implements PickServiceV2 {
         private final AnonymousMemberService anonymousMemberService;
+        private final PickMapper pickMapper;
         public GuestPickServiceV2(PickRepository pickRepository, EmbeddingsService embeddingsService,
                                   PickBestCommentsPolicy pickBestCommentsPolicy,
                                   PickCommentRepository pickCommentRepository,
                                   PickCommentRecommendRepository pickCommentRecommendRepository,
                                   PickPopularScorePolicy pickPopularScorePolicy,
-                                  TimeProvider timeProvider, AnonymousMemberService anonymousMemberService) {
+                                  TimeProvider timeProvider, AnonymousMemberService anonymousMemberService, PickMapper pickMapper) {
             super(embeddingsService, pickBestCommentsPolicy, pickPopularScorePolicy, timeProvider, pickRepository,
                     pickCommentRepository, pickCommentRecommendRepository);
             this.anonymousMemberService = anonymousMemberService;
+            this.pickMapper = pickMapper;
         }
         /**
@@ Expand All @@
         @Transactional
         @Override
         public Slice<PickMainResponseV2> findPicksMain(Pageable pageable, Long pickId, PickSort pickSort,
-                                                     String anonymousMemberId, Authentication authentication) {
+                                                       String anonymousMemberId, Authentication authentication) {
             // 익명 사용자 호출인지 확인
             AuthenticationMemberUtils.validateAnonymousMethodCall(authentication);
@@ Expand Down Expand Up @@
         public List<SimilarPickResponseV2> findTop3SimilarPicksV2(Long pickId) {
             return super.findTop3SimilarPicksV2(pickId);
         }
+        @Transactional
+        @Override
+        public Slice<PickMainSearchResponseV2> findPickMainSearch(Pageable pageable, Long pickId, Double searchScore,
+                                                                  String keyword, String anonymousMemberId,
+                                                                  Authentication authentication) {
+            // 익명 사용자 호출인지 확인
+            AuthenticationMemberUtils.validateAnonymousMethodCall(authentication);
+            // anonymousMemberId 검증
+            AnonymousMember anonymousMember = anonymousMemberService.findOrCreateAnonymousMember(anonymousMemberId);
+            // 픽픽픽 검색
+            List<PickSearchDto> pickSearchDtos = pickMapper.findPickSearchDtoByKeywordAndCursor(pickId,
+                    keyword, searchScore, pageable.getPageSize());
+            Set<Long> pickIds = pickSearchDtos.stream()
+                    .map(PickSearchDto::getPickId)
+                    .collect(Collectors.toSet());
+            // 픽픽픽 조회
+            Map<Long, Pick> findPicks = pickRepository.findPicksWithPickOptionWithMemberByIdIn(pickIds).stream()
+                    .collect(Collectors.toMap(Pick::getId, Function.identity()));
+            // 데이터 가공
+            List<PickMainSearchResponseV2> pickMainSearchResponse = pickSearchDtos.stream()
+                    .flatMap(pickSearchDto -> Optional.ofNullable(findPicks.get(pickSearchDto.getPickId()))
+                            .map(pick -> PickMainSearchResponseV2.of(pick, anonymousMember, pickSearchDto.getMaxTotalScore()))
+                            .stream()
+                    )
+                    .toList();
+            return new SliceCustom<>(pickMainSearchResponse, pageable, (long) pickSearchDtos.size());
+        }
     }

src/main/java/com/dreamypatisiel/devdevdev/domain/service/pick/MemberPickServiceV2.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,45 +8,53 @@ @@
     import com.dreamypatisiel.devdevdev.domain.repository.pick.PickCommentRecommendRepository;
     import com.dreamypatisiel.devdevdev.domain.repository.pick.PickCommentRepository;
     import com.dreamypatisiel.devdevdev.domain.repository.pick.PickRepository;
+    import com.dreamypatisiel.devdevdev.domain.repository.pick.PickSearchDto;
     import com.dreamypatisiel.devdevdev.domain.repository.pick.PickSort;
+    import com.dreamypatisiel.devdevdev.domain.repository.pick.mybatis.PickMapper;
     import com.dreamypatisiel.devdevdev.global.common.MemberProvider;
     import com.dreamypatisiel.devdevdev.global.common.TimeProvider;
     import com.dreamypatisiel.devdevdev.openai.embeddings.EmbeddingsService;
     import com.dreamypatisiel.devdevdev.web.dto.SliceCustom;
     import com.dreamypatisiel.devdevdev.web.dto.response.pick.PickMainResponseV2;
+    import com.dreamypatisiel.devdevdev.web.dto.response.pick.PickMainSearchResponseV2;
     import com.dreamypatisiel.devdevdev.web.dto.response.pick.SimilarPickResponseV2;
+    import java.util.List;
+    import java.util.Map;
+    import java.util.Optional;
+    import java.util.Set;
+    import java.util.function.Function;
+    import java.util.stream.Collectors;
     import org.springframework.data.domain.Pageable;
     import org.springframework.data.domain.Slice;
     import org.springframework.security.core.Authentication;
     import org.springframework.stereotype.Service;
     import org.springframework.transaction.annotation.Transactional;
-    import java.util.List;
     @Service
     @Transactional(readOnly = true)
     public class MemberPickServiceV2 extends PickCommonService implements PickServiceV2 {
         private final MemberProvider memberProvider;
+        private final PickMapper pickMapper;
         public MemberPickServiceV2(EmbeddingsService embeddingsService, PickRepository pickRepository,
                                    MemberProvider memberProvider,
                                    PickCommentRepository pickCommentRepository,
                                    PickCommentRecommendRepository pickCommentRecommendRepository,
                                    PickPopularScorePolicy pickPopularScorePolicy,
-                                   PickBestCommentsPolicy pickBestCommentsPolicy, TimeProvider timeProvider) {
+                                   PickBestCommentsPolicy pickBestCommentsPolicy, TimeProvider timeProvider, PickMapper pickMapper) {
             super(embeddingsService, pickBestCommentsPolicy, pickPopularScorePolicy, timeProvider, pickRepository,
-                    pickCommentRepository,
-                    pickCommentRecommendRepository);
+                    pickCommentRepository, pickCommentRecommendRepository);
             this.memberProvider = memberProvider;
+            this.pickMapper = pickMapper;
         }
         /**
          * 픽픽픽 메인 조회 V2
          */
         @Override
         public Slice<PickMainResponseV2> findPicksMain(Pageable pageable, Long pickId, PickSort pickSort,
-                                                     String anonymousMemberId, Authentication authentication) {
+                                                       String anonymousMemberId, Authentication authentication) {
             // 픽픽픽 조회
             Slice<Pick> picks = pickRepository.findPicksByCursor(pageable, pickId, pickSort);
@@ Expand All @@
         public List<SimilarPickResponseV2> findTop3SimilarPicksV2(Long pickId) {
             return super.findTop3SimilarPicksV2(pickId);
         }
+        /**
+         * @Author: 장세웅
+         * @Note: 픽픽픽 검색 조회
+         */
+        @Override
+        public Slice<PickMainSearchResponseV2> findPickMainSearch(Pageable pageable, Long pickId, Double searchScore, String keyword,
+                                                                  String anonymousMemberId, Authentication authentication) {
+            // 회원 조회
+            Member findMember = memberProvider.getMemberByAuthentication(authentication);
+            // 픽픽픽 검색
+            List<PickSearchDto> pickSearchDtos = pickMapper.findPickSearchDtoByKeywordAndCursor(pickId,
+                    keyword, searchScore, pageable.getPageSize());
+            Set<Long> pickIds = pickSearchDtos.stream()
+                    .map(PickSearchDto::getPickId)
+                    .collect(Collectors.toSet());
+            // 픽픽픽 조회
+            Map<Long, Pick> findPicks = pickRepository.findPicksWithPickOptionWithMemberByIdIn(pickIds).stream()
+                    .collect(Collectors.toMap(Pick::getId, Function.identity()));
+            // 데이터 가공
+            List<PickMainSearchResponseV2> pickMainSearchResponse = pickSearchDtos.stream()
+                    .flatMap(pickSearchDto -> Optional.ofNullable(findPicks.get(pickSearchDto.getPickId()))
+                            .map(pick -> PickMainSearchResponseV2.of(pick, findMember, pickSearchDto.getMaxTotalScore()))
+                            .stream()
+                    )
+                    .toList();
+            return new SliceCustom<>(pickMainSearchResponse, pageable, (long) pickSearchDtos.size());
+        }
     }

src/main/java/com/dreamypatisiel/devdevdev/domain/service/pick/PickServiceV2.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,16 +2,19 @@ @@
     import com.dreamypatisiel.devdevdev.domain.repository.pick.PickSort;
     import com.dreamypatisiel.devdevdev.web.dto.response.pick.PickMainResponseV2;
+    import com.dreamypatisiel.devdevdev.web.dto.response.pick.PickMainSearchResponseV2;
     import com.dreamypatisiel.devdevdev.web.dto.response.pick.SimilarPickResponseV2;
+    import java.util.List;
     import org.springframework.data.domain.Pageable;
     import org.springframework.data.domain.Slice;
     import org.springframework.security.core.Authentication;
-    import java.util.List;
     public interface PickServiceV2 extends PickService {
         Slice<PickMainResponseV2> findPicksMain(Pageable pageable, Long pickId, PickSort pickSort, String anonymousMemberId,
                                                 Authentication authentication);
         List<SimilarPickResponseV2> findTop3SimilarPicksV2(Long pickId);
+        Slice<PickMainSearchResponseV2> findPickMainSearch(Pageable pageable, Long pickId, Double searchScore, String keyword,
+                                                           String anonymousMemberId, Authentication authentication);
     }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DP-560] 픽픽픽 검색 기능 API #194

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!