[π μ¬μ΄ν΄2 - λ―Έμ (λΈλμ λ² ν )] λ λ λ―Έμ μ μΆν©λλ€. #1117
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,14 @@ | ||
| package controller; | ||
|
There was a problem hiding this comment. μ΄λ² PRμ κΈ°λ₯ μΆκ° κ·λͺ¨μ λΉν΄ commit μκ° κ΅μ₯ν λ§μ νΈμ΄λ€μ. νμ΅ν΄λ³΄λ©΄μ, λλ μ΄κ² μ κ² λμ ν΄λ³΄λ©° λ€μν μλλ₯Ό ν΄λ³΄λ κ²μ μ’μμ. μ΄λ κ² μκ°νλ μ΄μ λ λ€μκ³Ό κ°μ΅λλ€ :
λ¬Όλ‘ μ΄λ€ νλ‘μ νΈμΈμ§μ λ°λΌ, λλ ν 컨벀μ μ λ°λΌ μ»€λ° κ΄λ¦¬λ₯Ό 그리 μ€μνκ² μκ°νμ§ μμ λλ μμ΄μ. νμ§λ§ μ΄ μ°Έμ git μ΄ μ 곡νλ κΈ°λ₯μ λν΄ μμλ³΄κ³ , κΌ νμν κ²λ€λ§ λ΄μμ μ»€λ° κΈ°λ‘μ μ μμ보λ κ²½νμ ν΄λ³΄λ©΄ μ’μ κ² κ°λ€μ :) There was a problem hiding this comment. μΆκ°λ‘, e8f7aa8 μ λ©μμ§λ κ·Έλ¦¬κ³ fix: finalλ‘ μμ κ°μ λ©μμ§λ μ§κΈ λΉμ₯μ μ°κΈ° νΈνμ§λ§, μ»€λ° λ©μμ§λ₯Ό μλμ λ§κ² μ μμ±ν΄λ³΄μ£ :) There was a problem hiding this comment. νμ λ리μλ©΄, μ΄λ° νμ€ν 리 μ 리λ git κΈ°λ₯μ μ‘°κΈλ§ μ΅νλ 체κ°μ΄ ν λ¬λΌμ Έμ. μ§κΈ λ¨κ³μμλ μ°μ μ΄ λ κ°μ§λΆν° κ°λ³κ² νμ΅ν΄λ³΄λ©΄ λ€μ PRμ΄ ν¨μ¬ κΉλν΄μ§ κ±°μμ. νΉν rebase λ₯Ό νμ©ν git κ΄λ¦¬ μ°μ΅μ μ‘°κΈμ© ν΄λ³΄μλ©΄ μ’μ λ― νλ€μ. :)
Author
There was a problem hiding this comment. μ²μμ μ‘°κΈλ§ λ³κ²½ν΄λ 컀λ°μ νλΌκ³ ν΄μμ μ΅κ΄μ μΌλ‘ νμμ΅λλ€. 리뷰νλ μ
μ₯μμλ μ΄ κ³Όμ μ΄ λ§€μ° νΌκ³€ν μ μκ² λ€λΌλ μκ°μ΄ λλλ€. κ·Έλ¦¬κ³ revertλ₯Ό μ¬μ©μ νλ€λ©΄, μ΄λ¬ν κ³Όμ μ΄ μ’ λ μ λ¦¬κ° λμμ κ² κ°μ΅λλ€. κ·Έλ¦¬κ³ μ€νμ μμ κ°μ κ²½μ° νΈμλ₯Ό ν ν λ€λ¦κ² λ°κ²¬μ ν΄μ κ³ μΉλ κ²μ΄ νλ€μμ΅λλ€. μμΌλ‘, μ»€λ° ν λλ λ©μμ§λ₯Ό κΌΌκΌΌν νμΈνκ³ , μ¬μ€ λ³Έλ¬Έ λ΄μ©λ κ°μ΄ μ μ΄μΌνλλ°, κ·Έλ₯ μ λͺ©λ§ μ§κ³ λ겨λ²λ¦¬μ, νλ λΆλΆμ΄ λ°μ±νκ² λ©λλ€. 리뷰λ°μλ μκ°λΆν° κ³ μ³λ³΄λλ‘ νκ² μ΅λλ€. rebaseλ κΈ°λ₯μ μκ³ λ μλλ°, 3-way mergeλ₯Ό ν λ, μΆ©λμ ν΄κ²°μ μ λͺ»νλ©΄ μ΄λ‘νμ§, μ΄μ μΌλ‘ λμκ°κΈ° νλ€ κ² κ°μλ°? λΌλ μκ°μ κ°μ§κ² λμ΄μ, μΌλ° mergeλ‘ μ΅κ΄μ λ€μμμ΅λλ€. μ’ λ κΉκ² 곡λΆλ₯Ό ν΄μΌν κ² κ°μ΅λλ€. |
||
|
|
||
| import domain.participant.Players; | ||
| import domain.betting.Money; | ||
| import domain.participant.Dealer; | ||
| import domain.participant.Player; | ||
| import dto.PlayerHandDto; | ||
| import service.BettingCalculateService; | ||
| import service.GameService; | ||
| import util.HitOption; | ||
| import util.InputBettingParser; | ||
| import view.InputView; | ||
| import view.OutputView; | ||
|
|
||
|
|
@@ -19,13 +23,20 @@ public GameController(InputView inputView, OutputView outputView) { | |
|
|
||
| public void run() { | ||
| Players players = inputPlayers(); | ||
| Dealer dealer = new Dealer(); | ||
| GameService gameService = new GameService(players, dealer); | ||
| BettingCalculateService bettingCalculateService = new BettingCalculateService(players, dealer); | ||
|
|
||
| playerBetting(players); | ||
| outputView.printStartGame(gameService.startGame()); | ||
|
|
||
| boolean dealerIsBlackJack = processDealerBlackJack(gameService); | ||
| if (!dealerIsBlackJack) { | ||
| processGame(gameService); | ||
| } | ||
|
|
||
| outputView.printScore(gameService.getTotalScore()); | ||
| outputView.printBettingResults(bettingCalculateService.getBettingResult()); | ||
| } | ||
|
|
||
| private Players inputPlayers() { | ||
|
|
@@ -34,7 +45,7 @@ private Players inputPlayers() { | |
| String rawPlayerNames = inputView.readPlayerNames(); | ||
| return Players.fromString(rawPlayerNames); | ||
| } catch (IllegalArgumentException exception) { | ||
| outputView.printInputErrorMessage(exception.getMessage()); | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -43,9 +54,20 @@ private HitOption inputHitOption(Player player) { | |
| while (true) { | ||
| try { | ||
| String rawHitOption = inputView.readHitOption(player.getName()); | ||
| return HitOption.of(rawHitOption); | ||
| } catch (IllegalArgumentException exception) { | ||
| outputView.printInputErrorMessage(exception.getMessage()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private Money inputBettingMoney(Player player) { | ||
| while (true) { | ||
| try { | ||
| String rawBettingMoney = inputView.readBetting(player.getName()); | ||
| return InputBettingParser.parseBettingMoney(rawBettingMoney); | ||
| } catch (IllegalArgumentException exception) { | ||
| outputView.printInputErrorMessage(exception.getMessage()); | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -57,19 +79,44 @@ private void processGame(GameService gameService) { | |
| dealerTurn(gameService); | ||
| } | ||
|
|
||
| private boolean processDealerBlackJack(GameService gameService) { | ||
| Dealer dealer = gameService.getDealer(); | ||
| if (dealer.isBlackJack()) { | ||
| gameService.endGameImmediately(); | ||
| outputView.printDealerBlackJack(); | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private void playerTurn(Player player, GameService gameService) { | ||
| while (player.isRunning() && inputHitOption(player) == HitOption.YES) { | ||
| gameService.hit(player); | ||
| outputView.printHandCard(PlayerHandDto.from(player)); | ||
| } | ||
|
|
||
| if (player.isRunning()) { | ||
| gameService.stay(player); | ||
| outputView.printHandCard(PlayerHandDto.from(player)); | ||
| } | ||
| } | ||
|
|
||
| private void dealerTurn(GameService gameService) { | ||
| Dealer dealer = gameService.getDealer(); | ||
|
|
||
| while (dealer.isReceiveCard()) { | ||
| gameService.hit(dealer); | ||
| outputView.printDealerReceiveCard(); | ||
| } | ||
|
|
||
| if (dealer.isRunning()) { | ||
| gameService.stay(dealer); | ||
| } | ||
| } | ||
|
|
||
| private void playerBetting(Players players) { | ||
| for (Player player : players) { | ||
| player.bettingMoney(inputBettingMoney(player)); | ||
| } | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package domain; | ||
|
|
||
| public final class BlackJackInfo { | ||
| public static final int BLACKJACK_SCORE = 21; | ||
| public static final int SOFT_HAND_PROCESS_SCORE = 10; | ||
| public static final int DEALER_THRESHOLD_SCORE = 16; | ||
| public static final int FIRST_CARD_COUNT = 2; | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ν΄λΉ λ΄μ©μ μ κ±°ν μ΄μ κ° κΆκΈν΄μ.
λͺλͺ λ€λ₯Έ ν¬λ£¨λ€λ μ κ±°νλ λ― νλλ°, μ΄μ λ μ¬μ©νμ§ μλ ν νλ¦Ώ λ΄μ©μΈκ°μ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
μ°ν μ½ κΉνλΈ μͺ½μμ μΌκ΄μ μΌλ‘ μ κ±°ν κ² κ°μ΅λλ€.