[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/ClientConfiguration.java

@@ -0,0 +1,36 @@
+package roomescape.common;
+
+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.web.client.RestClient;
+import roomescape.payment.client.PaymentProperties;
+
+@Configuration
+public class ClientConfiguration {
+
+    private static final String BASIC_PREFIX = "Basic ";
+    private static final String NO_PASSWORD_SUFFIX = ":";
+
+    private final PaymentProperties paymentProperties;
+
+    public ClientConfiguration(final PaymentProperties paymentProperties) {
+        this.paymentProperties = paymentProperties;
+    }
+
+    @Bean
+    public RestClient restClient() {
+        byte[] encodedBytes = Base64.getEncoder()
+                .encode((paymentProperties.getSecretKey() + NO_PASSWORD_SUFFIX)
+                        .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)
+                .build();
+    }
+}

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

@@ -15,6 +15,8 @@
 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;
 
@@ -49,6 +51,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());
+
+        PaymentClientErrorResponse response = ex.getResponseBodyAs(PaymentClientErrorResponse.class);
+        return ResponseEntity.status(ex.getStatusCode())
+                .body(ProblemDetail.forStatusAndDetail(ex.getStatusCode(), response.message()));
+    }
+
+    @ExceptionHandler
+    public ResponseEntity<ProblemDetail> catchHttpClientErrorException(HttpServerErrorException ex) {
+        logger.warning(EXCEPTION_PREFIX + ex.getMessage());
+
+        PaymentClientErrorResponse response = ex.getResponseBodyAs(PaymentClientErrorResponse.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());

src/main/java/roomescape/common/PaymentClientErrorResponse.java

@@ -0,0 +1,5 @@
+package roomescape.common;
+
+public record PaymentClientErrorResponse(String code,
+                                         String 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,17 @@
+package roomescape.payment.client;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(value = "payment")
+public class PaymentProperties {
+
+    private final String secretKey;
+
+    public PaymentProperties(final String secretKey) {
+        this.secretKey = secretKey;
+    }
+
+    public String getSecretKey() {
+        return secretKey;
+    }
+}

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

@@ -0,0 +1,26 @@
+package roomescape.payment.client;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestClient;
+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/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) {
 }

src/main/java/roomescape/reservation/service/ReservationService.java

@@ -8,6 +8,8 @@
 import roomescape.common.exception.ForbiddenException;
 import roomescape.member.domain.Member;
 import roomescape.member.repository.MemberRepository;
+import roomescape.payment.dto.request.ConfirmPaymentRequest;
+import roomescape.payment.service.PaymentService;
 import roomescape.reservation.dto.request.CreateMyReservationRequest;
 import roomescape.reservation.dto.request.CreateReservationByAdminRequest;
 import roomescape.reservation.dto.request.CreateReservationRequest;
@@ -29,19 +31,22 @@
 public class ReservationService {
 
     private final WaitingService waitingService;
+    private final PaymentService paymentService;
+
     private final ReservationRepository reservationRepository;
     private final ReservationTimeRepository reservationTimeRepository;
     private final ThemeRepository themeRepository;
     private final MemberRepository memberRepository;
     private final WaitingRepository waitingRepository;
 
     public ReservationService(final WaitingService waitingService,
-                              final ReservationRepository reservationRepository,
+                              final PaymentService paymentService, final ReservationRepository reservationRepository,
                               final ReservationTimeRepository reservationTimeRepository,
                               final ThemeRepository themeRepository,
                               final MemberRepository memberRepository,
                               final WaitingRepository waitingRepository) {
         this.waitingService = waitingService;
+        this.paymentService = paymentService;
         this.reservationRepository = reservationRepository;
         this.reservationTimeRepository = reservationTimeRepository;
         this.themeRepository = themeRepository;
@@ -53,33 +58,33 @@ public CreateReservationResponse createMyReservation(final AuthInfo authInfo,
                                                          final CreateMyReservationRequest createMyReservationRequest) {
         CreateReservationRequest createReservationRequest = CreateReservationRequest.of(authInfo.getMemberId(),
                 createMyReservationRequest);
-        return CreateReservationResponse.from(createReservation(createReservationRequest));
+        Reservation reservation = convertToReservation(createReservationRequest);
+        paymentService.createPayment(ConfirmPaymentRequest.from(createMyReservationRequest));
+        return CreateReservationResponse.from(reservationRepository.save(reservation));
     }
 
-    public CreateReservationResponse createReservationByAdmin(
-            final CreateReservationByAdminRequest createReservationByAdminRequest) {
+    public CreateReservationResponse createReservationByAdmin(final CreateReservationByAdminRequest createReservationByAdminRequest) {
         CreateReservationRequest createReservationRequest = CreateReservationRequest.of(createReservationByAdminRequest);
-        return CreateReservationResponse.from(createReservation(createReservationRequest));
+        Reservation reservation = convertToReservation(createReservationRequest);
+        return CreateReservationResponse.from(reservationRepository.save(reservation));
     }
 
-    public Reservation createReservation(final CreateReservationRequest createReservationRequest) {
+    public Reservation convertToReservation(final CreateReservationRequest createReservationRequest) {
         ReservationTime reservationTime = reservationTimeRepository.getById(createReservationRequest.timeId());
         Theme theme = themeRepository.getById(createReservationRequest.themeId());
         Member member = memberRepository.getById(createReservationRequest.memberId());
 
-        checkAlreadyExistReservation(createReservationRequest, createReservationRequest.date(), theme.getName(),
-                reservationTime.getStartAt());
-        Reservation reservation = createReservationRequest.toReservation(member, reservationTime, theme);
-        return reservationRepository.save(reservation);
+        checkAlreadyExistReservation(createReservationRequest, theme.getName(), reservationTime.getStartAt());
+        return createReservationRequest.toReservation(member, reservationTime, theme);
     }
 
     private void checkAlreadyExistReservation(final CreateReservationRequest createReservationRequest,
-                                              final LocalDate date, final String themeName, final LocalTime time) {
+                                              final String themeName, final LocalTime time) {
         if (reservationRepository.existsByDateAndReservationTimeIdAndThemeId(
                 createReservationRequest.date(),
                 createReservationRequest.timeId(),
                 createReservationRequest.themeId())) {
-            throw new IllegalArgumentException("이미 " + date + "의 " + themeName + " 테마에는 " + time
+            throw new IllegalArgumentException("이미 " + createReservationRequest.date() + "의 " + themeName + " 테마에는 " + time
                     + " 시의 예약이 존재하여 예약을 생성할 수 없습니다.");
         }
     }

src/main/resources/application.properties

@@ -4,5 +4,7 @@ spring.h2.console.enabled=true
 token.secretKey=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIiLCJuYW1lIjoiSm9obiBEb2UiLCJpYXQiOjE1MTYyMzkwMjJ9.ih1aovtQShabQ7l0cINw4k1fagApg3qLWiB8Kt59Lno
 token.validityInMilliseconds=3600000
 
+payment.secretKey=test_gsk_docs_OaPz8L5KdmQXkzRz3y47BMw6
+
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.jpa.defer-datasource-initialization=true