refactor(InputView, RaceGame): 반복을 RaceGame이 아닌 InputView에서 하도록 수정

src/main/kotlin/controller/RaceGame.kt

@@ -1,14 +1,16 @@
 package controller
+
 import model.Cars
 import util.CarsHelper
-import util.Validator
 import view.InputView
 import view.OutputView
 
 class RaceGame(private val outputView: OutputView, private val inputView: InputView) {
 
  fun run() {
+ outputView.outputCarNames()
  val cars = executeInputCarNames()
+ outputView.outputTryNumber()
  val tryNumber = executeInputTryNumber()
  outputView.outputResults()
  repeat(tryNumber) {
@@ -25,39 +27,6 @@ class RaceGame(private val outputView: OutputView, private val inputView: InputV
  outputView.outputNextLine()
  }
 
- private fun executeInputTryNumber(): Int {
- var result: Int?
- do {
- outputView.outputTryNumber()
- result = getInputTryNumber(inputView.inputTryNumber())
- } while (result == null)
- return result
- }
-
- private fun getInputTryNumber(number: String): Int? {
- return runCatching {
- Validator().checkTryNumber(number)
- number.toInt()
- }.onFailure {
- outputView.outputErrorMessage(it.message ?: "에러가 발생했습니다.")
- }.getOrNull()
- }
-
- private fun executeInputCarNames(): Cars {
- var result: Cars?
- do {
- outputView.outputCarNames()
- result = getInputCarNames(inputView.inputCarNames())
- } while (result == null)
- return result
- }
-
- private fun getInputCarNames(cars: String): Cars? {
- return runCatching {
- Validator().checkNames(cars)
- Cars(cars)
- }.onFailure {
- outputView.outputErrorMessage(it.message ?: "에러가 발생했습니다.")
- }.getOrNull()
- }
+ private fun executeInputTryNumber(): Int = inputView.inputTryNumber().toInt()
+ private fun executeInputCarNames(): Cars = Cars(inputView.inputCarNames())
 }

src/main/kotlin/util/Validator.kt

@@ -1,5 +1,7 @@
 package util
 
+import view.OutputView
+
 class Validator {
 
  fun checkNames(names: String?) {
@@ -18,34 +20,35 @@ class Validator {
 
  fun checkTryNumber(name: String?) {
  checkTryNumberNull(name)
- checkTryNumberIsRight(name)
+ checkTryNumberIsRight(name ?: "")
  }
 
  private fun checkNameNull(name: String?) {
- require(name != null) { Constants.INPUT_NAME_NULL_ERROR_MESSAGE }
+ require(name != null) { OutputView().outputErrorMessage(Constants.INPUT_NAME_NULL_ERROR_MESSAGE) }
  }
 
  private fun checkNameSize(name: String) {
- require(name.length < 5) { Constants.INPUT_NAME_SIZE_ERROR_MESSAGE }
+ require(name.length < 5) { OutputView().outputErrorMessage(Constants.INPUT_NAME_SIZE_ERROR_MESSAGE) }
  }
 
  private fun checkNameEmpty(name: String) {
- require(name != "") { Constants.INPUT_NAME_NULL_ERROR_MESSAGE }
+ require(name != "") { OutputView().outputErrorMessage(Constants.INPUT_NAME_NULL_ERROR_MESSAGE) }
  }
 
  private fun checkNameRight(name: String) {
- require(name.contains("^[a-zA-Z가-힣]*$".toRegex())) { Constants.INPUT_NAME_RIGHT_ERROR_MESSAGE }
+ require(name.contains("^[a-zA-Z가-힣]*$".toRegex())) { OutputView().outputErrorMessage(Constants.INPUT_NAME_RIGHT_ERROR_MESSAGE) }
  }
 
  private fun checkTryNumberNull(number: String?) {
- require(number != null) { Constants.INPUT_TRY_NUMBER_NULL_ERROR_MESSAGE }
+ require(number != null) { OutputView().outputErrorMessage(Constants.INPUT_TRY_NUMBER_NULL_ERROR_MESSAGE) }
  }
 
- private fun checkTryNumberIsRight(number: String?) {
- try {
- number!!.toInt()
- } catch (e: NumberFormatException) {
- throw IllegalArgumentException(Constants.INPUT_TRY_NUMBER_RIGHT_ERROR_MESSAGE)
+ private fun checkTryNumberIsRight(number: String) {
+ require(
+ number.isNotEmpty() && number.chars().allMatch { Character.isDigit(it) }) {
+ OutputView().outputErrorMessage(
+ Constants.INPUT_TRY_NUMBER_RIGHT_ERROR_MESSAGE
+ )
  }
  }
 }

src/main/kotlin/view/InputView.kt

@@ -1,11 +1,25 @@
 package view
 
+import util.Validator
+
 class InputView {
  fun inputCarNames(): String {
- return readLine() ?: ""
+ val input = readlnOrNull()
+ runCatching {
+ Validator().checkNames(input)
+ }.onFailure {
+ return inputCarNames()
+ }.getOrNull()
+ return input ?: inputCarNames()
  }
 
  fun inputTryNumber(): String {
- return readLine() ?: ""
+ val input = readlnOrNull()
+ runCatching {
+ Validator().checkTryNumber(input)
+ }.onFailure {
+ return inputTryNumber()
+ }.getOrNull()
+ return input ?: inputTryNumber()
  }
 }