Merge pull request #107 from prgrms-web-devcourse-final-project/fix#106

[Fix]: PG 연동, env 제거

Author: dlawhd

.gitignore

@@ -40,3 +40,8 @@ out/
 db_dev.mv.db
 db_dev.trace.db
 src/main/generated/
+
+### env ###
+.env
+*.env
+.env.*

build.gradle.kts

@@ -1,3 +1,5 @@
+import org.gradle.kotlin.dsl.implementation
+
 plugins {
     java
     id("org.springframework.boot") version "3.5.5"
@@ -31,6 +33,8 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
     implementation ("org.springframework.boot:spring-boot-starter-websocket")
+    implementation ("org.springframework.boot:spring-boot-starter-webflux")
+
 
     // 스프링부트 추가 기능
     implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0")

src/main/java/com/backend/domain/payment/controller/ApiV1PaymentController.java

@@ -4,7 +4,10 @@
 import com.backend.domain.member.service.MemberService;
 import com.backend.domain.payment.dto.PaymentRequest;
 import com.backend.domain.payment.dto.PaymentResponse;
+import com.backend.domain.payment.dto.TossIssueBillingKeyRequest;
+import com.backend.domain.payment.dto.TossIssueBillingKeyResponse;
 import com.backend.domain.payment.service.PaymentService;
+import com.backend.domain.payment.service.TossBillingClient;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -26,9 +29,10 @@ public class ApiV1PaymentController {
 
     private final MemberService memberService;
     private final PaymentService paymentService;
+    private final TossBillingClient tossBillingClient;
 
     @PostMapping
-    @Operation(summary="지갑 충전 요청", description="idempotencyKey로 중복 충전 방지")
+    @Operation(summary="지갑 충전 요청", description="idempotencyKey로 중복 충전 방지, 일단은 idempotencyKey 아무키로 등록해주세요!.")
     public PaymentResponse charge(
             @AuthenticationPrincipal User user,
             @RequestBody @Valid PaymentRequest req
@@ -41,4 +45,17 @@ public PaymentResponse charge(
 
         return paymentService.charge(actor, req);
     }
+
+    @PostMapping("/toss/issue-billing-key")
+    public TossIssueBillingKeyResponse issueBillingKey(
+            @AuthenticationPrincipal User user,
+            @RequestBody TossIssueBillingKeyRequest req
+    ) {
+        if (user == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
+
+        Member me = memberService.findMemberByEmail(user.getUsername());
+        String customerKey = "user-" + me.getId();   // ★ 프런트 값 무시하고 서버에서 생성
+
+        return tossBillingClient.issueBillingKey(customerKey, req.getAuthKey());
+    }
 }

src/main/java/com/backend/domain/payment/dto/PaymentRequest.java

@@ -15,7 +15,7 @@ public class PaymentRequest {
     private Long paymentMethodId;  // 결제수단 ID..
 
     @NotNull
-    @Min(1)
+    @Min(100)
     private Long amount;           // 충전 금액(원)..
 
     @NotBlank

src/main/java/com/backend/domain/payment/dto/PgChargeResultResponse.java

@@ -0,0 +1,13 @@
+package com.backend.domain.payment.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class PgChargeResultResponse {
+    private final boolean success;        // 승인 성공 여부
+    private final String transactionId;   // PG의 paymentKey 등
+    private final String failureCode;     // 실패시 코드(선택)
+    private final String failureMsg;      // 실패시 메시지(선택)
+}

src/main/java/com/backend/domain/payment/dto/TossIssueBillingKeyRequest.java

@@ -0,0 +1,11 @@
+package com.backend.domain.payment.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class TossIssueBillingKeyRequest {
+    private String customerKey;
+    private String authKey;
+}

src/main/java/com/backend/domain/payment/dto/TossIssueBillingKeyResponse.java

@@ -0,0 +1,15 @@
+package com.backend.domain.payment.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class TossIssueBillingKeyResponse {
+    private String billingKey;
+    private String provider;   // "toss"
+    private String cardBrand;  // 선택: 스냅샷에 쓰려면
+    private String cardNumber; // 선택
+    private Integer expMonth;  // 선택
+    private Integer expYear;   // 선택
+}

src/main/java/com/backend/domain/payment/service/PaymentMethodService.java

@@ -74,9 +74,8 @@ public PaymentMethodResponse create(Long memberId, PaymentMethodCreateRequest re
         switch (type) {
             case CARD -> {
                 // 필수값 체크..
-                if (isBlank(req.getBrand()) || isBlank(req.getLast4()) ||
-                        req.getExpMonth() == null || req.getExpYear() == null) {
-                    throw new IllegalArgumentException("CARD는 brand, last4, expMonth, expYear가 필요합니다.");
+                if (isBlank(req.getBrand()) || isBlank(req.getLast4())){
+                    throw new IllegalArgumentException("CARD는 brand, last4가 필요합니다. (expMonth/expYear는 선택)");
                 }
                 // 카드 필드 채우기..
                 brand = req.getBrand();

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

@@ -9,17 +9,21 @@
 import com.backend.domain.payment.constant.PaymentStatus;
 import com.backend.domain.payment.dto.PaymentRequest;
 import com.backend.domain.payment.dto.PaymentResponse;
+import com.backend.domain.payment.dto.PgChargeResultResponse;
 import com.backend.domain.payment.entity.Payment;
 import com.backend.domain.payment.entity.PaymentMethod;
 import com.backend.domain.payment.repository.PaymentMethodRepository;
 import com.backend.domain.payment.repository.PaymentRepository;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.server.ResponseStatusException;
 
 import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
 
+    @Slf4j
 @Service
 @RequiredArgsConstructor
 public class PaymentService {
@@ -28,19 +32,22 @@ public class PaymentService {
     private final PaymentMethodRepository paymentMethodRepository;          // 수단..
     private final CashRepository cashRepository;                            // 지갑..
     private final CashTransactionRepository cashTransactionRepository;      // 원장..
-
+    private final TossBillingClient tossBillingClient;
+    private static final long MIN_AMOUNT = 100L;                            // 최소 100원
     private static final long MAX_AMOUNT_PER_TX = 1_000_000L;               // 1회 한도(예시)..
 
     @Transactional                                                    // 원자성 보장..
     public PaymentResponse charge(Member actor, PaymentRequest req) {
 
         // 입력 검증..
-        if (req.getAmount() == null || req.getAmount() <= 0)         // 금액 필수/양수..
-            throw new IllegalArgumentException("금액은 1원 이상이어야 합니다.");
-        if (req.getAmount() > MAX_AMOUNT_PER_TX)                     // 한도 체크..
-            throw new IllegalArgumentException("1회 최대 충전 한도를 초과했습니다.");
-        if (req.getIdempotencyKey() == null || req.getIdempotencyKey().isBlank()) // 멱등키 필수..
-            throw new IllegalArgumentException("idempotencyKey가 필요합니다.");
+        if (req.getAmount() == null || req.getAmount() < MIN_AMOUNT)
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "최소 결제 금액은 100원입니다.");
+
+        if (req.getAmount() > MAX_AMOUNT_PER_TX)
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST,"1회 최대 충전 한도를 초과했습니다.");
+
+        if (req.getIdempotencyKey() == null || req.getIdempotencyKey().isBlank())
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "idempotencyKey가 필요합니다.");
 
         // 멱등 선조회(같은 회원+키면 기존 결과 그대로 반환)..
         var existingOpt = paymentRepository.findByMemberAndIdempotencyKey(actor, req.getIdempotencyKey());
@@ -53,9 +60,13 @@ public PaymentResponse charge(Member actor, PaymentRequest req) {
         // 결제수단 검증(본인 소유 + 삭제X + active)..
         PaymentMethod pm = paymentMethodRepository
                 .findByIdAndMemberAndDeletedFalse(req.getPaymentMethodId(), actor) // 삭제 안 된 본인 수단..
-                .orElseThrow(() -> new IllegalArgumentException("결제수단을 찾을 수 없습니다."));
-        if (Boolean.FALSE.equals(pm.getActive()))                                   // 비활성 차단..
-            throw new IllegalArgumentException("비활성화된 결제수단입니다.");
+                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "결제수단을 찾을 수 없습니다."));
+
+        if (Boolean.FALSE.equals(pm.getActive()) || Boolean.TRUE.equals(pm.getDeleted()))
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "비활성/삭제된 결제수단입니다.");
+
+        if (pm.getToken() == null || pm.getToken().isBlank())
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "이 결제수단에는 billingKey가 없습니다. 카드 등록(빌링키 발급) 후 사용하세요.");
 
         // payments: PENDING 생성..
         Payment payment = Payment.builder()
@@ -77,9 +88,39 @@ public PaymentResponse charge(Member actor, PaymentRequest req) {
                 .build();
         payment = paymentRepository.save(payment);
 
-        // (PG 모의) 승인 성공 가정 → 트랜잭션ID 발급..
-        String txId = "pg_" + payment.getId() + "_" + System.currentTimeMillis(); // 간단 모의..
-        payment.setTransactionId(txId);
+        log.info("[PM] id={}, token(billingKey)={}, brand={}, last4={}",
+                pm.getId(), pm.getToken(), pm.getBrand(), pm.getLast4());
+
+        // (PG 모의) → (실제 토스 빌링 결제)로 교체..
+        String customerKey = "user-" + actor.getId();
+        PgChargeResultResponse res;
+        try {
+            res = tossBillingClient.charge(
+                    pm.getToken(),           // billingKey
+                    req.getAmount(),         // 금액
+                    req.getIdempotencyKey(),  // 멱등키
+                    customerKey
+            );
+        } catch (ResponseStatusException ex) {
+            // 실패 상태로 마킹(선택)
+            payment.setStatus(PaymentStatus.FAILED);
+            paymentRepository.save(payment);
+
+            // 4xx/5xx 그대로 클라이언트에 전달
+            throw ex;
+        }
+
+        // (tossBillingClient가 onStatus 에러를 던지도록 바꿨다면 아래는 안전망 정도로 유지)
+        if (!res.isSuccess()) {
+            payment.setStatus(PaymentStatus.FAILED);
+            payment.setTransactionId(res.getTransactionId()); // 있을 수도/없을 수도
+            paymentRepository.save(payment);
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
+                    "PG 승인 실패: " + res.getFailureMsg());
+        }
+
+        // 성공: PG에서 받은 키를 트랜잭션 ID로 저장...
+        payment.setTransactionId(res.getTransactionId());
 
         // 지갑 잠금 후 잔액 증가 + 원장 DEPOSIT 기록..
         Cash cash = cashRepository.findWithLockByMember(actor)                     // 비관적 잠금..