chore: 중복된 keyword count 증가 추가

iHangbot · Aug 17, 2023 · e4d9dfa · e4d9dfa
1 parent 7300218
commit e4d9dfa
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/src/main/java/com/mz/ihangbot/keyWord/domain/KeyWord.java b/src/main/java/com/mz/ihangbot/keyWord/domain/KeyWord.java
@@ -41,4 +41,8 @@ public KeyWord(Member member, String keyword, int count, Date date) {
         this.count = count;
         this.date = date;
     }
+
+    public void updateCount(int count) {
+        this.count += count;
+    }
 }
diff --git a/src/main/java/com/mz/ihangbot/keyWord/repository/KeyWordRepository.java b/src/main/java/com/mz/ihangbot/keyWord/repository/KeyWordRepository.java
@@ -1,20 +1,25 @@
 package com.mz.ihangbot.keyWord.repository;
 
 import com.mz.ihangbot.keyWord.domain.KeyWord;
+import com.mz.ihangbot.member.domain.Member;
 import com.mz.ihangbot.report.dto.KeyWordReportResponseDTO;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 public interface KeyWordRepository extends JpaRepository<KeyWord, Long>  {
 
     @Query(value = "select new com.mz.ihangbot.report.dto.KeyWordReportResponseDTO(result.kw, result.cnt) from (select k.keyword as kw, SUM(k.count) as cnt from KeyWord k where :username = k.member.username and :aWeekAgo <= k.date group by k.keyword) as result order by result.cnt DESC limit 5")
     List<KeyWordReportResponseDTO> getKeyWords(@Param("username") String username, @Param("aWeekAgo") Date aWeekAgo);
 
-
     @Query(value = "select k from KeyWord k where :username = k.member.username and k.date >= :aWeekAgo")
     List<KeyWord> findAllByUsernameAndDate(@Param("username") String username, @Param("aWeekAgo") Date aWeekAgo);
+
+    @Query(value = "select k from KeyWord k where :username = k.member.username and k.date >= :aWeekAgo and k.keyword = :keyword")
+    Optional<KeyWord> findByUsernameAndDateAndKeyWord(@Param("username") String username, @Param("aWeekAgo") Date aWeekAgo, @Param("keyword") String keyword);
+
 }
diff --git a/src/main/java/com/mz/ihangbot/keyWord/service/KeyWordService.java b/src/main/java/com/mz/ihangbot/keyWord/service/KeyWordService.java
@@ -16,6 +16,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
@@ -31,15 +32,26 @@ public KeyWordResponseDTO addKeyWord(String keyword, String username, int count,
         Member member = memberRepository.findByUserName(username)
                 .orElseThrow(() -> new EntityNotFoundException(ErrorCode.MEMBER_NOT_FOUND));
 
-        KeyWord keyWord = KeyWord.builder()
-                .keyword(keyword)
-                .member(member)
-                .count(count)
-                .date(date)
-                .build();
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        cal.add(Calendar.DATE, -7);
+
+        Optional<KeyWord> word = keyWordRepository.findByUsernameAndDateAndKeyWord(username, cal.getTime(), keyword);
 
-        KeyWord saved = keyWordRepository.save(keyWord);
-        return KeyWordResponseDTO.from(saved);
+        if (word.isEmpty()) {
+            KeyWord keyWord = KeyWord.builder()
+                    .keyword(keyword)
+                    .member(member)
+                    .count(count)
+                    .date(date)
+                    .build();
+            KeyWord saved = keyWordRepository.save(keyWord);
+            return KeyWordResponseDTO.from(saved);
+        }
+        else {
+            word.get().updateCount(count);
+        }
+        return KeyWordResponseDTO.from(word.get());
     }
 
     @Transactional