diff --git a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/ControllerAdvice.java b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/ControllerAdvice.java index c2e7f337..a5e1a792 100644 --- a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/ControllerAdvice.java +++ b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/ControllerAdvice.java @@ -2,6 +2,7 @@ import com.jootalkpia.stock_server.stocks.advice.exception.BadRequestException; import com.jootalkpia.stock_server.stocks.advice.exception.ErrorResponse; +import com.jootalkpia.stock_server.stocks.advice.exception.InvalidMinutePriceFromApiException; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -11,6 +12,11 @@ public class ControllerAdvice { @ExceptionHandler(BadRequestException.class) public ResponseEntity handleBadRequestException(BadRequestException e) { - return ResponseEntity.badRequest().body(new ErrorResponse(e.getMessage())); + return ResponseEntity.badRequest().body(new ErrorResponse(e.getErrorCode(), e.getMessage())); + } + + @ExceptionHandler(InvalidMinutePriceFromApiException.class) + public ResponseEntity handleRuntimeException(InvalidMinutePriceFromApiException e) { + return ResponseEntity.internalServerError().body(new ErrorResponse(e.getErrorCode(), e.getMessage())); } } diff --git a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/BadRequestException.java b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/BadRequestException.java index 45339afb..a25d6af5 100644 --- a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/BadRequestException.java +++ b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/BadRequestException.java @@ -2,7 +2,7 @@ public class BadRequestException extends BusinessException { - public BadRequestException(String message) { - super(message); + public BadRequestException(String errorCode, String message) { + super(errorCode, message); } } diff --git a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/BusinessException.java b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/BusinessException.java index 1843bec7..7c856fd2 100644 --- a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/BusinessException.java +++ b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/BusinessException.java @@ -1,8 +1,14 @@ package com.jootalkpia.stock_server.stocks.advice.exception; public class BusinessException extends RuntimeException { + private final String errorCode; - public BusinessException(String message) { + public BusinessException(String errorCode, String message) { super(message); + this.errorCode = errorCode; + } + + public String getErrorCode() { + return errorCode; } } diff --git a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/ErrorResponse.java b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/ErrorResponse.java index ab5aabe5..84a22da8 100644 --- a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/ErrorResponse.java +++ b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/ErrorResponse.java @@ -1,4 +1,6 @@ package com.jootalkpia.stock_server.stocks.advice.exception; -public record ErrorResponse(String message) { +public record ErrorResponse( + String code, + String message) { } diff --git a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/InvalidMinutePriceFromApiException.java b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/InvalidMinutePriceFromApiException.java new file mode 100644 index 00000000..12e1575f --- /dev/null +++ b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/InvalidMinutePriceFromApiException.java @@ -0,0 +1,18 @@ +package com.jootalkpia.stock_server.stocks.advice.exception; + +public class InvalidMinutePriceFromApiException extends RuntimeException { + + private static final String ERROR_CODE = "S50001"; + private static final String MESSAGE = "한국 투자 API로부터 응답 받은 데이터가 없습니다. 1분 후에 다시 시도하세요."; + + private final String errorCode; + + public InvalidMinutePriceFromApiException() { + super(MESSAGE); + this.errorCode = ERROR_CODE; + } + + public String getErrorCode() { + return errorCode; + } +} diff --git a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/InvalidObjectIdFormatException.java b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/InvalidObjectIdFormatException.java index 324d6f98..559c7800 100644 --- a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/InvalidObjectIdFormatException.java +++ b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/InvalidObjectIdFormatException.java @@ -2,9 +2,11 @@ public class InvalidObjectIdFormatException extends BadRequestException { + private static final String ERROR_CODE = "S40002"; + private static final String MESSAGE = "ObjectId는 24자리의 16진수 문자열이어야 합니다: "; public InvalidObjectIdFormatException(String cursorId) { - super(MESSAGE + cursorId); + super(ERROR_CODE, MESSAGE + cursorId); } } diff --git a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/NoSuchMinutePriceException.java b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/NoSuchMinutePriceException.java index 86b080d4..7bdbd77a 100644 --- a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/NoSuchMinutePriceException.java +++ b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/exception/NoSuchMinutePriceException.java @@ -2,9 +2,11 @@ public class NoSuchMinutePriceException extends BadRequestException { + private static final String ERROR_CODE = "S40001"; + private static final String MESSAGE = "조회된 분봉 데이터가 없습니다."; public NoSuchMinutePriceException() { - super(MESSAGE); + super(ERROR_CODE, MESSAGE); } } diff --git a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/util/StockValidationUtils.java b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/util/StockValidationUtils.java index f8a04690..62201fb4 100644 --- a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/util/StockValidationUtils.java +++ b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/advice/util/StockValidationUtils.java @@ -1,11 +1,12 @@ package com.jootalkpia.stock_server.stocks.advice.util; +import com.jootalkpia.stock_server.stocks.advice.exception.InvalidMinutePriceFromApiException; import com.jootalkpia.stock_server.stocks.advice.exception.InvalidObjectIdFormatException; import com.jootalkpia.stock_server.stocks.advice.exception.NoSuchMinutePriceException; import com.jootalkpia.stock_server.stocks.dto.MinutePrice; +import com.jootalkpia.stock_server.stocks.dto.response.MinutePriceDetailedResponse; import java.util.List; -import java.util.NoSuchElementException; public class StockValidationUtils { private StockValidationUtils() { @@ -31,4 +32,10 @@ private static boolean isValidObjectId(String cursorId) { return cursorId.matches("[0-9a-fA-F]{24}"); } + + public static void validateMinutePriceOutput(MinutePriceDetailedResponse minutePriceDetailedResponse) { + if (minutePriceDetailedResponse.output2().size() < 2) { + throw new InvalidMinutePriceFromApiException(); + } + } } diff --git a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/dto/response/MinutePriceSimpleResponse.java b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/dto/response/MinutePriceSimpleResponse.java index a322d542..455ebd28 100644 --- a/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/dto/response/MinutePriceSimpleResponse.java +++ b/src/backend/stock_server/src/main/java/com/jootalkpia/stock_server/stocks/dto/response/MinutePriceSimpleResponse.java @@ -2,6 +2,8 @@ import com.jootalkpia.stock_server.stocks.dto.MinutePrice; +import static com.jootalkpia.stock_server.stocks.advice.util.StockValidationUtils.validateMinutePriceOutput; + public record MinutePriceSimpleResponse( String code, String htsKorIsnm, @@ -16,6 +18,8 @@ public record MinutePriceSimpleResponse( ) { public static MinutePriceSimpleResponse from(MinutePriceDetailedResponse minutePriceDto, String code) { + validateMinutePriceOutput(minutePriceDto); + return new MinutePriceSimpleResponse( code, minutePriceDto.output1().htsKorIsnm(), diff --git a/src/backend/stock_server/src/main/resources/application.yml b/src/backend/stock_server/src/main/resources/application.yml index 0f358546..7f58ea8c 100644 --- a/src/backend/stock_server/src/main/resources/application.yml +++ b/src/backend/stock_server/src/main/resources/application.yml @@ -20,6 +20,7 @@ spring: uri: ${MONGO_URI} jackson: property-naming-strategy: LOWER_CAMEL_CASE + time-zone: Asia/Seoul logging: level: