Feat/#54 search history

src/main/java/com/hyetaekon/hyetaekon/common/config/SecurityPath.java

@@ -28,7 +28,9 @@ public class SecurityPath {
       "/api/interests",
       "/api/interests/me",
       "/api/posts",
-      "/api/posts/*"
+      "/api/posts/*",
+      "/api/search/history",
+      "/api/search/history/*"
   };
 
   // hasRole("ADMIN")

src/main/java/com/hyetaekon/hyetaekon/common/config/redis/SearchHistoryConfig.java

@@ -0,0 +1,24 @@
+package com.hyetaekon.hyetaekon.common.config.redis;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+@EnableRedisRepositories(basePackages = "com.hyetaekon.hyetaekon.publicservice.repository.redis")
+public class SearchHistoryConfig {
+
+    @Bean
+    public RedisTemplate<String, Object> searchHistoryRedisTemplate(RedisTemplate<String, Object> redisTemplate) {
+        // 키와 값의 직렬화 방식 지정
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(new Jackson2JsonRedisSerializer<>(Object.class));
+        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+        redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(Object.class));
+
+        return redisTemplate;
+    }
+}

src/main/java/com/hyetaekon/hyetaekon/publicservice/dto/mongodb/ServiceSearchCriteriaDto.java

@@ -36,8 +36,4 @@ public ServiceSearchCriteriaDto withUserInfo(
             .build();
     }
 
-    // 검색 조건 유무 확인
-    public boolean hasSearchCriteria() {
-        return StringUtils.hasText(searchTerm);
-    }
 }

src/main/java/com/hyetaekon/hyetaekon/publicservice/repository/mongodb/ServiceSearchClient.java

@@ -160,11 +160,19 @@ private String buildUserMustClause(ServiceSearchCriteriaDto criteria) {
             {
                 compound: {
                     should: [
-                        {exists: {path: "%s", exists: false}},
-                        {equals: {path: "%s", value: "Y"}}
+                        {
+                            compound: {
+                                mustNot: [{exists: {path: "%s"}}]
+                            }
+                        },
+                        {
+                            equals: {path: "%s", value: "Y"}
+                        }
                     ]
                 }
-            }""".formatted(genderField, genderField));
+            }
+            """.formatted(genderField, genderField));
+
         }
 
         // 나이 필수 조건
@@ -176,21 +184,36 @@ private String buildUserMustClause(ServiceSearchCriteriaDto criteria) {
             {
                 compound: {
                     should: [
-                        {exists: {path: "targetAgeStart", exists: false}},
-                        {range: {path: "targetAgeStart", lte: %d}}
+                        {
+                            compound: {
+                                mustNot: [{exists: {path: "targetAgeStart"}}]
+                            }
+                        },
+                        {
+                            range: {path: "targetAgeStart", lte: %d}
+                        }
                     ]
                 }
-            }""".formatted(age));
+            }
+            """.formatted(age));
 
-            mustClauses.add("""
+                        mustClauses.add("""
             {
                 compound: {
                     should: [
-                        {exists: {path: "targetAgeEnd", exists: false}},
-                        {range: {path: "targetAgeEnd", gte: %d}}
+                        {
+                            compound: {
+                                mustNot: [{exists: {path: "targetAgeEnd"}}]
+                            }
+                        },
+                        {
+                            range: {path: "targetAgeEnd", gte: %d}
+                        }
                     ]
                 }
-            }""".formatted(age));
+            }
+            """.formatted(age));
+
         }
 
         // must 조건이 없으면 빈 문자열 반환

src/main/java/com/hyetaekon/hyetaekon/publicservice/service/mongodb/ServiceSearchService.java

@@ -1,7 +1,8 @@
 package com.hyetaekon.hyetaekon.publicservice.service.mongodb;
 
-import com.hyetaekon.hyetaekon.UserInterest.entity.UserInterest;
-import com.hyetaekon.hyetaekon.UserInterest.repository.UserInterestRepository;
+import com.hyetaekon.hyetaekon.searchHistory.Service.SearchHistoryService;
+import com.hyetaekon.hyetaekon.userInterest.entity.UserInterest;
+import com.hyetaekon.hyetaekon.userInterest.repository.UserInterestRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -34,11 +35,12 @@ public class ServiceSearchService {
     private final UserRepository userRepository;
     private final UserInterestRepository userInterestRepository;
     private final IncomeEstimationHandler incomeEstimationHandler;
+    private final SearchHistoryService searchHistoryService;
 
     // 기본 검색 (비로그인)
     public Page<PublicServiceListResponseDto> searchServices(ServiceSearchCriteriaDto criteria) {
         // 검색 조건이 없는 경우 빈 결과 반환
-        if (!criteria.hasSearchCriteria()) {
+        if (!StringUtils.hasText(criteria.getSearchTerm())) {
             return Page.empty(criteria.getPageable());
         }
 
@@ -54,8 +56,10 @@ public Page<PublicServiceListResponseDto> searchPersonalizedServices(
         ServiceSearchCriteriaDto criteria, Long userId) {
 
         // 검색 조건이 없는 경우 빈 결과 반환
-        if (!criteria.hasSearchCriteria()) {
+        if (!StringUtils.hasText(criteria.getSearchTerm())) {
             return Page.empty(criteria.getPageable());
+        } else if(StringUtils.hasText(criteria.getSearchTerm())) { // 검색어가 유효하면 검색 기록 저장
+            searchHistoryService.saveSearchHistory(userId, criteria.getSearchTerm());
         }
 
         // 사용자 정보 가져오기

src/main/java/com/hyetaekon/hyetaekon/searchHistory/Dto/SearchHistoryDto.java

@@ -0,0 +1,25 @@
+package com.hyetaekon.hyetaekon.searchHistory.Dto;
+
+import com.hyetaekon.hyetaekon.searchHistory.entity.SearchHistory;
+import lombok.*;
+
+import java.time.format.DateTimeFormatter;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SearchHistoryDto {
+    private String id;
+    private String searchTerm;
+    private String createdAt;
+
+    // Entity -> DTO 변환
+    public static SearchHistoryDto from(SearchHistory entity) {
+        return SearchHistoryDto.builder()
+            .id(entity.getId())
+            .searchTerm(entity.getSearchTerm())
+            .createdAt(entity.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+            .build();
+    }
+}

src/main/java/com/hyetaekon/hyetaekon/searchHistory/Repository/SearchHistoryRepository.java

@@ -0,0 +1,16 @@
+package com.hyetaekon.hyetaekon.searchHistory.Repository;
+
+import com.hyetaekon.hyetaekon.searchHistory.entity.SearchHistory;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface SearchHistoryRepository extends CrudRepository<SearchHistory, String> {
+    // 특정 사용자의 모든 검색 기록 조회
+    List<SearchHistory> findByUserId(Long userId);
+
+    // 특정 사용자의 특정 검색어 기록 삭제
+    void deleteByUserIdAndId(Long userId, String id);
+}

src/main/java/com/hyetaekon/hyetaekon/searchHistory/Service/SearchHistoryService.java

@@ -0,0 +1,85 @@
+package com.hyetaekon.hyetaekon.searchHistory.Service;
+
+import com.hyetaekon.hyetaekon.searchHistory.Dto.SearchHistoryDto;
+import com.hyetaekon.hyetaekon.searchHistory.Repository.SearchHistoryRepository;
+import com.hyetaekon.hyetaekon.searchHistory.entity.SearchHistory;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.Comparator;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SearchHistoryService {
+    private final SearchHistoryRepository searchHistoryRepository;
+
+    private static final int MAX_DISPLAY_COUNT = 6;
+
+    /**
+     * 검색 기록 저장
+     */
+    @Transactional
+    public void saveSearchHistory(Long userId, String searchTerm) {
+        // 검색어가 없거나 빈 문자열이면 저장하지 않음
+        if (!StringUtils.hasText(searchTerm) || userId == 0L) {
+            return;
+        }
+
+        // 검색어 중복 제거를 위한 기존 검색 기록 확인
+        List<SearchHistory> existingHistories = searchHistoryRepository.findByUserId(userId);
+
+        // 이미 동일한 검색어가 있으면 삭제
+        existingHistories.stream()
+            .filter(history -> history.getSearchTerm().equals(searchTerm))
+            .forEach(history -> searchHistoryRepository.deleteById(history.getId()));
+
+        // 새로운 검색 기록 저장
+        SearchHistory newHistory = SearchHistory.of(userId, searchTerm);
+        searchHistoryRepository.save(newHistory);
+        log.debug("사용자 {} 검색 기록 저장: {}", userId, searchTerm);
+    }
+
+    /**
+     * 사용자의 검색 기록 조회 (최신 6개)
+     */
+    @Transactional(readOnly = true)
+    public List<SearchHistoryDto> getUserSearchHistories(Long userId) {
+        List<SearchHistory> histories = searchHistoryRepository.findByUserId(userId);
+
+        // 최신 순으로 정렬하여 최대 6개 반환
+        return histories.stream()
+            .sorted(Comparator.comparing(SearchHistory::getCreatedAt).reversed())
+            .limit(MAX_DISPLAY_COUNT)
+            .map(SearchHistoryDto::from)
+            .collect(Collectors.toList());
+    }
+
+    /**
+     * 개별 검색 기록 삭제
+     */
+    @Transactional
+    public void deleteSearchHistory(Long userId, String historyId) {
+        if (!StringUtils.hasText(historyId)) {
+            return;
+        }
+        // 사용자의 검색 기록만 삭제하기 위해 사용자 ID도 함께 확인
+        searchHistoryRepository.deleteByUserIdAndId(userId, historyId);
+        log.debug("사용자 {} 검색 기록 삭제: {}", userId, historyId);
+    }
+
+    /**
+     * 사용자의 모든 검색 기록 삭제
+     */
+    @Transactional
+    public void deleteAllSearchHistories(Long userId) {
+        List<SearchHistory> histories = searchHistoryRepository.findByUserId(userId);
+        searchHistoryRepository.deleteAll(histories);
+        log.debug("사용자 {} 검색 기록 전체 삭제", userId);
+    }
+}

src/main/java/com/hyetaekon/hyetaekon/searchHistory/controller/SearchHistoryController.java

@@ -0,0 +1,49 @@
+package com.hyetaekon.hyetaekon.searchHistory.controller;
+
+import com.hyetaekon.hyetaekon.common.jwt.CustomUserDetails;
+import com.hyetaekon.hyetaekon.searchHistory.Dto.SearchHistoryDto;
+import com.hyetaekon.hyetaekon.searchHistory.Service.SearchHistoryService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/search/history")
+@RequiredArgsConstructor
+public class SearchHistoryController {
+
+    private final SearchHistoryService searchHistoryService;
+
+    /**
+     * 현재 로그인한 사용자의 검색 기록 조회 (최신 6개)
+     */
+    @GetMapping
+    public ResponseEntity<List<SearchHistoryDto>> getSearchHistories(
+        @AuthenticationPrincipal CustomUserDetails userDetails) {
+        return ResponseEntity.ok(searchHistoryService.getUserSearchHistories(userDetails.getId()));
+    }
+
+    /**
+     * 특정 검색 기록 삭제
+     */
+    @DeleteMapping("/{historyId}")
+    public ResponseEntity<Void> deleteSearchHistory(@PathVariable String historyId
+    , @AuthenticationPrincipal CustomUserDetails userDetails) {
+        searchHistoryService.deleteSearchHistory(userDetails.getId(), historyId);
+        return ResponseEntity.ok().build();
+    }
+
+    /**
+     * 모든 검색 기록 삭제
+     */
+    @DeleteMapping
+    public ResponseEntity<Void> deleteAllSearchHistories(
+        @AuthenticationPrincipal CustomUserDetails userDetails
+    ) {
+        searchHistoryService.deleteAllSearchHistories(userDetails.getId());
+        return ResponseEntity.ok().build();
+    }
+}

src/main/java/com/hyetaekon/hyetaekon/searchHistory/entity/SearchHistory.java

@@ -0,0 +1,36 @@
+package com.hyetaekon.hyetaekon.searchHistory.entity;
+
+import lombok.*;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.redis.core.RedisHash;
+import org.springframework.data.redis.core.index.Indexed;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@RedisHash(value = "searchHistory", timeToLive = 2592000) // 30일 유지
+public class SearchHistory implements Serializable {
+    @Id
+    private String id; // userId:timestamp 형태로 구성
+
+    @Indexed // 인덱싱으로 특정 사용자의 검색 기록 조회 가능
+    private Long userId;
+
+    private String searchTerm;
+    private LocalDateTime createdAt;
+
+    // 팩토리 메서드
+    public static SearchHistory of(Long userId, String searchTerm) {
+        String id = userId + ":" + System.currentTimeMillis();
+        return SearchHistory.builder()
+            .id(id)
+            .userId(userId)
+            .searchTerm(searchTerm)
+            .createdAt(LocalDateTime.now())
+            .build();
+    }
+}

src/main/java/com/hyetaekon/hyetaekon/user/entity/User.java

@@ -1,6 +1,6 @@
 package com.hyetaekon.hyetaekon.user.entity;
 
-import com.hyetaekon.hyetaekon.UserInterest.entity.UserInterest;
+import com.hyetaekon.hyetaekon.userInterest.entity.UserInterest;
 import com.hyetaekon.hyetaekon.bookmark.entity.Bookmark;
 import com.hyetaekon.hyetaekon.recommend.entity.Recommend;
 import jakarta.persistence.*;

src/main/java/com/hyetaekon/hyetaekon/UserInterest/controller/UserInterestController.java → src/main/java/com/hyetaekon/hyetaekon/userInterest/controller/UserInterestController.java

@@ -1,10 +1,10 @@
-package com.hyetaekon.hyetaekon.UserInterest.controller;
+package com.hyetaekon.hyetaekon.userInterest.controller;
 
-import com.hyetaekon.hyetaekon.UserInterest.dto.CategorizedInterestsResponseDto;
-import com.hyetaekon.hyetaekon.UserInterest.dto.CategorizedInterestsWithSelectionDto;
-import com.hyetaekon.hyetaekon.UserInterest.dto.InterestSelectionRequestDto;
-import com.hyetaekon.hyetaekon.UserInterest.entity.UserInterestEnum;
-import com.hyetaekon.hyetaekon.UserInterest.service.UserInterestService;
+import com.hyetaekon.hyetaekon.userInterest.dto.CategorizedInterestsResponseDto;
+import com.hyetaekon.hyetaekon.userInterest.dto.CategorizedInterestsWithSelectionDto;
+import com.hyetaekon.hyetaekon.userInterest.dto.InterestSelectionRequestDto;
+import com.hyetaekon.hyetaekon.userInterest.entity.UserInterestEnum;
+import com.hyetaekon.hyetaekon.userInterest.service.UserInterestService;
 import com.hyetaekon.hyetaekon.common.jwt.CustomUserDetails;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;

src/main/java/com/hyetaekon/hyetaekon/UserInterest/dto/CategorizedInterestsResponseDto.java → src/main/java/com/hyetaekon/hyetaekon/userInterest/dto/CategorizedInterestsResponseDto.java

@@ -1,8 +1,7 @@
-package com.hyetaekon.hyetaekon.UserInterest.dto;
+package com.hyetaekon.hyetaekon.userInterest.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.Setter;
 
 import java.util.List;
 import java.util.Map;