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

merged 29 commits into from
Jul 31, 2021

Commits on Jul 29, 2021

  1. refactor: PaymentSaveResponse -> PaymentPendingResponse 네이밍 변경, Payme… 

    …ntPendingRequest dto 생성
    @Joyykim
    Joyykim committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    c55af3b View commit details
    Browse the repository at this point in the history

  2. feat: Payment 환불 도메인 로직 작성

    @Joyykim
    Joyykim committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    78efff0 View commit details
    Browse the repository at this point in the history

  3. feat: Payment 환불 컨트롤러,서비스 로직 작성

    @Joyykim
    Joyykim committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    5bc76ae View commit details
    Browse the repository at this point in the history

  4. feat: 환불API js코드예시 작성

    @Joyykim
    Joyykim committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    dd89c27 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop-server' of https://github.com/woowacourse-teams… 

    …/2021-tyf into feature/iamport-cancel-payment-api
    @Joyykim
    Joyykim committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    4f191a1 View commit details
    Browse the repository at this point in the history

  6. refactor: PaymentService#cancelPayment의 불필요한 로직 정리

    @Joyykim
    Joyykim committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    d0a756b View commit details
    Browse the repository at this point in the history

  7. refactor: PaymentCancelRequest의 환불금액 필드 제거

    @Joyykim
    Joyykim committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    1f48d36 View commit details
    Browse the repository at this point in the history

  8. test: Payment 도메인 테스트 작성

    @Joyykim
    Joyykim committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    6e3d048 View commit details
    Browse the repository at this point in the history

  9. feat: Payment의 id 타입을 UUID로 변경

    @Joyykim
    Joyykim committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    8b397ce View commit details
    Browse the repository at this point in the history

  10. feat: Payment 관련 DTO의 merchantUid 타입을 UUID로 변경, 더이상 사용되지 않는 DonationR… 

    …equest 삭제
    @Joyykim
    Joyykim committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    6611c32 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop-server' of https://github.com/woowacourse-teams… 

    …/2021-tyf into feature/iamport-cancel-payment-api

Conflicts:
    server/src/main/java/com/example/tyfserver/payment/controller/PaymentController.java
    server/src/main/java/com/example/tyfserver/payment/domain/Payment.java
    server/src/main/java/com/example/tyfserver/payment/domain/PaymentInfo.java
    server/src/main/java/com/example/tyfserver/payment/service/PaymentService.java
    server/src/main/java/com/example/tyfserver/payment/util/IamPortPaymentServiceConnector.java
    server/src/test/java/com/example/tyfserver/donation/controller/DonationControllerTest.java
    server/src/test/java/com/example/tyfserver/payment/domain/PaymentTest.java
    @Joyykim
    Joyykim committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    e79a835 View commit details
    Browse the repository at this point in the history

  12. fix: request dto에서 UUID를 받지 못하는 이슈 해결

    @Joyykim
    Joyykim committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    fe9121f View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2021

  1. fix: PaymentNotFoundException 메시지/에러코드 수정, 사용되지 않는 PaymentRequestExce… 

    …ption, PaymentCancelException 삭제
    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    8c57263 View commit details
    Browse the repository at this point in the history

  2. refactor: IllegalPaymentInfoException 예외메시지 수정

    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    6c4c108 View commit details
    Browse the repository at this point in the history

  3. fix: 환불요청dto 유효성검사 실패시 PaymentCancelRequestException 발생하도록 변경

    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    a3f1bcc View commit details
    Browse the repository at this point in the history

  4. test: Payment 컨트롤러 테스트케이스 추가

    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    b83ca46 View commit details
    Browse the repository at this point in the history

  5. refactor: convertToPaymentInfo 수정

    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    049e8e1 View commit details
    Browse the repository at this point in the history

  6. feat: Payment id타입 Long으로 변경, merchantUid UUID타입 컬럼 추가

    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    50f6f00 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop-server' into feature/iamport-cancel-payment-api

    @DWL5
    DWL5 committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    625bb3a View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop-server' of https://github.com/woowacourse-teams… 

    …/2021-tyf into feature/iamport-cancel-payment-api

� Conflicts:
�	server/src/test/java/com/example/tyfserver/donation/DonationAcceptanceTest.java
    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    3847a07 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/feature/iamport-cancel-payment-a… 

    …pi' into feature/iamport-cancel-payment-api
    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    2a674e2 View commit details
    Browse the repository at this point in the history

  10. style: 리포매팅

    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    155311f View commit details
    Browse the repository at this point in the history

  11. refactor: PaymentRequest -> PaymentCompleteRequest 리네임

    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    a9ad935 View commit details
    Browse the repository at this point in the history

  12. refactor: 사용되지 않는 클래스 제거

    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    8242c01 View commit details
    Browse the repository at this point in the history

  13. refactor: 환불요청 dto의 merchantUid 타입 UUID로 변경

    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    2638b42 View commit details
    Browse the repository at this point in the history

  14. feat: Payment의 merchantUid 컬럼 nullable=false 추가

    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    f31567f View commit details
    Browse the repository at this point in the history

  15. feat: UUID 커스텀 Validator 생성, DTO의 merchantUid를 String타입으로 변경

    @Joyykim
    Joyykim committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    8e94396 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2021

  1. refactor: 스네이크케이스 -> 카멜케이스로 변경

    @Joyykim
    Joyykim committed Jul 31, 2021
    Configuration menu
    Copy the full SHA
    05a161b View commit details
    Browse the repository at this point in the history

  2. feat: UUIDValidator null 검증 추가, 테스트작성

    @Joyykim
    Joyykim committed Jul 31, 2021
    Configuration menu
    Copy the full SHA
    49fcdac View commit details
    Browse the repository at this point in the history