[Spring 체스 - 2단계] 써머(최혜원) 미션 제출합니다.

README.md

@@ -0,0 +1,13 @@
+## 웹 체스  
+
+### step2 요구 기능 목록 
+
+- [x] 체스방 만들기 버튼을 누르면 제목과 비밀번호를 입력할 수 있는 팝업이 뜬다  
+- [x] 제목과 비밀번호를 입력하면 새로운 체스판이 만들어진다  
+- [x] 메인 페이지에서 체스방 목록을 볼 수 있다  
+- [x] 목록에서 체스방을 클릭하면 방에 입장한다  
+- [x] 삭제 버튼을 누르면 비밀번호 입력 팝업이 뜬다  
+- [x] 비밀번호가 일치하면 방이 삭제된다  
+  - [x] 비밀번호가 불일치하면 방이 삭제되지 않는다  
+  - [x] 게임이 진행중인 상황이면 방이 삭제되지 않는다  
+

docker/db/mysql/init/init.sql

@@ -1,23 +1,25 @@
 create table room
 (
-    id   int not null auto_increment primary key,
-    name varchar(16) not null
+    id       int         not null auto_increment primary key,
+    name     varchar(16) not null,
+    password varchar(16) not null
 );
 
 create table board
 (
-    id        int not null auto_increment primary key,
-    room_id int not null,
-    turn      varchar(5) not null,
-    foreign key (room_id) references room(id)
+    id      int        not null auto_increment primary key,
+    room_id int        not null,
+    turn    varchar(5) not null,
+    end     tinyint(1)    not null,
+    foreign key (room_id) references room (id) on delete cascade
 );
 
 create table piece
 (
-    id       int not null auto_increment primary key,
-    board_id int not null,
+    id       int        not null auto_increment primary key,
+    board_id int        not null,
     position varchar(2) not null,
     color    varchar(5) not null,
     role     varchar(1) not null,
-    foreign key (board_id) references board(id) on delete cascade
+    foreign key (board_id) references board (id) on delete cascade
 );

src/main/java/chess/web/BoardController.java → src/main/java/chess/controller/BoardController.java

@@ -1,18 +1,19 @@
-package chess.web;
+package chess.controller;
 
+import chess.dto.BoardDto;
+import chess.dto.CommendDto;
+import chess.dto.ResultDto;
 import chess.service.GameService;
-import chess.web.dto.BoardDto;
-import chess.web.dto.CommendDto;
-import chess.web.dto.ResultDto;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
 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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-@Controller
+@RestController
 @RequestMapping("/boards")
 public class BoardController {
 
@@ -22,18 +23,23 @@ public BoardController(GameService gameService) {
         this.gameService = gameService;
     }
 
-    @PostMapping(value = "/{boardId}", params = "command=move")
+    @GetMapping
+    public ResponseEntity<BoardDto> findBoard(@RequestParam int roomId) {
+        return ResponseEntity.ok(gameService.loadGame(roomId));
+    }
+
+    @PatchMapping(value = "/{boardId}")
     public ResponseEntity<BoardDto> movePiece(@PathVariable int boardId, @RequestBody CommendDto commendDto) {
         gameService.move(boardId, commendDto);
         return ResponseEntity.ok(gameService.gameStateAndPieces(boardId));
     }
 
-    @GetMapping(value = "/{boardId}", params = "command=result")
+    @GetMapping(value = "/{boardId}/result")
     public ResponseEntity<ResultDto> result(@PathVariable int boardId) {
         return ResponseEntity.ok(gameService.gameResult(boardId));
     }
 
-    @GetMapping(value = "/{boardId}", params = "command=end")
+    @GetMapping(value = "/{boardId}/end")
     public ResponseEntity<ResultDto> end(@PathVariable int boardId) {
         return ResponseEntity.ok(gameService.gameFinalResult(boardId));
     }

src/main/java/chess/web/ExceptionAdviser.java → src/main/java/chess/controller/ExceptionAdviser.java

@@ -1,11 +1,11 @@
-package chess.web;
+package chess.controller;
 
-import chess.web.dto.ErrorMessageDto;
+import chess.dto.ErrorMessageDto;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-@ControllerAdvice
+@RestControllerAdvice
 public class ExceptionAdviser {
 
     @ExceptionHandler(IllegalArgumentException.class)

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

@@ -1,4 +1,4 @@
-package chess.web;
+package chess.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/chess/web/RoomController.java → src/main/java/chess/controller/RoomController.java

@@ -1,11 +1,14 @@
-package chess.web;
+package chess.controller;
 
+import chess.dto.BoardDto;
+import chess.dto.RoomDto;
+import chess.dto.RoomResponseDto;
 import chess.service.GameService;
 import chess.service.RoomService;
-import chess.web.dto.BoardDto;
-import chess.web.dto.RoomDto;
+import java.util.List;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+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;
@@ -24,10 +27,14 @@ public RoomController(RoomService roomService, GameService gameService) {
         this.gameService = gameService;
     }
 
+    @GetMapping
+    public ResponseEntity<List<RoomResponseDto>> findRooms() {
+        return ResponseEntity.ok(roomService.findRooms());
+    }
+
     @PostMapping
-    public String createRoom(@RequestParam String name) {
-        RoomDto roomDto = roomService.create(name);
-        return "redirect:/rooms/" + roomDto.getId();
+    public ResponseEntity<RoomResponseDto> createRoom(RoomDto roomDto) {
+        return ResponseEntity.ok(roomService.create(roomDto));
     }
 
     @GetMapping("/{roomId}")
@@ -36,13 +43,14 @@ public String board(@PathVariable int roomId) {
         return "/board.html";
     }
 
-    @GetMapping(value = "/{roomId}", params = "command=start")
-    public ResponseEntity<BoardDto> startNewGame(@PathVariable int roomId) {
-        return ResponseEntity.ok(gameService.startNewGame(roomId));
+    @DeleteMapping("/{roomId}")
+    public ResponseEntity<Void> deleteRoom(@PathVariable int roomId, @RequestParam String password) {
+        roomService.delete(roomId, password);
+        return ResponseEntity.noContent().build();
     }
 
-    @GetMapping(value = "/{roomId}", params = "command=load")
-    public ResponseEntity<BoardDto> loadGame(@PathVariable int roomId) {
-        return ResponseEntity.ok(gameService.loadGame(roomId));
+    @PostMapping(value = "/{roomId}/new")
+    public ResponseEntity<BoardDto> startNewGame(@PathVariable int roomId) {
+        return ResponseEntity.ok(gameService.newBoard(roomId));
     }
 }