From 4cf369cc8a5cd12acb1bfa8525b0e5fd914e25e4 Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Thu, 3 Oct 2024 13:55:29 +0900 Subject: [PATCH 01/13] =?UTF-8?q?feat:=20#5=20=EC=98=88=EC=99=B8=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xcellentbe/global/error/ErrorCode.java | 22 ++++++++++ .../global/error/ErrorResponse.java | 19 +++++++++ .../error/exception/CommonException.java | 12 ++++++ .../exception/GlobalExceptionHandler.java | 40 +++++++++++++++++++ .../custom/ArticleNotFoundException.java | 10 +++++ .../custom/ChatRoomNotFoundException.java | 10 +++++ .../custom/ChatRoomUnauthorized.java | 10 +++++ .../custom/ExpiredTokenException.java | 10 +++++ .../custom/FailedSearchException.java | 10 +++++ .../custom/InternalServerErrorException.java | 10 +++++ .../custom/InvalidInputValueException.java | 10 +++++ .../custom/InvalidTokenException.java | 10 +++++ .../custom/UserNotFoundException.java | 10 +++++ 13 files changed, 183 insertions(+) create mode 100644 src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java create mode 100644 src/main/java/com/leets/xcellentbe/global/error/ErrorResponse.java create mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/CommonException.java create mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/GlobalExceptionHandler.java create mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/custom/ArticleNotFoundException.java create mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java create mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorized.java create mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/custom/ExpiredTokenException.java create mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/custom/FailedSearchException.java create mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/custom/InternalServerErrorException.java create mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidInputValueException.java create mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidTokenException.java create mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java diff --git a/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java b/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java new file mode 100644 index 0000000..92ed8d4 --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java @@ -0,0 +1,22 @@ +package com.leets.xcellentbe.global.error; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ErrorCode { + INTERNAL_SERVER_ERROR(500, "INTERNAL_SERVER_ERROR", "서버 오류가 발생했습니다."), + INVALID_TOKEN(401, "INVALID_TOKEN", "유효하지 않은 토큰입니다."), + EXPIRED_TOKEN(403, "EXPIRED_TOKEN", "만료된 토큰입니다."), + ARTICLE_NOT_FOUND(404, "ARTICLE_NOT_FOUND", "게시물을 찾을 수 없습니다."), + INVALID_INPUT_VALUE(400, "INVALID_INPUT_VALUE", "유효하지 않은 입력값입니다."), + CHAT_ROOM_NOT_FOUND(404, "CHAT_ROOM_NOT_FOUND", "채팅방을 찾을 수 없습니다."), + CHAT_ROOM_UNAUTHORIZED(401, "CHAT_ROOM_UNAUTHORIZED","권한이 없는 채팅방입니다."), + USER_NOT_FOUND(404, "USER_NOT_FOUND", "유저를 찾을 수 없습니다."), + FAILED_SEARCH(404, "FAILED_SEARCH", "검색할 수 없습니다."); + + private final int status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/leets/xcellentbe/global/error/ErrorResponse.java b/src/main/java/com/leets/xcellentbe/global/error/ErrorResponse.java new file mode 100644 index 0000000..fa3001f --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/ErrorResponse.java @@ -0,0 +1,19 @@ +package com.leets.xcellentbe.global.error; + +import lombok.Getter; + +@Getter +public class ErrorResponse { + private final int status; + private final String message; + private final String code; + + public ErrorResponse(ErrorCode errorCode) { + this.status = errorCode.getStatus(); + this.message = errorCode.getMessage(); + this.code = errorCode.getCode(); + } + public static ErrorResponse of(ErrorCode errorCode) { + return new ErrorResponse(errorCode); + } +} diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/CommonException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/CommonException.java new file mode 100644 index 0000000..ee14e53 --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/CommonException.java @@ -0,0 +1,12 @@ +package com.leets.xcellentbe.global.error.exception; + +import com.leets.xcellentbe.global.error.ErrorCode; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class CommonException extends RuntimeException { + private final ErrorCode errorCode; +} diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/GlobalExceptionHandler.java b/src/main/java/com/leets/xcellentbe/global/error/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..28eb796 --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/GlobalExceptionHandler.java @@ -0,0 +1,40 @@ +package com.leets.xcellentbe.global.error.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import com.leets.xcellentbe.global.error.*; +import com.leets.xcellentbe.global.error.exception.custom.*; + +@ControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(ArticleNotFoundException.class) + public ResponseEntity handleResourceNotFoundException(ArticleNotFoundException ex) { + ErrorCode errorCode = ErrorCode.ARTICLE_NOT_FOUND; + ErrorResponse errorResponse = new ErrorResponse(errorCode); + return new ResponseEntity<>(errorResponse, HttpStatus.NOT_FOUND); + } + + @ExceptionHandler(IllegalArgumentException.class) + public ResponseEntity handleIllegalArgumentException(IllegalArgumentException ex) { + ErrorCode errorCode = ErrorCode.INVALID_INPUT_VALUE; + ErrorResponse errorResponse = new ErrorResponse(errorCode); + return new ResponseEntity<>(errorResponse, HttpStatus.BAD_REQUEST); + } + + @ExceptionHandler(FailedSearchException.class) + public ResponseEntity handleFailedSearchException(FailedSearchException ex) { + ErrorCode errorCode = ErrorCode.FAILED_SEARCH; + ErrorResponse errorResponse = new ErrorResponse(errorCode); + return new ResponseEntity<>(errorResponse, HttpStatus.NOT_FOUND); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleGenericException(Exception ex) { + ErrorCode errorCode = ErrorCode.INTERNAL_SERVER_ERROR; + ErrorResponse errorResponse = new ErrorResponse(errorCode); + return new ResponseEntity<>(errorResponse, HttpStatus.INTERNAL_SERVER_ERROR); + } +} diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ArticleNotFoundException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ArticleNotFoundException.java new file mode 100644 index 0000000..6268abc --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ArticleNotFoundException.java @@ -0,0 +1,10 @@ +package com.leets.xcellentbe.global.error.exception.custom; + +import com.leets.xcellentbe.global.error.ErrorCode; +import com.leets.xcellentbe.global.error.exception.CommonException; + +public class ArticleNotFoundException extends CommonException { + public ArticleNotFoundException() { + super(ErrorCode.ARTICLE_NOT_FOUND); + } +} diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java new file mode 100644 index 0000000..bac267c --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java @@ -0,0 +1,10 @@ +package com.leets.xcellentbe.global.error.exception.custom; + +import com.leets.xcellentbe.global.error.ErrorCode; +import com.leets.xcellentbe.global.error.exception.CommonException; + +public class ChatRoomNotFoundException extends CommonException { + public ChatRoomNotFoundException(String message) { + super(ErrorCode.CHAT_ROOM_NOT_FOUND); + } +} diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorized.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorized.java new file mode 100644 index 0000000..3e175c4 --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorized.java @@ -0,0 +1,10 @@ +package com.leets.xcellentbe.global.error.exception.custom; + +import com.leets.xcellentbe.global.error.ErrorCode; +import com.leets.xcellentbe.global.error.exception.CommonException; + +public class ChatRoomUnauthorized extends CommonException { + public ChatRoomUnauthorized(String message) { + super(ErrorCode.CHAT_ROOM_UNAUTHORIZED); + } +} diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ExpiredTokenException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ExpiredTokenException.java new file mode 100644 index 0000000..2ba2b8b --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ExpiredTokenException.java @@ -0,0 +1,10 @@ +package com.leets.xcellentbe.global.error.exception.custom; + +import com.leets.xcellentbe.global.error.ErrorCode; +import com.leets.xcellentbe.global.error.exception.CommonException; + +public class ExpiredTokenException extends CommonException { + public ExpiredTokenException(String message) { + super(ErrorCode.EXPIRED_TOKEN); + } +} diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/FailedSearchException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/FailedSearchException.java new file mode 100644 index 0000000..b30f6f7 --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/FailedSearchException.java @@ -0,0 +1,10 @@ +package com.leets.xcellentbe.global.error.exception.custom; + +import com.leets.xcellentbe.global.error.ErrorCode; +import com.leets.xcellentbe.global.error.exception.CommonException; + +public class FailedSearchException extends CommonException { + public FailedSearchException(String message) { + super(ErrorCode.FAILED_SEARCH); + } +} diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InternalServerErrorException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InternalServerErrorException.java new file mode 100644 index 0000000..f5216d6 --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InternalServerErrorException.java @@ -0,0 +1,10 @@ +package com.leets.xcellentbe.global.error.exception.custom; + +import com.leets.xcellentbe.global.error.ErrorCode; +import com.leets.xcellentbe.global.error.exception.CommonException; + +public class InternalServerErrorException extends CommonException { + public InternalServerErrorException(String message) { + super(ErrorCode.INTERNAL_SERVER_ERROR); + } +} diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidInputValueException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidInputValueException.java new file mode 100644 index 0000000..9786cae --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidInputValueException.java @@ -0,0 +1,10 @@ +package com.leets.xcellentbe.global.error.exception.custom; + +import com.leets.xcellentbe.global.error.ErrorCode; +import com.leets.xcellentbe.global.error.exception.CommonException; + +public class InvalidInputValueException extends CommonException { + public InvalidInputValueException() { + super(ErrorCode.INVALID_INPUT_VALUE); + } +} diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidTokenException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidTokenException.java new file mode 100644 index 0000000..9073275 --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidTokenException.java @@ -0,0 +1,10 @@ +package com.leets.xcellentbe.global.error.exception.custom; + +import com.leets.xcellentbe.global.error.ErrorCode; +import com.leets.xcellentbe.global.error.exception.CommonException; + +public class InvalidTokenException extends CommonException { + public InvalidTokenException(String message) { + super(ErrorCode.INVALID_TOKEN); + } +} diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java new file mode 100644 index 0000000..a01e665 --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java @@ -0,0 +1,10 @@ +package com.leets.xcellentbe.global.error.exception.custom; + +import com.leets.xcellentbe.global.error.ErrorCode; +import com.leets.xcellentbe.global.error.exception.CommonException; + +public class UserNotFoundException extends CommonException { + public UserNotFoundException(String message) { + super(ErrorCode.USER_NOT_FOUND); + } +} From e52e1da697638370aa19eac7011abd93c8215a3a Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Fri, 4 Oct 2024 06:38:49 +0900 Subject: [PATCH 02/13] =?UTF-8?q?style:=20#5=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=97=86=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/leets/xcellentbe/XcellentBeApplicationTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/leets/xcellentbe/XcellentBeApplicationTests.java b/src/test/java/com/leets/xcellentbe/XcellentBeApplicationTests.java index 9c0836f..cb934ff 100644 --- a/src/test/java/com/leets/xcellentbe/XcellentBeApplicationTests.java +++ b/src/test/java/com/leets/xcellentbe/XcellentBeApplicationTests.java @@ -10,4 +10,4 @@ class XcellentBeApplicationTests { void contextLoads() { } -} +} \ No newline at end of file From e8884c420650f4275afd95c0fb8cb831fcd6b065 Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Fri, 4 Oct 2024 06:39:59 +0900 Subject: [PATCH 03/13] =?UTF-8?q?refactor:=20#5=20=EC=A0=84=EC=97=AD=20?= =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC=EA=B8=B0=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/GlobalExceptionHandler.java | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/GlobalExceptionHandler.java b/src/main/java/com/leets/xcellentbe/global/error/exception/GlobalExceptionHandler.java index 28eb796..00ecb84 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/GlobalExceptionHandler.java @@ -10,25 +10,11 @@ @ControllerAdvice public class GlobalExceptionHandler { - @ExceptionHandler(ArticleNotFoundException.class) - public ResponseEntity handleResourceNotFoundException(ArticleNotFoundException ex) { - ErrorCode errorCode = ErrorCode.ARTICLE_NOT_FOUND; + @ExceptionHandler(CommonException.class) // Custom Exception을 포괄적으로 처리 + public ResponseEntity handleCommonException(CommonException ex) { + ErrorCode errorCode = ex.getErrorCode(); // 전달된 예외에서 에러 코드 가져오기 ErrorResponse errorResponse = new ErrorResponse(errorCode); - return new ResponseEntity<>(errorResponse, HttpStatus.NOT_FOUND); - } - - @ExceptionHandler(IllegalArgumentException.class) - public ResponseEntity handleIllegalArgumentException(IllegalArgumentException ex) { - ErrorCode errorCode = ErrorCode.INVALID_INPUT_VALUE; - ErrorResponse errorResponse = new ErrorResponse(errorCode); - return new ResponseEntity<>(errorResponse, HttpStatus.BAD_REQUEST); - } - - @ExceptionHandler(FailedSearchException.class) - public ResponseEntity handleFailedSearchException(FailedSearchException ex) { - ErrorCode errorCode = ErrorCode.FAILED_SEARCH; - ErrorResponse errorResponse = new ErrorResponse(errorCode); - return new ResponseEntity<>(errorResponse, HttpStatus.NOT_FOUND); + return new ResponseEntity<>(errorResponse, HttpStatus.valueOf(errorCode.getStatus())); } @ExceptionHandler(Exception.class) From 8d76526e0cbd985189abfd33b6cbdcadd702dfcb Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Fri, 4 Oct 2024 06:42:18 +0900 Subject: [PATCH 04/13] =?UTF-8?q?refactor:=20#5=20=EC=B1=84=ED=8C=85?= =?UTF-8?q?=EB=B0=A9=20=EC=97=90=EC=99=B8=EC=B2=98=EB=A6=AC=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=AA=85=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...omUnauthorized.java => ChatRoomUnauthorizedException.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/main/java/com/leets/xcellentbe/global/error/exception/custom/{ChatRoomUnauthorized.java => ChatRoomUnauthorizedException.java} (64%) diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorized.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorizedException.java similarity index 64% rename from src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorized.java rename to src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorizedException.java index 3e175c4..d351a46 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorized.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorizedException.java @@ -3,8 +3,8 @@ import com.leets.xcellentbe.global.error.ErrorCode; import com.leets.xcellentbe.global.error.exception.CommonException; -public class ChatRoomUnauthorized extends CommonException { - public ChatRoomUnauthorized(String message) { +public class ChatRoomUnauthorizedException extends CommonException { + public ChatRoomUnauthorizedException(String message) { super(ErrorCode.CHAT_ROOM_UNAUTHORIZED); } } From 934b4804f595d6dd546ec9d8797b166573d4693a Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Fri, 4 Oct 2024 06:45:25 +0900 Subject: [PATCH 05/13] =?UTF-8?q?style:=20#5=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=ED=8F=AC=EB=A7=B7=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/error/exception/GlobalExceptionHandler.java | 1 - .../error/exception/custom/InvalidInputValueException.java | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/GlobalExceptionHandler.java b/src/main/java/com/leets/xcellentbe/global/error/exception/GlobalExceptionHandler.java index 00ecb84..010b6cc 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/GlobalExceptionHandler.java @@ -5,7 +5,6 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import com.leets.xcellentbe.global.error.*; -import com.leets.xcellentbe.global.error.exception.custom.*; @ControllerAdvice public class GlobalExceptionHandler { diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidInputValueException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidInputValueException.java index 9786cae..f6b84d9 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidInputValueException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidInputValueException.java @@ -4,7 +4,5 @@ import com.leets.xcellentbe.global.error.exception.CommonException; public class InvalidInputValueException extends CommonException { - public InvalidInputValueException() { - super(ErrorCode.INVALID_INPUT_VALUE); - } + public InvalidInputValueException() { super(ErrorCode.INVALID_INPUT_VALUE); } } From cae96124fa9475d5f65fdf8f06451aa7e5f4f197 Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Fri, 4 Oct 2024 06:59:14 +0900 Subject: [PATCH 06/13] =?UTF-8?q?feat:=20#5=20=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?=EB=B0=A9=EC=A7=80=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/leets/xcellentbe/global/error/ErrorCode.java | 3 ++- .../exception/custom/RejectDuplicationException.java | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/custom/RejectDuplicationException.java diff --git a/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java b/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java index 92ed8d4..870cb99 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java +++ b/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java @@ -14,7 +14,8 @@ public enum ErrorCode { CHAT_ROOM_NOT_FOUND(404, "CHAT_ROOM_NOT_FOUND", "채팅방을 찾을 수 없습니다."), CHAT_ROOM_UNAUTHORIZED(401, "CHAT_ROOM_UNAUTHORIZED","권한이 없는 채팅방입니다."), USER_NOT_FOUND(404, "USER_NOT_FOUND", "유저를 찾을 수 없습니다."), - FAILED_SEARCH(404, "FAILED_SEARCH", "검색할 수 없습니다."); + FAILED_SEARCH(404, "FAILED_SEARCH", "검색할 수 없습니다."), + REJECT_DUPLICATION(409,"REJECT_DUPLICATION","중복된 값입니다."); private final int status; private final String code; diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/RejectDuplicationException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/RejectDuplicationException.java new file mode 100644 index 0000000..d9f43b5 --- /dev/null +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/RejectDuplicationException.java @@ -0,0 +1,8 @@ +package com.leets.xcellentbe.global.error.exception.custom; + +import com.leets.xcellentbe.global.error.ErrorCode; +import com.leets.xcellentbe.global.error.exception.CommonException; + +public class RejectDuplicationException extends CommonException { + public RejectDuplicationException(String message) { super(ErrorCode.REJECT_DUPLICATION); } +} From 057cf401df75c18ecfbf34c2bf061d3bad9d8b2f Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Fri, 4 Oct 2024 07:07:30 +0900 Subject: [PATCH 07/13] =?UTF-8?q?fix=20#5=20=ED=95=84=EC=9A=94=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EC=9D=B8=EC=9E=90=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../error/exception/custom/ChatRoomNotFoundException.java | 2 +- .../error/exception/custom/ChatRoomUnauthorizedException.java | 2 +- .../global/error/exception/custom/ExpiredTokenException.java | 2 +- .../global/error/exception/custom/FailedSearchException.java | 4 +--- .../error/exception/custom/InternalServerErrorException.java | 2 +- .../global/error/exception/custom/InvalidTokenException.java | 2 +- .../error/exception/custom/RejectDuplicationException.java | 2 +- .../global/error/exception/custom/UserNotFoundException.java | 2 +- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java index bac267c..c258eae 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java @@ -4,7 +4,7 @@ import com.leets.xcellentbe.global.error.exception.CommonException; public class ChatRoomNotFoundException extends CommonException { - public ChatRoomNotFoundException(String message) { + public ChatRoomNotFoundException() { super(ErrorCode.CHAT_ROOM_NOT_FOUND); } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorizedException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorizedException.java index d351a46..4745d4c 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorizedException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorizedException.java @@ -4,7 +4,7 @@ import com.leets.xcellentbe.global.error.exception.CommonException; public class ChatRoomUnauthorizedException extends CommonException { - public ChatRoomUnauthorizedException(String message) { + public ChatRoomUnauthorizedException() { super(ErrorCode.CHAT_ROOM_UNAUTHORIZED); } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ExpiredTokenException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ExpiredTokenException.java index 2ba2b8b..702f7fe 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ExpiredTokenException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ExpiredTokenException.java @@ -4,7 +4,7 @@ import com.leets.xcellentbe.global.error.exception.CommonException; public class ExpiredTokenException extends CommonException { - public ExpiredTokenException(String message) { + public ExpiredTokenException() { super(ErrorCode.EXPIRED_TOKEN); } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/FailedSearchException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/FailedSearchException.java index b30f6f7..c1ac6f1 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/FailedSearchException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/FailedSearchException.java @@ -4,7 +4,5 @@ import com.leets.xcellentbe.global.error.exception.CommonException; public class FailedSearchException extends CommonException { - public FailedSearchException(String message) { - super(ErrorCode.FAILED_SEARCH); - } + public FailedSearchException() { super(ErrorCode.FAILED_SEARCH);} } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InternalServerErrorException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InternalServerErrorException.java index f5216d6..40a7bb5 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InternalServerErrorException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InternalServerErrorException.java @@ -4,7 +4,7 @@ import com.leets.xcellentbe.global.error.exception.CommonException; public class InternalServerErrorException extends CommonException { - public InternalServerErrorException(String message) { + public InternalServerErrorException() { super(ErrorCode.INTERNAL_SERVER_ERROR); } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidTokenException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidTokenException.java index 9073275..76c64dc 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidTokenException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidTokenException.java @@ -4,7 +4,7 @@ import com.leets.xcellentbe.global.error.exception.CommonException; public class InvalidTokenException extends CommonException { - public InvalidTokenException(String message) { + public InvalidTokenException() { super(ErrorCode.INVALID_TOKEN); } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/RejectDuplicationException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/RejectDuplicationException.java index d9f43b5..790b85a 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/RejectDuplicationException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/RejectDuplicationException.java @@ -4,5 +4,5 @@ import com.leets.xcellentbe.global.error.exception.CommonException; public class RejectDuplicationException extends CommonException { - public RejectDuplicationException(String message) { super(ErrorCode.REJECT_DUPLICATION); } + public RejectDuplicationException() { super(ErrorCode.REJECT_DUPLICATION); } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java index a01e665..6e66c5d 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java @@ -4,7 +4,7 @@ import com.leets.xcellentbe.global.error.exception.CommonException; public class UserNotFoundException extends CommonException { - public UserNotFoundException(String message) { + public UserNotFoundException() { super(ErrorCode.USER_NOT_FOUND); } } From 8612e9e62f1fff2721453926cbdf80ad5f8c60e9 Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Fri, 4 Oct 2024 14:53:43 +0900 Subject: [PATCH 08/13] =?UTF-8?q?refactor:=20#5=20=EC=97=90=EB=9F=AC?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java b/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java index 870cb99..ba81aca 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java +++ b/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java @@ -12,7 +12,7 @@ public enum ErrorCode { ARTICLE_NOT_FOUND(404, "ARTICLE_NOT_FOUND", "게시물을 찾을 수 없습니다."), INVALID_INPUT_VALUE(400, "INVALID_INPUT_VALUE", "유효하지 않은 입력값입니다."), CHAT_ROOM_NOT_FOUND(404, "CHAT_ROOM_NOT_FOUND", "채팅방을 찾을 수 없습니다."), - CHAT_ROOM_UNAUTHORIZED(401, "CHAT_ROOM_UNAUTHORIZED","권한이 없는 채팅방입니다."), + CHAT_ROOM_FORBIDDEN(403, "CHAT_ROOM_FORBIDDEN","권한이 없는 채팅방입니다."), USER_NOT_FOUND(404, "USER_NOT_FOUND", "유저를 찾을 수 없습니다."), FAILED_SEARCH(404, "FAILED_SEARCH", "검색할 수 없습니다."), REJECT_DUPLICATION(409,"REJECT_DUPLICATION","중복된 값입니다."); From 345751cd2967bc8ddf05a1d16b6244a831f59284 Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Fri, 4 Oct 2024 15:01:14 +0900 Subject: [PATCH 09/13] =?UTF-8?q?style:=20#5=20=EC=BB=A8=EB=B2=A4=EC=85=98?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../error/exception/custom/ArticleNotFoundException.java | 1 + .../error/exception/custom/ChatRoomNotFoundException.java | 1 + .../global/error/exception/custom/ExpiredTokenException.java | 1 + .../error/exception/custom/InternalServerErrorException.java | 1 + .../error/exception/custom/InvalidInputValueException.java | 5 ++++- .../global/error/exception/custom/InvalidTokenException.java | 1 + .../error/exception/custom/RejectDuplicationException.java | 5 ++++- .../global/error/exception/custom/UserNotFoundException.java | 1 + 8 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ArticleNotFoundException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ArticleNotFoundException.java index 6268abc..13d82e9 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ArticleNotFoundException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ArticleNotFoundException.java @@ -5,6 +5,7 @@ public class ArticleNotFoundException extends CommonException { public ArticleNotFoundException() { + super(ErrorCode.ARTICLE_NOT_FOUND); } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java index c258eae..79f20c6 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java @@ -5,6 +5,7 @@ public class ChatRoomNotFoundException extends CommonException { public ChatRoomNotFoundException() { + super(ErrorCode.CHAT_ROOM_NOT_FOUND); } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ExpiredTokenException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ExpiredTokenException.java index 702f7fe..f963971 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ExpiredTokenException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ExpiredTokenException.java @@ -5,6 +5,7 @@ public class ExpiredTokenException extends CommonException { public ExpiredTokenException() { + super(ErrorCode.EXPIRED_TOKEN); } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InternalServerErrorException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InternalServerErrorException.java index 40a7bb5..897d3cb 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InternalServerErrorException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InternalServerErrorException.java @@ -5,6 +5,7 @@ public class InternalServerErrorException extends CommonException { public InternalServerErrorException() { + super(ErrorCode.INTERNAL_SERVER_ERROR); } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidInputValueException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidInputValueException.java index f6b84d9..51ec39f 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidInputValueException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidInputValueException.java @@ -4,5 +4,8 @@ import com.leets.xcellentbe.global.error.exception.CommonException; public class InvalidInputValueException extends CommonException { - public InvalidInputValueException() { super(ErrorCode.INVALID_INPUT_VALUE); } + public InvalidInputValueException() { + + super(ErrorCode.INVALID_INPUT_VALUE); + } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidTokenException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidTokenException.java index 76c64dc..7df255b 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidTokenException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/InvalidTokenException.java @@ -5,6 +5,7 @@ public class InvalidTokenException extends CommonException { public InvalidTokenException() { + super(ErrorCode.INVALID_TOKEN); } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/RejectDuplicationException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/RejectDuplicationException.java index 790b85a..f1c40cc 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/RejectDuplicationException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/RejectDuplicationException.java @@ -4,5 +4,8 @@ import com.leets.xcellentbe.global.error.exception.CommonException; public class RejectDuplicationException extends CommonException { - public RejectDuplicationException() { super(ErrorCode.REJECT_DUPLICATION); } + public RejectDuplicationException() { + + super(ErrorCode.REJECT_DUPLICATION); + } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java index 6e66c5d..beccbeb 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java @@ -5,6 +5,7 @@ public class UserNotFoundException extends CommonException { public UserNotFoundException() { + super(ErrorCode.USER_NOT_FOUND); } } From 19f3ab82f2fa41ed8b0d0e25e9bb4256c06a280e Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Fri, 4 Oct 2024 15:05:24 +0900 Subject: [PATCH 10/13] =?UTF-8?q?fix:=20=EC=97=90=EB=9F=AC=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EB=B0=8F=20=EA=B2=80=EC=83=89=EC=98=88=EC=99=B8=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/leets/xcellentbe/global/error/ErrorCode.java | 1 - ...hException.java => ChatRoomForbiddenException.java} | 7 +++++-- .../custom/ChatRoomUnauthorizedException.java | 10 ---------- 3 files changed, 5 insertions(+), 13 deletions(-) rename src/main/java/com/leets/xcellentbe/global/error/exception/custom/{FailedSearchException.java => ChatRoomForbiddenException.java} (55%) delete mode 100644 src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorizedException.java diff --git a/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java b/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java index ba81aca..f5240e4 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java +++ b/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java @@ -14,7 +14,6 @@ public enum ErrorCode { CHAT_ROOM_NOT_FOUND(404, "CHAT_ROOM_NOT_FOUND", "채팅방을 찾을 수 없습니다."), CHAT_ROOM_FORBIDDEN(403, "CHAT_ROOM_FORBIDDEN","권한이 없는 채팅방입니다."), USER_NOT_FOUND(404, "USER_NOT_FOUND", "유저를 찾을 수 없습니다."), - FAILED_SEARCH(404, "FAILED_SEARCH", "검색할 수 없습니다."), REJECT_DUPLICATION(409,"REJECT_DUPLICATION","중복된 값입니다."); private final int status; diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/FailedSearchException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomForbiddenException.java similarity index 55% rename from src/main/java/com/leets/xcellentbe/global/error/exception/custom/FailedSearchException.java rename to src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomForbiddenException.java index c1ac6f1..3b4a3ec 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/FailedSearchException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomForbiddenException.java @@ -3,6 +3,9 @@ import com.leets.xcellentbe.global.error.ErrorCode; import com.leets.xcellentbe.global.error.exception.CommonException; -public class FailedSearchException extends CommonException { - public FailedSearchException() { super(ErrorCode.FAILED_SEARCH);} +public class ChatRoomForbiddenException extends CommonException { + public ChatRoomForbiddenException() { + + super(ErrorCode.CHAT_ROOM_FORBIDDEN); + } } diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorizedException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorizedException.java deleted file mode 100644 index 4745d4c..0000000 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomUnauthorizedException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.leets.xcellentbe.global.error.exception.custom; - -import com.leets.xcellentbe.global.error.ErrorCode; -import com.leets.xcellentbe.global.error.exception.CommonException; - -public class ChatRoomUnauthorizedException extends CommonException { - public ChatRoomUnauthorizedException() { - super(ErrorCode.CHAT_ROOM_UNAUTHORIZED); - } -} From 615bcecc91711882e505eb2a6d0f1b23f1f89d93 Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Fri, 4 Oct 2024 15:18:00 +0900 Subject: [PATCH 11/13] =?UTF-8?q?style:=20#5=20=EC=BB=A8=EB=B2=A4=EC=85=98?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java | 1 + .../leets/xcellentbe/global/error/exception/CommonException.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java b/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java index f5240e4..d43ec6f 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java +++ b/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java @@ -6,6 +6,7 @@ @Getter @AllArgsConstructor public enum ErrorCode { + INTERNAL_SERVER_ERROR(500, "INTERNAL_SERVER_ERROR", "서버 오류가 발생했습니다."), INVALID_TOKEN(401, "INVALID_TOKEN", "유효하지 않은 토큰입니다."), EXPIRED_TOKEN(403, "EXPIRED_TOKEN", "만료된 토큰입니다."), diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/CommonException.java b/src/main/java/com/leets/xcellentbe/global/error/exception/CommonException.java index ee14e53..948fbd4 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/CommonException.java +++ b/src/main/java/com/leets/xcellentbe/global/error/exception/CommonException.java @@ -8,5 +8,6 @@ @Getter @AllArgsConstructor public class CommonException extends RuntimeException { + private final ErrorCode errorCode; } From cc881b2558ec255742862cd9d793d76d996043a9 Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Fri, 4 Oct 2024 15:50:28 +0900 Subject: [PATCH 12/13] =?UTF-8?q?style:=20#5=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=97=86=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chatroom/domain/exception}/ChatRoomForbiddenException.java | 2 +- .../chatroom/domain/exception}/ChatRoomNotFoundException.java | 2 +- .../post/exception}/ArticleNotFoundException.java | 2 +- .../custom => domain/user/exception}/UserNotFoundException.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename src/main/java/com/leets/xcellentbe/{global/error/exception/custom => domain/chatroom/domain/exception}/ChatRoomForbiddenException.java (81%) rename src/main/java/com/leets/xcellentbe/{global/error/exception/custom => domain/chatroom/domain/exception}/ChatRoomNotFoundException.java (81%) rename src/main/java/com/leets/xcellentbe/{global/error/exception/custom => domain/post/exception}/ArticleNotFoundException.java (81%) rename src/main/java/com/leets/xcellentbe/{global/error/exception/custom => domain/user/exception}/UserNotFoundException.java (81%) diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomForbiddenException.java b/src/main/java/com/leets/xcellentbe/domain/chatroom/domain/exception/ChatRoomForbiddenException.java similarity index 81% rename from src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomForbiddenException.java rename to src/main/java/com/leets/xcellentbe/domain/chatroom/domain/exception/ChatRoomForbiddenException.java index 3b4a3ec..507176f 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomForbiddenException.java +++ b/src/main/java/com/leets/xcellentbe/domain/chatroom/domain/exception/ChatRoomForbiddenException.java @@ -1,4 +1,4 @@ -package com.leets.xcellentbe.global.error.exception.custom; +package com.leets.xcellentbe.domain.chatroom.domain.exception; import com.leets.xcellentbe.global.error.ErrorCode; import com.leets.xcellentbe.global.error.exception.CommonException; diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java b/src/main/java/com/leets/xcellentbe/domain/chatroom/domain/exception/ChatRoomNotFoundException.java similarity index 81% rename from src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java rename to src/main/java/com/leets/xcellentbe/domain/chatroom/domain/exception/ChatRoomNotFoundException.java index 79f20c6..105f827 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ChatRoomNotFoundException.java +++ b/src/main/java/com/leets/xcellentbe/domain/chatroom/domain/exception/ChatRoomNotFoundException.java @@ -1,4 +1,4 @@ -package com.leets.xcellentbe.global.error.exception.custom; +package com.leets.xcellentbe.domain.chatroom.domain.exception; import com.leets.xcellentbe.global.error.ErrorCode; import com.leets.xcellentbe.global.error.exception.CommonException; diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ArticleNotFoundException.java b/src/main/java/com/leets/xcellentbe/domain/post/exception/ArticleNotFoundException.java similarity index 81% rename from src/main/java/com/leets/xcellentbe/global/error/exception/custom/ArticleNotFoundException.java rename to src/main/java/com/leets/xcellentbe/domain/post/exception/ArticleNotFoundException.java index 13d82e9..0064d6d 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/ArticleNotFoundException.java +++ b/src/main/java/com/leets/xcellentbe/domain/post/exception/ArticleNotFoundException.java @@ -1,4 +1,4 @@ -package com.leets.xcellentbe.global.error.exception.custom; +package com.leets.xcellentbe.domain.post.exception; import com.leets.xcellentbe.global.error.ErrorCode; import com.leets.xcellentbe.global.error.exception.CommonException; diff --git a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java b/src/main/java/com/leets/xcellentbe/domain/user/exception/UserNotFoundException.java similarity index 81% rename from src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java rename to src/main/java/com/leets/xcellentbe/domain/user/exception/UserNotFoundException.java index beccbeb..9d03c98 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/exception/custom/UserNotFoundException.java +++ b/src/main/java/com/leets/xcellentbe/domain/user/exception/UserNotFoundException.java @@ -1,4 +1,4 @@ -package com.leets.xcellentbe.global.error.exception.custom; +package com.leets.xcellentbe.domain.user.exception; import com.leets.xcellentbe.global.error.ErrorCode; import com.leets.xcellentbe.global.error.exception.CommonException; From b9805e4e9e2c6f6a09742090af92f0e6accd42b3 Mon Sep 17 00:00:00 2001 From: Dongyun Kim Date: Fri, 4 Oct 2024 16:11:46 +0900 Subject: [PATCH 13/13] =?UTF-8?q?style:=20#5=20=EC=97=90=EB=9F=AC=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=98=A4=EB=A6=84=EC=B0=A8=EC=88=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/leets/xcellentbe/global/error/ErrorCode.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java b/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java index d43ec6f..55728ea 100644 --- a/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java +++ b/src/main/java/com/leets/xcellentbe/global/error/ErrorCode.java @@ -7,15 +7,15 @@ @AllArgsConstructor public enum ErrorCode { - INTERNAL_SERVER_ERROR(500, "INTERNAL_SERVER_ERROR", "서버 오류가 발생했습니다."), + INVALID_INPUT_VALUE(400, "INVALID_INPUT_VALUE", "유효하지 않은 입력값입니다."), INVALID_TOKEN(401, "INVALID_TOKEN", "유효하지 않은 토큰입니다."), + CHAT_ROOM_FORBIDDEN(403, "CHAT_ROOM_FORBIDDEN","권한이 없는 채팅방입니다."), EXPIRED_TOKEN(403, "EXPIRED_TOKEN", "만료된 토큰입니다."), ARTICLE_NOT_FOUND(404, "ARTICLE_NOT_FOUND", "게시물을 찾을 수 없습니다."), - INVALID_INPUT_VALUE(400, "INVALID_INPUT_VALUE", "유효하지 않은 입력값입니다."), CHAT_ROOM_NOT_FOUND(404, "CHAT_ROOM_NOT_FOUND", "채팅방을 찾을 수 없습니다."), - CHAT_ROOM_FORBIDDEN(403, "CHAT_ROOM_FORBIDDEN","권한이 없는 채팅방입니다."), USER_NOT_FOUND(404, "USER_NOT_FOUND", "유저를 찾을 수 없습니다."), - REJECT_DUPLICATION(409,"REJECT_DUPLICATION","중복된 값입니다."); + REJECT_DUPLICATION(409,"REJECT_DUPLICATION","중복된 값입니다."), + INTERNAL_SERVER_ERROR(500, "INTERNAL_SERVER_ERROR", "서버 오류가 발생했습니다."); private final int status; private final String code;