[Spring 체스 - 2단계] 연로그(권시연) 미션 제출합니다.

README.md

@@ -0,0 +1,19 @@
+# 웹 체스
+> (e): Exception 처리
+
+### 1단계 요구 사항
+- 스프링 애플리케이션으로 체스 실행
+- Spring MVC를 활용 (Spark 대체)
+- JdbcTemplate 활용 (기존의 Connection 직접 생성 로직 대체)
+- 요청 받기: @Controller / @RestController 활용
+
+### 2단계 요구 사항
+- 체스방 생성
+  - 제목, 비밀번호 입력받기
+  - 생성 시 만들어지는 고유값은 url에 활용
+- 체스방 목록 조회
+  - 제목 클릭 시 체스방 참가
+  - 삭제 버튼 클릭 시 체스방 삭제
+    - 비밀번호 입력받기
+    - (e) 진행중인 체스방은 삭제 불가능
+    - 동일한 비밀번호라면 삭제

docker/db/mysql/init/init.sql

@@ -1,13 +1,15 @@
 CREATE TABLE game
 (
-    id    BIGINT NOT NULL AUTO_INCREMENT,
+    id BIGINT NOT NULL AUTO_INCREMENT,
+    title VARCHAR(30) NOT NULL,
+    password VARCHAR(30) NOT NULL,
     running BOOLEAN NOT NULL DEFAULT true,
     PRIMARY KEY (id)
 );
 
 CREATE TABLE event
 (
-    game_id  BIGINT NOT NULL,
-    type  VARCHAR(20) NOT NULL,
+    game_id BIGINT NOT NULL,
+    type VARCHAR(20) NOT NULL,
     description VARCHAR(20)
 );

src/main/java/chess/controller/CustomErrorController.java

@@ -0,0 +1,14 @@
+package chess.controller;
+
+import org.springframework.boot.web.servlet.error.ErrorController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+public class CustomErrorController implements ErrorController {
+
+    @RequestMapping("/error")
+    public String handleError() {
+        return "error";
+    }
+}

src/main/java/chess/controller/ExceptionResolver.java

@@ -1,5 +1,8 @@
 package chess.controller;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -9,14 +12,25 @@
 public class ExceptionResolver {
 
     private static final String DEFAULT_SERVER_EXCEPTION_MESSAGE = "예상치 못한 문제가 발생하였습니다.";
+    private static final String NO_DATA_EXCEPTION_MESSAGE = "해당 데이터를 찾을 수 없습니다.";
+    private static final String EMPTY_STRING = "";
+    private static final Logger logger = LoggerFactory.getLogger(ExceptionResolver.class);
 
     @ExceptionHandler
     public ResponseEntity<String> handleException(Exception e) {
+        logger.error(EMPTY_STRING, e);
         return new ResponseEntity<>(DEFAULT_SERVER_EXCEPTION_MESSAGE, HttpStatus.INTERNAL_SERVER_ERROR);
     }
 
+    @ExceptionHandler
+    public ResponseEntity<String> handleException(EmptyResultDataAccessException e) {
+        logger.error(EMPTY_STRING, e);
+        return new ResponseEntity<>(NO_DATA_EXCEPTION_MESSAGE, HttpStatus.NOT_FOUND);
+    }
+
     @ExceptionHandler
     public ResponseEntity<String> handleException(IllegalArgumentException e) {
+        logger.error(EMPTY_STRING, e);
         return ResponseEntity.badRequest().body(e.getMessage());
     }
 }

src/main/java/chess/controller/GameController.java

@@ -1,16 +1,20 @@
 package chess.controller;
 
-import chess.domain.event.MoveEvent;
-import chess.domain.event.MoveRoute;
-import chess.dto.CreateGameDto;
+import chess.dto.CreateGameRequest;
+import chess.dto.CreateGameResponse;
+import chess.dto.DeleteGameRequest;
 import chess.dto.GameDto;
+import chess.dto.MoveRouteDto;
 import chess.service.ChessService;
 import chess.util.ResponseUtil;
+import org.springframework.http.HttpStatus;
+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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -27,8 +31,9 @@ public GameController(ChessService chessService) {
     }
 
     @PostMapping("/new")
-    public CreateGameDto createGame() {
-        return chessService.initGame();
+    @ResponseStatus(HttpStatus.CREATED)
+    public CreateGameResponse createGame(@RequestBody CreateGameRequest createGameRequest) {
+        return chessService.initGame(createGameRequest);
     }
 
     @GetMapping("/{id}")
@@ -38,10 +43,17 @@ public ModelAndView findGame(@PathVariable int id) {
     }
 
     @PostMapping("/{id}")
-    public ModelAndView playGame(@PathVariable int id,
-                                 @RequestBody MoveRoute moveRoute) {
-        chessService.playGame(id, new MoveEvent(moveRoute));
+    public ModelAndView playGame(@PathVariable int id
+            , @RequestBody MoveRouteDto moveRoute) {
+        chessService.playGame(id, moveRoute);
         GameDto gameDto = chessService.findGame(id);
         return ResponseUtil.createModelAndView(HTML_TEMPLATE_PATH, gameDto);
     }
+
+    @DeleteMapping("/{id}")
+    @ResponseStatus(HttpStatus.NON_AUTHORITATIVE_INFORMATION)
+    public void delete(@PathVariable int id
+            ,@RequestBody DeleteGameRequest deleteGameRequest) {
+        chessService.deleteGame(id, deleteGameRequest);
+    }
 }

src/main/java/chess/controller/HomeController.java

@@ -3,7 +3,9 @@
 import chess.dto.GameCountDto;
 import chess.service.ChessService;
 import chess.util.ResponseUtil;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -19,6 +21,7 @@ public HomeController(ChessService chessService) {
     }
 
     @GetMapping
+    @ResponseStatus(HttpStatus.NON_AUTHORITATIVE_INFORMATION)
     public ModelAndView home() {
         GameCountDto gameCountDto = chessService.countGames();
         return ResponseUtil.createModelAndView(HTML_TEMPLATE_PATH, gameCountDto);

src/main/java/chess/controller/SearchController.java

@@ -1,13 +1,15 @@
 package chess.controller;
 
 import chess.dto.GameCountDto;
-import chess.dto.SearchResultDto;
+import chess.entity.GameEntity;
+import chess.dto.GamesResponse;
 import chess.service.ChessService;
 import chess.util.ResponseUtil;
+import java.util.List;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -24,13 +26,12 @@ public SearchController(ChessService chessService) {
     }
 
     @GetMapping
-    public ModelAndView render() {
+    @ResponseStatus(HttpStatus.NON_AUTHORITATIVE_INFORMATION)
+    public ModelAndView renderSearchPage() {
         GameCountDto gameCountDto = chessService.countGames();
-        return ResponseUtil.createModelAndView(HTML_TEMPLATE_PATH, gameCountDto);
-    }
+        List<GameEntity> gameEntities = chessService.selectAllGames();
+        GamesResponse gamesResponse = new GamesResponse(gameCountDto, gameEntities);
 
-    @PostMapping
-    public SearchResultDto searchResult(@RequestParam(name = "game_id") int gameId) {
-        return chessService.searchGame(gameId);
+        return ResponseUtil.createModelAndView(HTML_TEMPLATE_PATH, gamesResponse);
     }
 }

src/main/java/chess/dao/EventDao.java

@@ -1,6 +1,6 @@
 package chess.dao;
 
-import chess.domain.event.Event;
+import chess.entity.EventEntity;
 import java.util.List;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
@@ -17,17 +17,17 @@ public EventDao(NamedParameterJdbcTemplate namedParameterJdbcTemplate) {
         this.namedParameterJdbcTemplate = namedParameterJdbcTemplate;
     }
 
-    private final RowMapper<Event> eventRowMapper = (resultSet, rowNum) ->
-            Event.of(resultSet.getString("type"),
+    private final RowMapper<EventEntity> eventRowMapper = (resultSet, rowNum) ->
+            new EventEntity(resultSet.getString("type"),
                     resultSet.getString("description"));
 
-    public List<Event> findAllByGameId(int gameId) {
+    public List<EventEntity> findAllByGameId(int gameId) {
         final String sql = "SELECT type, description FROM event WHERE game_id = :game_id";
         SqlParameterSource paramSource = new MapSqlParameterSource("game_id", gameId);
         return namedParameterJdbcTemplate.query(sql, paramSource, eventRowMapper);
     }
 
-    public void save(int gameId, Event event) {
+    public void save(int gameId, EventEntity event) {
         final String sql = "INSERT INTO event (game_id, type, description)"
                 + "VALUES (:game_id, :type, :description)";
 

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

@@ -1,10 +1,13 @@
 package chess.dao;
 
+import chess.dto.CreateGameRequest;
+import chess.entity.GameEntity;
+import chess.util.DaoUtil;
+import java.util.List;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.EmptySqlParameterSource;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -16,11 +19,34 @@ public GameDao(NamedParameterJdbcTemplate namedParameterJdbcTemplate) {
         this.namedParameterJdbcTemplate = namedParameterJdbcTemplate;
     }
 
-    public int saveAndGetGeneratedId() {
-        final String sql = "INSERT INTO game VALUES ()";
-        KeyHolder keyHolder = new GeneratedKeyHolder();
-        namedParameterJdbcTemplate.update(sql, new EmptySqlParameterSource(), keyHolder);
-        return keyHolder.getKey().intValue();
+    private final RowMapper<GameEntity> eventRowMapper = (resultSet, rowNum) ->
+            new GameEntity(resultSet.getInt("id"),
+                    resultSet.getString("title"),
+                    resultSet.getString("password"),
+                    resultSet.getBoolean("running")
+            );
+
+    public List<GameEntity> selectAll() {
+        final String sql = "SELECT id, title, password, running FROM game";
+        return DaoUtil.queryNoParameter(namedParameterJdbcTemplate, sql, eventRowMapper);
+    }
+
+    public GameEntity findById(int id) {
+        final String sql = "SELECT id, title, password, running FROM game WHERE id = :id";
+        MapSqlParameterSource paramSource = new MapSqlParameterSource();
+        paramSource.addValue("id", id);
+
+        return namedParameterJdbcTemplate.queryForObject(sql, paramSource, eventRowMapper);
+    }
+
+    public int saveAndGetGeneratedId(CreateGameRequest request) {
+        final String sql = "INSERT INTO game(title, password) VALUES (:title, :password)";
+
+        MapSqlParameterSource paramSource = new MapSqlParameterSource();
+        paramSource.addValue("title", request.getTitle());
+        paramSource.addValue("password", request.getPassword());
+
+        return DaoUtil.queryForKeyHolder(namedParameterJdbcTemplate, sql, paramSource);
     }
 
     public void finishGame(int gameId) {
@@ -31,21 +57,19 @@ public void finishGame(int gameId) {
         namedParameterJdbcTemplate.update(sql, paramSource);
     }
 
-    public boolean checkById(int gameId) {
-        final String sql = "SELECT COUNT(*) FROM game WHERE id = :game_id";
-
-        MapSqlParameterSource paramSource = new MapSqlParameterSource("game_id", gameId);
-        int existingGameCount = namedParameterJdbcTemplate.queryForObject(sql, paramSource, Integer.class);
-        return existingGameCount > 0;
-    }
-
     public int countAll() {
         final String sql = "SELECT COUNT(*) FROM game";
-        return namedParameterJdbcTemplate.queryForObject(sql, new EmptySqlParameterSource(), Integer.class);
+        return DaoUtil.queryForInt(namedParameterJdbcTemplate, sql, new EmptySqlParameterSource());
     }
 
     public int countRunningGames() {
         final String sql = "SELECT COUNT(*) FROM game WHERE running = true";
-        return namedParameterJdbcTemplate.queryForObject(sql, new EmptySqlParameterSource(), Integer.class);
+        return DaoUtil.queryForInt(namedParameterJdbcTemplate, sql, new EmptySqlParameterSource());
+    }
+
+    public int delete(int id) {
+        final String sql = "delete from game where id = :id";
+        MapSqlParameterSource paramSource = new MapSqlParameterSource("id", id);
+        return namedParameterJdbcTemplate.update(sql, paramSource);
     }
 }

src/main/java/chess/domain/event/Event.java

@@ -1,11 +1,13 @@
 package chess.domain.event;
 
+import chess.entity.EventEntity;
+
 public abstract class Event {
 
-    public static Event of(String type, String description) {
-        EventType eventType = EventType.valueOf(type);
+    public static Event of(EventEntity eventEntity) {
+        EventType eventType = EventType.valueOf(eventEntity.getType());
         if (eventType == EventType.MOVE) {
-            return new MoveEvent(description);
+            return new MoveEvent(eventEntity.getDescription());
         }
         return new InitEvent();
     }

src/main/java/chess/domain/game/BlackTurn.java

@@ -22,7 +22,7 @@ protected Game continueGame() {
     }
 
     @Override
-    protected GameState getState() {
+    public GameState getState() {
         return GameState.BLACK_TURN;
     }
 

src/main/java/chess/domain/game/Game.java

@@ -1,8 +1,9 @@
 package chess.domain.game;
 
+import chess.domain.board.Board;
 import chess.domain.event.Event;
 import chess.domain.game.statistics.GameResult;
-import chess.dto.GameDto;
+import chess.domain.game.statistics.GameState;
 
 public interface Game {
 
@@ -12,5 +13,7 @@ public interface Game {
 
     GameResult getResult();
 
-    GameDto toDtoOf(int gameId);
+    Board getBoard();
+
+    GameState getState();
 }

src/main/java/chess/domain/game/GameOver.java

@@ -32,7 +32,7 @@ public GameResult getResult() {
     }
 
     @Override
-    protected GameState getState() {
+    public GameState getState() {
         return GameState.OVER;
     }
 

src/main/java/chess/domain/game/NewGame.java

@@ -3,7 +3,7 @@
 import chess.domain.board.Board;
 import chess.domain.event.Event;
 import chess.domain.game.statistics.GameResult;
-import chess.dto.GameDto;
+import chess.domain.game.statistics.GameState;
 import chess.util.BoardMapGeneratorUtil;
 
 public final class NewGame implements Game {
@@ -30,7 +30,12 @@ public GameResult getResult() {
     }
 
     @Override
-    public GameDto toDtoOf(int gameId) {
+    public Board getBoard() {
+        throw new UnsupportedOperationException(GAME_NOT_STARTED_EXCEPTION_MESSAGE);
+    }
+
+    @Override
+    public GameState getState() {
         throw new UnsupportedOperationException(GAME_NOT_STARTED_EXCEPTION_MESSAGE);
     }
 }