Merge pull request #58 from seoshinehyo/fix/#57

[Fix] 키워드 랜덤 받아오기 수정
seoshinehyo · Dec 22, 2024 · aa70d2a · aa70d2a
2 parents bb6da2e + 6a6cba7
commit aa70d2a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/com/dearnote/repository/KeywordRepository.java b/src/main/java/com/dearnote/repository/KeywordRepository.java
@@ -2,6 +2,9 @@
 
 import com.dearnote.domain.Keyword;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface KeywordRepository extends JpaRepository<Keyword, Long> {
+    @Query(value = "SELECT * FROM keyword ORDER BY RAND() LIMIT 1", nativeQuery = true)
+    Keyword findRandomKeyword();
 }
diff --git a/src/main/java/com/dearnote/service/keyword/KeywordQueryServiceImpl.java b/src/main/java/com/dearnote/service/keyword/KeywordQueryServiceImpl.java
@@ -23,9 +23,11 @@ public Keyword getKeyword(Long keywordId) {
     }
 
     @Override
-    public Keyword getRandomKeyword(){
-        List<Keyword> allKeywords = keywordRepository.findAll();
-        Collections.shuffle(allKeywords);
-        return allKeywords.get(0);
+    public Keyword getRandomKeyword() {
+        Keyword keyword = keywordRepository.findRandomKeyword();
+        if (keyword == null) {
+            throw new MemberHandler(ErrorStatus.KEYWORD_NOT_FOUND);
+        }
+        return keyword;
     }
 }