[Spring 체스 - 2단계] 레넌(조형래) 미션 제출합니다.

build.gradle

@@ -13,9 +13,6 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.sparkjava:spark-core:2.9.3'
-    implementation 'com.sparkjava:spark-template-handlebars:2.7.1'
-
     implementation 'ch.qos.logback:logback-classic:1.2.10'
     testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'

docker/db/mysql/init/init.sql

@@ -1,3 +1,12 @@
+create table game
+(
+    id       int auto_increment
+        primary key,
+    title    varchar(20) not null,
+    password varchar(20) not null,
+    state    varchar(20) not null
+);
+
 create table board
 (
     position varchar(5)  not null,
@@ -9,10 +18,3 @@ create table board
         foreign key (game_id) references game (id)
             on update cascade on delete cascade
 );
-
-create table game
-(
-    id    int auto_increment
-        primary key,
-    state varchar(20) not null
-);

src/main/java/chess/controller/ErrorController.java

@@ -1,5 +1,6 @@
 package chess.controller;
 
+import org.springframework.beans.BeanInstantiationException;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -8,6 +9,11 @@
 @ControllerAdvice
 public class ErrorController {
 
+    @ExceptionHandler(BeanInstantiationException.class)
+    public ResponseEntity<String> errorBeanResponse(IllegalArgumentException e) {
+        return ResponseEntity.badRequest().body(e.getMessage());
+    }
+
     @ExceptionHandler({IllegalStateException.class, IllegalArgumentException.class})
     public ResponseEntity<String> errorResponse(Exception e) {
         return ResponseEntity.badRequest().body(e.getMessage());

src/main/java/chess/controller/WebController.java

@@ -1,64 +1,88 @@
 package chess.controller;
 
+import chess.domain.chessboard.ChessBoard;
+import chess.domain.piece.generator.NormalPiecesGenerator;
 import chess.dto.BoardDto;
+import chess.dto.GameDto;
 import chess.dto.MoveDto;
+import chess.dto.RoomDto;
 import chess.dto.StatusDto;
 import chess.service.ChessService;
-import java.util.HashMap;
-import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
+import java.util.List;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
 
 @Controller
 public class WebController {
 
     private final ChessService chessService;
 
-    @Autowired
     public WebController(ChessService chessService) {
         this.chessService = chessService;
     }
 
     @GetMapping("/")
-    public ModelAndView selectGame() {
-        BoardDto boardDto = chessService.selectBoard();
-        String winner = chessService.selectWinner();
+    public String selectGame(Model model) {
+        List<GameDto> games = chessService.findGame();
+        model.addAttribute("game", games);
+        return "index";
+    }
+
+    @PostMapping("/game")
+    public String insertGame(RoomDto roomDto) {
+        chessService.insertGame(roomDto, new ChessBoard(new NormalPiecesGenerator()));
+        return "redirect:/";
+    }
 
-        Map<String, Object> model = new HashMap<>();
-        model.put("board", boardDto);
-        model.put("winner", winner);
+    @GetMapping("/game/{gameId}")
+    public String startGame(@PathVariable int gameId, Model model) {
+        BoardDto boardDto = chessService.selectBoard(gameId);
+        String winner = chessService.selectWinner(gameId);
+        String state = chessService.selectState(gameId);
 
-        return new ModelAndView("index", model);
+        model.addAttribute("board", boardDto);
+        model.addAttribute("id", gameId);
+        model.addAttribute("winner", winner);
+        model.addAttribute("state", state);
+
+        return "game";
     }
 
-    @GetMapping("/game")
-    public ModelAndView insertGame() {
-        chessService.insertGame();
-        return new ModelAndView("redirect:/");
+    @PutMapping("/game/board/{gameId}")
+    public String movePiece(@PathVariable int gameId, MoveDto moveDto) {
+        chessService.movePiece(gameId, moveDto.getFrom(), moveDto.getTo());
+        return "redirect:/game/" + gameId;
     }
 
-    @PutMapping("/game/board")
-    public ModelAndView updateBoard(MoveDto moveDto) {
-        chessService.updateBoard(moveDto.getFrom(), moveDto.getTo());
-        return new ModelAndView("redirect:/");
+    @PutMapping("/game/{gameId}")
+    public String restartGame(@PathVariable int gameId) {
+        chessService.restartGame(gameId);
+        return "redirect:/game/" + gameId;
     }
 
-    @GetMapping("/game/status")
+    @GetMapping("/game/status/{gameId}")
     @ResponseBody
-    public ResponseEntity<StatusDto> selectStatus() {
-        StatusDto statusDto = chessService.selectStatus();
+    public ResponseEntity<StatusDto> selectStatus(@PathVariable int gameId) {
+        StatusDto statusDto = chessService.selectStatus(gameId);
         return ResponseEntity.ok().body(statusDto);
     }
 
-    @DeleteMapping("/game")
-    public ModelAndView deleteGame() {
-        chessService.deleteGame();
-        return new ModelAndView("redirect:/");
+    @PutMapping("/game/end/{gameId}")
+    public String endGame(@PathVariable int gameId) {
+        chessService.endGame(gameId);
+        return "redirect:/";
+    }
+
+    @DeleteMapping("/game/{gameId}")
+    public String deleteGame(@PathVariable int gameId, String password) {
+        chessService.deleteGame(gameId, password);
+        return "redirect:/";
     }
 }

src/main/java/chess/dao/BoardDao.java

@@ -0,0 +1,16 @@
+package chess.dao;
+
+import chess.domain.chessboard.ChessBoard;
+import chess.domain.piece.Piece;
+import chess.domain.position.Position;
+
+public interface BoardDao {
+
+    void save(ChessBoard chessBoard, int gameId);
+
+    ChessBoard findById(int id);
+
+    int update(Position position, Piece piece, int gameId);
+
+    void delete(int gameId);
+}

src/main/java/chess/repository/BoardDao.java → src/main/java/chess/dao/BoardDaoImpl.java

@@ -1,4 +1,4 @@
-package chess.repository;
+package chess.dao;
 
 import chess.domain.chessboard.ChessBoard;
 import chess.domain.piece.Piece;
@@ -7,31 +7,35 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class BoardDao {
+public class BoardDaoImpl implements BoardDao {
 
-    @Autowired
     private JdbcTemplate jdbcTemplate;
 
-    public void save(ChessBoard chessBoard, Long gameId) {
+    public BoardDaoImpl(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    @Override
+    public void save(ChessBoard chessBoard, int gameId) {
         String sql = "insert into board (position, symbol, color, game_id) values (?, ?, ?, ?)";
 
         List<Object[]> board = chessBoard.getPieces().entrySet().stream()
-                .map(entry -> new Object[]{entry.getKey().toString(), entry.getValue().getSymbol().name(),
+                .map(entry -> new Object[]{entry.getKey().getValue(), entry.getValue().getSymbol().name(),
                         entry.getValue().getColor().name(), gameId})
                 .collect(Collectors.toList());
 
         jdbcTemplate.batchUpdate(sql, board);
     }
 
-    public ChessBoard find() {
-        String sql = "select position, symbol, color from board";
+    @Override
+    public ChessBoard findById(int id) {
+        String sql = "select position, symbol, color from board where game_id = ?";
 
-        List<Map<String, Object>> squares = jdbcTemplate.queryForList(sql);
+        List<Map<String, Object>> squares = jdbcTemplate.queryForList(sql, id);
         Map<Position, Piece> board = new HashMap<>();
         for (Map<String, Object> square : squares) {
             board.put(
@@ -41,8 +45,15 @@ public ChessBoard find() {
         return new ChessBoard(board);
     }
 
-    public int update(Position position, Piece piece, Long gameId) {
+    @Override
+    public int update(Position position, Piece piece, int gameId) {
         String sql = "update board set symbol = (?), color = (?) where game_id = (?) and position = (?)";
-        return jdbcTemplate.update(sql, piece.getSymbol().name(), piece.getColor().name(), gameId, position.toString());
+        return jdbcTemplate.update(sql, piece.getSymbol().name(), piece.getColor().name(), gameId, position.getValue());
+    }
+
+    @Override
+    public void delete(int gameId) {
+        String sql = "delete from board where game_id = ?";
+        jdbcTemplate.update(sql, gameId);
     }
 }

src/main/java/chess/dao/GameDao.java

@@ -0,0 +1,20 @@
+package chess.dao;
+
+import chess.domain.state.State;
+import chess.entity.Game;
+import java.util.List;
+
+public interface GameDao {
+
+    int save(String title, String password, String state);
+
+    List<Game> findAll();
+
+    Game findById(int id);
+
+    State findState(int id);
+
+    int update(String state, int id);
+
+    int delete(int id);
+}

src/main/java/chess/dao/GameDaoImpl.java

@@ -0,0 +1,75 @@
+package chess.dao;
+
+import chess.domain.state.State;
+import chess.entity.Game;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class GameDaoImpl implements GameDao {
+
+    private JdbcTemplate jdbcTemplate;
+
+    public GameDaoImpl(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    @Override
+    public int save(String title, String password, String state) {
+        SimpleJdbcInsert simpleJdbcInsert = new SimpleJdbcInsert(jdbcTemplate).withTableName("game")
+                .usingGeneratedKeyColumns("id");
+        Map<String, String> params = new HashMap<>();
+        params.put("title", title);
+        params.put("password", password);
+        params.put("state", state);
+
+        int id = simpleJdbcInsert.executeAndReturnKey(params).intValue();
+        return id;
+    }
+
+    @Override
+    public List<Game> findAll() {
+        String sql = "select * from game";
+        return jdbcTemplate.query(sql, (rs, rowNum) -> {
+            Game game = new Game(rs.getInt("id"), rs.getString("title"), rs.getString("password"),
+                    rs.getString("state"));
+            return game;
+        });
+    }
+
+    @Override
+    public Game findById(int id) {
+        String sql = "select * from game where id = ?";
+        return jdbcTemplate.queryForObject(sql, (rs, rowNum) -> {
+            Game game = new Game(rs.getInt("id"), rs.getString("title"), rs.getString("password"),
+                    rs.getString("state"));
+            return game;
+        }, id);
+    }
+
+    @Override
+    public State findState(int id) {
+        String sql = "select state from game where id = ?";
+        return jdbcTemplate.queryForObject(sql, (rs, rowNum) -> {
+            State state = State.of(rs.getString("state"));
+            return state;
+        }, id);
+    }
+
+    @Override
+    public int update(String state, int id) {
+        String sql = "update game set state=? where id=?";
+        jdbcTemplate.update(sql, state, id);
+        return id;
+    }
+
+    @Override
+    public int delete(int id) {
+        String sql = "delete from game where id = ?";
+        return jdbcTemplate.update(sql, id);
+    }
+}

src/main/java/chess/domain/chessboard/ChessBoard.java

@@ -129,6 +129,6 @@ public Map<Position, Piece> getPieces() {
     public Map<String, Piece> toMap() {
         return pieces.entrySet()
                 .stream()
-                .collect(Collectors.toMap(m -> m.getKey().toString(), Map.Entry::getValue));
+                .collect(Collectors.toMap(m -> m.getKey().getValue(), Map.Entry::getValue));
     }
 }

src/main/java/chess/domain/position/Column.java

@@ -46,9 +46,4 @@ public Column move(final int value) {
     public int getValue() {
         return value;
     }
-
-    @Override
-    public String toString() {
-        return name().toLowerCase(Locale.ROOT);
-    }
 }

src/main/java/chess/domain/position/Position.java

@@ -101,8 +101,15 @@ public int hashCode() {
         return Objects.hash(column, row);
     }
 
+    public String getValue() {
+        return column.name().toLowerCase(Locale.ROOT) + row.getValue();
+    }
+
     @Override
     public String toString() {
-        return column.toString() + row.toString();
+        return "Position{" +
+                "column=" + column +
+                ", row=" + row +
+                '}';
     }
 }

src/main/java/chess/domain/position/Row.java

@@ -48,9 +48,4 @@ public Row move(final int value) {
     public int getValue() {
         return value;
     }
-
-    @Override
-    public String toString() {
-        return Integer.toString(value);
-    }
 }