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

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/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

@@ -1,16 +1,17 @@
 package racingcar.controller;
 
-import java.util.InputMismatchException;
-import java.util.List;
-import java.util.stream.Collectors;
 import racingcar.domain.Cars;
 import racingcar.domain.TryCount;
-import racingcar.dto.CarStatusResponseDto;
-import racingcar.dto.GameHistoriesResponseDto;
+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 = ",";
@@ -33,7 +34,7 @@ public void startGame() {
 
         startRace(cars, tryCount);
 
-        GameHistoriesResponseDto gameHistoryDto = GameHistoriesResponseDto.toDto(findWinnerNames(cars), findCarStatuses(cars));
+        GameHistoriesResponseDto gameHistoryDto = GameHistoriesResponseDto.toDto(getWinnerNames(cars), convertToCarStatuses(cars));
 
         outputView.printWinners(gameHistoryDto);
         outputView.printCurrentRacingStatus(gameHistoryDto);
@@ -67,11 +68,11 @@ private void startRace(final Cars cars, final TryCount tryCount) {
         }
     }
 
-    private String findWinnerNames(final Cars cars) {
+    private String getWinnerNames(final Cars cars) {
         return String.join(CAR_NAME_DELIMITER, cars.getWinnerNames());
     }
 
-    private List<CarStatusResponseDto> findCarStatuses(final Cars cars) {
+    private List<CarStatusResponseDto> convertToCarStatuses(final Cars cars) {
         return cars.getCars().stream()
                 .map(CarStatusResponseDto::toDto)
                 .collect(Collectors.toList());

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

@@ -1,20 +1,18 @@
 package racingcar.controller;
 
-import java.util.List;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import racingcar.domain.Cars;
 import racingcar.domain.TryCount;
-import racingcar.dto.GameHistoriesResponseDto;
-import racingcar.dto.GameResultResponseDto;
-import racingcar.dto.StartGameRequestDto;
+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 {
@@ -29,23 +27,25 @@ public RacingGameWebController(final RacingCarService racingCarService) {
 
     @GetMapping
     public ResponseEntity<List<GameHistoriesResponseDto>> findGameHistories() {
-        return new ResponseEntity<>(racingCarService.findAllGameHistories(), HttpStatus.OK);
+        return ResponseEntity.ok()
+                .body(racingCarService.findAllGameHistories());
     }
 
     @PostMapping
-    public ResponseEntity<GameResultResponseDto> startGame(@RequestBody final StartGameRequestDto request) {
+    public ResponseEntity<GameResultResponseDto> startGame(@Valid @RequestBody final StartGameRequestDto request) {
         Cars cars = makeCars(request.getNames());
         TryCount tryCount = makeTryCount(request.getCount());
 
-        return new ResponseEntity<>(racingCarService.startRace(cars, tryCount), HttpStatus.OK);
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(racingCarService.startRace(cars, tryCount));
     }
 
-    public Cars makeCars(final String input) {
+    private Cars makeCars(final String input) {
         List<String> carNames = List.of(input.split(CAR_NAME_DELIMITER));
         return Cars.from(carNames);
     }
 
-    public TryCount makeTryCount(final int input) {
+    private TryCount makeTryCount(final int input) {
         return new TryCount(input);
     }
 }

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

@@ -1,20 +1,21 @@
 package racingcar.dao;
 
+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.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;
-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.PlayerHistoryDto;
 
 @Component
 public class GameResultDao {
@@ -50,7 +51,7 @@ public GameResultResponseDto saveGame(final Cars cars, final TryCount tryCount)
         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();
 
@@ -64,7 +65,7 @@ public Long saveGameHistory(final TryCount tryCount) {
         return Objects.requireNonNull(keyHolder.getKey()).longValue();
     }
 
-    private GameResultResponseDto savePlayersStatus(final Cars cars, final long gameId) {
+    private GameResultResponseDto savePlayersStatus(final Cars cars, final Long gameId) {
         String sql = "INSERT INTO player (game_id, name, position, isWinner) VALUES (?, ?, ?, ?)";
 
         cars.getCars()

src/main/java/racingcar/dto/CarStatusResponseDto.java → src/main/java/racingcar/dto/car/CarStatusResponseDto.java

@@ -1,4 +1,4 @@
-package racingcar.dto;
+package racingcar.dto.car;
 
 import racingcar.domain.Car;
 
@@ -16,10 +16,6 @@ public static CarStatusResponseDto toDto(final Car car) {
         return new CarStatusResponseDto(car.getCarName(), car.getDistance());
     }
 
-    public static CarStatusResponseDto toDto(final String name, final int position) {
-        return new CarStatusResponseDto(name, position);
-    }
-
     public static CarStatusResponseDto toDto(final PlayerHistoryDto playerHistoryDto) {
         return new CarStatusResponseDto(playerHistoryDto.getName(), playerHistoryDto.getPosition());
     }

src/main/java/racingcar/dto/GameHistoriesResponseDto.java → src/main/java/racingcar/dto/car/GameHistoriesResponseDto.java

@@ -1,4 +1,4 @@
-package racingcar.dto;
+package racingcar.dto.car;
 
 import java.util.List;
 

src/main/java/racingcar/dto/GameResultResponseDto.java → src/main/java/racingcar/dto/car/GameResultResponseDto.java

@@ -1,8 +1,9 @@
-package racingcar.dto;
+package racingcar.dto.car;
+
+import racingcar.domain.Cars;
 
 import java.util.List;
 import java.util.stream.Collectors;
-import racingcar.domain.Cars;
 
 public class GameResultResponseDto {
 

src/main/java/racingcar/dto/PlayerHistoryDto.java → src/main/java/racingcar/dto/car/PlayerHistoryDto.java

@@ -1,4 +1,4 @@
-package racingcar.dto;
+package racingcar.dto.car;
 
 public class PlayerHistoryDto {
 

src/main/java/racingcar/dto/car/StartGameRequestDto.java

@@ -0,0 +1,33 @@
+package racingcar.dto.car;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+public class StartGameRequestDto {
+
+    @NotBlank(message = "이름을 입력해주세요.")
+    private String names;
+
+    @NotNull(message = "시도 회수를 입력해주세요.")
+    @Min(value = 2, message = "최소 횟수는 2입니다.")
+    @Max(value = 10, message = "최대 횟수는 10입니다.")
+    private Integer count;
+
+    public StartGameRequestDto() {
+    }
+
+    public StartGameRequestDto(final String names, final int count) {
+        this.names = names;
+        this.count = count;
+    }
+
+    public String getNames() {
+        return names;
+    }
+
+    public int getCount() {
+        return count;
+    }
+}

src/main/java/racingcar/dto/response/ErrorResponse.java

@@ -0,0 +1,24 @@
+package racingcar.dto.response;
+
+public class ErrorResponse {
+
+    private final int code;
+    private final String message;
+
+    public ErrorResponse(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public static ErrorResponse send(final int code, final String message) {
+        return new ErrorResponse(code, message);
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

src/main/java/racingcar/service/RacingCarService.java

@@ -1,20 +1,21 @@
 package racingcar.service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import racingcar.dao.GameResultDao;
 import racingcar.domain.Cars;
 import racingcar.domain.TryCount;
-import racingcar.dto.CarStatusResponseDto;
-import racingcar.dto.GameHistoriesResponseDto;
-import racingcar.dto.GameResultResponseDto;
-import racingcar.dto.PlayerHistoryDto;
+import racingcar.dto.car.CarStatusResponseDto;
+import racingcar.dto.car.GameHistoriesResponseDto;
+import racingcar.dto.car.GameResultResponseDto;
+import racingcar.dto.car.PlayerHistoryDto;
 import racingcar.utils.RandomPowerGenerator;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 public class RacingCarService {
 

src/main/java/racingcar/view/OutputView.java

@@ -1,10 +1,11 @@
 package racingcar.view;
 
+import racingcar.dto.car.CarStatusResponseDto;
+import racingcar.dto.car.GameHistoriesResponseDto;
+
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import racingcar.dto.CarStatusResponseDto;
-import racingcar.dto.GameHistoriesResponseDto;
 
 public class OutputView {
 

src/main/resources/application.properties

@@ -3,3 +3,4 @@ spring.h2.console.enabled=true
 spring.datasource.url=jdbc:h2:mem:testdb;MODE=MySQL
 spring.datasource.driver-class-name=org.h2.Driver
 
+spring.config.activate.on-profile=test