Merge pull request #16 from urdego/refactor/#14

Refactor(#14) : swagger 수정, 패키지 이름 수정
urdego · Feb 4, 2025 · dddc0cc · dddc0cc
2 parents 8f89b24 + 2e4b67b
commit dddc0cc
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 15 deletions.
diff --git a/.../client/content/ContentServiceClient.java → .../client/content/ContentServiceClient.java b/.../client/content/ContentServiceClient.java → .../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/...common/client/content/dto/ContentRes.java → ...roller/client/content/dto/ContentRes.java b/...common/client/content/dto/ContentRes.java → ...roller/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/...common/client/user/UserServiceClient.java → ...roller/client/user/UserServiceClient.java b/...common/client/user/UserServiceClient.java → ...roller/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
@@ -31,15 +31,15 @@ public ResponseEntity<GameCreateRes> startGame(@RequestBody GameCreateReq reques
         return new ResponseEntity<>(response, HttpStatus.CREATED);
     }
 
-    @Tag(name = "게임 Socket")
+    @Tag(name = "백엔드 API")
     @Operation(summary = "게임 점수", description = "게임 점수 조회")
     @PostMapping("/score")
     public ResponseEntity<ScoreRes> giveScores(@RequestBody ScoreReq request) {
         ScoreRes response = gameService.giveScores(request);
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
 
-    @Tag(name = "게임 Socket")
+    @Tag(name = "백엔드 API")
     @Operation(summary = "게임 종료", description = "게임 종료")
     @PostMapping("/end")
     public ResponseEntity<GameEndRes> 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
@@ -39,23 +39,31 @@ public ResponseEntity<List<RoomInfoRes>> viewRooms() {
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
 
-    @Tag(name = "대기방 Socket")
-    @Operation(summary = "플레이어 초대", description = "대기방에 플레이어 참여")
+    @Tag(name = "백엔드 API")
+    @Operation(summary = "플레이어 초대", description = "대기방 플레이어 참여")
     @PostMapping("/player/invite")
     public ResponseEntity<RoomPlayersRes> 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<RoomPlayersRes> 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<RoomPlayersRes> 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<Void> 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
@@ -21,15 +21,15 @@ public class RoundController {
 
     private final RoundService roundService;
 
-    @Tag(name = "게임 라운드 Socket")
+    @Tag(name = "백엔드 API")
     @Operation(summary = "문제 출제", description = "라운드 시작")
     @PostMapping("/question")
     public ResponseEntity<QuestionRes> giveQuestion(@RequestBody QuestionReq request) {
         QuestionRes response = roundService.getQuestion(request);
         return ResponseEntity.ok(response);
     }
 
-    @Tag(name = "게임 라운드 Socket")
+    @Tag(name = "백엔드 API")
     @Operation(summary = "답안 제출", description = "사용자별 답안 제출")
     @PostMapping("/answer")
     public ResponseEntity<AnswerRes> 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
@@ -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;