Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#199, #198] 환불 API 작성, Payment 도메인 수정 #200

Merged
merged 29 commits into from
Jul 31, 2021
Merged

[#199, #198] 환불 API 작성, Payment 도메인 수정 #200

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c55af3b
refactor: PaymentSaveResponse -> PaymentPendingResponse 네이밍 변경, Payme…
Joyykim Jul 29, 2021
78efff0
feat: Payment 환불 도메인 로직 작성
Joyykim Jul 29, 2021
5bc76ae
feat: Payment 환불 컨트롤러,서비스 로직 작성
Joyykim Jul 29, 2021
dd89c27
feat: 환불API js코드예시 작성
Joyykim Jul 29, 2021
4f191a1
Merge branch 'develop-server' of https://github.com/woowacourse-teams…
Joyykim Jul 29, 2021
d0a756b
refactor: PaymentService#cancelPayment의 불필요한 로직 정리
Joyykim Jul 29, 2021
1f48d36
refactor: PaymentCancelRequest의 환불금액 필드 제거
Joyykim Jul 29, 2021
6e3d048
test: Payment 도메인 테스트 작성
Joyykim Jul 29, 2021
8b397ce
feat: Payment의 id 타입을 UUID로 변경
Joyykim Jul 29, 2021
6611c32
feat: Payment 관련 DTO의 merchantUid 타입을 UUID로 변경, 더이상 사용되지 않는 DonationR…
Joyykim Jul 29, 2021
e79a835
Merge branch 'develop-server' of https://github.com/woowacourse-teams…
Joyykim Jul 29, 2021
fe9121f
fix: request dto에서 UUID를 받지 못하는 이슈 해결
Joyykim Jul 29, 2021
8c57263
fix: PaymentNotFoundException 메시지/에러코드 수정, 사용되지 않는 PaymentRequestExce…
Joyykim Jul 30, 2021
6c4c108
refactor: IllegalPaymentInfoException 예외메시지 수정
Joyykim Jul 30, 2021
a3f1bcc
fix: 환불요청dto 유효성검사 실패시 PaymentCancelRequestException 발생하도록 변경
Joyykim Jul 30, 2021
b83ca46
test: Payment 컨트롤러 테스트케이스 추가
Joyykim Jul 30, 2021
049e8e1
refactor: convertToPaymentInfo 수정
Joyykim Jul 30, 2021
50f6f00
feat: Payment id타입 Long으로 변경, merchantUid UUID타입 컬럼 추가
Joyykim Jul 30, 2021
625bb3a
Merge branch 'develop-server' into feature/iamport-cancel-payment-api
DWL5 Jul 30, 2021
3847a07
Merge branch 'develop-server' of https://github.com/woowacourse-teams…
Joyykim Jul 30, 2021
2a674e2
Merge remote-tracking branch 'origin/feature/iamport-cancel-payment-a…
Joyykim Jul 30, 2021
155311f
style: 리포매팅
Joyykim Jul 30, 2021
a9ad935
refactor: PaymentRequest -> PaymentCompleteRequest 리네임
Joyykim Jul 30, 2021
8242c01
refactor: 사용되지 않는 클래스 제거
Joyykim Jul 30, 2021
2638b42
refactor: 환불요청 dto의 merchantUid 타입 UUID로 변경
Joyykim Jul 30, 2021
f31567f
feat: Payment의 merchantUid 컬럼 nullable=false 추가
Joyykim Jul 30, 2021
8e94396
feat: UUID 커스텀 Validator 생성, DTO의 merchantUid를 String타입으로 변경
Joyykim Jul 30, 2021
05a161b
refactor: 스네이크케이스 -> 카멜케이스로 변경
Joyykim Jul 31, 2021
49fcdac
feat: UUIDValidator null 검증 추가, 테스트작성
Joyykim Jul 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions server/src/main/java/com/example/tyfserver/payment/domain/Payment.java
View file
Open in desktop
Expand Up @@ -33,6 +33,7 @@ public class Payment extends BaseTimeEntity {

private String impUid;

@Column(nullable = false)
Copy link
Collaborator

Choose a reason for hiding this comment

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

굿!! merchantUid는 null이 아니어야 하지

private UUID merchantUid;

@PrePersist
Expand Down