Merge pull request #7 from Qua-Project/feat/recentSearch

feat : 최근 검색어 기능 추가

Author: pstar987

src/main/java/medilux/aquabe/domain/product/controller/ProductController.java

@@ -6,6 +6,8 @@
 import medilux.aquabe.domain.product.service.ProductService;
 import medilux.aquabe.domain.search.service.SearchLogService;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -22,15 +24,18 @@ public class ProductController {
     // 제품 검색 이름 API
     @GetMapping("/search")
     public ResponseEntity<List<ProductSearchResponse>> searchProducts(
-            @RequestParam(name = "query", required = false) String query,
+            @RequestParam(name = "keyword", required = false) String keyword,
             @RequestParam(name = "category", required = false) Integer category,
             @RequestParam(name = "type", required = false) String type) {
-
-        if (query != null && !query.trim().isEmpty()) {
-            searchKeywordService.saveSearchKeyword(query);
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String loginEmail = authentication.getName();
+        //검색어 저장
+        if (keyword != null && !keyword.trim().isEmpty()) {
+            searchKeywordService.saveSearchKeyword(loginEmail, keyword);
         }
 
-        List<ProductSearchResponse> products = productService.searchProducts(query, category, type);
+
+        List<ProductSearchResponse> products = productService.searchProducts(keyword, category, type);
         return ResponseEntity.ok(products);
     }
 

src/main/java/medilux/aquabe/domain/search/controller/SearchKeywordController.java

@@ -2,8 +2,11 @@
 
 import lombok.RequiredArgsConstructor;
 import medilux.aquabe.domain.search.dto.PopularKeywordResponse;
+import medilux.aquabe.domain.search.dto.RecentKeywordResponse;
 import medilux.aquabe.domain.search.service.SearchLogService;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -19,4 +22,11 @@ public class SearchKeywordController {
     public ResponseEntity<List<PopularKeywordResponse>> getPopularKeywords() {
         return ResponseEntity.ok(searchLogService.getTop10SearchKeywords());
     }
+
+    @GetMapping("/recent")
+    public ResponseEntity<RecentKeywordResponse> getRecentKeywords(){
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String loginEmail = authentication.getName();
+        return ResponseEntity.ok(searchLogService.getRecentSearchKeywords(loginEmail));
+    }
 }

src/main/java/medilux/aquabe/domain/search/dto/RecentKeywordResponse.java

@@ -0,0 +1,12 @@
+package medilux.aquabe.domain.search.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+@Builder
+public class RecentKeywordResponse {
+    private List<String> keyword;
+}

…omain/search/entity/SearchLogEntity.java …earch/entity/SearchLogPopularEntity.javasrc/main/java/medilux/aquabe/domain/search/entity/SearchLogEntity.java renamed to src/main/java/medilux/aquabe/domain/search/entity/SearchLogPopularEntity.java src/main/java/medilux/aquabe/domain/search/entity/SearchLogEntity.java renamed to src/main/java/medilux/aquabe/domain/search/entity/SearchLogPopularEntity.java

@@ -6,9 +6,9 @@
 
 @Entity
 @Getter
-@Table(name = "search_logs")
+@Table(name = "search_logs_popular")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class SearchLogEntity {
+public class SearchLogPopularEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -21,7 +21,7 @@ public class SearchLogEntity {
     private LocalDateTime searchedAt;  // 검색된 시간 저장
 
     @Builder
-    public SearchLogEntity(String keyword) {
+    public SearchLogPopularEntity(String keyword) {
         this.keyword = keyword;
         this.searchedAt = LocalDateTime.now();
     }

src/main/java/medilux/aquabe/domain/search/entity/SearchLogRecentEntity.java

@@ -0,0 +1,46 @@
+package medilux.aquabe.domain.search.entity;
+
+
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import medilux.aquabe.domain.user.entity.UserEntity;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Getter
+@Table(name = "search_logs_recent")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class SearchLogRecentEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private String keyword;
+
+    @Column(nullable = false)
+    private LocalDateTime searchedAt;  // 검색된 시간 저장
+
+    @ManyToOne
+    @JoinColumn(name = "user_id", nullable = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)  // User 삭제 시 해당 검색어 삭제
+    private UserEntity user;
+
+
+    @Builder
+    public SearchLogRecentEntity(String keyword, UserEntity user) {
+        this.keyword = keyword;
+        this.searchedAt = LocalDateTime.now();
+        this.user = user;
+    }
+
+
+
+
+}

…arch/repository/SearchLogRepository.java …pository/SearchLogPopularRepository.javasrc/main/java/medilux/aquabe/domain/search/repository/SearchLogRepository.java renamed to src/main/java/medilux/aquabe/domain/search/repository/SearchLogPopularRepository.java src/main/java/medilux/aquabe/domain/search/repository/SearchLogRepository.java renamed to src/main/java/medilux/aquabe/domain/search/repository/SearchLogPopularRepository.java

@@ -1,22 +1,22 @@
 package medilux.aquabe.domain.search.repository;
 
-import medilux.aquabe.domain.search.entity.SearchLogEntity;
+import medilux.aquabe.domain.search.entity.SearchLogPopularEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import java.time.LocalDateTime;
 import java.util.List;
 
-public interface SearchLogRepository extends JpaRepository<SearchLogEntity, Long> {
+public interface SearchLogPopularRepository extends JpaRepository<SearchLogPopularEntity, Long> {
 
     // 특정 시간 이후의 검색 로그만 가져오기
-    List<SearchLogEntity> findBySearchedAtAfter(LocalDateTime time);
+    List<SearchLogPopularEntity> findBySearchedAtAfter(LocalDateTime time);
 
     // 특정 시간 이전의 검색 로그 삭제
     void deleteBySearchedAtBefore(LocalDateTime time);
 
     // 최근 N시간 동안 가장 많이 검색된 키워드 (상위 10개)
-    @Query("SELECT s.keyword, COUNT(s.keyword) as count FROM SearchLogEntity s " +
+    @Query("SELECT s.keyword, COUNT(s.keyword) as count FROM SearchLogPopularEntity s " +
             "WHERE s.searchedAt > :time " +
             "GROUP BY s.keyword " +
             "ORDER BY count DESC")

src/main/java/medilux/aquabe/domain/search/repository/SearchLogRecentRepository.java

@@ -0,0 +1,13 @@
+package medilux.aquabe.domain.search.repository;
+
+import medilux.aquabe.domain.search.entity.SearchLogPopularEntity;
+import medilux.aquabe.domain.search.entity.SearchLogRecentEntity;
+import medilux.aquabe.domain.user.entity.UserEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface SearchLogRecentRepository extends JpaRepository<SearchLogRecentEntity, Long> {
+
+    List<SearchLogRecentEntity> findByUser(UserEntity user);
+}

src/main/java/medilux/aquabe/domain/search/service/SearchLogService.java

@@ -1,9 +1,15 @@
 package medilux.aquabe.domain.search.service;
 
 import lombok.RequiredArgsConstructor;
+import medilux.aquabe.common.error.exceptions.BadRequestException;
 import medilux.aquabe.domain.search.dto.PopularKeywordResponse;
-import medilux.aquabe.domain.search.entity.SearchLogEntity;
-import medilux.aquabe.domain.search.repository.SearchLogRepository;
+import medilux.aquabe.domain.search.dto.RecentKeywordResponse;
+import medilux.aquabe.domain.search.entity.SearchLogPopularEntity;
+import medilux.aquabe.domain.search.entity.SearchLogRecentEntity;
+import medilux.aquabe.domain.search.repository.SearchLogPopularRepository;
+import medilux.aquabe.domain.search.repository.SearchLogRecentRepository;
+import medilux.aquabe.domain.user.entity.UserEntity;
+import medilux.aquabe.domain.user.repository.UserRepository;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -13,22 +19,32 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import static medilux.aquabe.common.error.ErrorCode.ROW_DOES_NOT_EXIST;
+
 @Service
 @RequiredArgsConstructor
 public class SearchLogService {
 
-    private final SearchLogRepository searchLogRepository;
+    private final SearchLogPopularRepository searchLogPopularRepository;
+    private final SearchLogRecentRepository searchLogRecentRepository;
+    private final UserRepository userRepository;
 
     // 검색어 저장
     @Transactional
-    public void saveSearchKeyword(String keyword) {
-        searchLogRepository.save(new SearchLogEntity(keyword));
+    public void saveSearchKeyword(String loginEmail, String keyword) {
+
+        UserEntity user = userRepository.findByEmail(loginEmail)
+                .orElseThrow(() -> new BadRequestException(ROW_DOES_NOT_EXIST, "존재하지 않는 사용자입니다."));
+
+        searchLogRecentRepository.save(new SearchLogRecentEntity(keyword, user));
+        searchLogPopularRepository.save(new SearchLogPopularEntity(keyword));
     }
 
     // 인기 검색어 조회 (24시간 기준)
+    @Transactional(readOnly = true)
     public List<PopularKeywordResponse> getTop10SearchKeywords() {
         LocalDateTime recentTime = LocalDateTime.now().minusHours(24);
-        List<Object[]> topKeywords = searchLogRepository.findTop10PopularKeywords(recentTime);
+        List<Object[]> topKeywords = searchLogPopularRepository.findTop10PopularKeywords(recentTime);
 
         return IntStream.range(0, topKeywords.size())
                 .mapToObj(i -> PopularKeywordResponse.builder()
@@ -38,11 +54,27 @@ public List<PopularKeywordResponse> getTop10SearchKeywords() {
                 .collect(Collectors.toList());
     }
 
+    @Transactional(readOnly = true)
+    public RecentKeywordResponse getRecentSearchKeywords(String loginEmail){
+        UserEntity user = userRepository.findByEmail(loginEmail)
+                .orElseThrow(() -> new BadRequestException(ROW_DOES_NOT_EXIST, "존재하지 않는 사용자입니다."));
+
+        List<SearchLogRecentEntity> searchLogRecent = searchLogRecentRepository.findByUser(user);
+
+        List<String> keywords = searchLogRecent.stream()
+                .map(SearchLogRecentEntity::getKeyword)
+                .toList();
+
+        return RecentKeywordResponse.builder()
+                .keyword(keywords)
+                .build();
+    }
+
     // 오래된 검색어 삭제
     @Transactional
     @Scheduled(cron = "0 0 * * * ?")  // 1시간마다 삭제 실행
     public void deleteOldSearchLogs() {
         LocalDateTime thresholdTime = LocalDateTime.now().minusHours(24);
-        searchLogRepository.deleteBySearchedAtBefore(thresholdTime);
+        searchLogPopularRepository.deleteBySearchedAtBefore(thresholdTime);
     }
 }