[2단계 - 웹 자동차 경주] 허브(방대의) 미션 제출합니다.

README.md

@@ -3,8 +3,22 @@
 ### 요구사항
 
 - [x] 자동차 경주 코드 가져오기
-- [x] 웹 요청/응답 구현하기
+- [x] 게임 실행 기능
  - [x] 게임 실행 요청 구현
  - [x] 게임 저장 기능 구현
  - [x] 자동차 저장 기능 구현
+- [x] 게임 조회 기능
+ - [x] 게임 조회 요청 구현
+- [x] 콘솔 애플리케이션 출력 변경
+ - [x] 중간 과정을 출력하는 로직 제거
+ - [x] 우승자와 플레이어별 최종 이동거리를 출력하도록 수정
+- [x] 콘솔과 웹의 중복 코드 제거
 - [x] DB 연동하기
+
+### Database
+
+<img width="517" alt="image" src="https://user-images.githubusercontent.com/58586537/232510797-0c0ea14f-4ce9-4d74-a997-1ecdc3175491.png">
+
+### API
+
+[API 명세](http-request.http)

build.gradle

@@ -1,23 +1,24 @@
 plugins {
- id 'java'
- id 'org.springframework.boot' version '2.7.9'
- id 'io.spring.dependency-management' version '1.0.15.RELEASE'
+ id 'java'
+ id 'org.springframework.boot' version '2.7.9'
+ id 'io.spring.dependency-management' version '1.0.15.RELEASE'
 }
 
 sourceCompatibility = '11'
 
 repositories {
- mavenCentral()
+ mavenCentral()
 }
 
 dependencies {
- implementation 'org.springframework.boot:spring-boot-starter-web'
- testImplementation 'org.springframework.boot:spring-boot-starter-test'
+ implementation 'org.springframework.boot:spring-boot-starter-web'
+ implementation 'org.springframework.boot:spring-boot-starter-validation'
+ testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
- implementation 'org.springframework.boot:spring-boot-starter-jdbc'
- runtimeOnly 'com.h2database:h2'
+ implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+ runtimeOnly 'com.h2database:h2'
 }
 
 tasks.named('test') {
- useJUnitPlatform()
+ useJUnitPlatform()
 }

http-request.http

@@ -0,0 +1,18 @@
+### 게임 실행
+
+POST localhost:8080/plays
+Content-Type: application/json
+
+{
+ "names": [
+ "브리",
+ "토미",
+ "브라운"
+ ],
+ "count": 10
+}
+
+### 게임 조회
+
+GET http://localhost:8080/plays
+Content-Type: application/json

src/main/java/racingcar/ConsoleRacingGameApplication.java

@@ -0,0 +1,33 @@
+package racingcar;
+
+import java.util.Scanner;
+import racingcar.controller.ConsoleRacingGameController;
+import racingcar.dao.ConsoleCarDao;
+import racingcar.dao.ConsoleGameDao;
+import racingcar.domain.RandomNumberGenerator;
+import racingcar.service.RacingGameMapper;
+import racingcar.service.RacingGameService;
+import racingcar.view.InputParser;
+import racingcar.view.InputView;
+import racingcar.view.OutputView;
+
+public class ConsoleRacingGameApplication {
+ public static void main(String[] args) {
+ final RacingGameService racingGameService = generateRacingGameService();
+ final ConsoleRacingGameController racingGameController = new ConsoleRacingGameController(
+ racingGameService,
+ new InputView(new InputParser(), new Scanner(System.in)),
+ new OutputView()
+ );
+ racingGameController.run();
+ }
+
+ private static RacingGameService generateRacingGameService() {
+ return new RacingGameService(
+ new RandomNumberGenerator(),
+ new RacingGameMapper(),
+ new ConsoleGameDao(),
+ new ConsoleCarDao()
+ );
+ }
+}

src/main/java/racingcar/WebRacingGameApplication.java

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

src/main/java/racingcar/config/RacingGameConfig.java

@@ -0,0 +1,15 @@
+package racingcar.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import racingcar.domain.NumberGenerator;
+import racingcar.domain.RandomNumberGenerator;
+
+@Configuration
+public class RacingGameConfig {
+
+ @Bean
+ public NumberGenerator numberGenerator() {
+ return new RandomNumberGenerator();
+ }
+}

src/main/java/racingcar/controller/ConsoleRacingGameController.java

@@ -0,0 +1,33 @@
+package racingcar.controller;
+
+import racingcar.dto.GamePlayRequestDto;
+import racingcar.dto.GamePlayResponseDto;
+import racingcar.service.RacingGameService;
+import racingcar.view.InputView;
+import racingcar.view.OutputView;
+
+public class ConsoleRacingGameController {
+ private final RacingGameService racingGameService;
+ private final InputView inputView;
+ private final OutputView outputView;
+
+ public ConsoleRacingGameController(
+ final RacingGameService racingGameService,
+ final InputView inputView,
+ final OutputView outputView
+ ) {
+ this.racingGameService = racingGameService;
+ this.inputView = inputView;
+ this.outputView = outputView;
+ }
+
+ public void run() {
+ try {
+ final GamePlayRequestDto request = inputView.readGamePlayRequest();
+ final GamePlayResponseDto response = racingGameService.play(request);
+ outputView.printResult(response);
+ } catch (final IllegalArgumentException e) {
+ outputView.printErrorMessage(e.getMessage());
+ }
+ }
+}

src/main/java/racingcar/controller/WebRacingGameController.java

@@ -1,10 +1,15 @@
 package racingcar.controller;
 
+import java.util.List;
+import javax.validation.Valid;
+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.RestController;
-import racingcar.dto.GameRequest;
-import racingcar.dto.GameResponse;
+import racingcar.dto.GamePlayRequestDto;
+import racingcar.dto.GamePlayResponseDto;
 import racingcar.service.RacingGameService;
 
 @RestController
@@ -16,7 +21,15 @@ public WebRacingGameController(final RacingGameService racingGameService) {
  }
 
  @PostMapping("/plays")
- public GameResponse plays(@RequestBody final GameRequest gameRequest) {
- return racingGameService.play(gameRequest);
+ public ResponseEntity<GamePlayResponseDto> play(@RequestBody @Valid final GamePlayRequestDto request) {
+ final GamePlayResponseDto result = racingGameService.play(request);
+ return ResponseEntity.status(HttpStatus.CREATED)
+ .body(result);
+ }
+
+ @GetMapping("/plays")
+ public ResponseEntity<List<GamePlayResponseDto>> findAll() {
+ final List<GamePlayResponseDto> result = racingGameService.findAll();
+ return ResponseEntity.ok(result);
  }
 }

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

@@ -1,8 +1,10 @@
 package racingcar.dao;
 
 import java.util.List;
-import racingcar.domain.Car;
+import racingcar.entity.CarEntity;
 
 public interface CarDao {
- void saveAll(final int gameId, final List<Car> cars);
+ void saveAll(final List<CarEntity> cars);
+
+ List<CarEntity> findAll();
 }

src/main/java/racingcar/dao/CarJdbcDao.java

@@ -1,38 +1,43 @@
 package racingcar.dao;
 
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
 import java.util.List;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
 import org.springframework.stereotype.Component;
-import racingcar.domain.Car;
+import racingcar.entity.CarEntity;
 
 @Component
 public class CarJdbcDao implements CarDao {
  private final JdbcTemplate jdbcTemplate;
+ private final SimpleJdbcInsert jdbcInsert;
+ private final RowMapper<CarEntity> rowMapper = (resultSet, rowNum) -> new CarEntity(
+ resultSet.getInt("id"),
+ resultSet.getString("name"),
+ resultSet.getInt("position"),
+ resultSet.getBoolean("winner"),
+ resultSet.getInt("game_id")
+ );
 
  public CarJdbcDao(final JdbcTemplate jdbcTemplate) {
  this.jdbcTemplate = jdbcTemplate;
+ this.jdbcInsert = new SimpleJdbcInsert(jdbcTemplate)
+ .withTableName("Car")
+ .usingGeneratedKeyColumns("id");
  }
 
- public void saveAll(final int gameId, final List<Car> cars) {
- final String sql = "INSERT INTO car(name, position, game_id) VALUES (?, ?, ?)";
- final BatchPreparedStatementSetter batchPreparedStatementSetter = new BatchPreparedStatementSetter() {
-
- @Override
- public void setValues(PreparedStatement ps, int i) throws SQLException {
- final Car car = cars.get(i);
- ps.setString(1, car.getName());
- ps.setInt(2, car.getPosition());
- ps.setInt(3, gameId);
- }
+ @Override
+ public void saveAll(final List<CarEntity> cars) {
+ final BeanPropertySqlParameterSource[] parameterSources = cars.stream()
+ .map(BeanPropertySqlParameterSource::new)
+ .toArray(BeanPropertySqlParameterSource[]::new);
+ jdbcInsert.executeBatch(parameterSources);
+ }
 
- @Override
- public int getBatchSize() {
- return cars.size();
- }
- };
- jdbcTemplate.batchUpdate(sql, batchPreparedStatementSetter);
+ @Override
+ public List<CarEntity> findAll() {
+ final String sql = "SELECT * FROM CAR";
+ return jdbcTemplate.query(sql, rowMapper);
  }
 }

src/main/java/racingcar/dao/ConsoleCarDao.java

@@ -0,0 +1,15 @@
+package racingcar.dao;
+
+import java.util.List;
+import racingcar.entity.CarEntity;
+
+public class ConsoleCarDao implements CarDao {
+ @Override
+ public void saveAll(final List<CarEntity> cars) {
+ }
+
+ @Override
+ public List<CarEntity> findAll() {
+ return List.of();
+ }
+}