[2단계 - 자동차 경주 리팩터링] 페드로(류형욱) 미션 제출합니다.

src/main/java/racingcar/controller/GameController.java

@@ -5,33 +5,35 @@
 import java.util.Map;
 import racingcar.model.Car;
 import racingcar.model.CarGroup;
+import racingcar.model.RacingGame;
 import racingcar.utils.NameParser;
 import racingcar.utils.InputValidator;
 import racingcar.view.InputView;
 import racingcar.view.OutputView;
 
 public class GameController {
-    private final CarGroup carGroup = new CarGroup();
-    private List<String> names;
-    private int moveCount;
+    private RacingGame racingGame;
 
     public void init() throws IOException {
-        readCarNames();
-        readMoveCount();
-        initCars(names);
+        List<String> names;
+        int moveCount;
+
+        do {
+            names = readCarNames();
+        } while (!isNameValid(names));
+        do {
+            moveCount = readMoveCount();
+        } while (!isMoveCountValid(moveCount));
+
+        racingGame = new RacingGame(createCarGroup(names), moveCount);
     }
 
-    private void readCarNames() throws IOException {
-        boolean isValid = false;
-        while (!isValid) {
-            isValid = doReadCarNames();
-        }
+    private List<String> readCarNames() throws IOException {
+        return NameParser.parse(InputView.inputNames());
     }
 
-    private boolean doReadCarNames() throws IOException {
+    private boolean isNameValid(List<String> names) {
         try {
-            OutputView.printlnInputName();
-            names = NameParser.parse(InputView.inputNames());
             InputValidator.validateCarName(names);
         } catch (IllegalArgumentException e) {
             OutputView.printException(e.getMessage());
@@ -40,17 +42,8 @@ private boolean doReadCarNames() throws IOException {
         return true;
     }
 
-    private void readMoveCount() throws IOException {
-        boolean isValid = false;
-        while (!isValid) {
-            isValid = doReadMoveCount();
-        }
-    }
-
-    private boolean doReadMoveCount() throws IOException {
+    private boolean isMoveCountValid(int moveCount) {
         try {
-            OutputView.printlnInputMoveCount();
-            moveCount = InputView.inputMoveCount();
             InputValidator.validateMoveCount(moveCount);
         } catch (IllegalArgumentException e) {
             OutputView.printException(e.getMessage());
@@ -59,22 +52,27 @@ private boolean doReadMoveCount() throws IOException {
         return true;
     }
 
-    private void initCars(List<String> carNames) {
+    private int readMoveCount() throws IOException {
+        return InputView.inputMoveCount();
+    }
+
+    private CarGroup createCarGroup(List<String> carNames) {
+        CarGroup carGroup = new CarGroup();
+
         for (String name : carNames) {
             carGroup.add(new Car(name));
         }
+        return carGroup;
     }
 
     public void play() {
         OutputView.printResultDescription();
-        for (int i = 0; i < moveCount; i++) {
-            Map<String, Integer> raceResponse = carGroup.race();
-            OutputView.printPosition(raceResponse);
-        }
+        List<Map<String, Integer>> raceResponse = racingGame.race();
+        OutputView.printPosition(raceResponse);
     }
 
     public void finish() {
-        List<String> winners = carGroup.findWinners();
+        List<String> winners = racingGame.findWinners();
         if (winners.isEmpty()) {
             OutputView.printNoWinner();
             return;

src/main/java/racingcar/model/CarGroup.java

@@ -13,14 +13,14 @@ public void add(Car car) {
         cars.add(car);
     }
 
-    public Map<String, Integer> race() {
-        Map<String, Integer> raceResponse = new HashMap<>();
+    public Map<String, Integer> playRound() {
+        Map<String, Integer> roundResponse = new HashMap<>();
         for (Car car : cars) {
             int nextPosition = car.move(RandomNumberGenerator.generate());
-            raceResponse.put(car.getName(), nextPosition);
+            roundResponse.put(car.getName(), nextPosition);
         }
 
-        return raceResponse;
+        return roundResponse;
     }
 
     public List<String> findWinners() {

src/main/java/racingcar/model/RacingGame.java

@@ -0,0 +1,25 @@
+package racingcar.model;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.IntStream;
+
+public class RacingGame {
+    CarGroup cars;
+    int moveCount;
+
+    public RacingGame(CarGroup cars, int moveCount) {
+        this.cars = cars;
+        this.moveCount = moveCount;
+    }
+
+    public List<Map<String, Integer>> race() {
+        return IntStream.range(0, moveCount)
+                .mapToObj(c -> cars.playRound())
+                .toList();
+    }
+
+    public List<String> findWinners() {
+        return cars.findWinners();
+    }
+}

src/main/java/racingcar/utils/InputValidator.java

@@ -3,6 +3,12 @@
 import java.util.List;
 
 public class InputValidator {
+    private static final int NAME_LENGTH_LIMIT = 5;
+    private static final String NAME_REGEX_PATTERN = "^[a-zA-Z]*$";
+
+    private InputValidator() {
+    }
+
     public static void validateCarName(List<String> names) {
         validateDuplicateNames(names);
         for (String name : names) {
@@ -12,7 +18,7 @@ public static void validateCarName(List<String> names) {
     }
 
     private static void validateNameLength(String name) {
-        if (name.length() > 5) {
+        if (name.length() > NAME_LENGTH_LIMIT) {
             throw new IllegalArgumentException("자동차의 이름은 5글자를 초과할 수 없습니다.");
         }
     }
@@ -28,7 +34,7 @@ private static void validateDuplicateNames(List<String> names) {
     }
 
     private static void validateNameCharacters(String name) {
-        if (!name.matches("^[a-zA-Z]*$")) {
+        if (!name.matches(NAME_REGEX_PATTERN)) {
             throw new IllegalArgumentException("자동차의 이름은 영어로만 이루어져야 합니다.");
         }
     }

src/main/java/racingcar/utils/NameParser.java

@@ -6,6 +6,9 @@
 public class NameParser {
     private static final String DELIMITER = ",";
 
+    private NameParser() {
+    }
+
     public static List<String> parse(String rawNames) {
         String[] names = rawNames.split(DELIMITER);
         return Arrays.stream(names)

src/main/java/racingcar/utils/RandomNumberGenerator.java

@@ -5,6 +5,9 @@
 public class RandomNumberGenerator {
     private static final int RANDOM_BOUND = 10;
 
+    private RandomNumberGenerator() {
+    }
+
     public static int generate() {
         Random random = new Random();
         return random.nextInt(RANDOM_BOUND);

src/main/java/racingcar/view/InputView.java

@@ -5,13 +5,22 @@
 import java.io.InputStreamReader;
 
 public class InputView {
+    private static final String NAME_INPUT_DESCRIPTION = "경주할 자동차 이름을 입력하세요(이름은 쉼표(,)를 기준으로 구분).";
+    private static final String MOVE_COUNT_INPUT_DESCRIPTION = "시도할 회수는 몇회인가요?";
+
     private static final BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
 
+    // 인스턴스화 방지
+    private InputView() {
+    }
+
     public static String inputNames() throws IOException {
+        System.out.println(NAME_INPUT_DESCRIPTION);
         return br.readLine();
     }
 
     public static int inputMoveCount() throws IOException {
+        System.out.println(MOVE_COUNT_INPUT_DESCRIPTION);
         String moveCount = br.readLine();
         return Integer.parseInt(moveCount);
     }

src/main/java/racingcar/view/OutputView.java

@@ -7,45 +7,45 @@ public class OutputView {
     private static final String WINNER_DESCRIPTION = "가 최종 우승했습니다.";
     private static final String RESULT_DESCRIPTION = "실행 결과";
     private static final String NO_WINNER_DESCRIPTION = "최대 이동 거리가 0이므로 우승한 자동차가 없습니다.";
-    private static final String NAME_INPUT_DESCRIPTION = "경주할 자동차 이름을 입력하세요(이름은 쉼표(,)를 기준으로 구분).";
-    private static final String MOVE_COUNT_INPUT_DESCRIPTION = "시도할 회수는 몇회인가요?";
-
     private static final String POSITION_METER = "-";
+    private static final String CAR_NAME_DELIMITER = ",";
+    private static final String NEW_LINE = System.lineSeparator();
+
+    // 인스턴스화 방지
+    private OutputView() {
+    }
 
     public static void printResultDescription() {
         System.out.println();
         System.out.println(RESULT_DESCRIPTION);
     }
 
-    public static void printPosition(Map<String, Integer> carPositions) {
+    private static String createRoundResponseMessage(Map<String, Integer> roundResponse) {
         StringBuilder sb = new StringBuilder();
-        carPositions.forEach(
-                (name, position) -> sb.append(name).append(":").append(POSITION_METER.repeat(position)).append("\n")
+        roundResponse.forEach(
+                (name, position) -> sb.append(name).append(":").append(POSITION_METER.repeat(position)).append(NEW_LINE)
         );
-        System.out.println(sb);
+        sb.append(NEW_LINE);
+        return sb.toString();
+    }
+
+    public static void printPosition(List<Map<String, Integer>> raceResponse) {
+        StringBuilder sb = new StringBuilder();
+        raceResponse.forEach(r -> sb.append(createRoundResponseMessage(r)));
+        System.out.print(sb);
     }
 
     public static void printException(String message) {
         System.out.println(message);
     }
 
     public static void printWinnerList(List<String> winners) {
-        List<String> names = winners.stream()
-                .toList();
-
-        String winnerNames = String.join(", ", names);
+        List<String> names = winners.stream().toList();
+        String winnerNames = String.join(CAR_NAME_DELIMITER, names);
         System.out.println(winnerNames + WINNER_DESCRIPTION);
     }
 
     public static void printNoWinner() {
         System.out.println(NO_WINNER_DESCRIPTION);
     }
-
-    public static void printlnInputName() {
-        System.out.println(NAME_INPUT_DESCRIPTION);
-    }
-
-    public static void printlnInputMoveCount() {
-        System.out.println(MOVE_COUNT_INPUT_DESCRIPTION);
-    }
 }

src/test/java/racingcar/model/CarGroupTest.java

@@ -32,7 +32,7 @@ void findWinnerTest() {
         neo.move(moveNumber);
         pedro.move(moveNumber);
 
-        assertThat(carGroup.findWinners()).isEqualTo(List.of(neo));
+        assertThat(carGroup.findWinners()).isEqualTo(List.of("네오"));
     }
 
     @Test

src/test/java/racingcar/model/CarTest.java

@@ -21,7 +21,7 @@ void moveTest() {
     @DisplayName("생성된 난수가 이동 기준을 만족하지 않을 때 위치는 변하지 않는다.")
     void notMoveTest() {
         final Car car = new Car("몰리");
-        final int randomNumber = 2;
+        final int randomNumber = 3;
 
         car.move(randomNumber);