fix: 테스트 실패 문제 해결

Space-Club · May 20, 2024 · 9d8f658 · 9d8f658
1 parent 58fca5f
commit 9d8f658
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 61 deletions.
diff --git a/src/main/java/com/spaceclub/global/annotation/profanity/ProfanityLoader.java b/src/main/java/com/spaceclub/global/annotation/profanity/ProfanityLoader.java
@@ -4,38 +4,29 @@
 import com.googlecode.concurrenttrees.radix.node.concrete.voidvalue.VoidValue;
 import com.googlecode.concurrenttrees.radixinverted.ConcurrentInvertedRadixTree;
 import com.googlecode.concurrenttrees.radixinverted.InvertedRadixTree;
-import com.spaceclub.global.config.ProfanityConfig;
+import com.spaceclub.global.annotation.profanity.domain.Profanity;
+import com.spaceclub.global.annotation.profanity.domain.repository.ProfanityRepository;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.List;
 import java.util.Spliterator;
 import java.util.stream.StreamSupport;
 
-import static com.spaceclub.global.annotation.profanity.ProfanityExceptionMessage.FAIL_BAD_WORD_SETUP;
-
 @Slf4j
 @Component
 @RequiredArgsConstructor
 public class ProfanityLoader {
 
-    private final ProfanityConfig config;
+    private final ProfanityRepository profanityRepository;
     private final InvertedRadixTree<VoidValue> TRIE = new ConcurrentInvertedRadixTree<>(new SmartArrayBasedNodeFactory());
 
     @PostConstruct
     private void loadProfanityFromFile() {
-        try {
-            List<String> banWords = Files.readAllLines(Paths.get(config.filePath()));
-            banWords.forEach(banWord -> TRIE.put(banWord, VoidValue.SINGLETON)); // 메모리 효율을 위해 불필요한 value 설정 x
-        } catch (IOException e) {
-            log.error("비속어 목록 파일 읽기 실패", e);
-            throw new IllegalStateException(FAIL_BAD_WORD_SETUP.toString());
-        }
+        List<Profanity> banWords = profanityRepository.findAll();
+        banWords.forEach(banWord -> TRIE.put(banWord.getBanWord(), VoidValue.SINGLETON)); // 메모리 효율을 위해 불필요한 value 설정 x
     }
 
     public List<String> profanityContained(String text) {

diff --git a/src/test/java/com/spaceclub/board/controller/CommentControllerTest.java b/src/test/java/com/spaceclub/board/controller/CommentControllerTest.java
@@ -9,6 +9,7 @@
 import com.spaceclub.global.annotation.login.UserArgumentResolver;
 import com.spaceclub.global.annotation.profanity.ProfanityCheckValidator;
 import com.spaceclub.global.annotation.profanity.ProfanityLoader;
+import com.spaceclub.global.annotation.profanity.domain.repository.ProfanityRepository;
 import com.spaceclub.global.config.WebConfig;
 import com.spaceclub.oauth.interceptor.AuthenticationInterceptor;
 import com.spaceclub.oauth.interceptor.AuthorizationInterceptor;
@@ -92,6 +93,9 @@ class CommentControllerTest {
     @MockBean
     private ProfanityCheckValidator profanityCheckValidator;
 
+    @MockBean
+    private ProfanityRepository profanityRepository;
+
     @Test
     @WithMockUser
     void 댓글_전체_조회에_성공한다() throws Exception {

diff --git a/src/test/java/com/spaceclub/board/controller/PostControllerTest.java b/src/test/java/com/spaceclub/board/controller/PostControllerTest.java
@@ -10,6 +10,7 @@
 import com.spaceclub.global.annotation.login.UserArgumentResolver;
 import com.spaceclub.global.annotation.profanity.ProfanityCheckValidator;
 import com.spaceclub.global.annotation.profanity.ProfanityLoader;
+import com.spaceclub.global.annotation.profanity.domain.repository.ProfanityRepository;
 import com.spaceclub.global.aws.s3.S3ImageUploader;
 import com.spaceclub.global.config.WebConfig;
 import com.spaceclub.oauth.interceptor.AuthenticationInterceptor;
@@ -102,6 +103,9 @@ class PostControllerTest {
     @MockBean
     private ProfanityCheckValidator profanityCheckValidator;
 
+    @MockBean
+    private ProfanityRepository profanityRepository;
+
     @Test
     @WithMockUser
     void 게시글_전체_조회에_성공한다() throws Exception {

diff --git a/src/test/java/com/spaceclub/club/controller/ClubControllerTest.java b/src/test/java/com/spaceclub/club/controller/ClubControllerTest.java
@@ -9,6 +9,7 @@
 import com.spaceclub.global.annotation.login.UserArgumentResolver;
 import com.spaceclub.global.annotation.profanity.ProfanityCheckValidator;
 import com.spaceclub.global.annotation.profanity.ProfanityLoader;
+import com.spaceclub.global.annotation.profanity.domain.repository.ProfanityRepository;
 import com.spaceclub.global.aws.S3Properties;
 import com.spaceclub.global.config.WebConfig;
 import com.spaceclub.oauth.interceptor.AuthenticationInterceptor;
@@ -97,6 +98,9 @@ class ClubControllerTest {
     @MockBean
     private ProfanityCheckValidator profanityCheckValidator;
 
+    @MockBean
+    private ProfanityRepository profanityRepository;
+
     private MockMultipartFile logoImage;
     private MockMultipartFile coverImage;
     private MockMultipartFile request;

diff --git a/src/test/java/com/spaceclub/club/controller/ClubNoticeControllerTest.java b/src/test/java/com/spaceclub/club/controller/ClubNoticeControllerTest.java
@@ -9,6 +9,7 @@
 import com.spaceclub.global.annotation.login.UserArgumentResolver;
 import com.spaceclub.global.annotation.profanity.ProfanityCheckValidator;
 import com.spaceclub.global.annotation.profanity.ProfanityLoader;
+import com.spaceclub.global.annotation.profanity.domain.repository.ProfanityRepository;
 import com.spaceclub.global.config.WebConfig;
 import com.spaceclub.oauth.interceptor.AuthenticationInterceptor;
 import com.spaceclub.oauth.interceptor.AuthorizationInterceptor;
@@ -86,6 +87,9 @@ class ClubNoticeControllerTest {
     @MockBean
     private ProfanityCheckValidator profanityCheckValidator;
 
+    @MockBean
+    private ProfanityRepository profanityRepository;
+
     @Test
     @WithMockUser
     void 클럽_공지사항_작성에_성공한다() throws Exception {

diff --git a/src/test/java/com/spaceclub/global/profanity/ProfanityCheckValidatorTest.java b/src/test/java/com/spaceclub/global/profanity/ProfanityCheckValidatorTest.java
diff --git a/src/test/java/com/spaceclub/user/controller/LoginControllerTest.java b/src/test/java/com/spaceclub/user/controller/LoginControllerTest.java
@@ -6,6 +6,7 @@
 import com.spaceclub.global.annotation.login.UserArgumentResolver;
 import com.spaceclub.global.annotation.profanity.ProfanityCheckValidator;
 import com.spaceclub.global.annotation.profanity.ProfanityLoader;
+import com.spaceclub.global.annotation.profanity.domain.repository.ProfanityRepository;
 import com.spaceclub.global.config.WebConfig;
 import com.spaceclub.oauth.interceptor.AuthenticationInterceptor;
 import com.spaceclub.oauth.interceptor.AuthorizationInterceptor;
@@ -87,6 +88,9 @@ class LoginControllerTest {
     @MockBean
     private ProfanityCheckValidator profanityCheckValidator;
 
+    @MockBean
+    private ProfanityRepository profanityRepository;
+
     @Test
     @WithMockUser
     void 유저가_신규유저이면_빈값_토큰과_아이디반환에_성공한다() throws Exception {

diff --git a/src/test/java/com/spaceclub/user/controller/UserControllerTest.java b/src/test/java/com/spaceclub/user/controller/UserControllerTest.java
@@ -5,6 +5,7 @@
 import com.spaceclub.global.annotation.login.UserArgumentResolver;
 import com.spaceclub.global.annotation.profanity.ProfanityCheckValidator;
 import com.spaceclub.global.annotation.profanity.ProfanityLoader;
+import com.spaceclub.global.annotation.profanity.domain.repository.ProfanityRepository;
 import com.spaceclub.global.config.WebConfig;
 import com.spaceclub.oauth.interceptor.AuthenticationInterceptor;
 import com.spaceclub.oauth.interceptor.AuthorizationInterceptor;
@@ -97,6 +98,9 @@ class UserControllerTest {
     @MockBean
     private ProfanityCheckValidator profanityCheckValidator;
 
+    @MockBean
+    private ProfanityRepository profanityRepository;
+
     @Test
     @WithMockUser
     void 유저의_프로필_조회에_성공한다() throws Exception {