5단계 - 자동차 경주(리팩터링)

src/main/kotlin/racingcar/README.md

@@ -13,3 +13,8 @@
 - [x] 경주 결과를 출력할 때 우승자도 같이 표시한다. pobi, honux가 최종 우승했습니다.
 - [x] 우승자는 한명 이상이 될 수 있다.
 - [x] 자동차 이름은 5자를 초과할 수 없다.
+- [x] 패키지를 비즈니스 로직을 가지는 domain 패키지와 화면을 그리는 view 패키지로 나눈다.
+- [ ] mvc 패턴 기반으로 리팩토링한다.
+- [x] 기존의 자동차를 통해 새로운 자동차를 만들 수 있다.
+- [x] 자동차는 move 이후 새로운 자동차를 반환한다.
+- 

src/main/kotlin/racingcar/RacingGame.kt

@@ -1,8 +1,8 @@
 package racingcar
 
-import racingcar.component.CarNameInputComponent
-import racingcar.component.RacingResultComponent
-import racingcar.component.RoundInputComponent
+import racingcar.view.component.CarNameInputComponent
+import racingcar.view.component.RacingResultComponent
+import racingcar.view.component.RoundInputComponent
 
 object RacingGame {
     fun run() {

src/main/kotlin/racingcar/Car.kt → src/main/kotlin/racingcar/domain/Car.kt

@@ -1,4 +1,4 @@
-package racingcar
+package racingcar.domain
 
 class Car(
     val id: Int,
@@ -7,9 +7,17 @@ class Car(
 ) {
     var position = position
         private set
-    fun move(movePolicy: MovePolicy) {
+
+    constructor(car: Car) : this(
+        id = car.id,
+        name = car.name,
+        position = car.position,
+    )
+
+    fun move(movePolicy: MovePolicy): Car {
         if (movePolicy.canMove()) {
             this.position = this.position.forward()
         }
+        return Car(car = this)
     }
 }

src/main/kotlin/racingcar/CarFactory.kt → src/main/kotlin/racingcar/domain/CarFactory.kt

@@ -1,6 +1,6 @@
-package racingcar
+package racingcar.domain
 
-import racingcar.dto.CarCreateDto
+import racingcar.domain.dto.CarCreateDto
 
 object CarFactory {
     fun createMany(dtos: List<CarCreateDto>): List<Car> {

src/main/kotlin/racingcar/CarGroup.kt → src/main/kotlin/racingcar/domain/CarGroup.kt

@@ -1,8 +1,8 @@
-package racingcar
+package racingcar.domain
 
-class CarGroup(private val cars: List<Car>) {
+class CarGroup(private var cars: List<Car>) {
     fun move() {
-        this.cars.forEach { car ->
+        this.cars = this.cars.map { car ->
             val oil = OilStation.generateOilRandomly()
             car.move(movePolicy = OilPolicy(oil = oil))
         }

src/main/kotlin/racingcar/domain/CarName.kt

@@ -0,0 +1,15 @@
+package racingcar.domain
+
+@JvmInline
+value class CarName(
+    val value: String,
+) {
+    init {
+        require(this.value.isNullOrBlank().not()) { "자동차 이름은 비어 있을 수 없습니다." }
+        require(this.value.length <= MAX_NAME_LENGTH) { "자동차 이름은 5 글자를 초과할 수 없습니다." }
+    }
+
+    companion object {
+        private const val MAX_NAME_LENGTH = 5
+    }
+}

src/main/kotlin/racingcar/CarNameSplitter.kt → src/main/kotlin/racingcar/domain/CarNameSplitter.kt

@@ -1,4 +1,4 @@
-package racingcar
+package racingcar.domain
 
 object CarNameSplitter {
     private const val CAR_NAME_DELIMITER = ","

src/main/kotlin/racingcar/CarPosition.kt → src/main/kotlin/racingcar/domain/CarPosition.kt

@@ -1,4 +1,4 @@
-package racingcar
+package racingcar.domain
 
 data class CarPosition private constructor(
     val name: CarName,

src/main/kotlin/racingcar/MovePolicy.kt → src/main/kotlin/racingcar/domain/MovePolicy.kt

@@ -1,4 +1,4 @@
-package racingcar
+package racingcar.domain
 
 interface MovePolicy {
     fun canMove(): Boolean

src/main/kotlin/racingcar/Oil.kt → src/main/kotlin/racingcar/domain/Oil.kt

@@ -1,4 +1,4 @@
-package racingcar
+package racingcar.domain
 
 @JvmInline
 value class Oil(val amount: Int) {

src/main/kotlin/racingcar/OilPolicy.kt → src/main/kotlin/racingcar/domain/OilPolicy.kt

@@ -1,4 +1,4 @@
-package racingcar
+package racingcar.domain
 
 class OilPolicy(
     private val oil: Oil,

src/main/kotlin/racingcar/OilStation.kt → src/main/kotlin/racingcar/domain/OilStation.kt

@@ -1,4 +1,4 @@
-package racingcar
+package racingcar.domain
 
 object OilStation {
     private val RANDOM_RANGE = (0..9)

src/main/kotlin/racingcar/Position.kt → src/main/kotlin/racingcar/domain/Position.kt

@@ -1,4 +1,4 @@
-package racingcar
+package racingcar.domain
 
 @JvmInline
 value class Position(val value: Int) {

src/main/kotlin/racingcar/domain/Round.kt

@@ -0,0 +1,7 @@
+package racingcar.domain
+
+class Round(val id: Int) {
+    fun start(carGroup: CarGroup) {
+        carGroup.move()
+    }
+}

src/main/kotlin/racingcar/RoundFactory.kt → src/main/kotlin/racingcar/domain/RoundFactory.kt

@@ -1,4 +1,4 @@
-package racingcar
+package racingcar.domain
 
 object RoundFactory {
     fun createMany(amount: Int): List<Round> {

src/main/kotlin/racingcar/Winner.kt → src/main/kotlin/racingcar/domain/Winner.kt

@@ -1,3 +1,3 @@
-package racingcar
+package racingcar.domain
 
 data class Winner(val name: CarName)

src/main/kotlin/racingcar/WinnerCalculator.kt → src/main/kotlin/racingcar/domain/WinnerCalculator.kt

@@ -1,4 +1,4 @@
-package racingcar
+package racingcar.domain
 
 object WinnerCalculator {
     fun execute(cars: List<Car>): List<Car> {

src/main/kotlin/racingcar/domain/dto/CarCreateDto.kt

@@ -0,0 +1,7 @@
+package racingcar.domain.dto
+
+import racingcar.domain.CarName
+
+data class CarCreateDto(
+    val name: CarName,
+)

src/main/kotlin/racingcar/view/component/CarDistanceComponent.kt

@@ -0,0 +1,12 @@
+package racingcar.view.component
+
+import racingcar.domain.Position
+import racingcar.view.ui.Span
+
+class CarDistanceComponent(
+    private val position: Position,
+) : Component {
+    override fun render() {
+        repeat(this.position.value) { Span(text = "-").draw() }
+    }
+}

src/main/kotlin/racingcar/view/component/CarNameComponent.kt

@@ -0,0 +1,11 @@
+package racingcar.view.component
+
+import racingcar.view.ui.Span
+
+class CarNameComponent(
+    private val name: String,
+) : Component {
+    override fun render() {
+        Span(text = "${this.name} : ").draw()
+    }
+}

src/main/kotlin/racingcar/component/CarNameInputComponent.kt → src/main/kotlin/racingcar/view/component/CarNameInputComponent.kt

@@ -1,13 +1,13 @@
-package racingcar.component
+package racingcar.view.component
 
-import racingcar.CarFactory
-import racingcar.CarGroup
-import racingcar.CarName
-import racingcar.CarNameSplitter
-import racingcar.dto.CarCreateDto
-import racingcar.store.CarGroupStore
-import racingcar.ui.Input
-import racingcar.ui.Span
+import racingcar.domain.CarFactory
+import racingcar.domain.CarGroup
+import racingcar.domain.CarName
+import racingcar.domain.CarNameSplitter
+import racingcar.domain.dto.CarCreateDto
+import racingcar.view.store.CarGroupStore
+import racingcar.view.ui.Input
+import racingcar.view.ui.Span
 
 class CarNameInputComponent : Component {
     private val span = Span(text = "경주할 자동차 이름을 입력하세요(이름은 쉼표(,)를 기준으로 구분).", block = true)

src/main/kotlin/racingcar/view/component/CarPositionComponent.kt

@@ -0,0 +1,14 @@
+package racingcar.view.component
+
+import racingcar.domain.CarPosition
+import racingcar.view.ui.Br
+
+class CarPositionComponent(private val carPositions: List<CarPosition>) : Component {
+    override fun render() {
+        this.carPositions.forEach { carPosition ->
+            CarNameComponent(name = carPosition.name.value).render()
+            CarDistanceComponent(position = carPosition.position).render()
+            Br().draw()
+        }
+    }
+}

src/main/kotlin/racingcar/component/Component.kt → src/main/kotlin/racingcar/view/component/Component.kt

@@ -1,4 +1,4 @@
-package racingcar.component
+package racingcar.view.component
 
 interface Component {
     fun render()

src/main/kotlin/racingcar/view/component/RacingResultComponent.kt

@@ -0,0 +1,11 @@
+package racingcar.view.component
+
+import racingcar.view.container.RoundListContainer
+import racingcar.view.container.WinnerContainer
+
+class RacingResultComponent : Component {
+    override fun render() {
+        RoundListContainer().render()
+        WinnerContainer().render()
+    }
+}