[🚀 사이클2 - 미션 (블랙잭 베팅)] 주니 미션 제출합니다.

README.md

@@ -1,7 +1,8 @@
 # java-blackjack
 
-블랙잭 미션 저장소
+## 블랙잭 미션 저장소
 
+### 구현 기능 목록
 - [x] 카드 점수 계산 (숫자는 그대로, J,Q,K는 10으로 계산)
 - [x] 카드 합계 계산
     - [x] Ace 개수 계산
@@ -27,10 +28,32 @@
     - [x] 마지막 참가자가 버스트가 되거나 카드를 안받을 경우 게임 종료
     - [x] 전체 플레이어 승패 결과 계산
 
--[x] 입력
+- [x] 입력
     - [x] 게임 참가자 이름 입력
     - [x] 카드 더받기 유무 입력
+
 - [x] 출력
     - [x] 분배 받은 카드 목록 출력
     - [x] 딜러와 참가자 카드 합계 결과 출력
-    - [x] 최종 승패 결과 출력
+    - [x] 최종 승패 결과 출력
+
+### 추가 기능 구현 목록
+- [x] 입력
+  - [x] 참여하는 Player의 배팅 금액을 입력받는다.
+
+- [x] 배팅 금액
+  - [x] 플레이어와 딜러는 배팅 금액을 가진다.
+
+- [x] Player & Dealer 블랙잭 판단
+  - [x] 플레이어와 딜러의 초기 카드 2장의 합이 21인지 판단한다.
+    - [x] 플레이어에게 1.5배 지급하는 겅우
+      - [x] 플레이어의 초기 카드 2장이 21인 경우
+    - [x] 플레이어가 배팅 금액을 모두 잃는 경우
+      - [x] 딜러의 초기 카드 2장이 21인 경우
+      - [x] 플레이어가 버스트인 경우
+    - [x] 플레이어가 배팅한 금액을 그대로 받는 경우
+      - [x] 딜러와 플레이어 모두 초기 카드 합이 21인 경우
+      - [x] 플레이어가 카드를 계속 뽑아서 딜러보다 카드 합이 높은 경우
+
+- [x] 출력
+  - [x] 딜러와 참가자의 최종 수익을 출력한다.

src/main/java/blackjack/controller/BlackjackController.java

@@ -9,7 +9,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 import blackjack.view.InputView;
 import blackjack.view.OutputView;
@@ -23,27 +23,28 @@ public BlackjackController(CardDistributor cardDistributor) {
 
     public void startGame() {
         List<String> playerNames = getPlayerNames();
-        List<Participant> players = getPlayers(playerNames);
-
+        List<Participant> players = createPlayers(playerNames);
         Participant dealer = Participant.createDealer();
 
         setupInitialHand(players, dealer, playerNames);
         processPlayersTurn(players);
         playDealerTurn(dealer);
 
         calculateFinalScore(players, dealer);
-        calculateFinalGameResult(players, dealer);
+        calculateFinalGameProfit(players, dealer);
     }
 
-    private static List<String> getPlayerNames() {
-        String playerNamesStr = InputView.askPlayerNames();
-        return InputParser.splitPlayerNames(playerNamesStr);
+    private List<String> getPlayerNames() {
+        String names = InputView.askPlayerNames();
+        return InputParser.splitPlayerNames(names);
     }
 
-    private List<Participant> getPlayers(List<String> playerNames) {
+    private List<Participant> createPlayers(List<String> playerNames) {
         List<Participant> players = new ArrayList<>();
         for (String playerName : playerNames) {
-            players.add(Participant.createPlayer(playerName));
+            String amountStr = InputView.askPlayerBettingAmount(playerName);
+            int amount = InputParser.convertNumber(amountStr);
+            players.add(Participant.createPlayer(playerName, new Money(amount)));
         }
         return players;
     }
@@ -78,7 +79,9 @@ private void drawUntilPlayerStand(Participant player) {
 
     private void playDealerTurn(Participant dealer) {
         int additionalCount = game.dealerDrawsCardsUntilDone(dealer);
-        OutputView.printDealerCardDrawnResult(additionalCount);
+        if (additionalCount > 0) {
+            OutputView.printDealerCardDrawnResult(additionalCount);
+        }
     }
 
     private boolean isHit(Participant player) {
@@ -93,26 +96,23 @@ private boolean isHit(Participant player) {
     }
 
     private void calculateFinalScore(List<Participant> players, Participant dealer) {
-        List<ParticipantResult> playerResults = new ArrayList<>();
-        for (Participant player : players) {
-            ParticipantResult participantResult = new ParticipantResult(player.getName(), player.getCardNames(), player.calculateTotalScore());
-            playerResults.add(participantResult);
-        }
+        List<ParticipantResult> playerResults = players.stream()
+                .map(player -> new ParticipantResult(player.getName(), player.getCardNames(), player.calculateTotalScore()))
+                .collect(Collectors.toList());
 
         ParticipantResult dealerResult = new ParticipantResult(dealer.getName(), dealer.getCardNames(), dealer.calculateTotalScore());
         OutputView.printFinalCardScores(playerResults, dealerResult);
     }
 
-    private void calculateFinalGameResult(List<Participant> players, Participant dealer) {
-        GameResult gameResult = dealer.judgeResult(players, dealer);
-        Map<ScoreCompareResult, Integer> dealerResult = gameResult.dealerResult();
-        Map<Participant, ScoreCompareResult> playerResult = gameResult.playerResults();
-        HashMap<String, ScoreCompareResult> playerNameResult = new HashMap<>();
-
-        for (Entry<Participant, ScoreCompareResult> entry : playerResult.entrySet()) {
-            playerNameResult.put(entry.getKey().getName(), entry.getValue());
+    public void calculateFinalGameProfit(List<Participant> players, Participant dealer) {
+        HashMap<String, Integer> playersProfit = new HashMap<>();
+        int totalPlayerProfit = 0;
+        for (Participant player : players) {
+            int profit = player.calculateFinalProfit(dealer);
+            playersProfit.put(player.getName(), profit);
+            totalPlayerProfit += profit;
         }
-        OutputView.printFinalResult(dealerResult, playerNameResult);
+        int dealerProfit = -totalPlayerProfit;
+        OutputView.printFinalProfit(dealerProfit, playersProfit);
     }
-
 }

src/main/java/blackjack/domain/Cards.java

@@ -2,8 +2,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class Cards {
+    private static final int BLACKJACK_SCORE = 21;
+    private static final int ACE_SCORE = 10;
 
     private final List<Card> cards;
 
@@ -21,24 +24,27 @@ public int sumScore() {
             totalScore += card.getScore();
         }
         int aceCount = (int) cards.stream().filter(Card::isAce).count();
-
-        while (totalScore > 21 && aceCount > 0) {
-            totalScore -= 10;
+        while (totalScore > BLACKJACK_SCORE && aceCount > 0) {
+            totalScore -= ACE_SCORE;
             aceCount--;
         }
         return totalScore;
     }
 
     public void addCard(Card card) {
+        if (card == null || sumScore() > BLACKJACK_SCORE) {
+            throw new IllegalArgumentException("[ERROR] 카드를 추가할 수 없습니다.");
+        }
         cards.add(card);
     }
 
     public List<String> getCardNames() {
-        List<String> cardNames = new ArrayList<>();
-        for (Card card : cards) {
-            String cardName = card.getCardName();
-            cardNames.add(cardName);
-        }
-        return cardNames;
+        return cards.stream()
+                .map(Card::getCardName)
+                .collect(Collectors.toList());
+    }
+
+    public int getSize() {
+        return cards.size();
     }
 }

src/main/java/blackjack/domain/Money.java

@@ -0,0 +1,14 @@
+package blackjack.domain;
+
+public class Money {
+
+    private final int bettingMoney;
+
+    public Money(int bettingMoney) {
+        this.bettingMoney = bettingMoney;
+    }
+
+    public int getBettingMoney() {
+        return bettingMoney;
+    }
+}

src/main/java/blackjack/domain/Name.java

@@ -0,0 +1,20 @@
+package blackjack.domain;
+
+public class Name {
+    private final String name;
+
+    public Name(String name) {
+        validate(name);
+        this.name = name;
+    }
+
+    private void validate(String name) {
+        if (name == null || name.trim().isEmpty()) {
+            throw new IllegalArgumentException("[ERROR] 이름을 정확하게 입력해주세요.");
+        }
+    }
+
+    public String getName() {
+        return name;
+    }
+}

src/main/java/blackjack/domain/Participant.java

@@ -5,24 +5,19 @@
 
 public abstract class Participant {
 
-    protected final String name;
+    private static final int BLACKJACK_SCORE = 21;
+    private static final int BLACKJACK_SIZE = 2;
+
+    protected final Name name;
     protected final Cards drawnCards;
 
     protected Participant(String name) {
-        this.name = name;
+        this.name = new Name(name);
         this.drawnCards = new Cards();
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public boolean isDealerNotDone() {
-        return false;
-    }
-
-    public static Participant createPlayer(String name) {
-        return new Player(name);
+    public static Participant createPlayer(String name, Money money) {
+        return new Player(name, money);
     }
 
     public static Participant createDealer() {
@@ -33,19 +28,35 @@ public void receiveOneCard(Card card) {
         drawnCards.addCard(card);
     }
 
-    public List<String> getCardNames() {
-        return drawnCards.getCardNames();
+    public boolean isDealerNotDone() {
+        return false;
     }
 
     public boolean isBust() {
-        return drawnCards.sumScore() > 21;
+        return drawnCards.sumScore() > BLACKJACK_SCORE;
+    }
+
+    public boolean isBlackjack() {
+        return drawnCards.sumScore() == BLACKJACK_SCORE && drawnCards.getSize() == BLACKJACK_SIZE;
     }
 
     public int calculateTotalScore() {
         return drawnCards.sumScore();
     }
 
+    public int calculateFinalProfit(Participant dealer) {
+        return 0;
+    }
+
     public GameResult judgeResult(List<Participant> players, Participant dealer) {
         return new GameResult(new HashMap<>(), new HashMap<>());
     }
+
+    public String getName() {
+        return name.getName();
+    }
+
+    public List<String> getCardNames() {
+        return drawnCards.getCardNames();
+    }
 }

src/main/java/blackjack/domain/Player.java

@@ -1,14 +1,25 @@
 package blackjack.domain;
 
 public class Player extends Participant {
-    private final String name;
 
-    public Player(String name) {
+    private final Money money;
+
+    public Player(String name, Money money) {
         super(name);
-        this.name = name;
+        this.money = money;
     }
 
-    public String getName() {
-        return name;
+    @Override
+    public int calculateFinalProfit(Participant dealer) {
+        if (isBlackjack() && dealer.isBlackjack()) {
+            return money.getBettingMoney();
+        }
+        if (isBlackjack()) {
+            return (int) (money.getBettingMoney() * 1.5);
+        }
+        if (isBust() || dealer.isBlackjack() || (calculateTotalScore() < dealer.calculateTotalScore() && !dealer.isBust())) {
+            return -money.getBettingMoney();
+        }
+        return money.getBettingMoney();
     }
 }

src/main/java/blackjack/service/Game.java

@@ -1,12 +1,7 @@
 package blackjack.service;
 
 import blackjack.domain.*;
-import blackjack.view.InputView;
-import blackjack.view.OutputView;
-
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public class Game {
 

src/main/java/blackjack/service/RandomCardPicker.java

@@ -7,7 +7,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 public class RandomCardPicker implements CardPicker {
     private final NumberGenerator numberGenerator;

src/main/java/blackjack/utils/InputParser.java

@@ -1,25 +1,25 @@
 package blackjack.utils;
 
 import java.util.List;
+import java.util.stream.Stream;
 
 public class InputParser {
 
     public static List<String> splitPlayerNames(String input) {
         if (input == null || input.trim().isEmpty()) {
-            throw new IllegalArgumentException("[ERROR] 플레이어 이름을 입력해주세요.");
+            throw new IllegalArgumentException("[ERROR] 이름을 정확하게 입력해주세요.");
         }
         String[] names = input.split(",");
-        for (String name : names) {
-            validateNameEmpty(name);
-        }
-        return List.of(names).stream()
+        return Stream.of(names)
                 .map(String::trim)
                 .toList();
     }
 
-    private static void validateNameEmpty(String name) {
-        if (name.trim().isEmpty()) {
-            throw new IllegalArgumentException("[ERROR] 플레이어 이름은 공백이 될 수 없습니다.");
+    public static int convertNumber(String input) {
+        try {
+            return Integer.parseInt(input);
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("[ERROR] 숫자 이외의 값은 입력할 수 없습니다.");
         }
     }
 }

src/main/java/blackjack/view/InputView.java

@@ -17,4 +17,9 @@ public static String askHitOrStand(String playerName) {
         System.out.printf(ASK_HIT_OR_STAND, playerName);
         return scanner.nextLine();
     }
+
+    public static String askPlayerBettingAmount(String playerName) {
+        System.out.printf("%n%s의 배팅 금액은?%n", playerName);
+        return scanner.nextLine();
+    }
 }