[2단계 - 웹 자동차 경주] 제이(이재윤) 미션 제출합니다.

README.md

@@ -1,13 +1,19 @@
 ## 기능 구현 목록
 
 - [x] 자동차 경주 코드 가져오기
+
 - [x] 웹 요청 구현하기
-    - [x] 플레이어의 이름 요청 받기
-    - [x] 주행 횟수 요청 받기
-- [x] 웹 응답 구현하기
-    - [x] 우승자 출력하기
-    - [x] 플레이어의 좌표 값 출력
+  - [x] 자동차 경주 게임 API 구현
+  - [x] 게임 이력 조회 API 구현
+
 - [x] DB 연동하기
     - [x] H2 DB 연동하기
     - [x] 테이블 만들기
     - [x] 게임에 관한 정보 저장하기
+
+- [x] console application 기존 기능 수정하기
+  - [x] 플레이 중간 과정을 출력하는 로직 제거하기
+  - [x] 우승자와 player 별 최종 이동거리 출력하도록 리팩토링
+
+- [x] 중복 코드 제거하기
+  - [x] 중복 코드 제거하기

build.gradle

@@ -14,6 +14,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation'
     runtimeOnly 'com.h2database:h2'
 }
 

src/main/java/racingcar/RacingCarApplication.java

@@ -6,8 +6,7 @@
 @SpringBootApplication
 public class RacingCarApplication {
 
-	public static void main(String[] args) {
+    public static void main(String[] args) {
 		SpringApplication.run(RacingCarApplication.class, args);
-	}
-
+    }
 }

src/main/java/racingcar/advice/ControllerAdvice.java

@@ -0,0 +1,22 @@
+package racingcar.advice;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import racingcar.dto.response.ErrorResponse;
+
+import java.util.Objects;
+
+@RestControllerAdvice
+public class ControllerAdvice {
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<ErrorResponse> handleException(final MethodArgumentNotValidException exception) {
+        String errorMessage = Objects.requireNonNull(exception.getBindingResult().getFieldError()).getDefaultMessage();
+
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                .body(ErrorResponse.send(HttpStatus.BAD_REQUEST.value(), errorMessage));
+    }
+}

src/main/java/racingcar/controller/RacingGameConsoleController.java

@@ -0,0 +1,80 @@
+package racingcar.controller;
+
+import racingcar.domain.Cars;
+import racingcar.domain.TryCount;
+import racingcar.dto.car.CarStatusResponseDto;
+import racingcar.dto.car.GameHistoriesResponseDto;
+import racingcar.utils.RandomPowerGenerator;
+import racingcar.view.InputView;
+import racingcar.view.OutputView;
+
+import java.util.InputMismatchException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class RacingGameConsoleController {
+
+    private static final String CAR_NAME_DELIMITER = ",";
+
+    private final InputView inputView;
+    private final OutputView outputView;
+    private final RandomPowerGenerator randomPowerGenerator;
+
+    public RacingGameConsoleController(final InputView inputView,
+                                       final OutputView outputView,
+                                       final RandomPowerGenerator randomPowerGenerator) {
+        this.inputView = inputView;
+        this.outputView = outputView;
+        this.randomPowerGenerator = randomPowerGenerator;
+    }
+
+    public void startGame() {
+        final Cars cars = makeCars();
+        final TryCount tryCount = makeTryCount();
+
+        startRace(cars, tryCount);
+
+        GameHistoriesResponseDto gameHistoryDto = GameHistoriesResponseDto.toDto(getWinnerNames(cars), convertToCarStatuses(cars));
+
+        outputView.printWinners(gameHistoryDto);
+        outputView.printCurrentRacingStatus(gameHistoryDto);
+    }
+
+    private Cars makeCars() {
+        try {
+            List<String> carNames = inputView.inputCarNames();
+            return Cars.from(carNames);
+        } catch (IllegalArgumentException exception) {
+            System.out.println(exception.getMessage());
+            return makeCars();
+        }
+    }
+
+    private TryCount makeTryCount() {
+        try {
+            int tryCount = inputView.inputTryCount();
+            return new TryCount(tryCount);
+        } catch (IllegalArgumentException | InputMismatchException exception) {
+            System.out.println(exception.getMessage());
+            return makeTryCount();
+        }
+    }
+
+    private void startRace(final Cars cars, final TryCount tryCount) {
+        outputView.printResultMessage();
+
+        for (int i = 0; i < tryCount.getTryCount(); i++) {
+            cars.moveAll(randomPowerGenerator);
+        }
+    }
+
+    private String getWinnerNames(final Cars cars) {
+        return String.join(CAR_NAME_DELIMITER, cars.getWinnerNames());
+    }
+
+    private List<CarStatusResponseDto> convertToCarStatuses(final Cars cars) {
+        return cars.getCars().stream()
+                .map(CarStatusResponseDto::toDto)
+                .collect(Collectors.toList());
+    }
+}

src/main/java/racingcar/controller/RacingGameWebController.java

@@ -0,0 +1,51 @@
+package racingcar.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import racingcar.domain.Cars;
+import racingcar.domain.TryCount;
+import racingcar.dto.car.GameHistoriesResponseDto;
+import racingcar.dto.car.GameResultResponseDto;
+import racingcar.dto.car.StartGameRequestDto;
+import racingcar.service.RacingCarService;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RequestMapping("/plays")
+@RestController
+public class RacingGameWebController {
+
+    private static final String CAR_NAME_DELIMITER = ",";
+
+    private final RacingCarService racingCarService;
+
+    public RacingGameWebController(final RacingCarService racingCarService) {
+        this.racingCarService = racingCarService;
+    }
+
+    @GetMapping
+    public ResponseEntity<List<GameHistoriesResponseDto>> findGameHistories() {
+        return ResponseEntity.ok()
+                .body(racingCarService.findAllGameHistories());
+    }
+
+    @PostMapping
+    public ResponseEntity<GameResultResponseDto> startGame(@Valid @RequestBody final StartGameRequestDto request) {
+        Cars cars = makeCars(request.getNames());
+        TryCount tryCount = makeTryCount(request.getCount());
+
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(racingCarService.startRace(cars, tryCount));
+    }
+
+    private Cars makeCars(final String input) {
+        List<String> carNames = List.of(input.split(CAR_NAME_DELIMITER));
+        return Cars.from(carNames);
+    }
+
+    private TryCount makeTryCount(final int input) {
+        return new TryCount(input);
+    }
+}

src/main/java/racingcar/dao/GameResultDao.java

@@ -1,16 +1,21 @@
 package racingcar.dao;
 
-import java.sql.PreparedStatement;
-import java.sql.Statement;
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.util.Objects;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Component;
+import racingcar.domain.Cars;
 import racingcar.domain.TryCount;
-import racingcar.dto.GameResultResponseDto;
+import racingcar.dto.car.GameResultResponseDto;
+import racingcar.dto.car.PlayerHistoryDto;
+
+import java.sql.PreparedStatement;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 @Component
 public class GameResultDao {
@@ -21,12 +26,32 @@ public GameResultDao(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
 
-    public void saveGame(final TryCount tryCount, final GameResultResponseDto gameResult) {
+    public List<Long> findAllGamesId() {
+        String sql = "SELECT id FROM game";
+        return jdbcTemplate.queryForList(sql, Long.class);
+    }
+
+    public List<PlayerHistoryDto> findPlayerHistoriesByGameId(final Long gameId) {
+        String sql = "SELECT name, position, isWinner FROM player WHERE game_id = ?";
+
+        List<PlayerHistoryDto> playerHistories = new ArrayList<>();
+
+        jdbcTemplate.query(sql, preparedStatement -> preparedStatement.setLong(1, gameId), response -> {
+            String name = response.getString("name");
+            int position = response.getInt("position");
+            boolean isWinner = response.getBoolean("isWinner");
+            playerHistories.add(PlayerHistoryDto.toDto(name, position, isWinner));
+        });
+
+        return playerHistories;
+    }
+
+    public GameResultResponseDto saveGame(final Cars cars, final TryCount tryCount) {
         long gameId = saveGameHistory(tryCount);
-        savePlayersStatus(gameResult, gameId);
+        return savePlayersStatus(cars, gameId);
     }
 
-    public long saveGameHistory(final TryCount tryCount) {
+    private Long saveGameHistory(final TryCount tryCount) {
         String sql = "INSERT INTO game (trialCount, dateTime) VALUES (?, ?)";
         KeyHolder keyHolder = new GeneratedKeyHolder();
 
@@ -40,16 +65,18 @@ public long saveGameHistory(final TryCount tryCount) {
         return Objects.requireNonNull(keyHolder.getKey()).longValue();
     }
 
-    private void savePlayersStatus(final GameResultResponseDto gameResult, final long gameId) {
+    private GameResultResponseDto savePlayersStatus(final Cars cars, final Long gameId) {
         String sql = "INSERT INTO player (game_id, name, position, isWinner) VALUES (?, ?, ?, ?)";
 
-        gameResult.getRacingCars()
+        cars.getCars()
                 .forEach(racingCar -> {
                     jdbcTemplate.update(sql,
                             gameId,
-                            racingCar.getName(),
-                            racingCar.getPosition(),
-                            gameResult.isWinner(racingCar.getName()));
+                            racingCar.getCarName(),
+                            racingCar.getDistance(),
+                            cars.isWinner(racingCar.getCarName()));
                 });
+
+        return GameResultResponseDto.toDto(cars);
     }
 }

src/main/java/racingcar/domain/Cars.java

@@ -9,13 +9,26 @@
 
 public class Cars {
 
+    private static final int DEFAULT_DISTANCE_VALUE = 0;
+
     private final List<Car> cars;
 
-    public Cars(final List<Car> cars) {
+    private Cars(final List<Car> cars) {
         validate(cars);
         this.cars = cars;
     }
 
+    public static Cars from(final List<String> carNames) {
+        List<Car> cars = makeCars(carNames);
+        return new Cars(cars);
+    }
+
+    private static List<Car> makeCars(final List<String> carNames) {
+        return carNames.stream()
+                .map(carName -> new Car(carName, DEFAULT_DISTANCE_VALUE))
+                .collect(Collectors.toList());
+    }
+
     private void validate(List<Car> cars) {
         List<String> carNames = cars.stream()
                 .map(Car::getCarName)
@@ -46,6 +59,10 @@ public List<String> getWinnerNames() {
         return winnerNames;
     }
 
+    public boolean isWinner(final String name) {
+        return getWinnerNames().contains(name);
+    }
+
     private int findMaxCountOfDistance() {
         int maxCountOfDistance = Integer.MIN_VALUE;