-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* refactor: PaymentSaveResponse -> PaymentPendingResponse 네이밍 변경, PaymentPendingRequest dto 생성 * feat: Payment 환불 도메인 로직 작성 * feat: Payment 환불 컨트롤러,서비스 로직 작성 * feat: 환불API js코드예시 작성 * refactor: PaymentService#cancelPayment의 불필요한 로직 정리 * refactor: PaymentCancelRequest의 환불금액 필드 제거 * test: Payment 도메인 테스트 작성 * feat: Payment의 id 타입을 UUID로 변경 * feat: Payment 관련 DTO의 merchantUid 타입을 UUID로 변경, 더이상 사용되지 않는 DonationRequest 삭제 * fix: request dto에서 UUID를 받지 못하는 이슈 해결 * fix: PaymentNotFoundException 메시지/에러코드 수정, 사용되지 않는 PaymentRequestException, PaymentCancelException 삭제 * refactor: IllegalPaymentInfoException 예외메시지 수정 * fix: 환불요청dto 유효성검사 실패시 PaymentCancelRequestException 발생하도록 변경 * test: Payment 컨트롤러 테스트케이스 추가 * refactor: convertToPaymentInfo 수정 * feat: Payment id타입 Long으로 변경, merchantUid UUID타입 컬럼 추가 * style: 리포매팅 * refactor: PaymentRequest -> PaymentCompleteRequest 리네임 * refactor: 사용되지 않는 클래스 제거 * refactor: 환불요청 dto의 merchantUid 타입 UUID로 변경 * feat: Payment의 merchantUid 컬럼 nullable=false 추가 * feat: UUID 커스텀 Validator 생성, DTO의 merchantUid를 String타입으로 변경 * refactor: 스네이크케이스 -> 카멜케이스로 변경 * feat: UUIDValidator null 검증 추가, 테스트작성 Co-authored-by: dwl5 <ssop6403@gmail.com>
- Loading branch information
Showing
41 changed files
with
729 additions
and
394 deletions.
There are no files selected for viewing
Submodule securityKey
updated
from 37bdfc to 70e744
3 changes: 0 additions & 3 deletions
3
server/src/main/java/com/example/tyfserver/common/config/CommonConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 0 additions & 23 deletions
23
server/src/main/java/com/example/tyfserver/donation/dto/DonationRequest.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 5 additions & 4 deletions
9
server/src/main/java/com/example/tyfserver/payment/domain/PaymentInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 5 additions & 2 deletions
7
server/src/main/java/com/example/tyfserver/payment/domain/PaymentServiceConnector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
package com.example.tyfserver.payment.domain; | ||
|
||
import com.example.tyfserver.payment.dto.PaymentRequest; | ||
import java.util.UUID; | ||
|
||
public interface PaymentServiceConnector { | ||
PaymentInfo requestPaymentInfo(PaymentRequest paymentRequest); | ||
|
||
PaymentInfo requestPaymentInfo(UUID merchantUid); | ||
|
||
PaymentInfo requestPaymentCancel(UUID merchantUid); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
server/src/main/java/com/example/tyfserver/payment/dto/PaymentCancelRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package com.example.tyfserver.payment.dto; | ||
|
||
import com.example.tyfserver.payment.util.UUID; | ||
import lombok.AccessLevel; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Getter | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
public class PaymentCancelRequest { | ||
|
||
@UUID | ||
private String merchantUid; | ||
|
||
public PaymentCancelRequest(String merchantUid) { | ||
this.merchantUid = merchantUid; | ||
} | ||
} |
18 changes: 18 additions & 0 deletions
18
server/src/main/java/com/example/tyfserver/payment/dto/PaymentCancelResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package com.example.tyfserver.payment.dto; | ||
|
||
import lombok.AccessLevel; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
import java.util.UUID; | ||
|
||
@Getter | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
public class PaymentCancelResponse { | ||
|
||
private UUID merchantUid; | ||
|
||
public PaymentCancelResponse(UUID merchantUid) { | ||
this.merchantUid = merchantUid; | ||
} | ||
} |
Oops, something went wrong.