Step5 (MVC 리팩토링) 리뷰 요청드립니다.

src/main/java/step5/racingcar/Main.java

@@ -0,0 +1,17 @@
+package step5.racingcar;
+
+import step5.racingcar.controller.RacingGameController;
+import step5.racingcar.view.InputView;
+import step5.racingcar.view.ResultView;
+
+public class Main {
+
+    public static void main(String[] args) {
+        InputView inputView = new InputView();
+        ResultView resultView = new ResultView();
+        RacingGameController racingGameController = new RacingGameController(inputView, resultView);
+
+        racingGameController.processUserInputs();
+        racingGameController.startGame();
+    }
+}

src/main/java/step3/racingcar/README.md → src/main/java/step5/racingcar/README.md

@@ -12,3 +12,24 @@
 * 자동차 객체의 Position을 이동시키기는 기능.
 * 경기 결과를 출력하는 기능.
 * 가장 멀리 주행한 자동차들의 리스트를 가져오고 출력하는 기능.
+
+## MVC 기반 리팩토링
+
+* Domain
+    * Car
+    * CarFactory
+    * CarGroups
+    * RacingGame
+    * MovingStrategy
+    * RandomMovingStrategy
+    * Message
+
+ * Controller
+    * RacingGameController
+
+ * View
+    * InputView
+    * ResultView
+
+  * Application
+    * Main

src/main/java/step5/racingcar/controller/RacingGameController.java

@@ -0,0 +1,36 @@
+package step5.racingcar.controller;
+
+import step5.racingcar.domain.Message;
+import step5.racingcar.domain.RacingGame;
+import step5.racingcar.view.InputView;
+import step5.racingcar.view.ResultView;
+
+public class RacingGameController {
+
+    private RacingGame racingGame;
+    private final InputView inputView;
+    private final ResultView resultView;
+
+    public RacingGameController(InputView inputView, ResultView resultView) {
+        this.inputView = inputView;
+        this.resultView = resultView;
+    }
+
+    public void processUserInputs() {
+        String[] carNames = inputView.getCarNames(Message.CAR_NAMES);
+        int gameTryCounts = inputView.getGameTryCounts(Message.GAME_TRY_COUNTS);
+        this.racingGame = new RacingGame(carNames, gameTryCounts);
+    }
+
+    public void startGame() {
+        if (racingGame == null) {
+            throw new IllegalStateException(Message.ERROR_INVALID_ORDER);
+        }
+        resultView.printResultHeader(Message.RESULT_HEADER);
+        while (racingGame.hasNextRound() == true) {
+            racingGame.run();
+            resultView.printResult(racingGame);
+        }
+        resultView.printWinnerCarNames(racingGame);
+    }
+}

src/main/java/step3/racingcar/Car.java → src/main/java/step5/racingcar/domain/Car.java

@@ -1,12 +1,13 @@
-package step3.racingcar;
+package step5.racingcar.domain;
 
 public class Car {
 
-    private static final int DEFAULT_POSITION = 0;
     private int position;
     private final String name;
     private final MovingStrategy movingStrategy;
 
+    private static final int DEFAULT_POSITION = 0;
+
     public Car(String name, MovingStrategy movingStrategy) {
         this.position = DEFAULT_POSITION;
         this.name = name;
@@ -18,8 +19,8 @@ public Car(String name, MovingStrategy movingStrategy) {
     public String getName() { return name; }
 
     public void move() {
-        boolean isMovable = this.movingStrategy.isMovable();
+        boolean isMovable = movingStrategy.isMovable();
         if (isMovable == true)
-            this.position++;
+            position++;
     }
 }

src/main/java/step3/racingcar/CarFactory.java → src/main/java/step5/racingcar/domain/CarFactory.java

@@ -1,4 +1,4 @@
-package step3.racingcar;
+package step5.racingcar.domain;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/step3/racingcar/CarGroups.java → src/main/java/step5/racingcar/domain/CarGroups.java

@@ -1,4 +1,4 @@
-package step3.racingcar;
+package step5.racingcar.domain;
 
 import java.util.Comparator;
 import java.util.List;
@@ -14,17 +14,17 @@ public CarGroups(List<Car> carGroups) {
     }
 
     public void move() {
-        this.carGroups.forEach(Car::move);
+        carGroups.forEach(Car::move);
     }
 
     public List<String> getCarNames() {
-        return this.carGroups.stream()
+        return carGroups.stream()
                 .map(Car::getName)
                 .collect(Collectors.toList());
     }
 
     public List<Integer> getCarPositions() {
-        return this.carGroups.stream()
+        return carGroups.stream()
                 .map(Car::getPosition)
                 .collect(Collectors.toList());
     }
@@ -38,7 +38,7 @@ public List<String> getWinnerCarNames() {
     }
 
     private int getMaxPosition() {
-        Car car = this.carGroups.stream()
+        Car car = carGroups.stream()
                 .max(Comparator.comparing(Car::getPosition))
                 .orElseThrow(() -> new NoSuchElementException(Message.ERROR_MAX_POSITION));
         return car.getPosition();

src/main/java/step3/racingcar/Message.java → src/main/java/step5/racingcar/domain/Message.java

@@ -1,4 +1,4 @@
-package step3.racingcar;
+package step5.racingcar.domain;
 
 public class Message {
 
@@ -9,6 +9,8 @@ public class Message {
     public static final String ERROR_MAX_POSITION = "ERROR : 우승 차량을 찾을 수 없습니다.";
     public static final String RESULT_HEADER = "실행 결과";
     public static final String RESULT_FOOTER = "가 최종 우승했습니다.";
+    public static final String ERROR_INVALID_STATE = "ERROR : 더이상 플레이 할 수 없습니다.";
+    public static final String ERROR_INVALID_ORDER = "ERROR : 게임 실행 전 게임 정보를 입력 갱신하십시오.";
 
     private Message() {
     }

src/main/java/step3/racingcar/MovingStrategy.java → src/main/java/step5/racingcar/domain/MovingStrategy.java

@@ -1,4 +1,4 @@
-package step3.racingcar;
+package step5.racingcar.domain;
 
 public interface MovingStrategy {
 

src/main/java/step3/racingcar/RacingGame.java → src/main/java/step5/racingcar/domain/RacingGame.java

@@ -1,19 +1,18 @@
-package step3.racingcar;
-
-import java.util.List;
+package step5.racingcar.domain;
 
 public class RacingGame {
 
-    private String[] carNames;
     private int gameTryCounts;
+    private final CarGroups playerCars;
+
     private static final String BLANK_NAME = "";
     private static final int MINIMUM_LIMIT = 1;
     private static final int INDEX_ZERO = 0;
 
     public RacingGame(String[] carNames, int gameTryCounts) {
         validateConstructors(carNames, gameTryCounts);
-        this.carNames = carNames;
         this.gameTryCounts = gameTryCounts;
+        this.playerCars = new CarGroups(CarFactory.makeCars(carNames));
     }
 
     private void validateConstructors(String[] carNames, int gameTryCounts) {
@@ -24,20 +23,19 @@ private void validateConstructors(String[] carNames, int gameTryCounts) {
     }
 
     public void run() {
-        CarGroups playerCars = new CarGroups(CarFactory.makeCars(this.carNames));
-        ResultViewProcessor.printResultHeader(Message.RESULT_HEADER);
-        for (int i = INDEX_ZERO; i < gameTryCounts; i++) {
-            playerCars.move();
-            ResultViewProcessor.printResult(playerCars);
-        }
-        ResultViewProcessor.printWinnerCarNames(playerCars);
+        if (gameTryCounts < MINIMUM_LIMIT)
+            throw new IllegalStateException(Message.ERROR_INVALID_STATE);
+        playerCars.move();
+        gameTryCounts--;
     }
 
-    public String[] getCarNames() {
-        return carNames;
+    public boolean hasNextRound() {
+        return gameTryCounts >= MINIMUM_LIMIT;
     }
 
     public int getGameTryCounts() {
         return gameTryCounts;
     }
+
+    public CarGroups getPlayerCars() { return playerCars; }
 }

src/main/java/step3/racingcar/RandomMovingStrategy.java → src/main/java/step5/racingcar/domain/RandomMovingStrategy.java

@@ -1,4 +1,4 @@
-package step3.racingcar;
+package step5.racingcar.domain;
 
 import java.util.Random;
 

src/main/java/step3/racingcar/InputViewProcessor.java → src/main/java/step5/racingcar/view/InputView.java

@@ -1,22 +1,19 @@
-package step3.racingcar;
+package step5.racingcar.view;
 
 import java.util.Scanner;
 
-public class InputViewProcessor {
+public class InputView {
 
     private static final Scanner scanner = new Scanner(System.in);
     private static final String SEPARATOR = ",";
 
-    private InputViewProcessor() {
-    }
-
-    public static String[] getCarNames(String instructionMessage) {
+    public String[] getCarNames(String instructionMessage) {
         System.out.println(instructionMessage);
         String[] carNames = scanner.next().split(SEPARATOR);
         return carNames;
     }
 
-    public static int getGameTryCounts(String instructionMessage) {
+    public int getGameTryCounts(String instructionMessage) {
         System.out.println(instructionMessage);
         int userInput = scanner.nextInt();
         return userInput;

src/main/java/step3/racingcar/ResultViewProcessor.java → src/main/java/step5/racingcar/view/ResultView.java

@@ -1,24 +1,24 @@
-package step3.racingcar;
+package step5.racingcar.view;
+
+import step5.racingcar.domain.Message;
+import step5.racingcar.domain.RacingGame;
 
 import java.util.List;
 
-public class ResultViewProcessor {
+public class ResultView {
 
     private static final String POSITION_MARK = "-";
     private static final String DELIMITER = " : ";
     private static final String COMMA = ", ";
     private static final int INDEX_ZERO = 0;
 
-    private ResultViewProcessor() {
-    }
-
-    public static void printResultHeader(String headerMessage) {
+    public void printResultHeader(String headerMessage) {
         System.out.println(headerMessage);
     }
 
-    public static void printResult(CarGroups carGroups) {
-        List<String> carNames = carGroups.getCarNames();
-        List<Integer> carPositions = carGroups.getCarPositions();
+    public void printResult(RacingGame racingGame) {
+        List<String> carNames = racingGame.getPlayerCars().getCarNames();
+        List<Integer> carPositions = racingGame.getPlayerCars().getCarPositions();
         int carCounts = carNames.size();
         for (int i = INDEX_ZERO; i < carCounts; i++) {
             System.out.print(carNames.get(i) + DELIMITER);
@@ -27,15 +27,15 @@ public static void printResult(CarGroups carGroups) {
         System.out.println();
     }
 
-    private static void printCurrentPosition(int currentPosition) {
+    private void printCurrentPosition(int currentPosition) {
         for (int i = INDEX_ZERO; i < currentPosition; i++) {
             System.out.print(POSITION_MARK);
         }
         System.out.println();
     }
 
-    public static void printWinnerCarNames(CarGroups carGroups) {
-        List<String> winnerCarNames = carGroups.getWinnerCarNames();
+    public void printWinnerCarNames(RacingGame racingGame) {
+        List<String> winnerCarNames = racingGame.getPlayerCars().getWinnerCarNames();
         StringBuilder stringBuilder = new StringBuilder();
         for (String winnerCarName : winnerCarNames) {
             appendComma(stringBuilder);
@@ -44,7 +44,7 @@ public static void printWinnerCarNames(CarGroups carGroups) {
         System.out.println(stringBuilder.toString() + Message.RESULT_FOOTER);
     }
 
-    private static void appendComma(StringBuilder stringBuilder) {
+    private void appendComma(StringBuilder stringBuilder) {
         if (stringBuilder.length() > INDEX_ZERO)
             stringBuilder.append(COMMA);
     }