Feature/payment

.gitignore

@@ -49,4 +49,7 @@ src/main/resources/application.yml
 build.gradle
 
 # QueryDSL generated sources
-/build/generated/
+/build/generated/
+
+src/main/resources/static/payment-test.html
+src/main/resources/static/payment-success.html

src/main/java/com/eatsfine/eatsfine/domain/payment/controller/PaymentController.java

@@ -1,5 +1,6 @@
 package com.eatsfine.eatsfine.domain.payment.controller;
 
+import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentConfirmDTO;
 import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentRequestDTO;
 import com.eatsfine.eatsfine.domain.payment.dto.response.PaymentResponseDTO;
 import com.eatsfine.eatsfine.domain.payment.service.PaymentService;
@@ -21,10 +22,17 @@ public class PaymentController {
 
     private final PaymentService paymentService;
 
-    @Operation(summary = "결제 요청", description = "예약 ID와 결제 제공자를 받아 결제를 요청합니다.")
+    @Operation(summary = "결제 요청", description = "예약 ID를 받아 주문 ID를 생성하고 결제 정보를 초기화합니다.")
     @PostMapping("/request")
     public ApiResponse<PaymentResponseDTO.PaymentRequestResultDTO> requestPayment(
             @RequestBody @Valid PaymentRequestDTO.RequestPaymentDTO dto) {
         return ApiResponse.onSuccess(paymentService.requestPayment(dto));
     }
+
+    @Operation(summary = "결제 승인", description = "토스페이먼츠 결제 승인을 요청합니다.")
+    @PostMapping("/confirm")
+    public ApiResponse<PaymentResponseDTO.PaymentRequestResultDTO> confirmPayment(
+            @RequestBody @Valid PaymentConfirmDTO dto) {
+        return ApiResponse.onSuccess(paymentService.confirmPayment(dto));
+    }
 }

src/main/java/com/eatsfine/eatsfine/domain/payment/dto/request/PaymentConfirmDTO.java

@@ -0,0 +1,11 @@
+package com.eatsfine.eatsfine.domain.payment.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+
+@Builder
+public record PaymentConfirmDTO(
+        @NotNull String paymentKey,
+        @NotNull String orderId,
+        @NotNull Integer amount) {
+}

src/main/java/com/eatsfine/eatsfine/domain/payment/dto/request/PaymentRequestDTO.java

@@ -1,14 +1,10 @@
 package com.eatsfine.eatsfine.domain.payment.dto.request;
 
-import com.eatsfine.eatsfine.domain.payment.enums.PaymentProvider;
 import jakarta.validation.constraints.NotNull;
 
 public class PaymentRequestDTO {
 
     public record RequestPaymentDTO(
-            @NotNull Long bookingId,
-            @NotNull PaymentProvider provider,
-            @NotNull String successUrl,
-            @NotNull String failUrl) {
+            @NotNull Long bookingId) {
     }
 }

src/main/java/com/eatsfine/eatsfine/domain/payment/dto/response/PaymentResponseDTO.java

@@ -10,11 +10,8 @@ public class PaymentResponseDTO {
     public record PaymentRequestResultDTO(
             Long paymentId,
             Long bookingId,
-            PaymentMethod paymentMethod,
-            String tid,
+            String orderId,
             Integer amount,
-            PaymentStatus paymentStatus,
-            String nextRedirectUrl,
             LocalDateTime requestedAt) {
     }
 }

src/main/java/com/eatsfine/eatsfine/domain/payment/dto/response/TossPaymentResponse.java

@@ -0,0 +1,29 @@
+package com.eatsfine.eatsfine.domain.payment.dto.response;
+
+import java.time.OffsetDateTime;
+
+public record TossPaymentResponse(
+                String paymentKey,
+                String type,
+                String orderId,
+                String orderName,
+                String mId,
+                String currency,
+                String method,
+                Integer totalAmount,
+                Integer balanceAmount,
+                String status,
+                OffsetDateTime requestedAt,
+                OffsetDateTime approvedAt,
+                Boolean useEscrow,
+                String lastTransactionKey,
+                Integer suppliedAmount,
+                Integer vat,
+                EasyPay easyPay) {
+
+        public record EasyPay(
+                        String provider,
+                        Integer amount,
+                        Integer discountAmount) {
+        }
+}

src/main/java/com/eatsfine/eatsfine/domain/payment/entity/Payment.java

@@ -38,7 +38,7 @@ public class Payment extends BaseEntity {
     private String paymentKey;
 
     @Enumerated(EnumType.STRING)
-    @Column(name = "payment_provider", nullable = false)
+    @Column(name = "payment_provider")
     private PaymentProvider paymentProvider;
 
     @Enumerated(EnumType.STRING)
@@ -63,10 +63,12 @@ public void setPaymentKey(String paymentKey) {
         this.paymentKey = paymentKey;
     }
 
-    public void completePayment(LocalDateTime approvedAt, PaymentMethod method, String paymentKey) {
+    public void completePayment(LocalDateTime approvedAt, PaymentMethod method, String paymentKey,
+            PaymentProvider provider) {
         this.paymentStatus = PaymentStatus.COMPLETED;
         this.approvedAt = approvedAt;
         this.paymentMethod = method;
         this.paymentKey = paymentKey;
+        this.paymentProvider = provider;
     }
 }

src/main/java/com/eatsfine/eatsfine/domain/payment/enums/PaymentMethod.java

@@ -6,10 +6,7 @@
 @Getter
 @AllArgsConstructor
 public enum PaymentMethod {
-    CARD("카드"),
-    VIRTUAL_ACCOUNT("가상계좌"),
-    SIMPLE_PAYMENT("간편결제"),
-    PHONE("휴대폰");
+    SIMPLE_PAYMENT("간편결제");
 
     private final String description;
 }

src/main/java/com/eatsfine/eatsfine/domain/payment/repository/PaymentRepository.java

@@ -3,5 +3,8 @@
 import com.eatsfine.eatsfine.domain.payment.entity.Payment;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 public interface PaymentRepository extends JpaRepository<Payment, Long> {
+    Optional<Payment> findByOrderId(String orderId);
 }

src/main/java/com/eatsfine/eatsfine/domain/payment/service/PaymentService.java

@@ -2,18 +2,22 @@
 
 import com.eatsfine.eatsfine.domain.booking.entity.Booking;
 import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository;
-import com.eatsfine.eatsfine.global.apiPayload.code.status.ErrorStatus;
-import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException;
+import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentConfirmDTO;
 import com.eatsfine.eatsfine.domain.payment.dto.request.PaymentRequestDTO;
 import com.eatsfine.eatsfine.domain.payment.dto.response.PaymentResponseDTO;
+import com.eatsfine.eatsfine.domain.payment.dto.response.TossPaymentResponse;
 import com.eatsfine.eatsfine.domain.payment.entity.Payment;
-
+import com.eatsfine.eatsfine.domain.payment.enums.PaymentMethod;
+import com.eatsfine.eatsfine.domain.payment.enums.PaymentProvider;
 import com.eatsfine.eatsfine.domain.payment.enums.PaymentStatus;
 import com.eatsfine.eatsfine.domain.payment.enums.PaymentType;
 import com.eatsfine.eatsfine.domain.payment.repository.PaymentRepository;
+import com.eatsfine.eatsfine.global.apiPayload.code.status.ErrorStatus;
+import com.eatsfine.eatsfine.global.apiPayload.exception.GeneralException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestClient;
 
 import java.time.LocalDateTime;
 import java.util.UUID;
@@ -22,46 +26,85 @@
 @RequiredArgsConstructor
 public class PaymentService {
 
-        private final PaymentRepository paymentRepository;
-        private final BookingRepository bookingRepository;
-
-        @Transactional
-        public PaymentResponseDTO.PaymentRequestResultDTO requestPayment(PaymentRequestDTO.RequestPaymentDTO dto) {
-                Booking booking = bookingRepository.findById(dto.bookingId())
-                                .orElseThrow(() -> new IllegalArgumentException("Booking not found"));
-
-                // 주문 ID 생성
-                String orderId = UUID.randomUUID().toString();
-
-                // 예약금 검증
-                if (booking.getDepositAmount() == null || booking.getDepositAmount() <= 0) {
-                        throw new GeneralException(ErrorStatus.PAYMENT_INVALID_DEPOSIT);
-                }
-
-                Payment payment = Payment.builder()
-                                .booking(booking)
-                                .orderId(orderId)
-                                .amount(booking.getDepositAmount())
-                                .paymentProvider(dto.provider())
-                                .paymentStatus(PaymentStatus.PENDING)
-                                .paymentType(PaymentType.DEPOSIT)
-                                .requestedAt(LocalDateTime.now())
-                                .build();
-
-                Payment savedPayment = paymentRepository.save(payment);
-
-                // 외부 결제 제공자 응답 모의 처리
-                String tid = "T" + UUID.randomUUID().toString().replace("-", "").substring(0, 10);
-                String nextRedirectUrl = "https://mock.api.kakaopay.com/online/v1/payment/ready/" + tid;
-
-                return new PaymentResponseDTO.PaymentRequestResultDTO(
-                                savedPayment.getId(),
-                                booking.getId(),
-                                savedPayment.getPaymentMethod(),
-                                tid,
-                                savedPayment.getAmount(),
-                                savedPayment.getPaymentStatus(),
-                                nextRedirectUrl,
-                                savedPayment.getRequestedAt());
+    private final PaymentRepository paymentRepository;
+    private final BookingRepository bookingRepository;
+    private final RestClient tossPaymentClient;
+
+    @Transactional
+    public PaymentResponseDTO.PaymentRequestResultDTO requestPayment(PaymentRequestDTO.RequestPaymentDTO dto) {
+        Booking booking = bookingRepository.findById(dto.bookingId())
+                .orElseThrow(() -> new GeneralException(ErrorStatus.BOOKING_NOT_FOUND));
+
+        // 주문 ID 생성
+        String orderId = UUID.randomUUID().toString();
+
+        // 예약금 검증
+        if (booking.getDepositAmount() == null || booking.getDepositAmount() <= 0) {
+            throw new GeneralException(ErrorStatus.PAYMENT_INVALID_DEPOSIT);
         }
+
+        Payment payment = Payment.builder()
+                .booking(booking)
+                .orderId(orderId)
+                .amount(booking.getDepositAmount())
+                .paymentStatus(PaymentStatus.PENDING)
+                .paymentType(PaymentType.DEPOSIT)
+                .requestedAt(LocalDateTime.now())
+                .build();
+
+        Payment savedPayment = paymentRepository.save(payment);
+
+        return new PaymentResponseDTO.PaymentRequestResultDTO(
+                savedPayment.getId(),
+                booking.getId(),
+                savedPayment.getOrderId(),
+                savedPayment.getAmount(),
+                savedPayment.getRequestedAt());
+    }
+
+    @Transactional
+    public PaymentResponseDTO.PaymentRequestResultDTO confirmPayment(PaymentConfirmDTO dto) {
+        Payment payment = paymentRepository.findByOrderId(dto.orderId())
+                .orElseThrow(() -> new GeneralException(ErrorStatus.PAYMENT_NOT_FOUND));
+
+        if (!payment.getAmount().equals(dto.amount())) {
+            throw new GeneralException(ErrorStatus.PAYMENT_INVALID_AMOUNT);
+        }
+
+        // 토스 API 호출 
+        TossPaymentResponse response = tossPaymentClient.post()
+                .uri("/v1/payments/confirm")
+                .body(dto)
+                .retrieve()
+                .body(TossPaymentResponse.class);
+
+        if (response == null || !"DONE".equals(response.status())) {
+             throw new GeneralException(ErrorStatus._INTERNAL_SERVER_ERROR); 
+        }
+
+        // Provider 파싱 
+        PaymentProvider provider = null;
+        if (response.easyPay() != null) {
+            String providerCode = response.easyPay().provider();
+            if ("토스페이".equals(providerCode)) {
+                provider = PaymentProvider.TOSS;
+            } else if ("카카오페이".equals(providerCode)) {
+                provider = PaymentProvider.KAKAOPAY;
+            }
+        }
+
+        payment.completePayment(
+                response.approvedAt() != null ? response.approvedAt().toLocalDateTime() : LocalDateTime.now(),
+                PaymentMethod.SIMPLE_PAYMENT,
+                response.paymentKey(),
+                provider
+        );
+
+        return new PaymentResponseDTO.PaymentRequestResultDTO(
+                payment.getId(),
+                payment.getBooking().getId(),
+                payment.getOrderId(),
+                payment.getAmount(),
+                payment.getRequestedAt());
+    }
 }

src/main/java/com/eatsfine/eatsfine/global/apiPayload/code/status/ErrorStatus.java

@@ -16,7 +16,12 @@ public enum ErrorStatus implements BaseErrorCode {
     _NOT_FOUND(HttpStatus.NOT_FOUND, "COMMON404", "존재하지 않는 요청입니다."),
 
     // 예약금 관련 에러
-    PAYMENT_INVALID_DEPOSIT(HttpStatus.BAD_REQUEST, "PAYMENT4001", "예약금이 유효하지 않습니다.");
+    PAYMENT_INVALID_DEPOSIT(HttpStatus.BAD_REQUEST, "PAYMENT4001", "예약금이 유효하지 않습니다."),
+    PAYMENT_INVALID_AMOUNT(HttpStatus.BAD_REQUEST, "PAYMENT4002", "결제 금액이 일치하지 않습니다."),
+    PAYMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "PAYMENT4003", "결제 정보를 찾을 수 없습니다."),
+
+    // 예약 관련 에러
+    BOOKING_NOT_FOUND(HttpStatus.NOT_FOUND, "BOOKING4001", "예약을 찾을 수 없습니다.");
 
     private final HttpStatus httpStatus;
     private final String code;

src/main/java/com/eatsfine/eatsfine/global/config/TossPaymentConfig.java

@@ -0,0 +1,26 @@
+package com.eatsfine.eatsfine.global.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestClient;
+
+import java.util.Base64;
+
+@Configuration
+public class TossPaymentConfig {
+
+    @Value("${payment.toss.widget-secret-key}")
+    private String widgetSecretKey;
+
+    @Bean
+    public RestClient tossPaymentClient() {
+        String encodedSecretKey = Base64.getEncoder().encodeToString((widgetSecretKey + ":").getBytes());
+
+        return RestClient.builder()
+                .baseUrl("https://api.tosspayments.com")
+                .defaultHeader("Authorization", "Basic " + encodedSecretKey)
+                .defaultHeader("Content-Type", "application/json")
+                .build();
+    }
+}

src/main/resources/application-local.yml

@@ -23,3 +23,7 @@ spring:
     properties:
       hibernate:
         format_sql: true
+
+payment:
+  toss:
+    widget-secret-key: test_gsk_docs_OaPz8L5KdmQXkzRz3y47BMw6

src/test/resources/application.yml

@@ -1,5 +1,18 @@
 spring:
-  application:
-    name: Eatsfine
-  profiles:
-    active: test
+  datasource:
+    url: jdbc:h2:mem:testdb;MODE=MySQL
+    driver-class-name: org.h2.Driver
+    username: 
+    password:
+  jpa:
+    hibernate:
+      ddl-auto: create-drop
+    show-sql: true
+    properties:
+      hibernate:
+        format_sql: true
+        dialect: org.hibernate.dialect.H2Dialect
+
+payment:
+  toss:
+    widget-secret-key: test_sk_sample_key_for_testing