[fix] 저장한 검색어

billbill-project · Dec 5, 2024 · 183dccf · 183dccf
1 parent d3ef463
commit 183dccf
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/src/main/java/site/billbill/apiserver/api/borrowPosts/controller/PostsController.java b/src/main/java/site/billbill/apiserver/api/borrowPosts/controller/PostsController.java
@@ -101,13 +101,14 @@ public BaseResponse<String> deletePostController(@PathVariable(value = "postId",
     }
     @Operation(summary = "저장한 검색어 불러오기", description = "저장한 검색어 불러오기")
     @GetMapping("/searchHist")
-    public BaseResponse<List<String>> getSearchHistController(){
+    public BaseResponse<PostsResponse.saveSearchListResponse> getSearchHistController(){
         String userId = "";
         if(MDC.get(JWTUtil.MDC_USER_ID) != null) {
             userId=  MDC.get(JWTUtil.MDC_USER_ID).toString();
         }
         return new BaseResponse<>(postsService.findSearchService(userId));
     }
+
     @Operation(summary = "추천 검색어 불러오기", description = "추천 검색어 주기")
     @GetMapping("/recommend")
     public BaseResponse<List<String>> getRecommendController(){

diff --git a/src/main/java/site/billbill/apiserver/api/borrowPosts/converter/PostsConverter.java b/src/main/java/site/billbill/apiserver/api/borrowPosts/converter/PostsConverter.java
@@ -99,8 +99,12 @@ public static SearchKeywordStatsJpaEntity toSearchKeywordStats(String keyword){
                 .keyword(keyword)
                 .searchCount(1).build();
     }
-    public static String toUserSearchHist(UserSearchHistJpaEntity userSearchHist){
-        return userSearchHist.getKeyword();
+    public static PostsResponse.saveSearch toUserSearchHist(UserSearchHistJpaEntity userSeachHistory){
+        return PostsResponse.saveSearch.builder().id(userSeachHistory.getSearchId())
+                .keyword(userSeachHistory.getKeyword()).build();
+    }
+    public static PostsResponse.saveSearchListResponse toUserSearhList(List<PostsResponse.saveSearch> savedSearches){
+        return PostsResponse.saveSearchListResponse.builder().results(savedSearches).build();
     }
     public static String toRecommandSearch(SearchKeywordStatsJpaEntity searchKeywordStats){
         return searchKeywordStats.getKeyword();

diff --git a/src/main/java/site/billbill/apiserver/api/borrowPosts/dto/response/PostsResponse.java b/src/main/java/site/billbill/apiserver/api/borrowPosts/dto/response/PostsResponse.java
@@ -52,6 +52,20 @@ public static class ViewPostResponse{
         private String userName;
 
     }
+    @Getter
+    @Setter
+    @Builder
+    public static class saveSearchListResponse{
+        private List<saveSearch> results;
+    }
+    @Getter
+    @Setter
+    @Builder
+    public static class saveSearch{
+        private Long id;
+        private String keyword;
+    }
+
     @Getter
     @Setter
     @Builder

diff --git a/src/main/java/site/billbill/apiserver/api/borrowPosts/service/PostsService.java b/src/main/java/site/billbill/apiserver/api/borrowPosts/service/PostsService.java
@@ -19,7 +19,7 @@ public interface PostsService {
 
     PostsResponse.ViewAllResultResponse ViewSearchPostService(String userId,String category, int page, Sort.Direction direction, String orderType,String keyword,boolean state);
 
-    List<String> findSearchService(String userId);
+    PostsResponse.saveSearchListResponse findSearchService(String userId);
 
     List<String> findRecommandService();
 

diff --git a/src/main/java/site/billbill/apiserver/api/borrowPosts/service/PostsServiceImpl.java b/src/main/java/site/billbill/apiserver/api/borrowPosts/service/PostsServiceImpl.java
@@ -181,11 +181,11 @@ public PostsResponse.ViewAllResultResponse ViewSearchPostService(String userId,
         return PostsConverter.toViewAllList(items);
     }
 
-    public List<String> findSearchService(String userId){
+    public PostsResponse.saveSearchListResponse findSearchService(String userId){
         UserJpaEntity user = userRepository.findById(userId).orElse(null);
         List<UserSearchHistJpaEntity> searchHists=userSearchHistRepository.findByUserAndDelYnOrderByCreatedAtDesc(user,false);
-        List<String> result= searchHists.stream().map(searchHist-> PostsConverter.toUserSearchHist(searchHist)).toList();
-        return result;
+        List<PostsResponse.saveSearch> result= searchHists.stream().map(searchHist-> PostsConverter.toUserSearchHist(searchHist)).toList();
+        return PostsConverter.toUserSearhList(result);
 
     }
 

diff --git a/src/main/java/site/billbill/apiserver/model/user/UserSearchHistJpaEntity.java b/src/main/java/site/billbill/apiserver/model/user/UserSearchHistJpaEntity.java
@@ -17,7 +17,7 @@ public class UserSearchHistJpaEntity extends BaseTime {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "search_seq", nullable = false)
-    private String searchId;
+    private Long searchId;
     @Column(name = "keyword", nullable = true)
     private String keyword;
     @Column(name = "del_yn", nullable = false)