Merge pull request #168 from Gongjakso/refactor/search

fix: Discord Webhook 오류 및 StackName 조건 오류 수정
Gongjakso · Jul 14, 2024 · 9628a13 · 9628a13
2 parents c28be8f + 5cbc618
commit 9628a13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/com/gongjakso/server/domain/post/service/PostService.java b/src/main/java/com/gongjakso/server/domain/post/service/PostService.java
@@ -241,8 +241,7 @@ public Page<GetContestRes> getContestsByFilter(String sort, String meetingCity,
     @Transactional(readOnly = true)
     public Page<GetProjectRes> getProjectsByFilter(String sort, String meetingCity, String meetingTown, String stackName, String searchWord, Pageable page) {
         // Validation
-        System.out.println("TEST");
-        if(stackName != null && (stackName.isBlank() || StackNameType.isValid(stackName))) {
+        if(stackName != null && !stackName.isBlank() && !StackNameType.isValid(stackName)) {
             throw new ApplicationException(INVALID_VALUE_EXCEPTION);
         }
 

diff --git a/src/main/java/com/gongjakso/server/global/exception/GlobalExceptionHandler.java b/src/main/java/com/gongjakso/server/global/exception/GlobalExceptionHandler.java
@@ -20,15 +20,17 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(ApplicationException.class)
     protected ResponseEntity<ErrorResponse> handleApplicationException(ApplicationException e){
         log.error("{} {}", e, e.getErrorCode().toString());
-        discordClient.sendErrorMessage(e.getErrorCode().getCode(), e.getErrorCode().getMessage(), Arrays.toString(e.getStackTrace()));
+        // WebClient 관련 오류로 임시 비활성화
+        // discordClient.sendErrorMessage(e.getErrorCode().getCode(), e.getErrorCode().getMessage(), Arrays.toString(e.getStackTrace()));
         return ResponseEntity.status(e.getErrorCode().getHttpStatus())
                 .body(new ErrorResponse(e.getErrorCode()));
     }
 
     @ExceptionHandler(RuntimeException.class)
     protected ResponseEntity<ErrorResponse> handleRuntimeException(RuntimeException e) {
         log.error(e.getMessage());
-        discordClient.sendErrorMessage(ErrorCode.INTERNAL_SERVER_EXCEPTION.getCode(), e.getMessage(), Arrays.toString(e.getStackTrace()));
+        // WebClient 오류로 임시 비활성화
+        // discordClient.sendErrorMessage(ErrorCode.INTERNAL_SERVER_EXCEPTION.getCode(), e.getMessage(), Arrays.toString(e.getStackTrace()));
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
                 .body(new ErrorResponse(e.getMessage()));
     }