[2단계 - 웹 자동차 경주] 우르(김현우) 미션 제출합니다.

build.gradle

@@ -16,6 +16,8 @@ dependencies {
 
 	implementation 'org.springframework.boot:spring-boot-starter-jdbc'
 	runtimeOnly 'com.h2database:h2'
+
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 }
 
 tasks.named('test') {

src/main/java/racingcar/controller/RacingCarController.java

@@ -1,21 +1,12 @@
 package racingcar.controller;
 
-import racingcar.domain.Car;
 import racingcar.domain.RacingCars;
 import racingcar.util.NumberGenerator;
 import racingcar.view.InputView;
 import racingcar.view.OutputView;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 public class RacingCarController {
 
-    private static final int START_POSITION = 0;
-
     private final OutputView outputView;
     private final InputView inputView;
     private final NumberGenerator numberGenerator;
@@ -27,63 +18,24 @@ public RacingCarController(final NumberGenerator numberGenerator) {
     }
 
     public void run() {
-        String[] carNames = readCarNamesStep();
-        RacingCars racingCars = generateRacingCarsStep(carNames);
-        int tryNum = readTryNumStep();
-        race(tryNum, racingCars);
-        showWinners(racingCars);
-    }
+        final String carNames = inputView.readCarNames();
+        int trialCount = inputView.readTryNum();
 
-    private String[] readCarNamesStep() {
-        outputView.printReadCarNamesMessage();
-        String[] carNames = inputView.readCarNames();
-        return carNames;
+        RacingCars racingCars = moveCars(carNames, trialCount);
+        showRaceResult(racingCars);
     }
 
-    private RacingCars generateRacingCarsStep(String[] carNames) {
-        List<Car> cars = generateCars(carNames);
-        return null;
+    private void showRaceResult(final RacingCars racingCars) {
+        showWinners(racingCars);
     }
 
-    private List<Car> generateCars(String[] carNames) {
-        return Arrays.stream(carNames)
-                     .map(carName -> new Car(carName, START_POSITION))
-                     .collect(Collectors.toUnmodifiableList());
+    private RacingCars moveCars(String carNames, int trialCount) {
+        RacingCars racingCars = RacingCars.makeCars(carNames);
+        racingCars.moveAllCars(trialCount, numberGenerator);
+        return racingCars;
     }
 
     private void showWinners(RacingCars racingCars) {
-        List<String> winners = convertWinnersNameForPrint(racingCars.getWinners());
-        outputView.printWinners(winners);
-    }
-
-    private void race(int tryNum, RacingCars racingCars) {
-        outputView.printRacingResultMessage();
-        for (int repeatIndex = 0; repeatIndex < tryNum; repeatIndex++) {
-            List<Car> currentCars = racingCars.getCars();
-            for (Car currentCar : currentCars) {
-                int randomValue = numberGenerator.generate();
-                currentCar.move(randomValue);
-            }
-            outputView.printCurrentRacingCarsPosition(convertRacingCarsResultForPrint(currentCars));
-        }
-    }
-
-    private int readTryNumStep() {
-        outputView.printReadTryNumMessage();
-        return inputView.readTryNum();
-    }
-
-    private Map<String, Integer> convertRacingCarsResultForPrint(List<Car> currentCars) {
-        Map<String, Integer> racingCarsResult = new HashMap<>();
-        for (Car currentCar : currentCars) {
-            racingCarsResult.put(currentCar.getName(), currentCar.getPosition());
-        }
-        return racingCarsResult;
-    }
-
-    private List<String> convertWinnersNameForPrint(List<Car> winners) {
-        return winners.stream()
-                      .map(Car::getName)
-                      .collect(Collectors.toList());
+        outputView.printWinners(racingCars);
     }
 }

src/main/java/racingcar/controller/RacingCarWebController.java

@@ -1,30 +1,35 @@
 package racingcar.controller;
 
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import racingcar.controller.dto.GameInfoRequest;
-import racingcar.controller.dto.RaceResultResponse;
-import racingcar.controller.validator.GameOptionValidator;
 import racingcar.service.RaceResultService;
+import racingcar.service.dto.GameInfoRequest;
+import racingcar.service.dto.RaceResultResponse;
+
+import java.util.List;
 
 @RestController
 public class RacingCarWebController {
 
-    private final GameOptionValidator gameOptionValidator;
     private final RaceResultService raceResultService;
 
-    public RacingCarWebController(final GameOptionValidator gameOptionValidator,
-                                  final RaceResultService raceResultService) {
-        this.gameOptionValidator = gameOptionValidator;
+    public RacingCarWebController(final RaceResultService raceResultService) {
         this.raceResultService = raceResultService;
     }
 
     @PostMapping("/plays")
-    public RaceResultResponse registerRaceResult(@RequestBody final GameInfoRequest gameInfoRequest) {
-
-        gameOptionValidator.validateGameOption(gameInfoRequest);
-
+    @ResponseStatus(code = HttpStatus.CREATED)
+    public RaceResultResponse registerRaceResult(@Validated @RequestBody final GameInfoRequest gameInfoRequest) {
         return raceResultService.createRaceResult(gameInfoRequest);
     }
+
+    @GetMapping("/plays")
+    public List<RaceResultResponse> showRaceResult() {
+        return raceResultService.searchRaceResult();
+    }
 }

src/main/java/racingcar/dao/CarDao.java

@@ -0,0 +1,43 @@
+package racingcar.dao;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.namedparam.SqlParameterSourceUtils;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Repository;
+import racingcar.entity.CarEntity;
+
+import java.util.List;
+
+@Repository
+public class CarDao {
+
+    private final JdbcTemplate jdbcTemplate;
+    private final SimpleJdbcInsert simpleJdbcInsert;
+    private final RowMapper<CarEntity> rowMapper = (rs, rowNum) ->
+            new CarEntity(
+                    rs.getLong("id"),
+                    rs.getString("name"),
+                    rs.getInt("position"),
+                    rs.getLong("race_result_id"),
+                    rs.getBoolean("winner"),
+                    rs.getTimestamp("created_at").toLocalDateTime()
+            );
+
+    public CarDao(final JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+        this.simpleJdbcInsert =
+                new SimpleJdbcInsert(jdbcTemplate)
+                        .withTableName("CAR")
+                        .usingGeneratedKeyColumns("id");
+    }
+
+    public void save(final List<CarEntity> carEntities) {
+        simpleJdbcInsert.executeBatch(SqlParameterSourceUtils.createBatch(carEntities));
+    }
+
+    public List<CarEntity> findAll() {
+        final String sql = "select * from CAR";
+        return jdbcTemplate.query(sql, rowMapper);
+    }
+}

src/main/java/racingcar/dao/RaceResultDao.java

@@ -0,0 +1,25 @@
+package racingcar.dao;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Repository;
+import racingcar.entity.RaceResultEntity;
+
+@Repository
+public class RaceResultDao {
+
+    private final SimpleJdbcInsert simpleJdbcInsert;
+
+    public RaceResultDao(final JdbcTemplate jdbcTemplate) {
+        this.simpleJdbcInsert =
+                new SimpleJdbcInsert(jdbcTemplate)
+                        .withTableName("RACE_RESULT")
+                        .usingGeneratedKeyColumns("id");
+    }
+
+    public Long save(final RaceResultEntity raceResultEntity) {
+        return simpleJdbcInsert.executeAndReturnKey(new BeanPropertySqlParameterSource(raceResultEntity))
+                               .longValue();
+    }
+}

src/main/java/racingcar/domain/Car.java

@@ -47,6 +47,10 @@ public boolean isSamePositionCar(Car maxPositionCar) {
         return this.position == maxPositionCar.position;
     }
 
+    public boolean isSameCar(Car car) {
+        return this.name.equals(car.name);
+    }
+
     public String getName() {
         return name;
     }