diff --git a/src/main/java/com/catchtable/global/common/ApiResponse.java b/src/main/java/com/catchtable/global/common/ApiResponse.java index 2c0e62a..d1b24c5 100644 --- a/src/main/java/com/catchtable/global/common/ApiResponse.java +++ b/src/main/java/com/catchtable/global/common/ApiResponse.java @@ -9,26 +9,23 @@ public class ApiResponse { private int status; + private String code; private String message; private T data; - // 성공 (데이터 포함) public static ApiResponse success(SuccessCode code, T data) { - return new ApiResponse<>(code.getHttpStatus().value(), code.getMessage(), data); + return new ApiResponse<>(code.getHttpStatus().value(), code.getCode(), code.getMessage(), data); } - // 성공 (데이터 없음) public static ApiResponse success(SuccessCode code) { - return new ApiResponse<>(code.getHttpStatus().value(), code.getMessage(), null); + return new ApiResponse<>(code.getHttpStatus().value(), code.getCode(), code.getMessage(), null); } - // 실패 (데이터 없음) public static ApiResponse error(ErrorCode code) { - return new ApiResponse<>(code.getHttpStatus().value(), code.getMessage(), null); + return new ApiResponse<>(code.getHttpStatus().value(), code.getCode(), code.getMessage(), null); } - // 실패 (커스텀 메시지) public static ApiResponse error(ErrorCode code, String message) { - return new ApiResponse<>(code.getHttpStatus().value(), message, null); + return new ApiResponse<>(code.getHttpStatus().value(), code.getCode(), message, null); } } diff --git a/src/main/java/com/catchtable/global/common/ResponseCode.java b/src/main/java/com/catchtable/global/common/ResponseCode.java index 2ed2f53..d949ae0 100644 --- a/src/main/java/com/catchtable/global/common/ResponseCode.java +++ b/src/main/java/com/catchtable/global/common/ResponseCode.java @@ -5,4 +5,8 @@ public interface ResponseCode { HttpStatus getHttpStatus(); String getMessage(); + + default String getCode() { + return (this instanceof Enum e) ? e.name() : getClass().getSimpleName(); + } } diff --git a/src/test/java/com/catchtable/loadtest/VacancyLoadTestTokenGenerator.java b/src/test/java/com/catchtable/loadtest/VacancyLoadTestTokenGenerator.java index 1e96a86..67dee3c 100644 --- a/src/test/java/com/catchtable/loadtest/VacancyLoadTestTokenGenerator.java +++ b/src/test/java/com/catchtable/loadtest/VacancyLoadTestTokenGenerator.java @@ -53,11 +53,13 @@ void generateTokens() throws IOException { for (int i = 1; i <= userCount; i++) { String googleId = GOOGLE_ID_PREFIX + i; + String email = EMAIL_PREFIX + i + EMAIL_DOMAIN; + String nickname = NICKNAME_PREFIX + i; User user = userRepository.findByGoogleId(googleId) .orElseGet(() -> userRepository.save(User.builder() .googleId(googleId) - .email(EMAIL_PREFIX + i + EMAIL_DOMAIN) - .nickname(NICKNAME_PREFIX + i) + .email(email) + .nickname(nickname) .profileImage(null) .role(UserRole.USER) .status(UserStatus.ACTIVE)