Merge pull request #101 from Recipe-Project/feature/fix_badwords_filter

Feature/fix badwords filter

src/main/java/com/recipe/app/src/common/utils/BadWordFiltering.java

@@ -0,0 +1,47 @@
+package com.recipe.app.src.common.utils;
+
+import com.recipe.app.src.etc.exception.BadWordException;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Component;
+import org.springframework.util.FileCopyUtils;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Component
+public class BadWordFiltering {
+
+    private List<String> badWords;
+
+    public BadWordFiltering() {
+
+        try {
+
+            ClassPathResource resource = new ClassPathResource("badwords.txt");
+            byte[] bdata = FileCopyUtils.copyToByteArray(resource.getInputStream());
+            String text = new String(bdata, StandardCharsets.UTF_8);
+
+            this.badWords = Arrays.stream(text.replaceAll("\'", "").split(", ")).toList();
+        } catch (Exception e) {
+            this.badWords = new ArrayList<>();
+        }
+    }
+
+
+    public void check(String keyword) {
+
+        keyword = changeTextWithoutSpecialSymbols(keyword);
+
+        for (String badWord : badWords) {
+            if (keyword.contains(badWord)) {
+                throw new BadWordException(badWord);
+            }
+        }
+    }
+
+    private String changeTextWithoutSpecialSymbols(String keyword) {
+        return keyword.replaceAll("[^a-zA-Z0-9가-힣]", "");
+    }
+}

src/main/java/com/recipe/app/src/config/GeneralExceptionHandler.java

@@ -1,12 +1,14 @@
 package com.recipe.app.src.config;
 
+import com.recipe.app.src.etc.exception.BadWordException;
 import com.recipe.app.src.etc.exception.NotFoundNoticeException;
 import com.recipe.app.src.fridge.exception.NotFoundFridgeException;
 import com.recipe.app.src.fridgeBasket.exception.NotFoundFridgeBasketException;
 import com.recipe.app.src.ingredient.exception.NotFoundIngredientCategoryException;
 import com.recipe.app.src.ingredient.exception.NotFoundIngredientException;
 import com.recipe.app.src.recipe.exception.NotFoundRecipeException;
 import com.recipe.app.src.recipe.exception.NotFoundRecipeLevelException;
+import com.recipe.app.src.user.exception.ForbiddenAccessException;
 import com.recipe.app.src.user.exception.NotFoundUserException;
 import com.recipe.app.src.user.exception.UserTokenNotExistException;
 import org.slf4j.Logger;
@@ -29,9 +31,21 @@ public ResponseEntity<?> handleNotFoundException(Exception e) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e);
     }
 
-    @ExceptionHandler({UserTokenNotExistException.class})
+    @ExceptionHandler({UserTokenNotExistException.class, ForbiddenAccessException.class})
     public ResponseEntity<?> handleUnauthorizedException(Exception e) {
         log.error(e.getMessage());
         return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(e);
     }
+
+    @ExceptionHandler({BadWordException.class, IllegalArgumentException.class, NullPointerException.class})
+    public ResponseEntity<?> handleBadRequestException(Exception e) {
+        log.error(e.getMessage());
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e);
+    }
+
+    @ExceptionHandler({Exception.class})
+    public ResponseEntity<?> handleException(Exception e) {
+        log.error(e.getMessage());
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e);
+    }
 }

src/main/java/com/recipe/app/src/recipe/application/RecipeSearchService.java

@@ -1,6 +1,6 @@
 package com.recipe.app.src.recipe.application;
 
-import com.recipe.app.src.etc.application.BadWordService;
+import com.recipe.app.src.common.utils.BadWordFiltering;
 import com.recipe.app.src.fridge.application.FridgeService;
 import com.recipe.app.src.recipe.application.dto.RecipeDetailResponse;
 import com.recipe.app.src.recipe.application.dto.RecipesResponse;
@@ -23,24 +23,24 @@ public class RecipeSearchService {
     private final RecipeRepository recipeRepository;
     private final FridgeService fridgeService;
     private final UserService userService;
-    private final BadWordService badWordService;
+    private final BadWordFiltering badWordFiltering;
     private final RecipeScrapService recipeScrapService;
     private final RecipeViewService recipeViewService;
 
-    public RecipeSearchService(RecipeRepository recipeRepository, FridgeService fridgeService, UserService userService, BadWordService badWordService,
+    public RecipeSearchService(RecipeRepository recipeRepository, FridgeService fridgeService, UserService userService, BadWordFiltering badWordFiltering,
                                RecipeScrapService recipeScrapService, RecipeViewService recipeViewService) {
         this.recipeRepository = recipeRepository;
         this.fridgeService = fridgeService;
         this.userService = userService;
-        this.badWordService = badWordService;
+        this.badWordFiltering = badWordFiltering;
         this.recipeScrapService = recipeScrapService;
         this.recipeViewService = recipeViewService;
     }
 
     @Transactional(readOnly = true)
     public RecipesResponse findRecipesByKeywordOrderBy(User user, String keyword, long lastRecipeId, int size, String sort) {
 
-        badWordService.checkBadWords(keyword);
+        badWordFiltering.check(keyword);
 
         long totalCnt = recipeRepository.countByKeyword(keyword);
 

src/main/java/com/recipe/app/src/recipe/application/RecipeService.java

@@ -1,7 +1,7 @@
 package com.recipe.app.src.recipe.application;
 
 import com.google.common.base.Preconditions;
-import com.recipe.app.src.etc.application.BadWordService;
+import com.recipe.app.src.common.utils.BadWordFiltering;
 import com.recipe.app.src.recipe.application.dto.RecipeRequest;
 import com.recipe.app.src.recipe.domain.Recipe;
 import com.recipe.app.src.recipe.exception.NotFoundRecipeException;
@@ -18,15 +18,15 @@
 public class RecipeService {
 
     private final RecipeRepository recipeRepository;
-    private final BadWordService badWordService;
+    private final BadWordFiltering badWordFiltering;
     private final RecipeScrapService recipeScrapService;
     private final RecipeViewService recipeViewService;
     private final RecipeReportService recipeReportService;
 
-    public RecipeService(RecipeRepository recipeRepository, BadWordService badWordService, RecipeScrapService recipeScrapService,
+    public RecipeService(RecipeRepository recipeRepository, BadWordFiltering badWordFiltering, RecipeScrapService recipeScrapService,
                          RecipeViewService recipeViewService, RecipeReportService recipeReportService) {
         this.recipeRepository = recipeRepository;
-        this.badWordService = badWordService;
+        this.badWordFiltering = badWordFiltering;
         this.recipeScrapService = recipeScrapService;
         this.recipeViewService = recipeViewService;
         this.recipeReportService = recipeReportService;
@@ -37,8 +37,8 @@ public void create(User user, RecipeRequest request) {
 
         validateRecipeRequest(request);
 
-        badWordService.checkBadWords(request.getTitle());
-        badWordService.checkBadWords(request.getIntroduction());
+        badWordFiltering.check(request.getTitle());
+        badWordFiltering.check(request.getIntroduction());
 
         recipeRepository.save(request.toRecipeEntity(user.getUserId()));
     }
@@ -48,8 +48,8 @@ public void update(User user, Long recipeId, RecipeRequest request) {
 
         validateRecipeRequest(request);
 
-        badWordService.checkBadWords(request.getTitle());
-        badWordService.checkBadWords(request.getIntroduction());
+        badWordFiltering.check(request.getTitle());
+        badWordFiltering.check(request.getIntroduction());
 
         Recipe recipe = findByUserIdAndRecipeId(user, recipeId);
         recipe.updateRecipe(request.toRecipeEntity(user.getUserId()));

src/main/java/com/recipe/app/src/recipe/application/blog/BlogRecipeService.java

@@ -1,6 +1,6 @@
 package com.recipe.app.src.recipe.application.blog;
 
-import com.recipe.app.src.etc.application.BadWordService;
+import com.recipe.app.src.common.utils.BadWordFiltering;
 import com.recipe.app.src.recipe.application.dto.RecipesResponse;
 import com.recipe.app.src.recipe.domain.blog.BlogRecipe;
 import com.recipe.app.src.recipe.domain.blog.BlogRecipes;
@@ -18,24 +18,24 @@ public class BlogRecipeService {
     private final BlogRecipeRepository blogRecipeRepository;
     private final BlogScrapService blogScrapService;
     private final BlogViewService blogViewService;
-    private final BadWordService badWordService;
+    private final BadWordFiltering badWordFiltering;
     private final BlogRecipeClientSearchService blogRecipeClientSearchService;
 
 
     private static final int MIN_RECIPE_CNT = 10;
 
     public BlogRecipeService(BlogRecipeRepository blogRecipeRepository, BlogScrapService blogScrapService, BlogViewService blogViewService,
-                             BadWordService badWordService, BlogRecipeClientSearchService blogRecipeClientSearchService) {
+                             BadWordFiltering badWordFiltering, BlogRecipeClientSearchService blogRecipeClientSearchService) {
         this.blogRecipeRepository = blogRecipeRepository;
         this.blogScrapService = blogScrapService;
         this.blogViewService = blogViewService;
-        this.badWordService = badWordService;
+        this.badWordFiltering = badWordFiltering;
         this.blogRecipeClientSearchService = blogRecipeClientSearchService;
     }
 
     public RecipesResponse findBlogRecipesByKeyword(User user, String keyword, long lastBlogRecipeId, int size, String sort) {
 
-        badWordService.checkBadWords(keyword);
+        badWordFiltering.check(keyword);
 
         long totalCnt = blogRecipeRepository.countByKeyword(keyword);
 

src/main/java/com/recipe/app/src/recipe/application/youtube/YoutubeRecipeService.java

@@ -1,6 +1,6 @@
 package com.recipe.app.src.recipe.application.youtube;
 
-import com.recipe.app.src.etc.application.BadWordService;
+import com.recipe.app.src.common.utils.BadWordFiltering;
 import com.recipe.app.src.recipe.application.dto.RecipesResponse;
 import com.recipe.app.src.recipe.domain.youtube.YoutubeRecipe;
 import com.recipe.app.src.recipe.domain.youtube.YoutubeRecipes;
@@ -20,21 +20,21 @@ public class YoutubeRecipeService {
     private final YoutubeRecipeRepository youtubeRecipeRepository;
     private final YoutubeScrapService youtubeScrapService;
     private final YoutubeViewService youtubeViewService;
-    private final BadWordService badWordService;
+    private final BadWordFiltering badWordFiltering;
     private final YoutubeRecipeClientSearchService youtubeRecipeClientSearchService;
 
     public YoutubeRecipeService(YoutubeRecipeRepository youtubeRecipeRepository, YoutubeScrapService youtubeScrapService, YoutubeViewService youtubeViewService,
-                                BadWordService badWordService, YoutubeRecipeClientSearchService youtubeRecipeClientSearchService) {
+                                BadWordFiltering badWordFiltering, YoutubeRecipeClientSearchService youtubeRecipeClientSearchService) {
         this.youtubeRecipeRepository = youtubeRecipeRepository;
         this.youtubeScrapService = youtubeScrapService;
         this.youtubeViewService = youtubeViewService;
-        this.badWordService = badWordService;
+        this.badWordFiltering = badWordFiltering;
         this.youtubeRecipeClientSearchService = youtubeRecipeClientSearchService;
     }
 
     public RecipesResponse findYoutubeRecipesByKeyword(User user, String keyword, long lastYoutubeRecipeId, int size, String sort) throws IOException {
 
-        badWordService.checkBadWords(keyword);
+        badWordFiltering.check(keyword);
 
         long totalCnt = youtubeRecipeRepository.countByKeyword(keyword);