MOSU-51 feat: 결제 고도화 및 보상 트랜잭션 구성 (PR 닫지말고, 댓글 달지마요 아직 덜했어요) #53

polyglot-k · 2025-07-06T17:23:17Z

😎 연결된 이슈

open [🛠 기능 구현] 결제 고도화 및 보상 트랜잭션 구성 #51

✨ 구현한 기능

TransactionEventListener를 통한, 롤백 부분 전파
실패 시, 실패 상태 저장 및 존재하는 부분에 대해서는 변경 쿼리 작성
이벤트 전파 시, 병목으로 인한 에러 대응으로 Retryable을 통해서 재시도 로직 구성

📢 논의하고 싶은 내용

🎸 기타

…ntity 필드 삭제

… 매개변수 제거

…필드를 Long에서 Integer로 수정

Copilot

Pull Request Overview

This PR enhances the payment flow by propagating rollbacks via events, restructuring confirm logic with retries, and composing compensation transactions on failure.

Introduces event-driven confirm workflow in PaymentService, with retryable logic and compensation via PaymentEventListener and PaymentFailureHandler.
Refactors DTOs and payload types to support multiple application IDs, adds size/count helpers, and adjusts amount types.
Removes old persistence repos, reorganizes domain repositories, and extends JPA entities with failure constructors and static helpers.

Reviewed Changes

Copilot reviewed 21 out of 21 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
src/test/java/.../TossPaymentClientTest.java	Updated test payload type and removed duplicate dummy method
src/main/java/.../PreparePaymentRequest.java	Added `getSize()` helper
src/main/java/.../PaymentRequest.java	Changed to `List<Long> applicationIds`, added `applicantSize()`
src/main/java/.../persistence/profile/ProfileJpaRepository.java	Removed old profile repo
src/main/java/.../persistence/application/ApplicationJpaRepository.java	Removed old application repo
src/main/java/.../infra/payment/dto/TossPaymentPayload.java	Changed `amount` to `Integer`
src/main/java/.../infra/payment/dto/ConfirmTossPaymentResponse.java	Renamed `toPaymentJpaEntity` to `toEntity` and removed quantity
src/main/java/.../domain/school/SchoolRepository.java	Added new `SchoolRepository`
src/main/java/.../domain/payment/PaymentRepository.java	Added `findByOrderId`, noted index TODO
src/main/java/.../domain/payment/PaymentMethod.java	Improved `from()` filter, added logging
src/main/java/.../domain/payment/PaymentJpaEntity.java	Removed `quantity`, added failure constructors and status change
src/main/java/.../domain/payment/PaymentAmountVO.java	Added `ofFailure()` factory
src/main/java/.../domain/discount/DiscountPolicy.java	Added static `calculate()` helper
src/main/java/.../domain/applicationschool/ApplicationSchoolJpaRepository.java	Fixed package/imports
src/main/java/.../domain/application/ApplicationJpaRepository.java	New `existsAllByIds` query
src/main/java/.../application/payment/PaymentService.java	Refactored confirm flow, added helper methods and event publishing
src/main/java/.../application/payment/PaymentFailureHandler.java	New handler for failed payments
src/main/java/.../application/payment/PaymentEventListener.java	Added retryable compensation listener
src/main/java/.../application/payment/PaymentEvent.java	Extended event payload with IDs and totalAmount
src/main/java/.../application/applicationschool/ApplicationSchoolService.java	Cleaned imports/formatting
src/main/java/.../application/application/ApplicationService.java	Cleaned imports/formatting

Comments suppressed due to low confidence (2)

src/main/java/life/mosu/mosuserver/presentation/payment/dto/PreparePaymentRequest.java:13

[nitpick] The method name getSize() is generic and inconsistent with applicantSize() in PaymentRequest. Consider renaming both to something like getItemCount() or getApplicationCount() for clarity and consistency.

    public int getSize() {

src/main/java/life/mosu/mosuserver/application/payment/PaymentEventListener.java:37

The retryable compensation logic in afterRollbackHandler isn’t covered by existing tests. Consider adding unit or integration tests to validate retry behavior and failure handling.

    @Retryable(

Copilot · 2025-07-06T17:24:45Z

src/main/java/life/mosu/mosuserver/domain/payment/PaymentMethod.java

    public static PaymentMethod from(String raw) {
        return Arrays.stream(values())
-                .filter(v -> v.name().equalsIgnoreCase(raw))
+                .filter(v -> v.name.equalsIgnoreCase(raw))


Using the field name to match the input may shadow the enum's name() method and lead to confusion. If you intend to match the constant name, use v.name().equalsIgnoreCase(raw); otherwise rename the field (e.g., label) and update references accordingly.

Copilot · 2025-07-06T17:24:45Z

src/main/java/life/mosu/mosuserver/application/payment/PaymentService.java

+        } catch (Exception ex) {
+            log.error("error : {}", ex.getMessage());
+            publisher.publishEvent(PaymentEvent.ofFailed(applicationIds, orderId, amount));
+            throw ex;


Catching generic Exception will also catch business logic errors and trigger retries unintentionally under @Retryable. Consider catching more specific exceptions or rethrowing non-retryable exceptions to avoid infinite retry loops.

Suggested change

} catch (Exception ex) {

log.error("error : {}", ex.getMessage());

publisher.publishEvent(PaymentEvent.ofFailed(applicationIds, orderId, amount));

throw ex;

} catch (HttpStatusCodeException ex) {

log.error("HTTP error during payment confirmation: {}", ex.getMessage());

publisher.publishEvent(PaymentEvent.ofFailed(applicationIds, orderId, amount));

throw ex; // Allow retry for HTTP status-related exceptions

} catch (RuntimeException ex) {

log.error("Unexpected runtime error: {}", ex.getMessage());

publisher.publishEvent(PaymentEvent.ofFailed(applicationIds, orderId, amount));

throw ex; // Rethrow non-retryable runtime exceptions

polyglot-k · 2025-07-07T09:43:30Z

/gemini review

gemini-code-assist

Code Review

This pull request refactors the payment processing logic to support batch payments for multiple applications and introduces a robust failure handling mechanism using transactional events and retries. The changes significantly improve the structure and reliability of the payment confirmation flow.

My review focuses on further improving reliability and maintainability:

A critical issue with an incorrect @Recover method that could lead to data inconsistency has been identified.
I've suggested ensuring atomicity in the payment failure handler by adding transactional support.
Other suggestions include improving logging, code cleanup by removing unused dependencies and commented-out code, and optimizing database calls.

gemini-code-assist · 2025-07-07T09:45:41Z

src/main/java/life/mosu/mosuserver/application/payment/PaymentFailureHandler.java

+
+    private final PaymentRepository paymentRepository;
+
+    public void handlePaymentFailure(PaymentEvent event) {


The handlePaymentFailure method performs multiple database operations. Since it's called from an event listener with Propagation.NOT_SUPPORTED, these operations are not executed within a single transaction. This could lead to an inconsistent state if one of the subsequent operations fails after the first one has succeeded. To ensure atomicity, this method should be annotated with @Transactional.

Suggested change

public void handlePaymentFailure(PaymentEvent event) {

@Transactional

public void handlePaymentFailure(PaymentEvent event) {

gemini-code-assist · 2025-07-07T09:45:41Z

src/main/java/life/mosu/mosuserver/application/payment/PaymentEventListener.java

 public class PaymentEventListener {

-    // 1. 트랜잭션 커밋 직전에 호출됨 (롤백 가능 상태)
+    private final PaymentRepository paymentRepository;


The paymentRepository field is injected but not used within the PaymentEventListener class. Unused dependencies should be removed to keep the code clean and avoid confusion.

gemini-code-assist · 2025-07-07T09:45:41Z

src/main/java/life/mosu/mosuserver/application/payment/PaymentFailureHandler.java

+        paymentRepository.saveAll(existingPayments);
+        paymentRepository.saveAll(newPayments);


These two separate calls to paymentRepository.saveAll() can be combined into a single, more efficient database operation. This reduces network overhead and is a good practice for batch operations.

List<PaymentJpaEntity> allPaymentsToSave = new ArrayList<>(existingPayments); allPaymentsToSave.addAll(newPayments); paymentRepository.saveAll(allPaymentsToSave);

gemini-code-assist · 2025-07-07T09:45:42Z

src/main/java/life/mosu/mosuserver/application/payment/PaymentService.java

+            savePayments(paymentEntities);
+            publisher.publishEvent(PaymentEvent.ofSuccess(applicationIds, orderId, amount));
+        } catch (Exception ex) {
+            log.error("error : {}", ex.getMessage());


The current error logging only captures the exception message. This can make debugging difficult as the context (stack trace) is lost. It's a best practice to log the full exception object to get the stack trace.

Suggested change

log.error("error : {}", ex.getMessage());

log.error("error : {}", ex.getMessage(), ex); // include ex to log the stack trace

gemini-code-assist · 2025-07-07T09:45:42Z

src/main/java/life/mosu/mosuserver/application/payment/PaymentService.java

+//            return new ConfirmTossPaymentResponse(
+//                    "tviva20250702231345mODA4",     // paymentKey
+//                    "IDMAoki7azYp8SzQ06LMt12323235", // orderId
+//                    "DONE",                          // status
+//                    "2025-07-02T23:14:33+09:00",    // approvedAt
+//                    1_000,                           // totalAmount
+//                    1_000,                           // balanceAmount
+//                    1_000,                           // suppliedAmount
+//                    1_000,                           // vat
+//                    1_000,                           // taxFreeAmount
+//                    "간편결제"                            // method
+//            );


This commented-out code block appears to be for testing or debugging. It should be removed from the source code before merging to improve code clarity and maintainability.

polyglot-k added 18 commits July 7, 2025 02:16

test: TossPaymentClientTest에서 성공 응답 생성 메서드 추가 및 리팩토링

ee3d8fb

feat: PreparePaymentRequest에 getSize 메서드 추가

f473cd7

feat: 새로운 ApplicationJpaRepository 및 ApplicationSchoolJpaRepository 추가

b6aed69

refactor: 코드 정리 및 불필요한 import 제거

f049719

refactor: 코드 정리 및 불필요한 import 제거, 메서드 호출 시 포맷 개선

1e880ff

feat: PaymentEvent에 applicationIds 및 totalAmount 필드 추가

ad233df

refactor: PaymentEventListener에서 System.out.println을 로깅으로 변경 및 코드 정리

be12719

feat: PaymentFailureHandler 클래스 추가 및 결제 실패 처리 로직 구현

7403e00

feat: 결제 처리 로직 개선 및 중복 결제 검증 추가

f2ce3ed

feat: DiscountPolicy에 정적 메서드 calculate 추가

040baf8

feat: PaymentAmountVO에서 suppliedAmount 및 vatAmount 필드의 nullable 속성 제거

5b33ddd

feat: PaymentJpaEntity에서 paymentKey 및 method 필드의 nullable 속성 제거 및 qua…

7eba888

…ntity 필드 삭제

feat: PaymentMethod 클래스에 로깅 기능 추가 및 from 메서드의 예외 메시지 수정

a166a19

feat: PaymentRepository 인터페이스에 코드 정리 및 공백 추가

8140c04

feat: SchoolRepository 인터페이스 추가

5ad3e2a

feat: ConfirmTossPaymentResponse 클래스의 toEntity 메서드 수정 및 불필요한 quantity…

b00588b

… 매개변수 제거

feat: TossPaymentPayload 클래스의 amount 필드를 Long에서 Integer로 변경

6fb3df2

feat: PaymentRequest 클래스의 applicationId 필드를 List<Long>으로 변경 및 amount …

a70eb80

…필드를 Long에서 Integer로 수정

polyglot-k requested a review from Copilot July 6, 2025 17:23

polyglot-k changed the title ~~MOSU-51 feat: 결제 고도화 및 보상 트랜잭션 구성~~ MOSU-51 feat: 결제 고도화 및 보상 트랜잭션 구성 (PR 닫지말고, 댓글 달지마요 아직 덜했어요) Jul 6, 2025

Copilot AI reviewed Jul 6, 2025

View reviewed changes

polyglot-k and others added 2 commits July 7, 2025 02:33

Merge branch 'develop' into feature/mosu-51

8863ae0

style : applicationSchool, application 서비스 내에 import 제거 (conflict 완화)

323c671

polyglot-k linked an issue Jul 6, 2025 that may be closed by this pull request

[🛠 기능 구현] 결제 고도화 및 보상 트랜잭션 구성 #51

Closed

polyglot-k added this to the 모수 MVP API 구현 milestone Jul 6, 2025

polyglot-k self-assigned this Jul 6, 2025

polyglot-k added this to mosu-server Jul 6, 2025

polyglot-k moved this to In Progress in mosu-server Jul 6, 2025

gemini-code-assist bot reviewed Jul 7, 2025

View reviewed changes

polyglot-k merged commit bef1f8a into develop Jul 10, 2025
1 check passed

github-project-automation bot moved this from In Progress to Done in mosu-server Jul 10, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

MOSU-51 feat: 결제 고도화 및 보상 트랜잭션 구성 (PR 닫지말고, 댓글 달지마요 아직 덜했어요) #53

MOSU-51 feat: 결제 고도화 및 보상 트랜잭션 구성 (PR 닫지말고, 댓글 달지마요 아직 덜했어요) #53

Uh oh!

polyglot-k commented Jul 6, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jul 6, 2025

Uh oh!

Copilot AI Jul 6, 2025

Uh oh!

polyglot-k commented Jul 7, 2025

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

gemini-code-assist bot Jul 7, 2025

Uh oh!

gemini-code-assist bot Jul 7, 2025

Uh oh!

gemini-code-assist bot Jul 7, 2025

Uh oh!

gemini-code-assist bot Jul 7, 2025

Uh oh!

gemini-code-assist bot Jul 7, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants


		private final PaymentRepository paymentRepository;

		public void handlePaymentFailure(PaymentEvent event) {

	public void handlePaymentFailure(PaymentEvent event) {
	@Transactional
	public void handlePaymentFailure(PaymentEvent event) {

		paymentRepository.saveAll(existingPayments);
		paymentRepository.saveAll(newPayments);

	log.error("error : {}", ex.getMessage());
	log.error("error : {}", ex.getMessage(), ex); // include ex to log the stack trace

MOSU-51 feat: 결제 고도화 및 보상 트랜잭션 구성 (PR 닫지말고, 댓글 달지마요 아직 덜했어요) #53

MOSU-51 feat: 결제 고도화 및 보상 트랜잭션 구성 (PR 닫지말고, 댓글 달지마요 아직 덜했어요) #53

Uh oh!

Conversation

polyglot-k commented Jul 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

😎 연결된 이슈

✨ 구현한 기능

📢 논의하고 싶은 내용

🎸 기타

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Jul 6, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 6, 2025

Choose a reason for hiding this comment

Uh oh!

polyglot-k commented Jul 7, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

polyglot-k commented Jul 6, 2025 •

edited

Loading