From 5e064ba1d5c4b35fe4e1b738ff347b61aa39b247 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Thu, 31 Jul 2025 16:31:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor(storePayment):=20=EC=9D=BC?= =?UTF-8?q?=EB=B6=80=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storePayment/exception/StorePaymentNotFoundException.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/storePayment/exception/StorePaymentNotFoundException.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/storePayment/exception/StorePaymentNotFoundException.java index af83a4db..f384e132 100644 --- a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/storePayment/exception/StorePaymentNotFoundException.java +++ b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/storePayment/exception/StorePaymentNotFoundException.java @@ -4,6 +4,6 @@ public class StorePaymentNotFoundException extends RuntimeException { public StorePaymentNotFoundException() { - super(ErrorMessage.STORE_PAYMENT_PARAMETER_EMPTY.getMessage()); + super(ErrorMessage.STORE_PAYMENT_NOT_FOUND.getMessage()); } } From e3fa454a6067b319df3a4835faee9a242aa92308 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Thu, 31 Jul 2025 16:43:22 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor(storePayment):=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=AA=85=ED=99=95?= =?UTF-8?q?=ED=95=98=EA=B2=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/GlobalExceptionHandler.java | 14 ++++++++++---- .../controller/StorePaymentController.java | 5 ++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/exception/GlobalExceptionHandler.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/exception/GlobalExceptionHandler.java index 919e986d..e332ac26 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/exception/GlobalExceptionHandler.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/exception/GlobalExceptionHandler.java @@ -1,10 +1,7 @@ package com.nowait.applicationuser.exception; import static com.nowait.common.exception.ErrorMessage.*; -import static org.springframework.http.HttpStatus.FORBIDDEN; -import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; -import static org.springframework.http.HttpStatus.BAD_REQUEST; -import static org.springframework.http.HttpStatus.NOT_FOUND; +import static org.springframework.http.HttpStatus.*; import static org.springframework.http.HttpStatus.UNAUTHORIZED; import java.util.Map; @@ -35,6 +32,7 @@ import com.nowait.domaincorerdb.reservation.exception.ReservationNotFoundException; import com.nowait.domaincorerdb.store.exception.StoreNotFoundException; import com.nowait.domaincorerdb.store.exception.StoreWaitingDisabledException; +import com.nowait.domaincorerdb.storepayment.exception.StorePaymentNotFoundException; import com.nowait.domaincorerdb.token.exception.BusinessException; import com.nowait.domaincorerdb.user.exception.UserNotFoundException; import com.nowait.domainuserrdb.bookmark.exception.AlreadyDeletedBookmarkException; @@ -238,6 +236,14 @@ public ErrorResponse handleStoreNotFoundException(StoreNotFoundException e, WebR return new ErrorResponse(e.getMessage(), STORE_NOT_FOUND.getCode()); } + @ResponseStatus(NO_CONTENT) + @ExceptionHandler(StorePaymentNotFoundException.class) + public ErrorResponse handleStorePaymentNotFoundException(StorePaymentNotFoundException e, WebRequest request) { + alarm(e, request); + log.error("handleStorePaymentNotFoundException", e); + return new ErrorResponse(e.getMessage(), STORE_PAYMENT_NOT_FOUND.getCode()); + } + // 공통 에러 Map 생성 private static Map getErrors(MethodArgumentNotValidException e) { return e.getBindingResult() diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java index ba0020b5..12901d64 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/storepayment/controller/StorePaymentController.java @@ -44,13 +44,12 @@ public ResponseEntity getStorePaymentByStoreId(@PathVariable Long storeId) { ); } else { return ResponseEntity - .status(HttpStatus.NO_CONTENT) + .status(HttpStatus.OK) .body( ApiUtils.success( - response + "해당 주점의 등록된 결제 정보가 존재하지 않습니다." ) ); } - } }