Skip to content

feat/121 :: Payment 결제 서비스 구현#29

Open
lian2945 wants to merge 133 commits into
mainfrom
feat/121
Open

feat/121 :: Payment 결제 서비스 구현#29
lian2945 wants to merge 133 commits into
mainfrom
feat/121

Conversation

@lian2945

@lian2945 lian2945 commented May 18, 2026

Copy link
Copy Markdown
Collaborator

📌 관련 이슈

  • close #121

📝 변경 사항 요약

작업 유형

  • ✨ feat: 새로운 기능 추가 (기능 단위 완료 후 PR)
  • 🐛 fix: 버그 수정 (버그 1개 = PR 1개)
  • ♻️ refactor: 코드 리팩토링 (작업 단위 완료 후 PR)
  • ✅ test: 테스트 코드 추가/수정 (작업 단위 완료 후 PR)

변경 내용

  • 도메인: Payment/PaymentLine Aggregate, PaymentStatus/TossPaymentMethod Enum, 도메인 이벤트 4종, VO 3종, 예외 6종
  • 애플리케이션: UseCase 5종, Port 3종, Service 6종, DTO
  • 어댑터: REST Controller, Kafka Listener, Toss PG Feign Client, JPA Persistence, Inbox/Outbox, Security
  • 설정: application-local/dev/prod.yml, build.gradle, Dockerfile, Gradle Wrapper

변경 이유

  • 토스페이먼츠 PG 연동을 통한 결제 승인/취소를 처리하며, Orchestrator 커맨드 이벤트를 수신하여 결제 플로우를 자동화

✅ 테스트 체크리스트

  • 단위 테스트 작성 및 통과
  • 통합 테스트 통과
  • 기존 기능 정상 동작 확인 (Regression)
  • API 응답값 확인
  • 예외 케이스 처리 확인
  • 로컬 환경에서 직접 테스트 완료

📸 스크린샷 / 로그

펼쳐보기

curl-test.sh 기반 결제 API 테스트 완료

🔄 동작 플로우 (Mermaid)

flowchart TD
    A[Orchestrator 결제 승인 커맨드] --> B[PaymentCommandKafkaListener]
    B --> C[HandlePaymentApproveCommandService]
    C --> D[Toss PG 결제 승인 API 호출]
    D -->|성공| E[Payment 저장 APPROVED]
    E --> F[PaymentSucceeded 이벤트 발행]
    D -->|실패| G[PaymentFailed 이벤트 발행]
    H[결제 취소 요청] --> I[CancelPaymentService]
    I --> J[Toss PG 결제 취소 API 호출]
    J -->|성공| K[PaymentCancelSucceeded 이벤트 발행]
    J -->|실패| L[PaymentCancelFailed 이벤트 발행]
Loading

💬 리뷰어에게

  • Toss PG Feign Client의 에러 디코더 분기 로직을 검토해주세요.
  • 결제 금액 불일치 검증 로직과 고객 불일치 검증이 올바른지 확인 부탁드립니다.
  • Kafka 커맨드 수신 시 Inbox 멱등성 보장이 적용되었는지 확인해주세요.

lian2945 and others added 12 commits May 18, 2026 17:07
@lian2945 @claude
feat/116 :: Order 도메인 Aggregate, VO, 이벤트, 예외, 글로벌 예외 계층
35db47e 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/116 :: Order UseCase, Port, Service, DTO 구현
f79c8da 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/116 :: Order 어댑터 (Web/Kafka/gRPC/Persistence/Security/Scheduler)
fb32475 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/116 :: Order application-*.yml, Dockerfile, build.gradle 설정
c43e703 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/117 :: Release 도메인 Aggregate, VO, 예외, 글로벌 예외 계층
616e03c 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/117 :: Release UseCase, Port, Service, DTO 구현
87cf732 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/117 :: Release 어댑터 (Web/gRPC/Persistence/Security/Scheduler)
56edccf 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/117 :: Release application-*.yml, Dockerfile, build.gradle 설정
0c59c17 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/121 :: Payment 도메인 Aggregate, VO, 이벤트, 예외 계층
7fb3654 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/121 :: Payment UseCase, Port, Service, DTO 구현
29a0f1d 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/121 :: Payment 어댑터 (Web/Kafka/Toss PG/Persistence/Security)
0934fe2 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/121 :: Payment application-*.yml, Dockerfile, build.gradle, Grad…
e6e19a3 
…le Wrapper

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings May 18, 2026 08:36
Copilot AI reviewed May 18, 2026

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

lian2945 and others added 15 commits May 18, 2026 18:00
@lian2945 @claude
feat/121 :: SonarCloud 경고 해결 (빈 테스트 메서드 주석, Dockerfile non-root 유저)
90e28a8 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/116 :: SonarCloud 경고 해결 (빈 테스트 메서드 주석, Dockerfile non-root 유저)
503d3c3 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945 @claude
feat/117 :: SonarCloud 경고 해결 (빈 테스트 메서드 주석, Dockerfile non-root 유저)
f334e59 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@lian2945
feat/121 :: payment application-dev.yml trusted.ips 수정
9414fec
@lian2945
feat/117 :: release application-dev.yml trusted.ips 수정
6e3c690
@lian2945
feat/116 :: order application-dev.yml trusted.ips 수정
59650b6
@lian2945
feat/121 :: payment Dockerfile 경로 및 줄바꿈 오류 수정
ddfc85c
@lian2945
feat/117 :: release Dockerfile 경로 및 줄바꿈 오류 수정
6d817f6
@lian2945
feat/116 :: order Dockerfile 경로 및 줄바꿈 오류 수정
7452d15
@lian2945 @claude
feat/121 :: payment application-prod.yml security.trusted.ips 수정
4417b91 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945 @claude
feat/117 :: release application-prod.yml 추가
831584a 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945 @claude
feat/116 :: order application-prod.yml 수정 (server.port/TRUSTED_IPS 제거…
e92585c 
…, grpc 설정 추가)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945 @claude
feat/116 :: subscribe/creator application-dev/prod.yml server.port 제거
6f90fdb 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945 @claude
feat/117 :: subscribe/creator application-dev/prod.yml server.port 제거
23ac3b3 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945 @claude
feat/121 :: subscribe/creator application-dev/prod.yml server.port 제거
cd838b6 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
lian2945 and others added 29 commits May 22, 2026 12:08
@lian2945
Merge branch 'feat/116' into feat/117
0394205
@lian2945
Merge branch 'feat/116' into feat/121
4236d7c
@lian2945 @claude
fix(kafka): @RetryableTopic에 dltStrategy, dltTopicSuffix 명시
a72677b 
기본값과 동일하나 운영 시 DLT 전략을 명확히 하기 위해 명시적으로 추가.
- dltStrategy = FAIL_ON_ERROR: DLT 전송 실패 시 컨슈머 중단(메시지 유실 방지)
- dltTopicSuffix = "-dlt": DLT 토픽명 명시

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945
Merge branch 'feat/116' into feat/117
172f5e2 
# Conflicts:
#	services/creator/src/main/java/kr/magicbox/creator/adapter/in/kafka/UserEventKafkaListener.java
#	services/user/src/main/java/kr/magicbox/user/adapter/in/kafka/AuthEventKafkaListener.java
#	services/user/src/main/java/kr/magicbox/user/adapter/in/kafka/SseConnectedKafkaListener.java
#	services/user/src/main/java/kr/magicbox/user/adapter/in/kafka/SseDisconnectedKafkaListener.java
@lian2945 @claude
fix(kafka): IdempotentAspect catch(Exception) → catch(Throwable) 컴파일 …
e7bf5c8 
…에러 수정

pjp.proceed()가 throws Throwable로 선언되어 있어 catch(Exception)으로는
컴파일러가 Throwable 처리를 인정하지 않아 컴파일 에러 발생.
마지막 catch 블록을 Throwable로 변경하여 수정.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945
Merge branch 'feat/116' into feat/117
1b1d96c
@lian2945
Merge branch 'feat/116' into feat/121
21fa104 
# Conflicts:
#	services/order/src/main/java/kr/magicbox/order/adapter/in/kafka/DeliveryEventKafkaListener.java
#	services/order/src/main/java/kr/magicbox/order/adapter/in/kafka/OrderStateKafkaListener.java
#	services/order/src/main/java/kr/magicbox/order/adapter/in/kafka/PaymentEventKafkaListener.java
#	services/order/src/main/java/kr/magicbox/order/adapter/in/kafka/StockEventKafkaListener.java
#	services/user/src/main/java/kr/magicbox/user/adapter/in/kafka/AuthEventKafkaListener.java
#	services/user/src/main/java/kr/magicbox/user/adapter/in/kafka/SseConnectedKafkaListener.java
#	services/user/src/main/java/kr/magicbox/user/adapter/in/kafka/SseDisconnectedKafkaListener.java
@lian2945
fix: 충돌 마커 제거
af92b8a
@lian2945
Merge remote-tracking branch 'origin/main' into feat/117
b0327b5 
# Conflicts:
#	services/auth/src/main/java/kr/magicbox/auth/adapter/in/kafka/UserEventKafkaListener.java
#	services/auth/src/main/resources/application-dev.yml
#	services/auth/src/main/resources/application-prod.yml
#	services/creator/src/main/java/kr/magicbox/creator/adapter/in/kafka/UserEventKafkaListener.java
#	services/creator/src/main/resources/application-prod.yml
#	services/general-goods/src/main/java/kr/magicbox/generalgoods/adapter/in/kafka/CreatorEventKafkaListener.java
#	services/general-goods/src/main/java/kr/magicbox/generalgoods/adapter/in/kafka/aop/IdempotentAspect.java
#	services/general-goods/src/main/java/kr/magicbox/generalgoods/adapter/out/communication/grpc/CreatorGrpcAdapter.java
#	services/general-goods/src/main/resources/application-prod.yml
#	services/order/build.gradle
#	services/order/src/main/resources/application-local.yml
#	services/release/build.gradle
#	services/release/src/main/resources/application-local.yml
#	services/shopping-cart/Dockerfile
#	services/subscribe/src/main/java/kr/magicbox/subscribe/adapter/in/kafka/CreatorEventKafkaListener.java
#	services/subscribe/src/main/java/kr/magicbox/subscribe/adapter/in/kafka/UserEventKafkaListener.java
#	services/subscribe/src/main/java/kr/magicbox/subscribe/adapter/in/kafka/aop/IdempotentAspect.java
#	services/subscribe/src/main/resources/application-prod.yml
#	services/user/src/main/java/kr/magicbox/user/adapter/in/kafka/AuthEventKafkaListener.java
#	services/user/src/main/java/kr/magicbox/user/adapter/in/kafka/SseConnectedKafkaListener.java
#	services/user/src/main/java/kr/magicbox/user/adapter/in/kafka/SseDisconnectedKafkaListener.java
#	services/user/src/main/java/kr/magicbox/user/adapter/out/communication/grpc/ReviewQueryGrpcAdapter.java
#	services/user/src/main/resources/application-dev.yml
#	services/user/src/main/resources/application-prod.yml
@lian2945
fix: settings.gradle shopping-cart 제거
d531349
@lian2945
Merge remote-tracking branch 'origin/main' into feat/121
3dc7477 
# Conflicts:
#	services/auth/src/main/java/kr/magicbox/auth/adapter/in/kafka/UserEventKafkaListener.java
#	services/auth/src/main/resources/application-dev.yml
#	services/auth/src/main/resources/application-prod.yml
#	services/creator/src/main/java/kr/magicbox/creator/adapter/in/kafka/UserEventKafkaListener.java
#	services/creator/src/main/resources/application-prod.yml
#	services/general-goods/src/main/java/kr/magicbox/generalgoods/adapter/in/kafka/CreatorEventKafkaListener.java
#	services/general-goods/src/main/java/kr/magicbox/generalgoods/adapter/in/kafka/aop/IdempotentAspect.java
#	services/general-goods/src/main/java/kr/magicbox/generalgoods/adapter/out/communication/grpc/CreatorGrpcAdapter.java
#	services/general-goods/src/main/resources/application-local.yml
#	services/general-goods/src/main/resources/application-prod.yml
#	services/order/build.gradle
#	services/order/src/main/resources/application-local.yml
#	services/payment/.gitattributes
#	services/payment/.gitignore
#	services/payment/gradle/wrapper/gradle-wrapper.properties
#	services/payment/gradlew
#	services/payment/gradlew.bat
#	services/payment/src/main/java/kr/magicbox/payment/PaymentApplication.java
#	services/payment/src/main/resources/application.yml
#	services/payment/src/test/java/kr/magicbox/payment/PaymentApplicationTests.java
#	services/shopping-cart/Dockerfile
#	services/subscribe/src/main/java/kr/magicbox/subscribe/adapter/in/kafka/CreatorEventKafkaListener.java
#	services/subscribe/src/main/java/kr/magicbox/subscribe/adapter/in/kafka/UserEventKafkaListener.java
#	services/subscribe/src/main/java/kr/magicbox/subscribe/adapter/in/kafka/aop/IdempotentAspect.java
#	services/subscribe/src/main/resources/application-local.yml
#	services/subscribe/src/main/resources/application-prod.yml
#	services/user/src/main/java/kr/magicbox/user/adapter/in/kafka/AuthEventKafkaListener.java
#	services/user/src/main/java/kr/magicbox/user/adapter/in/kafka/SseConnectedKafkaListener.java
#	services/user/src/main/java/kr/magicbox/user/adapter/in/kafka/SseDisconnectedKafkaListener.java
#	services/user/src/main/java/kr/magicbox/user/adapter/out/communication/grpc/ReviewQueryGrpcAdapter.java
#	services/user/src/main/resources/application-dev.yml
#	services/user/src/main/resources/application-prod.yml
#	settings.gradle
@lian2945
fix: settings.gradle 실제 존재하는 서비스만 포함
4d00864
@lian2945 @claude
fix(grpc): proto Release 메시지 누락 필드 추가 및 created_at 매핑 오류 수정
14a67c3 
- release.proto: ReleaseStatus enum 추가, Release 메시지에 scheduled_at/status/limited_quantity/sold_quantity 필드 추가
- ReleaseGrpcService: toProtoRelease()에서 createdAt을 scheduledAt으로 잘못 매핑하던 버그 수정, 누락 필드 매핑 추가
- creator/release.proto: release 서비스 proto와 동기화 (ReleaseStatus enum, 누락 필드 추가)
- ReleaseResult: soldQuantity/status/scheduledAt/createdAt 필드 추가
- ReleaseStatus: 신규 enum 추가 (SCHEDULED/ON_SALE/SOLD_OUT/ENDED)
- ReleaseQueryGrpcAdapter: 신규 필드 매핑 추가, import 정렬

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945 @claude
fix(scheduler): Redisson 분산 락 + 청크 처리로 AutoStartSale 다중 인스턴스 충돌 해소
418df4d 
- StartSaleScheduler: fixedDelay=60000 → cron="0 */10 * * * *" (10분 주기, ScheduledAtMultipleOfTenMinutes와 정렬)
- StartSaleScheduler: RedissonClient.tryLock()으로 분산 락 적용 — 락 획득 실패 시 즉시 반환
- AutoStartSaleService: 단일 트랜잭션 전체 처리 → 청크 루프(100건 단위) + AutoStartSaleChunkService에서 건별 트랜잭션
- ReleaseRepositoryPort/ReleaseJpaAdapter/ReleaseJpaRepository: findScheduledBefore에 limit 파라미터 추가 (Pageable 기반)
- build.gradle: redisson-spring-boot-starter 의존성 추가
- application-*.yml: Redis 설정 추가

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945 @claude
chore(deps): redisson-spring-boot-starter 3.45.1 → 3.50.0
4b9b8fa 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945 @claude
refactor(grpc): IncreaseSoldQuantity gRPC 엔드포인트 제거 — Kafka Inbox 단일 경…
6cdb350 
…로로 통일

sold_quantity 증가는 Outbox→Inbox(Kafka) 경로만 사용하므로 gRPC 중복 경로 제거.
- release.proto: rpc IncreaseSoldQuantity 및 관련 메시지 제거
- ReleaseGrpcService: increaseSoldQuantity 메서드 및 IncreaseSoldQuantityUseCase 의존성 제거
- IncreaseSoldQuantityUseCase, IncreaseSoldQuantityService 삭제

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945
Merge branch 'feat/117' into feat/121
c4195d0
@lian2945 @claude
refactor(release): gRPC 호출을 트랜잭션 밖으로 분리
53f1aff 
creatorIdQueryPort.getCreatorId() (gRPC + CircuitBreaker)가 @transactional 경계 안에 포함되어
DB 커넥션을 불필요하게 점유하는 문제 수정.

- RegisterReleaseService: @transactional 제거, gRPC 조회 후 RegisterReleaseTxService에 위임
- RegisterReleaseTxService: DB 저장만 담당하는 별도 서비스로 @transactional 격리
  (self-invocation으로 AOP 프록시가 무시되는 문제를 피하기 위해 별도 클래스로 분리)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945
Merge branch 'feat/117' into feat/121
e1d04a4
@lian2945 @claude
fix(release): PR 리뷰 코멘트 반영 — isOnSale 도메인 위임, Validator 개선, gRPC 채널 재사용
9a1f7d4 
- ReleaseResult: isOnSale() 파생 메서드 추가 — 판매 중 판단 로직을 DTO에 집중
- ReleaseGrpcService: isReleaseOnSale에서 enum 직접 비교 → result.isOnSale() 위임, 불필요한 ReleaseStatus import 제거
- ScheduledAtMultipleOfTenMinutesValidator: atZone() 중복 호출 제거(ZonedDateTime 한 번만), 현재 시각+10분 이후만 허용하는 최소 예약 시간 검증 추가
- ReleaseQueryGrpcAdapter: 매 호출마다 새 채널 생성 → GrpcConfiguration의 releaseManagedChannel Bean 주입으로 채널 재사용

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945
Merge branch 'feat/117' into feat/121
48ce839
@lian2945 @claude
refactor(validation): ZonedDateTime 제거 — epochSecond % 600 으로 단순화
3bf4654 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945
Merge branch 'feat/117' into feat/121
4bd184d
@lian2945 @claude
fix(general-goods): CreatorGrpcAdapter — grpcChannelFactory 직접 호출 제거,…
4017fd3 
… 주입된 creatorManagedChannel 사용

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945
Merge branch 'feat/117' into feat/121
8c99121
@lian2945 @claude
fix(order): shedlock-provider-redisson → shedlock-provider-redis-spri…
0722dca 
…ng 교체 (Maven Central 미존재)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945
Merge branch 'feat/117' into feat/121
1c5d661
@lian2945 @claude
fix(docker): COPY --chown으로 chown RUN 레이어 제거 — I/O 에러 방지
82f2719 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@lian2945
Merge branch 'feat/117' into feat/121
5b35a21
@sonarqubecloud

sonarqubecloud Bot commented May 23, 2026

Copy link
Copy Markdown

Quality Gate Failed Quality Gate failed

Failed conditions
9 Security Hotspots

See analysis details on SonarQube Cloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@lian2945