[라빈] 체스 스프링 4단계 미션 제출합니다.

README.md

@@ -30,6 +30,34 @@
 # 체스 3단계 - Spring Data JDBC 적용하기
 
 ## **프로그래밍 요구사항**
-- Spring Data JDBC를 활용하여 기존에 사용하던 DB에 접근하기
+- Spring Data JDBC를 활용하여 기존에 사용하던 DB에 접근하기.
 - 엔티티 클래스를 만들어 DB 테이블과 맵핑한다.
-- Spring Data JDBC에서 제공하는 Repository를 활용하여 DB에 접근한다.
+- Spring Data JDBC에서 제공하는 Repository를 활용하여 DB에 접근한다.
+
+# 체스 4단계 - 동시에 여러 게임 하기
+
+## **프로그래밍 요구사항**
+- 체스 게임을 진행할 수 있는 방을 만들어서 동시에 여러 게임이 가능하도록 하기.
+
+### 체스방 만들기
+
+- localhost:8080 요청 시 노출되는 페이지에 체스방을 만들 수 있는 버튼이 있다.
+- 체스방 이름 입력하기 input을 추가한다.
+- 체스방 만들기 버튼을 누르면 새로운 체스판이 초기화 된다.
+- 체스방에는 고유식별값이 랜덤으로 부여된다.
+
+### 체스방 목록 조회하기
+
+- localhost:8080 요청 시 체스방 목록을 조회할 수 있다
+- 체스방 목록에는 체스방 제목이 표시된다.
+- 방법은 '/'로 GET 요청을 보내면 체스방에  대한 JSON이 반환된다.
+- 그리고 해당 JSON을 index.js에서 처리하여 보여준다.
+
+### 체스방 참여하기
+
+- localhost:8080 요청 시 체스방 목록에서 체스방을 클릭하면 체스 게임을 이어서 진행할 수 있다.
+
+### 엔티티
+
+- Game : id(auto increment), UUID, name, canContinue 
+- History : id, start, end, gameId

build.gradle

@@ -20,7 +20,6 @@ dependencies {
 	implementation 'net.rakugakibox.spring.boot:logback-access-spring-boot-starter:2.7.1'
 	implementation 'pl.allegro.tech.boot:handlebars-spring-boot-starter:0.3.1'
 	implementation 'com.google.code.gson:gson:2.8.6'
-	implementation 'com.google.code.gson:gson:2.8.6'
 	compile('com.sparkjava:spark-core:2.9.0')
 	compile('com.sparkjava:spark-template-handlebars:2.7.1')
 	compile('ch.qos.logback:logback-classic:1.2.3')

src/main/java/wooteco/chess/controller/SparkChessController.java

@@ -70,7 +70,8 @@ private String postBoard(Request req, Response res) {
         Map<String, Object> model = new HashMap<>();
 
         try {
-            MoveStatusDto moveStatusDto = sparkChessService.move(new MovingPosition(req.queryParams("source"), req.queryParams("destination")));
+            MoveStatusDto moveStatusDto = sparkChessService.move(new MovingPosition(req.queryParams("source"),
+                    req.queryParams("destination")));
 
             model.put("normalStatus", moveStatusDto.getNormalStatus());
             model.put("winner", moveStatusDto.getWinner());
@@ -108,7 +109,8 @@ private Map<String, Object> getMovablePositions(Request req, Response res) throw
     private Map<String, Object> move(Request req, Response res) {
         Map<String, Object> model = new HashMap<>();
 
-        DestinationPositionDto destinationPositionDto = sparkChessService.chooseDestinationPosition(req.queryParams("destination"));
+        DestinationPositionDto destinationPositionDto = sparkChessService.chooseDestinationPosition(
+                req.queryParams("destination"));
 
         model.put("normalStatus", destinationPositionDto.getNormalStatus().isNormalStatus());
         model.put("position", destinationPositionDto.getPosition());

src/main/java/wooteco/chess/controller/SpringChessController.java

@@ -7,94 +7,115 @@
 import wooteco.chess.domain.game.NormalStatus;
 import wooteco.chess.domain.position.MovingPosition;
 import wooteco.chess.dto.ChessGameDto;
+import wooteco.chess.dto.GamesDto;
 import wooteco.chess.dto.MovablePositionsDto;
 import wooteco.chess.dto.MoveStatusDto;
 import wooteco.chess.service.SpringDataJDBCChessService;
 import wooteco.chess.web.JsonTransformer;
 
-import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
 @Controller
 public class SpringChessController {
-    @Autowired
-    private SpringDataJDBCChessService springChessService;
+	@Autowired
+	private SpringDataJDBCChessService springDataJDBCChessService;
 
-    @GetMapping("/")
-    public ModelAndView routeMainPage() {
-        ModelAndView modelAndView = new ModelAndView();
-        modelAndView.setViewName("index");
-        modelAndView.addObject("normalStatus", NormalStatus.YES.isNormalStatus());
-        return modelAndView;
-    }
+	@GetMapping("/")
+	public ModelAndView routeMainPage() {
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("index");
+		modelAndView.addObject("normalStatus", NormalStatus.YES.isNormalStatus());
+		return modelAndView;
+	}
 
-    @GetMapping("/new")
-    public ModelAndView startNewGame() throws SQLException {
-        ModelAndView modelAndView = new ModelAndView();
-        modelAndView.setViewName("chess");
-        modelAndView.addObject("normalStatus", NormalStatus.YES.isNormalStatus());
-        springChessService.clearHistory();
-        return modelAndView;
-    }
+	@GetMapping("/games")
+	@ResponseBody
+	public String showGames() {
+		GamesDto games = springDataJDBCChessService.selectAvailableGames();
+		return JsonTransformer.toJson(games);
+	}
 
-    @GetMapping("/board")
-    @ResponseBody
-    public String setBoard() throws SQLException {
-        ChessGameDto chessGameDto = springChessService.setBoard();
-        return JsonTransformer.toJson(chessGameDto);
-    }
+	@PostMapping("/new")
+	@ResponseBody
+	public String saveNewGame(@RequestBody Map<String, Object> param) {
+		System.out.println(param.get("gameName"));
+		ChessGameDto chessGameDto = springDataJDBCChessService.createGameBy((String) param.get("gameName"));
 
-    @GetMapping("/source")
-    @ResponseBody
-    public String getMovablePositions(@RequestParam String source) throws SQLException {
-        Map<String, Object> model = new HashMap<>();
-        try {
-            MovablePositionsDto movablePositionsDto = springChessService.findMovablePositions(source);
-            model.put("movable", movablePositionsDto.getMovablePositionNames());
-            model.put("position", movablePositionsDto.getPosition());
-            model.put("normalStatus", NormalStatus.YES.isNormalStatus());
-            return JsonTransformer.toJson(model);
-        } catch (IllegalArgumentException | UnsupportedOperationException | NullPointerException e) {
-            model.put("normalStatus", NormalStatus.NO.isNormalStatus());
-            model.put("exception", e.getMessage());
-            return JsonTransformer.toJson(model);
-        }
-    }
+		return JsonTransformer.toJson(chessGameDto);
+	}
 
-    @GetMapping("/destination")
-    @ResponseBody
-    public String checkMovable(@RequestParam String startPosition, @RequestParam String destination) {
-        Map<String, Object> model = new HashMap<>();
-        MoveStatusDto moveStatusDto = springChessService.checkMovable(
-                new MovingPosition(startPosition, destination));
+	@GetMapping("/game/{id}")
+	@ResponseBody
+	public ModelAndView startGame() {
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("chess");
+		modelAndView.addObject("normalStatus", NormalStatus.YES.isNormalStatus());
+		return modelAndView;
+	}
 
-        model.put("normalStatus", moveStatusDto.getNormalStatus());
-        model.put("exception", moveStatusDto.getException());
-        return JsonTransformer.toJson(model);
-    }
+	@GetMapping("/board/{id}")
+	@ResponseBody
+	public String setBoard(@PathVariable Long id) {
+		ChessGameDto chessGameDto = springDataJDBCChessService.setBoardBy(id);
+		return JsonTransformer.toJson(chessGameDto);
+	}
 
-    @PostMapping("/board")
-    public ModelAndView saveHistory(@RequestBody MovingPosition movingPosition) throws SQLException {
-        ModelAndView modelAndView = new ModelAndView();
+	@GetMapping("/board/{id}/source")
+	@ResponseBody
+	public String getMovablePositions(@PathVariable Long id, @RequestParam String source) {
+		Map<String, Object> model = new HashMap<>();
+		try {
+			MovablePositionsDto movablePositionsDto = springDataJDBCChessService.findMovablePositions(id, source);
+			model.put("movable", movablePositionsDto.getMovablePositionNames());
+			model.put("position", movablePositionsDto.getPosition());
+			model.put("normalStatus", NormalStatus.YES.isNormalStatus());
+			return JsonTransformer.toJson(model);
+		} catch (IllegalArgumentException | UnsupportedOperationException | NullPointerException e) {
+			model.put("normalStatus", NormalStatus.NO.isNormalStatus());
+			model.put("exception", e.getMessage());
+			return JsonTransformer.toJson(model);
+		}
+	}
 
-        MoveStatusDto moveStatusDto = springChessService.move(movingPosition);
-        if (moveStatusDto.getWinner().isNone()) {
-            modelAndView.setViewName("chess");
-            return modelAndView;
-        }
-        modelAndView.setViewName("result");
-        modelAndView.addObject("winner", moveStatusDto.getWinner());
-        springChessService.clearHistory();
-        return modelAndView;
-    }
+	@GetMapping("/board/{id}/destination")
+	@ResponseBody
+	public String checkMovable(@PathVariable Long id, @RequestParam String startPosition,
+							   @RequestParam String destination) {
+		Map<String, Object> model = new HashMap<>();
+		MoveStatusDto moveStatusDto = springDataJDBCChessService.checkMovable(id,
+				new MovingPosition(startPosition, destination));
 
-    @GetMapping("/loading")
-    public ModelAndView loadGame() {
-        ModelAndView modelAndView = new ModelAndView();
-        modelAndView.setViewName("chess");
-        modelAndView.addObject("normalStatus", NormalStatus.YES.isNormalStatus());
+		model.put("normalStatus", moveStatusDto.getNormalStatus());
+		model.put("exception", moveStatusDto.getException());
+		return JsonTransformer.toJson(model);
+	}
 
-        return modelAndView;
-    }
+	@PostMapping("/board/{id}")
+	@ResponseBody
+	public String saveHistory(@PathVariable Long id, @RequestBody MovingPosition movingPosition) {
+		try {
+			MoveStatusDto moveStatusDto = springDataJDBCChessService.move(id, movingPosition);
+			return JsonTransformer.toJson(moveStatusDto);
+		} catch (IllegalArgumentException e) {
+			MoveStatusDto moveStatusDto = new MoveStatusDto(false, e.getMessage());
+			return JsonTransformer.toJson(moveStatusDto);
+		}
+	}
+
+	@GetMapping("/loading/{id}")
+	public ModelAndView loadGame() {
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("chess");
+		modelAndView.addObject("normalStatus", NormalStatus.YES.isNormalStatus());
+		return modelAndView;
+	}
+
+	@GetMapping("/result/{winner}")
+	public ModelAndView showResult(@PathVariable String winner) {
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("result");
+		modelAndView.addObject("winner", winner);
+		return modelAndView;
+	}
 }

src/main/java/wooteco/chess/dto/BoardDto.java

@@ -4,6 +4,7 @@
 import wooteco.chess.domain.piece.pieces.Pieces;
 import wooteco.chess.domain.position.Position;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -17,6 +18,6 @@ public BoardDto(Pieces pieces) {
     }
 
     public Map<Position, PieceDto> getBoard() {
-        return board;
+        return Collections.unmodifiableMap(board);
     }
 }

src/main/java/wooteco/chess/dto/ChessGameDto.java

@@ -4,10 +4,11 @@
 import wooteco.chess.domain.game.Turn;
 
 public class ChessGameDto {
-    private BoardDto boardDto;
-    private Turn turn;
-    private ScoreResult score;
-    private boolean normalStatus;
+    private Long gameId;
+    private final BoardDto boardDto;
+    private final Turn turn;
+    private final ScoreResult score;
+    private final boolean normalStatus;
 
     public ChessGameDto(BoardDto boardDto, Turn turn, ScoreResult score, boolean normalStatus) {
         this.boardDto = boardDto;
@@ -16,6 +17,18 @@ public ChessGameDto(BoardDto boardDto, Turn turn, ScoreResult score, boolean nor
         this.normalStatus = normalStatus;
     }
 
+    public ChessGameDto(Long gameId, BoardDto boardDto, Turn turn, ScoreResult score, boolean normalStatus) {
+        this.gameId = gameId;
+        this.boardDto = boardDto;
+        this.turn = turn;
+        this.score = score;
+        this.normalStatus = normalStatus;
+    }
+
+    public Long getGameId() {
+        return gameId;
+    }
+
     public BoardDto getBoardDto() {
         return boardDto;
     }

src/main/java/wooteco/chess/dto/DestinationPositionDto.java

@@ -3,8 +3,8 @@
 import wooteco.chess.domain.game.NormalStatus;
 
 public class DestinationPositionDto {
-    private String position;
-    private NormalStatus normalStatus;
+    private final String position;
+    private final NormalStatus normalStatus;
 
     public DestinationPositionDto(String position, NormalStatus normalStatus) {
         this.position = position;

src/main/java/wooteco/chess/dto/GamesDto.java

@@ -0,0 +1,16 @@
+package wooteco.chess.dto;
+
+import java.util.Collections;
+import java.util.Map;
+
+public class GamesDto {
+	private final Map<Long, String> games;
+
+	public GamesDto(Map<Long, String> games) {
+		this.games = games;
+	}
+
+	public Map<Long, String> getGames() {
+		return Collections.unmodifiableMap(games);
+	}
+}

src/main/java/wooteco/chess/dto/MovablePositionsDto.java

@@ -1,18 +1,19 @@
 package wooteco.chess.dto;
 
+import java.util.Collections;
 import java.util.List;
 
 public class MovablePositionsDto {
-    private List<String> movablePositionNames;
-    private String position;
+    private final List<String> movablePositionNames;
+    private final String position;
 
     public MovablePositionsDto(List<String> movablePositionNames, String position) {
         this.movablePositionNames = movablePositionNames;
         this.position = position;
     }
 
     public List<String> getMovablePositionNames() {
-        return movablePositionNames;
+        return Collections.unmodifiableList(movablePositionNames);
     }
 
     public String getPosition() {

src/main/java/wooteco/chess/dto/MoveStatusDto.java

@@ -5,9 +5,9 @@
 public class MoveStatusDto {
     private static final String EMPTY_STRING = "";
 
-    private boolean normalStatus;
-    private Color winner;
-    private String exception;
+    private final boolean normalStatus;
+    private final Color winner;
+    private final String exception;
 
     public MoveStatusDto(boolean normalStatus, String exception) {
         this.normalStatus = normalStatus;