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

[또링] 블랙잭 2차 미션 코드리뷰 요청합니다. #68

Merged
merged 62 commits into from
Mar 23, 2020
Merged

[또링] 블랙잭 2차 미션 코드리뷰 요청합니다. #68

merged 62 commits into from
Mar 23, 2020

Commits on Mar 12, 2020

  1. Merge pull request #1 from hwangbo/smallbear 

    첫주차 페어 종료를 위한 PR
    @KimGyeong
    KimGyeong committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    737a007 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. refactor: User 인터페이스 내 checkBurst 메소드 반환값 변경

    hwangbo committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    fb1134a View commit details
    Browse the repository at this point in the history

  2. refactor: Hands 클래스 멤버 변수 초기화 변경

    hwangbo committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    8ac72b9 View commit details
    Browse the repository at this point in the history

  3. refactor: Controller클래스 내 run 동작 변경

    hwangbo committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    5a01e00 View commit details
    Browse the repository at this point in the history

  4. feat: 딜러가 버스트이고, 플레이어가 버스트가 아닐 경우 승 판정 기능 구현

    hwangbo committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    e9b28e8 View commit details
    Browse the repository at this point in the history

  5. refactor: GameResult 클래스 내 calculateDealerResult 메소드 반환값 변경 및 불필요한 메소… 

    …드(continue) 제거
    hwangbo committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    9f3353e View commit details
    Browse the repository at this point in the history

  6. refactor: GameResult 클래스 내 게임결과 총합 변수 구현 및 calculateDealerResult 메소드 변경

    hwangbo committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    3a62173 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2020

  1. refactor: DeckTest 메소드 중 deck의 사이즈 감소 변수 변경

    hwangbo committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    4b9e0a1 View commit details
    Browse the repository at this point in the history

  2. refactor: Players 클래스 내 상태 변수 접근 제어자 변경

    hwangbo committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    a9df56b View commit details
    Browse the repository at this point in the history

  3. refactor: DeckFactory 클래스 내 불필요한 지역 변수 제거

    hwangbo committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    fd5f140 View commit details
    Browse the repository at this point in the history

  4. feat: Deck이 비어있을 경우 예외처리 기능 구현

    hwangbo committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    67c3553 View commit details
    Browse the repository at this point in the history

  5. feat: Player가 5명을 초과할 경우 예외처리 기능 구현

    hwangbo committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    ff89f04 View commit details
    Browse the repository at this point in the history

  6. refactor: 승패를 결정짓는 메소드를 enum 클래스에서 GameResult로 이동, 딜러의 결과를 상태변수로 추가 분리

    hwangbo committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    a51669d View commit details
    Browse the repository at this point in the history

  7. refactor: Hands의 상태변수인 score, hasAce를 지역 변수로 이동

    hwangbo committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    ce3323b View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2020

  1. refactor: User의 burst의 값을 변경하는 로직을 hit으로 이동, checkBurst 메소드 제거

    hwangbo committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    e6a4390 View commit details
    Browse the repository at this point in the history

  2. refactor: GameResult 클래스 내 dealerResult 변수 제거

    hwangbo committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    e379188 View commit details
    Browse the repository at this point in the history

  3. refactor: KindOfGameResult enum 클래스명 변경

    hwangbo committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    31a7a20 View commit details
    Browse the repository at this point in the history

  4. refactor: Hands 클래스 내 checkAce 메소드 반환값 변경

    hwangbo committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    b35a684 View commit details
    Browse the repository at this point in the history

  5. refactor: GameResult 클래스 내 checkWinOrLose 메소드를 Player 클래스 내 checkKind… 

    …OfGameResult로 이동
    hwangbo committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    761d852 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. refacotr: KindOfGameResult 클래스명 ResultType으로 변경

    hwangbo committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    06d6709 View commit details
    Browse the repository at this point in the history

  2. refactor: GameController 클래스 내 dealer가 hit 했는지에 대한 여부를 메소드로 추출

    hwangbo committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    378d944 View commit details
    Browse the repository at this point in the history

  3. refactor: User 클래스 내 추상 메소드 hit 제거, Dealer 클래스 내 hitOrStay 메소드 추가

    hwangbo committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    1774439 View commit details
    Browse the repository at this point in the history

  4. refactor: GameResult 클래스 생성자 변경

    hwangbo committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    87ce4e8 View commit details
    Browse the repository at this point in the history

  5. refactor: GameResult 클래스 내 gameResult 변수 제거 및 dealer의 결과를 만들어주는 메소드 수정

    hwangbo committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    9c53a9f View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2020

  1. refactor: Player의 버스트를 체크하는 checkBurstPlayer 로직을 GameResult에서 Player … 

    …클래스의 checkResultType으로 이동
    hwangbo committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    2ddcdd9 View commit details
    Browse the repository at this point in the history

  2. docs: README.md 업데이트

    hwangbo committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    09b266c View commit details
    Browse the repository at this point in the history

  3. feat: BettingMoney 객체 생성자 및 유효성 검사 구현

    hwangbo committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    d05b866 View commit details
    Browse the repository at this point in the history

  4. feat: PlayerNames 클래스 구현

    hwangbo committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    52a191a View commit details
    Browse the repository at this point in the history

  5. feat: 베팅금액을 입력받는 기능 구현

    hwangbo committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    a8434a7 View commit details
    Browse the repository at this point in the history

  6. feat: 블랙잭 판단 기능 구현

    hwangbo committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    e80ee49 View commit details
    Browse the repository at this point in the history

  7. feat: ResultType에 BLACKJACK 추가

    hwangbo committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    fa1af1c View commit details
    Browse the repository at this point in the history

  8. feat: 수익을 계산하는 Profits 구현

    hwangbo committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    679b472 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. feat: 모든 사용자의 수익을 출력하는 기능 구현

    hwangbo committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    5fec37e View commit details
    Browse the repository at this point in the history

  2. refactor: Money 클래스를 ProfitMoney, BettingMoney로 분리, GameResult 내에 있는 … 

    …Profits 멤버 변수 제거
    hwangbo committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    a9174a0 View commit details
    Browse the repository at this point in the history

  3. feat: ProfitsFactory 클래스 생성

    hwangbo committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    c250174 View commit details
    Browse the repository at this point in the history

  4. feat: GameResultFactory 클래스 생성

    hwangbo committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    8464e51 View commit details
    Browse the repository at this point in the history

  5. feat: 딜러의 처음 카드 오픈을 한장만 할 수 있는 openFirstCard 메소드 구현

    hwangbo committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    9288302 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2 from hwangbo/secondweek 

    두번째 페어 종료를 위한 PR
    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    f231b21 View commit details
    Browse the repository at this point in the history

  7. refactor : Profits 테스트 수정 및 접근지정자 수정

    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    4113549 View commit details
    Browse the repository at this point in the history

  8. docs : Hands 클래스 주석 추가

    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    e2952c5 View commit details
    Browse the repository at this point in the history

  9. refactor : Controller의 인스턴수 변수 제거

    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    751be32 View commit details
    Browse the repository at this point in the history

  10. refactor : 딜러의 전체 승패 결과를 구하는 메서드 삭제

    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    fd9d071 View commit details
    Browse the repository at this point in the history

  11. refactor : 숫자와 문자를 상수로 변경

    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    507d2b8 View commit details
    Browse the repository at this point in the history

  12. refactor :상수와 변수 위치를 변경해주어 NPE에 방어적으로 코드 작성

    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    fde7083 View commit details
    Browse the repository at this point in the history

  13. refacto : methodSource를 이용하여 테스트 수정

    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    572ea17 View commit details
    Browse the repository at this point in the history

  14. refactor : Controller 수정

    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    67deeb3 View commit details
    Browse the repository at this point in the history

  15. merge branch

    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    66a34c9 View commit details
    Browse the repository at this point in the history

  16. refactor : 충돌된 부분 해결 및 파일 삭제

    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    bdb9d5a View commit details
    Browse the repository at this point in the history

  17. feat : 딜러가 처음 카드를 오픈 할 때 한 장만 보이도록 구현

    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    50a5155 View commit details
    Browse the repository at this point in the history

  18. test : 테스트 추가 구현

    @jnsorn
    jnsorn committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    01d8d12 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2020

  1. refactor: 상수와 변수의 위치를 변경하여 NPE에 방어적으로 코드 작성

    @jnsorn
    jnsorn committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    28673e8 View commit details
    Browse the repository at this point in the history

  2. test : 무승부인 경우에 대한 테스트 추가 작성

    @jnsorn
    jnsorn committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    af4d3f5 View commit details
    Browse the repository at this point in the history

  3. refactor : Players가 불변하도록 수정

    @jnsorn
    jnsorn committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    978f9ad View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2020

  1. refactor : 베팅하는 행위를 Players에 위임

    @jnsorn
    jnsorn committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    1780df5 View commit details
    Browse the repository at this point in the history

  2. refactor : inputView에서 outputView의 메서드를 호출할 수 있도록 수정

    @jnsorn
    jnsorn committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    70b3878 View commit details
    Browse the repository at this point in the history

  3. refactor : 플레이어 전체를 돌며 카드 뽑는 행위를 Players에 위임

    @jnsorn
    jnsorn committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    6d8b1dd View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2020

  1. refactor : 딜러와 플레이어의 점수를 비교해 결과를 구하는 로직을 enum을 이용하여 수정

    @jnsorn
    jnsorn committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    68892eb View commit details
    Browse the repository at this point in the history

  2. refactor: 도메인에 function을 넘겨 처리했던 부분을 다시 value로 넘겨주도록 수정

    @jnsorn
    jnsorn committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    8ccbd34 View commit details
    Browse the repository at this point in the history

  3. refactor : GameFactory 제거

    @jnsorn
    jnsorn committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    4da2e11 View commit details
    Browse the repository at this point in the history

  4. refactor : ProfitsFactory 제거, Player에 bet()위임

    @jnsorn
    jnsorn committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    b6041b0 View commit details
    Browse the repository at this point in the history

  5. fix : GameResultTest 수정

    @jnsorn
    jnsorn committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    4047b9a View commit details
    Browse the repository at this point in the history

  6. test : DealerTest 추가

    @jnsorn
    jnsorn committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    dd5f8fa View commit details
    Browse the repository at this point in the history