From 2e4b67bd3f5f95ba25c525a6b80300884a90e099 Mon Sep 17 00:00:00 2001 From: ooni Date: Mon, 3 Feb 2025 23:42:38 +0900 Subject: [PATCH] =?UTF-8?q?Refactor(#14)=20:=20swagger=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=A6=84?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/content/ContentServiceClient.java | 4 ++-- .../client/content/dto/ContentRes.java | 2 +- .../client/user/UserServiceClient.java | 2 +- .../controller/game/GameController.java | 4 ++-- .../controller/room/RoomController.java | 18 +++++++++++++----- .../controller/round/RoundController.java | 4 ++-- .../domain/round/service/RoundServiceImpl.java | 4 ++-- 7 files changed, 23 insertions(+), 15 deletions(-) rename src/main/java/io/urdego/urdego_game_service/{common => controller}/client/content/ContentServiceClient.java (79%) rename src/main/java/io/urdego/urdego_game_service/{common => controller}/client/content/dto/ContentRes.java (72%) rename src/main/java/io/urdego/urdego_game_service/{common => controller}/client/user/UserServiceClient.java (74%) diff --git a/src/main/java/io/urdego/urdego_game_service/common/client/content/ContentServiceClient.java b/src/main/java/io/urdego/urdego_game_service/controller/client/content/ContentServiceClient.java similarity index 79% rename from src/main/java/io/urdego/urdego_game_service/common/client/content/ContentServiceClient.java rename to src/main/java/io/urdego/urdego_game_service/controller/client/content/ContentServiceClient.java index df761ea..98ec022 100644 --- a/src/main/java/io/urdego/urdego_game_service/common/client/content/ContentServiceClient.java +++ b/src/main/java/io/urdego/urdego_game_service/controller/client/content/ContentServiceClient.java @@ -1,6 +1,6 @@ -package io.urdego.urdego_game_service.common.client.content; +package io.urdego.urdego_game_service.controller.client.content; -import io.urdego.urdego_game_service.common.client.content.dto.ContentRes; +import io.urdego.urdego_game_service.controller.client.content.dto.ContentRes; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/src/main/java/io/urdego/urdego_game_service/common/client/content/dto/ContentRes.java b/src/main/java/io/urdego/urdego_game_service/controller/client/content/dto/ContentRes.java similarity index 72% rename from src/main/java/io/urdego/urdego_game_service/common/client/content/dto/ContentRes.java rename to src/main/java/io/urdego/urdego_game_service/controller/client/content/dto/ContentRes.java index 85e79df..0a2d41f 100644 --- a/src/main/java/io/urdego/urdego_game_service/common/client/content/dto/ContentRes.java +++ b/src/main/java/io/urdego/urdego_game_service/controller/client/content/dto/ContentRes.java @@ -1,4 +1,4 @@ -package io.urdego.urdego_game_service.common.client.content.dto; +package io.urdego.urdego_game_service.controller.client.content.dto; public record ContentRes( Long contentId, diff --git a/src/main/java/io/urdego/urdego_game_service/common/client/user/UserServiceClient.java b/src/main/java/io/urdego/urdego_game_service/controller/client/user/UserServiceClient.java similarity index 74% rename from src/main/java/io/urdego/urdego_game_service/common/client/user/UserServiceClient.java rename to src/main/java/io/urdego/urdego_game_service/controller/client/user/UserServiceClient.java index d03be31..97a1109 100644 --- a/src/main/java/io/urdego/urdego_game_service/common/client/user/UserServiceClient.java +++ b/src/main/java/io/urdego/urdego_game_service/controller/client/user/UserServiceClient.java @@ -1,4 +1,4 @@ -package io.urdego.urdego_game_service.common.client.user; +package io.urdego.urdego_game_service.controller.client.user; import org.springframework.cloud.openfeign.FeignClient; diff --git a/src/main/java/io/urdego/urdego_game_service/controller/game/GameController.java b/src/main/java/io/urdego/urdego_game_service/controller/game/GameController.java index 118f098..153e52a 100644 --- a/src/main/java/io/urdego/urdego_game_service/controller/game/GameController.java +++ b/src/main/java/io/urdego/urdego_game_service/controller/game/GameController.java @@ -31,7 +31,7 @@ public ResponseEntity startGame(@RequestBody GameCreateReq reques return new ResponseEntity<>(response, HttpStatus.CREATED); } - @Tag(name = "게임 Socket") + @Tag(name = "백엔드 API") @Operation(summary = "게임 점수", description = "게임 점수 조회") @PostMapping("/score") public ResponseEntity giveScores(@RequestBody ScoreReq request) { @@ -39,7 +39,7 @@ public ResponseEntity giveScores(@RequestBody ScoreReq request) { return new ResponseEntity<>(response, HttpStatus.OK); } - @Tag(name = "게임 Socket") + @Tag(name = "백엔드 API") @Operation(summary = "게임 종료", description = "게임 종료") @PostMapping("/end") public ResponseEntity endGame(@RequestBody String gameId) { diff --git a/src/main/java/io/urdego/urdego_game_service/controller/room/RoomController.java b/src/main/java/io/urdego/urdego_game_service/controller/room/RoomController.java index 6d880f4..7305981 100644 --- a/src/main/java/io/urdego/urdego_game_service/controller/room/RoomController.java +++ b/src/main/java/io/urdego/urdego_game_service/controller/room/RoomController.java @@ -39,23 +39,31 @@ public ResponseEntity> viewRooms() { return new ResponseEntity<>(response, HttpStatus.OK); } - @Tag(name = "대기방 Socket") - @Operation(summary = "플레이어 초대", description = "대기방에 플레이어 참여") + @Tag(name = "백엔드 API") + @Operation(summary = "플레이어 초대", description = "대기방 플레이어 참여") @PostMapping("/player/invite") public ResponseEntity invitePlayer(@RequestBody PlayerReq request) { RoomPlayersRes response = roomService.joinRoom(request); return new ResponseEntity<>(response, HttpStatus.OK); } - @Tag(name = "대기방 Socket") - @Operation(summary = "플레이어 삭제", description = "대기방에 플레이어 삭제") + @Tag(name = "백엔드 API") + @Operation(summary = "플레이어 삭제", description = "대기방 플레이어 삭제") @PostMapping("/player/remove") public ResponseEntity removePlayer(@RequestBody PlayerReq request) { RoomPlayersRes response = roomService.removePlayer(request); return new ResponseEntity<>(response, HttpStatus.OK); } - @Tag(name = "대기방 Socket") + @Tag(name = "백엔드 API") + @Operation(summary = "플레이어 준비", description = "대기방 플레이어 준비 상태 관리") + @PostMapping("/player/ready") + public ResponseEntity readyPlayer(@RequestBody PlayerReq request) { + RoomPlayersRes response = roomService.readyPlayer(request); + return new ResponseEntity<>(response, HttpStatus.OK); + } + + @Tag(name = "백엔드 API") @Operation(summary = "게임 컨텐츠 선택", description = "게임 문제 출제를 위한 컨텐츠 선택") @PostMapping("/select-content") public ResponseEntity selectContent(@RequestBody ContentSelectReq request) { diff --git a/src/main/java/io/urdego/urdego_game_service/controller/round/RoundController.java b/src/main/java/io/urdego/urdego_game_service/controller/round/RoundController.java index 5b5e6ac..5cf8faa 100644 --- a/src/main/java/io/urdego/urdego_game_service/controller/round/RoundController.java +++ b/src/main/java/io/urdego/urdego_game_service/controller/round/RoundController.java @@ -21,7 +21,7 @@ public class RoundController { private final RoundService roundService; - @Tag(name = "게임 라운드 Socket") + @Tag(name = "백엔드 API") @Operation(summary = "문제 출제", description = "라운드 시작") @PostMapping("/question") public ResponseEntity giveQuestion(@RequestBody QuestionReq request) { @@ -29,7 +29,7 @@ public ResponseEntity giveQuestion(@RequestBody QuestionReq request return ResponseEntity.ok(response); } - @Tag(name = "게임 라운드 Socket") + @Tag(name = "백엔드 API") @Operation(summary = "답안 제출", description = "사용자별 답안 제출") @PostMapping("/answer") public ResponseEntity submitAnswer(@RequestBody AnswerReq request) { diff --git a/src/main/java/io/urdego/urdego_game_service/domain/round/service/RoundServiceImpl.java b/src/main/java/io/urdego/urdego_game_service/domain/round/service/RoundServiceImpl.java index 9b16b94..0894511 100644 --- a/src/main/java/io/urdego/urdego_game_service/domain/round/service/RoundServiceImpl.java +++ b/src/main/java/io/urdego/urdego_game_service/domain/round/service/RoundServiceImpl.java @@ -4,8 +4,8 @@ import io.urdego.urdego_game_service.controller.round.dto.request.QuestionReq; import io.urdego.urdego_game_service.controller.round.dto.response.AnswerRes; import io.urdego.urdego_game_service.controller.round.dto.response.QuestionRes; -import io.urdego.urdego_game_service.common.client.content.ContentServiceClient; -import io.urdego.urdego_game_service.common.client.content.dto.ContentRes; +import io.urdego.urdego_game_service.controller.client.content.ContentServiceClient; +import io.urdego.urdego_game_service.controller.client.content.dto.ContentRes; import io.urdego.urdego_game_service.common.exception.ExceptionMessage; import io.urdego.urdego_game_service.common.exception.round.QuestionException; import io.urdego.urdego_game_service.domain.room.entity.Room;