Merge pull request #174 from prgrms-web-devcourse-final-project/feature/

#173-letters-keyword-frequent Feature/#173 letters keyword frequent
prgrms-web-devcourse-final-project · Dec 8, 2024 · 9272e0f · 9272e0f
2 parents bba96fb + 979591c
commit 9272e0f
Show file tree

Hide file tree

Showing 15 changed files with 107 additions and 9 deletions.
diff --git a/src/main/java/postman/bottler/keyword/controller/KeywordController.java b/src/main/java/postman/bottler/keyword/controller/KeywordController.java
@@ -10,9 +10,11 @@
 import org.springframework.web.bind.annotation.RestController;
 import postman.bottler.global.response.ApiResponse;
 import postman.bottler.keyword.dto.request.UserKeywordRequestDTO;
+import postman.bottler.keyword.dto.response.FrequentKeywordsDTO;
 import postman.bottler.keyword.dto.response.KeywordResponseDTO;
 import postman.bottler.keyword.dto.response.UserKeywordResponseDTO;
 import postman.bottler.keyword.service.KeywordService;
+import postman.bottler.keyword.service.LetterKeywordService;
 import postman.bottler.keyword.service.UserKeywordService;
 import postman.bottler.user.auth.CustomUserDetails;
 
@@ -23,6 +25,7 @@ public class KeywordController {
 
     private final UserKeywordService userKeywordService;
     private final KeywordService keywordService;
+    private final LetterKeywordService letterKeywordService;
 
     @Operation(
             summary = "유저 키워드 목록 조회",
@@ -58,4 +61,16 @@ public ApiResponse<KeywordResponseDTO> getKeywordList() {
         KeywordResponseDTO result = keywordService.getKeywords();
         return ApiResponse.onSuccess(result);
     }
+
+    @Operation(
+            summary = "사용자의 자주 쓰는 키워드 조회",
+            description = "현재 사용자의 자주 쓰는 키워드를 조회합니다"
+    )
+    @GetMapping("/frequent")
+    public ApiResponse<FrequentKeywordsDTO> getTopFrequentKeywords(
+            @AuthenticationPrincipal CustomUserDetails userDetails
+    ) {
+        FrequentKeywordsDTO result = letterKeywordService.getTopFrequentKeywords(userDetails.getUserId());
+        return ApiResponse.onSuccess(result);
+    }
 }
diff --git a/src/main/java/postman/bottler/keyword/dto/response/FrequentKeywordsDTO.java b/src/main/java/postman/bottler/keyword/dto/response/FrequentKeywordsDTO.java
@@ -0,0 +1,13 @@
+package postman.bottler.keyword.dto.response;
+
+import java.util.List;
+
+public record FrequentKeywordsDTO(
+        List<String> keywords
+) {
+    public static FrequentKeywordsDTO from(List<String> keywords) {
+        return new FrequentKeywordsDTO(
+                keywords
+        );
+    }
+}
diff --git a/src/main/java/postman/bottler/keyword/infra/LetterKeywordQueryDslRepository.java b/src/main/java/postman/bottler/keyword/infra/LetterKeywordQueryDslRepository.java
@@ -1,5 +1,6 @@
 package postman.bottler.keyword.infra;
 
+import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
@@ -59,4 +60,22 @@ private List<Long> getRandomLetters(int limit, List<Long> excludedLetterIds) {
                 .limit(limit)
                 .fetch();
     }
+
+    public List<LetterKeywordEntity> getFrequentKeywords(List<Long> letterIds) {
+        QLetterKeywordEntity letterKeyword = QLetterKeywordEntity.letterKeywordEntity;
+
+        return queryFactory
+                .select(Projections.constructor(LetterKeywordEntity.class,
+                        letterKeyword.letterId.min(),
+                        letterKeyword.keyword,
+                        letterKeyword.isDeleted
+                ))
+                .from(letterKeyword)
+                .where(letterKeyword.letterId.in(letterIds)
+                        .and(letterKeyword.isDeleted.eq(false)))
+                .groupBy(letterKeyword.keyword)
+                .orderBy(letterKeyword.keyword.count().desc())
+                .limit(5)
+                .fetch();
+    }
 }
diff --git a/src/main/java/postman/bottler/keyword/infra/LetterKeywordRepositoryImpl.java b/src/main/java/postman/bottler/keyword/infra/LetterKeywordRepositoryImpl.java
@@ -35,4 +35,11 @@ public List<Long> getMatchedLetters(List<String> userKeywords, List<Long> letter
     public void markKeywordsAsDeleted(List<Long> letterIds) {
         jdbcRepository.batchUpdateIsDeleted(letterIds);
     }
+
+    @Override
+    public List<LetterKeyword> getFrequentKeywords(List<Long> letterIds) {
+        return queryDslRepository.getFrequentKeywords(letterIds).stream()
+                .map(LetterKeywordEntity::toDomain)
+                .toList();
+    }
 }
diff --git a/src/main/java/postman/bottler/keyword/infra/entity/LetterKeywordEntity.java b/src/main/java/postman/bottler/keyword/infra/entity/LetterKeywordEntity.java
@@ -33,7 +33,7 @@ public class LetterKeywordEntity {
     public LetterKeywordEntity(Long letterId, String keyword, boolean isDeleted) {
         this.letterId = letterId;
         this.keyword = keyword;
-        this.isDeleted = false;
+        this.isDeleted = isDeleted;
     }
 
     public static LetterKeywordEntity from(LetterKeyword letterKeyword) {

diff --git a/src/main/java/postman/bottler/keyword/service/AsyncRecommendationService.java b/src/main/java/postman/bottler/keyword/service/AsyncRecommendationService.java
@@ -14,7 +14,7 @@ public class AsyncRecommendationService {
     private final RecommendService recommendService;
     private final UserKeywordService userKeywordService;
     private final LetterBoxService letterBoxService;
-    private static final int RECOMMENDATION_LIMIT = 3;
+    private static final int RECOMMENDATION_LIMIT = 10;
     private final RedisLetterService redisLetterService;
 
     @Async

diff --git a/src/main/java/postman/bottler/keyword/service/LetterKeywordRepository.java b/src/main/java/postman/bottler/keyword/service/LetterKeywordRepository.java
@@ -11,4 +11,6 @@ public interface LetterKeywordRepository {
     List<Long> getMatchedLetters(List<String> userKeywords, List<Long> letterIds, int limit);
 
     void markKeywordsAsDeleted(List<Long> letterIds);
+
+    List<LetterKeyword> getFrequentKeywords(List<Long> letterIds);
 }
diff --git a/src/main/java/postman/bottler/keyword/service/LetterKeywordService.java b/src/main/java/postman/bottler/keyword/service/LetterKeywordService.java
@@ -2,15 +2,20 @@
 
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import postman.bottler.keyword.domain.LetterKeyword;
+import postman.bottler.keyword.dto.response.FrequentKeywordsDTO;
+import postman.bottler.letter.service.LetterService;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class LetterKeywordService {
 
     private final LetterKeywordRepository letterKeywordRepository;
+    private final LetterService letterService;
 
     @Transactional
     public void createLetterKeywords(Long letterId, List<String> keywords) {
@@ -33,4 +38,15 @@ public List<String> getKeywords(Long letterId) {
     public void markKeywordsAsDeleted(List<Long> letterIds) {
         letterKeywordRepository.markKeywordsAsDeleted(letterIds);
     }
+
+
+    @Transactional(readOnly = true)
+    public FrequentKeywordsDTO getTopFrequentKeywords(Long userId) {
+        List<Long> letterIds = letterService.findAllByUserId(userId);
+        List<LetterKeyword> frequentKeywords = letterKeywordRepository.getFrequentKeywords(letterIds);
+        List<String> keywords = frequentKeywords.stream()
+                .map(LetterKeyword::getKeyword)
+                .toList();
+        return FrequentKeywordsDTO.from(keywords);
+    }
 }
diff --git a/src/main/java/postman/bottler/keyword/service/RedisLetterService.java b/src/main/java/postman/bottler/keyword/service/RedisLetterService.java
@@ -7,8 +7,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import postman.bottler.keyword.util.RedisLetterKeyUtil;
 import postman.bottler.letter.domain.BoxType;
+import postman.bottler.letter.domain.Letter;
 import postman.bottler.letter.domain.LetterType;
 import postman.bottler.letter.dto.LetterBoxDTO;
 import postman.bottler.letter.exception.LetterNotFoundException;
@@ -26,11 +28,13 @@ public class RedisLetterService {
     private static final int MAX_RECOMMENDATIONS = 3;
     private final LetterService letterService;
 
+    @Transactional
     public void saveRecommendationsTemp(Long userId, List<Long> recommendations) {
         String key = RedisLetterKeyUtil.getTempRecommendationKey(userId);
         redisTemplate.opsForValue().set(key, recommendations);
     }
 
+    @Transactional
     public RecommendNotificationRequestDTO updateRecommendationsFromTemp(Long userId) {
         String tempKey = RedisLetterKeyUtil.getTempRecommendationKey(userId);
         String activeKey = RedisLetterKeyUtil.getActiveRecommendationKey(userId);
@@ -41,10 +45,11 @@ public RecommendNotificationRequestDTO updateRecommendationsFromTemp(Long userId
         Long recommendId = findFirstValidLetter(tempRecommendations);
         updateActiveRecommendations(recommendId, activeRecommendations, activeKey);
         saveLetterToBox(userId, recommendId);
-
+        Letter letter = letterService.findLetter(recommendId);
+
         redisTemplate.delete(tempKey);
 
-        return RecommendNotificationRequestDTO.of(userId, recommendId);
+        return RecommendNotificationRequestDTO.of(userId, recommendId, letter.getLabel());
     }
 
     private void saveLetterToBox(Long userId, Long letterId) {

diff --git a/src/main/java/postman/bottler/letter/infra/LetterJpaRepository.java b/src/main/java/postman/bottler/letter/infra/LetterJpaRepository.java
@@ -22,4 +22,7 @@ public interface LetterJpaRepository extends JpaRepository<LetterEntity, Long> {
 
     @Query("SELECT l FROM LetterEntity l WHERE l.id IN :letterIds AND l.isDeleted = false")
     List<LetterEntity> findAllByIds(List<Long> letterIds);
+
+    @Query("SELECT l FROM LetterEntity l WHERE l.userId = :userId AND l.isDeleted = false")
+    List<LetterEntity> findAllByUserId(Long userId);
 }
diff --git a/src/main/java/postman/bottler/letter/infra/LetterRepositoryImpl.java b/src/main/java/postman/bottler/letter/infra/LetterRepositoryImpl.java
@@ -47,4 +47,11 @@ public List<Letter> findAllByIds(List<Long> letterIds) {
     public boolean checkLetterExists(Long letterId) {
         return letterJpaRepository.existsById(letterId);
     }
+
+    @Override
+    public List<Letter> findAllByUserId(Long userId) {
+        return letterJpaRepository.findAllByUserId(userId).stream()
+                .map(LetterEntity::toDomain)
+                .toList();
+    }
 }
diff --git a/src/main/java/postman/bottler/letter/service/LetterRepository.java b/src/main/java/postman/bottler/letter/service/LetterRepository.java
@@ -16,4 +16,6 @@ public interface LetterRepository {
     List<Letter> findAllByIds(List<Long> letterIds);
 
     boolean checkLetterExists(Long letterId);
+
+    List<Letter> findAllByUserId(Long userId);
 }
diff --git a/src/main/java/postman/bottler/letter/service/LetterService.java b/src/main/java/postman/bottler/letter/service/LetterService.java
@@ -67,7 +67,8 @@ public ReceiverDTO getReceiverInfoById(Long letterId) {
         return ReceiverDTO.from(letter);
     }
 
-    private Letter findLetter(Long letterId) {
+    @Transactional(readOnly = true)
+    public Letter findLetter(Long letterId) {
         return letterRepository.findById(letterId)
                 .orElseThrow(() -> new LetterNotFoundException("키워드 편지가 존재하지 않습니다."));
     }
@@ -89,4 +90,11 @@ public List<NotificationLabelRequestDTO> getLabels(List<Long> ids) {
                 .map(find -> new NotificationLabelRequestDTO(find.getId(), find.getLabel()))
                 .toList();
     }
+
+    @Transactional(readOnly = true)
+    public List<Long> findAllByUserId(Long userId) {
+        return letterRepository.findAllByUserId(userId).stream()
+                .map(Letter::getId)
+                .toList();
+    }
 }
diff --git a/src/main/java/postman/bottler/notification/dto/request/RecommendNotificationRequestDTO.java b/src/main/java/postman/bottler/notification/dto/request/RecommendNotificationRequestDTO.java
@@ -2,9 +2,10 @@
 
 public record RecommendNotificationRequestDTO(
         Long userId,
-        Long letterId
+        Long letterId,
+        String label
 ) {
-    public static RecommendNotificationRequestDTO of(Long userId, Long letterId) {
-        return new RecommendNotificationRequestDTO(userId, letterId);
+    public static RecommendNotificationRequestDTO of(Long userId, Long letterId, String label) {
+        return new RecommendNotificationRequestDTO(userId, letterId, label);
     }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -13,7 +13,7 @@ spring:
         dialect: org.hibernate.dialect.MySQLDialect
         format_sql: true
         highlight_sql: true
-    show-sql: false
+    show-sql: true
   data:
     redis:
       host: ${REDIS_HOST}