[1단계 방탈출 결제 / 배포] 몰리(김지민) 미션 제출합니다.

docs/README.md

@@ -1,4 +1,4 @@
-# 요구사항 분석
+# 정책
 
 ## 예약 대기 정책
 
@@ -13,26 +13,9 @@
 - 예약 취소 시, 해당 예약에 대해 우선순위가 높은 대기가 자동으로 예약된다.
 - 관리자는 예약 대기를 거절할 수 있다.
 
-## 3단계
-- 예약 대기 요청 API 구현
-  - [x] 예약 대기 스키마 설계
-  - [x] 예약 대기 엔티티 구현
-  - [x] 예약 대기 요청 로직 구현
-- [x] 예약 대기 취소 API 구현 
-- [x] 예약 조회 API 변경
-  - 예약 조회 시, 대기 목록을 포함한다.
-
-## 4단계
-- [x] 에약 대기 승인 기능 구현
-  - 예약 취소 API에서 대기 번호 1번인 대기가 예약이 되도록 변경
-- [x] 예약 대기 거절 API 구현
-- [x] 어드민 예약 대기 목록 조회 API 구현
-
----
-## 1단계
-- [x] gradle 의존성 추가
-- [x] 엔티티 매핑
-- [x] 연관관계 매핑
-
-## 2단계
-- [x] 내 예약 조회 API 구현
+# 요구사항 분석
+- 예약 API 변경
+  - [x] 예약 요청 시 결제 기능 추가
+  - [x] 결제 실패 시 예외 처리
+    - [x] 사용자에게 결재 실패 사유 전달
+- [x] 외부 API 연동

src/main/java/roomescape/common/GlobalExceptionHandler.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonMappingException.Reference;
 import io.jsonwebtoken.JwtException;
+import java.net.SocketTimeoutException;
 import java.util.NoSuchElementException;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -15,8 +16,11 @@
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
 import roomescape.common.exception.ForbiddenException;
 import roomescape.common.exception.UnAuthorizationException;
+import roomescape.payment.client.toss.TossClientErrorResponse;
 
 @ControllerAdvice
 public class GlobalExceptionHandler {
@@ -49,6 +53,24 @@ public ResponseEntity<ProblemDetail> catchHttpMessageNotReadableException(HttpMe
                 .body(ProblemDetail.forStatusAndDetail(HttpStatus.BAD_REQUEST, exceptionMessage));
     }
 
+    @ExceptionHandler
+    public ResponseEntity<ProblemDetail> catchHttpClientErrorException(HttpClientErrorException ex) {
+        logger.warning(EXCEPTION_PREFIX + ex.getMessage());
+
+        TossClientErrorResponse response = ex.getResponseBodyAs(TossClientErrorResponse.class);
+        return ResponseEntity.status(ex.getStatusCode())
+                .body(ProblemDetail.forStatusAndDetail(ex.getStatusCode(), response.message()));
+    }
+
+    @ExceptionHandler
+    public ResponseEntity<ProblemDetail> catchHttpServerErrorException(HttpServerErrorException ex) {
+        logger.warning(EXCEPTION_PREFIX + ex.getMessage());
+
+        TossClientErrorResponse response = ex.getResponseBodyAs(TossClientErrorResponse.class);
+        return ResponseEntity.status(ex.getStatusCode())
+                .body(ProblemDetail.forStatusAndDetail(ex.getStatusCode(), response.message()));
+    }
+
     @ExceptionHandler
     public ResponseEntity<ProblemDetail> catchBadRequestException(IllegalArgumentException ex) {
         logger.warning(EXCEPTION_PREFIX + ex.getMessage());
@@ -90,6 +112,15 @@ public ResponseEntity<ProblemDetail> catchConflictException(IllegalStateExceptio
                 .body(ProblemDetail.forStatusAndDetail(HttpStatus.CONFLICT, ex.getMessage()));
     }
 
+    @ExceptionHandler
+    public ResponseEntity<ProblemDetail> catchSocketTimeoutException(SocketTimeoutException ex) {
+        logger.warning(EXCEPTION_PREFIX + ex.getClass() + " " + ex.getMessage());
+        String exceptionMessage = "요청 처리 중 처리 중단(Timeout)이 발생했습니다. 잠시 후 다시 시도해 주세요.";
+
+        return ResponseEntity.status(500)
+                .body(ProblemDetail.forStatusAndDetail(HttpStatus.INTERNAL_SERVER_ERROR, exceptionMessage));
+    }
+
     @ExceptionHandler
     public ResponseEntity<ProblemDetail> catchInternalServerException(Exception ex) {
         logger.warning(EXCEPTION_PREFIX + ex.getClass() + " " + ex.getMessage());

src/main/java/roomescape/common/exception/ClientException.java

@@ -0,0 +1,7 @@
+package roomescape.common.exception;
+
+public class ClientException extends RuntimeException {
+    public ClientException(final String message) {
+        super(message);
+    }
+}

src/main/java/roomescape/payment/client/PaymentClient.java

@@ -0,0 +1,9 @@
+package roomescape.payment.client;
+
+import roomescape.payment.dto.request.ConfirmPaymentRequest;
+import roomescape.payment.model.Payment;
+
+public interface PaymentClient {
+
+    Payment confirm(ConfirmPaymentRequest confirmPaymentRequest);
+}

src/main/java/roomescape/payment/client/PaymentProperties.java

@@ -0,0 +1,23 @@
+package roomescape.payment.client;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(value = "payment")
+public class PaymentProperties {
+
+    private final String secretKey;
+    private final String password;
+
+    public PaymentProperties(final String secretKey, final String password) {
+        this.secretKey = secretKey;
+        this.password = password;
+    }
+
+    public String getSecretKey() {
+        return secretKey;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+}

src/main/java/roomescape/payment/client/PaymentRestClientConfiguration.java

@@ -0,0 +1,46 @@
+package roomescape.payment.client;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.RestClient;
+import roomescape.payment.client.toss.TossPaymentErrorHandler;
+
+@Configuration
+public class PaymentRestClientConfiguration {
+
+    private static final String BASIC_PREFIX = "Basic ";
+
+    private final PaymentProperties paymentProperties;
+
+    public PaymentRestClientConfiguration(final PaymentProperties paymentProperties) {
+        this.paymentProperties = paymentProperties;
+    }
+
+    @Bean
+    public RestClient tossRestClient() {
+        byte[] encodedBytes = Base64.getEncoder()
+                .encode((paymentProperties.getSecretKey() + paymentProperties.getPassword())
+                        .getBytes(StandardCharsets.UTF_8));
+
+        String authorizations = BASIC_PREFIX + new String(encodedBytes);
+
+        return RestClient.builder()
+                .baseUrl("https://api.tosspayments.com/v1/payments")
+                .defaultHeader(HttpHeaders.AUTHORIZATION, authorizations)
+                .defaultStatusHandler(new TossPaymentErrorHandler())
+                .requestFactory(getClientHttpRequestFactory())
+                .build();
+    }
+
+    private ClientHttpRequestFactory getClientHttpRequestFactory() {
+        SimpleClientHttpRequestFactory simpleClientHttpRequestFactory = new SimpleClientHttpRequestFactory();
+        simpleClientHttpRequestFactory.setConnectTimeout(3);
+        simpleClientHttpRequestFactory.setReadTimeout(30);
+        return simpleClientHttpRequestFactory;
+    }
+}

src/main/java/roomescape/payment/client/toss/TossClientErrorResponse.java

@@ -0,0 +1,5 @@
+package roomescape.payment.client.toss;
+
+public record TossClientErrorResponse(String code,
+                                      String message) {
+}

src/main/java/roomescape/payment/client/toss/TossErrorCodeNotForUser.java

@@ -0,0 +1,22 @@
+package roomescape.payment.client.toss;
+
+
+import java.util.Arrays;
+
+public enum TossErrorCodeNotForUser {
+    INVALID_API_KEY,
+    NOT_FOUND_TERMINAL_ID,
+    INVALID_AUTHORIZE_AUTH,
+    INVALID_UNREGISTERED_SUBMALL,
+    NOT_REGISTERED_BUSINESS,
+    UNAPPROVED_ORDER_ID,
+    UNAUTHORIZED_KEY,
+    FORBIDDEN_REQUEST,
+    INCORRECT_BASIC_AUTH_FORMAT,
+    ;
+
+    public static boolean hasContains(final String message) {
+        return Arrays.stream(TossErrorCodeNotForUser.values())
+                .anyMatch(tossErrorCodeNotForUser -> tossErrorCodeNotForUser.name().equals(message));
+    }
+}

src/main/java/roomescape/payment/client/toss/TossPaymentClient.java

@@ -0,0 +1,27 @@
+package roomescape.payment.client.toss;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestClient;
+import roomescape.payment.client.PaymentClient;
+import roomescape.payment.dto.request.ConfirmPaymentRequest;
+import roomescape.payment.model.Payment;
+
+@Component
+public class TossPaymentClient implements PaymentClient {
+
+    private final RestClient restClient;
+
+    public TossPaymentClient(final RestClient restClient) {
+        this.restClient = restClient;
+    }
+
+    @Override
+    public Payment confirm(ConfirmPaymentRequest confirmPaymentRequest) {
+        return restClient.post()
+                .uri("/confirm")
+                .body(confirmPaymentRequest)
+                .retrieve()
+                .toEntity(Payment.class)
+                .getBody();
+    }
+}

src/main/java/roomescape/payment/client/toss/TossPaymentErrorHandler.java

@@ -0,0 +1,28 @@
+package roomescape.payment.client.toss;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.web.client.ResponseErrorHandler;
+import roomescape.common.exception.ClientException;
+
+public class TossPaymentErrorHandler implements ResponseErrorHandler {
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    public boolean hasError(final ClientHttpResponse response) throws IOException {
+        return response.getStatusCode().is4xxClientError() || response.getStatusCode().is5xxServerError();
+    }
+
+    @Override
+    public void handleError(final ClientHttpResponse response) throws IOException {
+        TossClientErrorResponse tossClientErrorResponse = objectMapper.readValue(response.getBody(),
+                TossClientErrorResponse.class);
+
+        if (TossErrorCodeNotForUser.hasContains(tossClientErrorResponse.code())) {
+            throw new ClientException("결제 오류입니다. 같은 문제가 반복된다면 문의해주세요.");
+        }
+
+        throw new ClientException(tossClientErrorResponse.message());
+    }
+}

src/main/java/roomescape/payment/dto/request/ConfirmPaymentRequest.java

@@ -0,0 +1,14 @@
+package roomescape.payment.dto.request;
+
+import roomescape.reservation.dto.request.CreateMyReservationRequest;
+
+public record ConfirmPaymentRequest(String paymentKey,
+                                    String orderId,
+                                    Long amount) {
+    public static ConfirmPaymentRequest from(final CreateMyReservationRequest createMyReservationRequest) {
+        return new ConfirmPaymentRequest(
+                createMyReservationRequest.paymentKey(),
+                createMyReservationRequest.orderId(),
+                createMyReservationRequest.amount());
+    }
+}

src/main/java/roomescape/payment/model/Payment.java

@@ -0,0 +1,25 @@
+package roomescape.payment.model;
+
+public class Payment {
+    private String paymentKey;
+    private String orderId;
+    private Long amount;
+
+    public Payment(final String paymentKey, final String orderId, final Long amount) {
+        this.paymentKey = paymentKey;
+        this.orderId = orderId;
+        this.amount = amount;
+    }
+
+    public String getPaymentKey() {
+        return paymentKey;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+}

src/main/java/roomescape/payment/service/PaymentService.java

@@ -0,0 +1,20 @@
+package roomescape.payment.service;
+
+import org.springframework.stereotype.Service;
+import roomescape.payment.client.PaymentClient;
+import roomescape.payment.dto.request.ConfirmPaymentRequest;
+import roomescape.payment.model.Payment;
+
+@Service
+public class PaymentService {
+
+    private final PaymentClient paymentClient;
+
+    public PaymentService(PaymentClient paymentClient) {
+        this.paymentClient = paymentClient;
+    }
+
+    public Payment createPayment(ConfirmPaymentRequest paymentRequest) {
+        return paymentClient.confirm(paymentRequest);
+    }
+}

src/main/java/roomescape/reservation/dto/request/CreateMyReservationRequest.java

@@ -16,5 +16,14 @@ public record CreateMyReservationRequest(
 
         @Positive(message = "예약 테마 식별자는 양수만 가능합니다.")
         @NotNull(message = "예약 등록 시 테마는 필수입니다.")
-        Long themeId) {
+        Long themeId,
+
+        @NotNull(message = "결제 키를 입력해주세요.")
+        String paymentKey,
+
+        @NotNull(message = "주문을 입력해주세요.")
+        String orderId,
+
+        @NotNull(message = "결제 금액를 입력해주세요.")
+        Long amount) {
 }