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

Develop #23

Merged
merged 71 commits into from
Jan 18, 2024
Merged

Develop #23

merged 71 commits into from
Jan 18, 2024

Commits on Nov 18, 2023

  1. 🎉 Start payment service

    @nowgnas
    nowgnas committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    35241b2 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2023

  1. 📝 Amend ignore file

    @nowgnas
    nowgnas committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    b715463 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from nowgnas/config/init 

    🎉 Start payment service
    @binarywoo27
    binarywoo27 authored Nov 19, 2023
    Configuration menu
    Copy the full SHA
    52a3897 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. 초기 설정 및 Entity 생성

    @binarywoo27
    binarywoo27 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    1fe2e57 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from lotteon2/LF1-306-payment-config 

    초기 설정 및 Entity 생성
    @nowgnas
    nowgnas authored Nov 21, 2023
    Configuration menu
    Copy the full SHA
    2bf339e View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. feat: 단건결제API 추가

    @binarywoo27
    binarywoo27 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    c48fd82 View commit details
    Browse the repository at this point in the history

  2. ammend: controller 리턴값 추가

    @binarywoo27
    binarywoo27 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    6563290 View commit details
    Browse the repository at this point in the history

  3. Jacoco setting 및 service, repository 테스트

    @binarywoo27
    binarywoo27 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    ebaa4ba View commit details
    Browse the repository at this point in the history

  4. controller 테스트

    @binarywoo27
    binarywoo27 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    29556fb View commit details
    Browse the repository at this point in the history

  5. controller 테스트 삭제

    @binarywoo27
    binarywoo27 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    23a3772 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. fix: 외부API 로직 분리, 트랙잭션 추가

    @binarywoo27
    binarywoo27 committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    c0586e0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from lotteon2/LF1-302-single-payment 

    Jacoco 설정 및 카카오페이 결제준비 Service, Repository Test 생성
    @qwerty1434
    qwerty1434 authored Nov 23, 2023
    Configuration menu
    Copy the full SHA
    5d5f295 View commit details
    Browse the repository at this point in the history

  3. feat: KakaopayApproveRequestDto 추가

    @binarywoo27
    binarywoo27 committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    52c4924 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. feat: 결제승인 API 테스트 코드

    @binarywoo27
    binarywoo27 committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    7a1797a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from lotteon2/LF1-302-single-payment-approval 

    결제승인 API 및 Test code
    @qwerty1434
    qwerty1434 authored Nov 24, 2023
    Configuration menu
    Copy the full SHA
    68c9619 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2023

  1. Create deploy-dev.yml

    @nowgnas
    nowgnas authored Nov 25, 2023
    Configuration menu
    Copy the full SHA
    580c32f View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge pull request #5 from lotteon2/nowgnas-patch-1 

    Create deploy-dev.yml
    @nowgnas
    nowgnas authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    e06e1bd View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. 🐛 OrderId 타입 수정 및 결제정보 저장 순서 수정

    @binarywoo27
    binarywoo27 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    c4ac300 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6 from lotteon2/LF1-473-subscription-ready 

    🐛 OrderId 타입 수정 및 결제정보 저장 순서 수정
    @qwerty1434
    qwerty1434 authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    c2f6545 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. update deploy dev

    @nowgnas
    nowgnas committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    c20d69e View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. 📝 OrderType을 넘겨주기 위한 ApproveUrl 수정

    @binarywoo27
    binarywoo27 committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    65822bd View commit details
    Browse the repository at this point in the history

  2. 🔀 Merged from origin develop

    @binarywoo27
    binarywoo27 committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    1de87d3 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. 🐛 자잘한 오류 해결

    @binarywoo27
    binarywoo27 committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    6543ac1 View commit details
    Browse the repository at this point in the history

  2. 💚 Yml 수정

    @binarywoo27
    binarywoo27 committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    a49be01 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. Update application-prod.yml

    @nowgnas
    nowgnas authored Dec 26, 2023
    Configuration menu
    Copy the full SHA
    c1184ad View commit details
    Browse the repository at this point in the history

  2. yml file update

    @binarywoo27
    binarywoo27 committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    084cbe9 View commit details
    Browse the repository at this point in the history

  3. 불필요한 코드 삭제 및 CommonResponse로 바꾸기

    @binarywoo27
    binarywoo27 committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    937b72a View commit details
    Browse the repository at this point in the history

  4. gradle 설정

    @binarywoo27
    binarywoo27 committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    fd511c2 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #7 from lotteon2/hotfix/develop 

    Hotfix/develop
    @nowgnas
    nowgnas authored Dec 26, 2023
    Configuration menu
    Copy the full SHA
    d5f8d37 View commit details
    Browse the repository at this point in the history

  6. build.gradle 의존성 수정

    @binarywoo27
    binarywoo27 committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    ad1d8ba View commit details
    Browse the repository at this point in the history

  7. 💚 의존성 수정 및 CommonResponse로 변경

    @binarywoo27
    binarywoo27 committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    bce6725 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2023

  1. Merge pull request #8 from lotteon2/hotfix/develop 

    build.gradle 의존성 수정
    @qwerty1434
    qwerty1434 authored Dec 27, 2023
    Configuration menu
    Copy the full SHA
    3b9e4fa View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. Update application-prod.yml

    @nowgnas
    nowgnas authored Dec 29, 2023
    Configuration menu
    Copy the full SHA
    9a571a2 View commit details
    Browse the repository at this point in the history

  2. 💚 Yml 설정 오류 수정

    @binarywoo27
    binarywoo27 committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    68c2547 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #9 from lotteon2/fix/develop 

    💚 Yml 설정 오류 수정
    @JIUNG9
    JIUNG9 authored Dec 29, 2023
    Configuration menu
    Copy the full SHA
    51865bf View commit details
    Browse the repository at this point in the history

  4. 🐛 Yml 파일 수정

    @binarywoo27
    binarywoo27 committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    6cd49de View commit details
    Browse the repository at this point in the history

  5. 📝 Url 변수명 수정

    @binarywoo27
    binarywoo27 committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    77e6f86 View commit details
    Browse the repository at this point in the history

  6. ✨ 정기결제 API 및 Test Code

    @binarywoo27
    binarywoo27 committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    4b9db93 View commit details
    Browse the repository at this point in the history

  7. 🐛 결제 버그 해결

    @binarywoo27
    binarywoo27 committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    e913e1a View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2023

  1. 🐛 Git의 파일 대소문자 인식 오류 해결 시도

    @binarywoo27
    binarywoo27 committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    6f5c932 View commit details
    Browse the repository at this point in the history

  2. 🐛 Git의 파일 대소문자 인식 오류 해결 시도

    @binarywoo27
    binarywoo27 committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    6cd8710 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #13 from lotteon2/cherrypick/feature/subscription 

    Cherrypick/feature/subscription
    @binarywoo27
    binarywoo27 authored Dec 30, 2023
    Configuration menu
    Copy the full SHA
    e5f4a45 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. ✨ 배치 정기결제(2회차 이후) API 및 Test code

    @binarywoo27
    binarywoo27 committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    4bbdd15 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #14 from lotteon2/LF1-910-batch 

    ✨ 배치 정기결제(2회차 이후) API 및 Test code
    @qwerty1434
    qwerty1434 authored Jan 2, 2024
    Configuration menu
    Copy the full SHA
    bce7758 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. ✨ 배치 정기결제 로직 및 Test Code

    @binarywoo27
    binarywoo27 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    f91d25d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #15 from lotteon2/LF1-910-batch 

    ✨ 배치 정기결제 로직 및 Test Code
    @qwerty1434
    qwerty1434 authored Jan 3, 2024
    Configuration menu
    Copy the full SHA
    9c3e014 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. 🐛 OrderType 제거 및 Feign client 요청 처리 추가

    @binarywoo27
    binarywoo27 committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    4f699e7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #16 from lotteon2/LF1-910-batch 

    🐛 OrderType 제거 및 Feign client 요청 처리 추가
    @qwerty1434
    qwerty1434 authored Jan 5, 2024
    Configuration menu
    Copy the full SHA
    22ae34e View commit details
    Browse the repository at this point in the history

  3. 🐛 Url 수정

    @binarywoo27
    binarywoo27 committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    b8085bc View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into LF1-910-batch

    @nowgnas
    nowgnas authored Jan 5, 2024
    Configuration menu
    Copy the full SHA
    cb67a08 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #17 from lotteon2/LF1-910-batch 

    🐛 Url 수정
    @nowgnas
    nowgnas authored Jan 5, 2024
    Configuration menu
    Copy the full SHA
    eca19af View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. 🐛 RequestParam -> RequestBody로 수정

    @binarywoo27
    binarywoo27 committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    e1a5846 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. 🐛 Feign url 수정

    @binarywoo27
    binarywoo27 committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    b059a84 View commit details
    Browse the repository at this point in the history

  2. fix: BaseEntity isDeleted=false 추가

    @binarywoo27
    binarywoo27 committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    23e16fc View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. fix: fix typo

    @binarywoo27
    binarywoo27 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    9eb3935 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #18 from lotteon2/fix/develop 

    fix: BaseEntity isDeleted=false 추가 및 Typo 수정
    @indl1670
    indl1670 authored Jan 10, 2024
    Configuration menu
    Copy the full SHA
    2f7081d View commit details
    Browse the repository at this point in the history

  3. fix: JPQL수정

    @binarywoo27
    binarywoo27 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    fb5cf98 View commit details
    Browse the repository at this point in the history

  4. docs: add release docs

    @nowgnas
    nowgnas committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    5135759 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #19 from lotteon2/fix/develop 

    fix: JPQL수정
    @indl1670
    indl1670 authored Jan 10, 2024
    Configuration menu
    Copy the full SHA
    bd2202c View commit details
    Browse the repository at this point in the history

  6. fix: build.gradle

    @binarywoo27
    binarywoo27 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    a0654a2 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'fix/develop' of https://github.com/lotteon2/BB-PAYMENT-… 

    …SERVICE into fix/develop
    @binarywoo27
    binarywoo27 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    841c79c View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Merge pull request #20 from lotteon2/fix/develop 

    fix: build.gradle
    @qwerty1434
    qwerty1434 authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    e4aaf1f View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. feature: 결제 취소(배송주문) API 및 Test Code

    @binarywoo27
    binarywoo27 committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    6973c99 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2024

  1. Update build.gradle

    @nowgnas
    nowgnas authored Jan 13, 2024
    Configuration menu
    Copy the full SHA
    8bcbc51 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2024

  1. fix: 배치 정기결제 로직 수정 및 정기결제 취소 API 추가

    @binarywoo27
    binarywoo27 committed Jan 14, 2024
    Configuration menu
    Copy the full SHA
    e51afd6 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Merge branch 'develop' into fix/develop

    @binarywoo27
    binarywoo27 authored Jan 15, 2024
    Configuration menu
    Copy the full SHA
    93fce7e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #21 from lotteon2/fix/develop 

    fix: 배치 정기결제 로직 수정 및 정기결제 취소 API 추가
    @qwerty1434
    qwerty1434 authored Jan 15, 2024
    Configuration menu
    Copy the full SHA
    49ecd78 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. fix: 불필요한 정기결제 KafkaConsumer 삭제

    @binarywoo27
    binarywoo27 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    c321a30 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix/develop' of https://github.com/lotteon2/BB-PAYMENT-… 

    …SERVICE into fix/develop
    @binarywoo27
    binarywoo27 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    99071a3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into fix/develop

    @binarywoo27
    binarywoo27 authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    abbf10c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #22 from lotteon2/fix/develop 

    fix: 불필요한 정기결제 KafkaConsumer 삭제
    @qwerty1434
    qwerty1434 authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    a3f2108 View commit details
    Browse the repository at this point in the history