[4, 5단계 - 체스] 기론(김규철) 미션 제출합니다.

README.md

@@ -75,3 +75,106 @@
 - [x] 남아있는 말에 대해서 점수를 계산한다.
 - [x] 게임이 끝나고 `status`를 입력하면 결과를 보여주고 우승 팀을 알려준다.
 - [x] 게임이 끝나고 아무키나 입력하면 그냥 종료된다.
+
+## 4, 5단계
+
+### api 명세
+
+| METHOD  |       URL       |              description               |
+|:-------:|:---------------:|:--------------------------------------:|
+|   GET   |        /        |   `index.html`을 부르면서 처음 페이지를 불러옵니다.    |
+|   GET   |    /api/load    |          현재 진행 중인 게임을 불러옵니다.           |  
+|   GET   |  /api/restart   | 게임을 재시작합니다. 체스판과 체스 기물들이 초기화되어서 생성됩니다. |  
+
+위 api들은 `boardDto`를 통해서 아래의 json형태로 보내줍니다.
+
+### Response Body
+
+|    name    |         type          |
+|:----------:|:---------------------:|
+|    turn    |        String         | 
+|   board    |  Map<String, String>  | 
+|  isFinish  |        boolean        | 
+
+```json
+{
+  turn: "white",
+  board: {
+    "a2": "pawn",
+    ...
+    (position: piece)
+    ...
+  },
+  isFinish: true
+}
+```
+
+***
+
+| METHOD |     URL     |    description    |
+|:------:|:-----------:|:-----------------:|
+|  GET   | /api/status | 현재 게임의 점수를 보여줍니다. |
+
+위 api는 아래의 json형태로 보내줍니다.
+
+### Response Body
+
+|      name      |  type  | 
+|:--------------:|:------:|
+| blackTeamScore | double |
+| whiteTeamScore | double |
+
+```json
+{
+  blackTeamScore: 38.0,
+  whiteTeamScore: 38.0
+}
+
+```
+
+***
+
+| METHOD |    URL    |        description        |
+|:------:|:---------:|:-------------------------:|
+|  POST  | /api/move | 체스 기물들을 from에서 to로 움직입니다. |
+
+위 api는 아래와 같은 형태로 `from`위치와 `to`위치를 json형태로 보내주고 통신합니다.
+
+### Request Body
+
+| name |  type  | 
+|:----:|:------:|
+| from | String |
+|  to  | String |
+
+```json
+POST
+{
+  "from": "a2",
+  "to": "a4"
+}
+```
+
+### Response Body
+
+| name | type |
+| ------|------|
+| turn    | String | 
+| board | Map<String, String> | 
+| isFinish | boolean | 
+
+```json
+{
+  turn: "white",
+  board: {
+    "a2": "pawn",
+    ...
+    (position: piece)
+    ...
+  },
+  isFinish: true
+}
+```
+
+
+

build.gradle

@@ -12,6 +12,7 @@ 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'
+    implementation 'com.google.code.gson:gson:2.8.7'
     runtimeOnly 'mysql:mysql-connector-java:8.0.28'
     testImplementation 'org.assertj:assertj-core:3.22.0'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'

docker/db/mysql/init/init.sql

@@ -1,15 +1,95 @@
-CREATE TABLE member
+DROP TABLE IF EXISTS board;
+DROP TABLE IF EXISTS piece;
+
+CREATE TABLE board
 (
-    id   varchar(10) not null,
-    name varchar(20) not null,
+    id   INT(10) not null AUTO_INCREMENT ,
+    turn VARCHAR (5) not null,
     primary key (id)
 );
 
-CREATE TABLE role
+INSERT INTO board (turn) VALUES ("white");
+
+CREATE TABLE piece
 (
-    member_id varchar(10) not null,
-    role      varchar(10) not null,
-    primary key (member_id),
-    foreign key (member_id) references member (id)
+    id       INT(10) not null AUTO_INCREMENT,
+    board_id INT(10),
+    position CHAR(2),
+    type     VARCHAR (20) not null,
+    team     VARCHAR (10) not null,
+    foreign key (board_id) references board (id) ON DELETE CASCADE ,
+    primary key (id)
 );
 
+INSERT INTO piece (position, board_id, type, team) VALUES ("a1", 1, "rook", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("b1", 1, "knight", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("c1", 1, "bishop", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("d1", 1, "queen", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("e1", 1, "king", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("f1", 1, "bishop", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("g1", 1, "knight", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("h1", 1, "rook", "white");
+
+INSERT INTO piece (position, board_id, type, team) VALUES ("a2", 1, "pawn", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("b2", 1, "pawn", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("c2", 1, "pawn", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("d2", 1, "pawn", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("e2", 1, "pawn", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("f2", 1, "pawn", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("g2", 1, "pawn", "white");
+INSERT INTO piece (position, board_id, type, team) VALUES ("h2", 1, "pawn", "white");
+
+INSERT INTO piece (position, board_id, type, team) VALUES ("a3", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("b3", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("c3", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("d3", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("e3", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("f3", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("g3", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("h3", 1, "empty", "none");
+
+INSERT INTO piece (position, board_id, type, team) VALUES ("a4", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("b4", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("c4", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("d4", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("e4", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("f4", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("g4", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("h4", 1, "empty", "none");
+
+INSERT INTO piece (position, board_id, type, team) VALUES ("a5", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("b5", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("c5", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("d5", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("e5", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("f5", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("g5", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("h5", 1, "empty", "none");
+
+INSERT INTO piece (position, board_id, type, team) VALUES ("a6", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("b6", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("c6", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("d6", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("e6", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("f6", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("g6", 1, "empty", "none");
+INSERT INTO piece (position, board_id, type, team) VALUES ("h6", 1, "empty", "none");
+
+INSERT INTO piece (position, board_id, type, team) VALUES ("a7", 1, "pawn", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("b7", 1, "pawn", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("c7", 1, "pawn", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("d7", 1, "pawn", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("e7", 1, "pawn", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("f7", 1, "pawn", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("g7", 1, "pawn", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("h7", 1, "pawn", "black");
+
+INSERT INTO piece (position, board_id, type, team) VALUES ("a8", 1, "rook", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("b8", 1, "knight", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("c8", 1, "bishop", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("d8", 1, "queen", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("e8", 1, "king", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("f8", 1, "bishop", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("g8", 1, "knight", "black");
+INSERT INTO piece (position, board_id, type, team) VALUES ("h8", 1, "rook", "black");
+

src/main/java/chess/ConsoleApplication.java

@@ -1,6 +1,6 @@
 package chess;
 
-import chess.controller.ChessController;
+import chess.console.controller.ChessController;
 
 public class ConsoleApplication {
     public static void main(String[] args) {

src/main/java/chess/WebApplication.java

@@ -1,22 +1,16 @@
 package chess;
 
-import spark.ModelAndView;
-import spark.template.handlebars.HandlebarsTemplateEngine;
+import chess.web.controller.ChessWebController;
+import chess.web.service.ChessService;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import static spark.Spark.get;
+import static spark.Spark.port;
+import static spark.Spark.staticFileLocation;
 
 public class WebApplication {
     public static void main(String[] args) {
-        get("/", (req, res) -> {
-            Map<String, Object> model = new HashMap<>();
-            return render(model, "index.html");
-        });
-    }
-
-    private static String render(Map<String, Object> model, String templatePath) {
-        return new HandlebarsTemplateEngine().render(new ModelAndView(model, templatePath));
+        port(8080);
+        staticFileLocation("static");
+        ChessWebController chessController = new ChessWebController(new ChessService());
+        chessController.run();
     }
 }

src/main/java/chess/Board.java → src/main/java/chess/board/Board.java

@@ -1,28 +1,34 @@
-package chess;
+package chess.board;
 
-import chess.piece.Empty;
-import chess.piece.Piece;
-import chess.piece.Pieces;
-import chess.piece.position.Position;
+import chess.board.piece.Empty;
+import chess.board.piece.Piece;
+import chess.board.piece.Pieces;
+import chess.board.piece.position.Position;
 
 import java.util.List;
 
 public final class Board {
 
     private final Pieces pieces;
+    private final Turn turn;
 
-    private Board(Pieces pieces) {
+    private Board(Pieces pieces, Turn turn) {
         this.pieces = pieces;
+        this.turn = turn;
     }
 
-    public static Board create(Pieces pieces) {
-        return new Board(pieces);
+    public static Board create(Pieces pieces, Turn turn) {
+        return new Board(pieces, turn);
     }
 
     public Pieces getPieces() {
         return pieces;
     }
 
+    public Turn getTurn() {
+        return turn;
+    }
+
     public void move(List<String> commandPosition, Turn thisTurn) {
         Position sourcePosition = getSource(commandPosition);
         Position targetPosition = getTarget(commandPosition);
@@ -35,7 +41,7 @@ public void move(List<String> commandPosition, Turn thisTurn) {
     }
 
     private void validateTurn(Turn thisTurn, Piece sourcePiece) {
-        if (!sourcePiece.isCurrentTurn(thisTurn)) {
+        if (sourcePiece.isNotCurrentTurn(thisTurn)) {
             throw new IllegalArgumentException("[ERROR] 현재 차례가 아닙니다.");
         }
     }

src/main/java/chess/board/Team.java

@@ -0,0 +1,35 @@
+package chess.board;
+
+import java.util.Arrays;
+
+public enum Team {
+    BLACK(-1),
+    WHITE(1),
+    NONE(0),
+    ;
+
+    private final int forwardDirection;
+
+    Team(int forwardDirection) {
+        this.forwardDirection = forwardDirection;
+    }
+
+    public static Team from(String name) {
+        return Arrays.stream(values())
+                .filter(team -> team.value().equals(name))
+                .findFirst()
+                .orElse(Team.NONE);
+    }
+
+    public String value() {
+        return this.name().toLowerCase();
+    }
+
+    public boolean isOpposingTeam(Team team) {
+        return this.forwardDirection + team.forwardDirection == 0;
+    }
+
+    public int getForwardDirection() {
+        return this.forwardDirection;
+    }
+}

src/main/java/chess/Turn.java → src/main/java/chess/board/Turn.java

@@ -1,4 +1,4 @@
-package chess;
+package chess.board;
 
 import java.util.Objects;
 
@@ -13,8 +13,8 @@ public static Turn init() {
         return new Turn(Team.WHITE);
     }
 
-    public boolean isCurrentTeam(Team team) {
-        return this.team.equals(team);
+    public boolean isNotCurrentTurn(Team team) {
+        return this.team.isOpposingTeam(team);
     }
 
     public Turn change() {
@@ -24,6 +24,10 @@ public Turn change() {
         return new Turn(Team.BLACK);
     }
 
+    public Team getTeam() {
+        return team;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {