Merge pull request #106 from Me1tingPot/feature/#104

feat : 요청 url 변경
Me1tingPot · Jun 29, 2024 · 97cfc71 · 97cfc71
2 parents d3191ec + 58c990f
commit 97cfc71
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 44 deletions.
diff --git a/src/main/java/meltingpot/server/chat/controller/ChatController.java b/src/main/java/meltingpot/server/chat/controller/ChatController.java
@@ -1,5 +1,6 @@
 package meltingpot.server.chat.controller;
 
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import meltingpot.server.chat.dto.SocketTokenGetResponse;
 import meltingpot.server.chat.service.ChatService;
@@ -19,6 +20,7 @@ public class ChatController {
     private final ChatService chatService;
 
     @GetMapping("/token")
+    @Operation(summary = "소켓 전용 토큰 발급", description = "사용자가 채팅방에 입장하기 전에, 소켓 전용 토큰 발급")
     public ResponseEntity<ResponseData<SocketTokenGetResponse>> getToken(@CurrentUser Account account) {
         SocketTokenGetResponse data = chatService.getToken(account);
 

diff --git a/src/main/java/meltingpot/server/chat/controller/ChatRoomController.java b/src/main/java/meltingpot/server/chat/controller/ChatRoomController.java
@@ -4,7 +4,6 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import meltingpot.server.chat.dto.*;
@@ -28,7 +27,7 @@ public class ChatRoomController {
     private final ChatRoomService chatRoomService;
 
     // [CHECK] 1. Post @RequestBody or 2. Get @ModelAttribute
-    @PostMapping()
+    @GetMapping()
     @Operation(summary = "채팅방 전체 목록 조회", description = "사용자가 참여하는 전체 채팅방 조회. 파티에 참여하면 채팅방 자동으로 생성")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "OK", description = "채팅방 전체 목록 조회 성공"),
@@ -37,9 +36,10 @@ public class ChatRoomController {
     })
     public ResponseEntity<ResponseData<ChatRoomsPageResponse>> getChatRooms(
             @CurrentUser Account user,
-            @RequestBody @Valid PageGetRequest pageGetRequest
+            @RequestParam(name = "page") int page,
+            @RequestParam(name = "size") int size
     ) {
-        return ResponseData.toResponseEntity(CHAT_ROOMS_LIST_GET_SUCCESS, chatRoomQueryService.getChatRooms(user.getId(), pageGetRequest));
+        return ResponseData.toResponseEntity(CHAT_ROOMS_LIST_GET_SUCCESS, chatRoomQueryService.getChatRooms(user.getId(), page, size));
     }
 
     @PostMapping("/alarm/{chatRoomId}")
@@ -57,7 +57,7 @@ public ResponseEntity<ResponseData> updateAlarmStatus(
     }
 
     // [CHECK] PageResponse
-    @PostMapping("/chat/{chatRoomId}")
+    @GetMapping("/chat/{chatRoomId}")
     @Operation(summary = "채팅방 채팅 내역 조회", description = "채팅방 입장 후, 채팅방 메시지 조회")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "OK", description = "채팅방 채팅 내역 조회 성공"),
@@ -66,8 +66,9 @@ public ResponseEntity<ResponseData> updateAlarmStatus(
     })
     public ResponseEntity<ResponseData<ChatMessagePageResponse>> getChatMessage(
             @PathVariable("chatRoomId") Long chatRoomId,
-            @RequestBody @Valid PageGetRequest pageGetRequest
+            @RequestParam(name = "page") int page,
+            @RequestParam(name = "size") int size
             ) {
-        return ResponseData.toResponseEntity(CHAT_MESSAGE_GET_SUCCESS, chatRoomQueryService.getChatMessages(chatRoomId, pageGetRequest));
+        return ResponseData.toResponseEntity(CHAT_MESSAGE_GET_SUCCESS, chatRoomQueryService.getChatMessages(chatRoomId, page, size));
     }
 }
diff --git a/src/main/java/meltingpot/server/chat/dto/ChatRoomDetailGetResponse.java b/src/main/java/meltingpot/server/chat/dto/ChatRoomDetailGetResponse.java
diff --git a/src/main/java/meltingpot/server/chat/dto/PageGetRequest.java b/src/main/java/meltingpot/server/chat/dto/PageGetRequest.java
diff --git a/src/main/java/meltingpot/server/chat/service/ChatRoomQueryService.java b/src/main/java/meltingpot/server/chat/service/ChatRoomQueryService.java
@@ -6,7 +6,6 @@
 import meltingpot.server.domain.entity.chat.ChatMessage;
 import meltingpot.server.domain.entity.chat.ChatRoom;
 import meltingpot.server.domain.entity.chat.ChatRoomUser;
-import meltingpot.server.domain.entity.party.Party;
 import meltingpot.server.domain.repository.chat.ChatMessageRepository;
 import meltingpot.server.domain.repository.chat.ChatRoomRepository;
 import meltingpot.server.domain.repository.chat.ChatRoomUserRepository;
@@ -19,7 +18,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import static meltingpot.server.util.ResponseCode.CHAT_ROOM_NOT_FOUND;
-import static meltingpot.server.util.ResponseCode.PARTY_NOT_FOUND;
 
 @Slf4j
 @Service
@@ -32,19 +30,19 @@ public class ChatRoomQueryService {
     private final PartyRepository partyRepository;
 
     // [CHECK] 1. slice or page or list 2. PageResponse api
-    public ChatMessagePageResponse getChatMessages(Long chatRoomId, PageGetRequest pageGetRequest) {
+    public ChatMessagePageResponse getChatMessages(Long chatRoomId, int page, int size) {
         ChatRoom chatRoom = chatRoomRepository.findById(chatRoomId)
                 .orElseThrow(() -> new ResourceNotFoundException(CHAT_ROOM_NOT_FOUND));
 
-        PageRequest pageRequest = PageRequest.of(pageGetRequest.page(), pageGetRequest.size(), Sort.by(Sort.Direction.DESC, "id"));
+        PageRequest pageRequest = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "id"));
 
         Slice<ChatMessage> chatMessagesSlice = chatMessageRepository.findAllByChatRoomId(chatRoom.getId(), pageRequest);
 
         return ChatMessagePageResponse.from(chatMessagesSlice, chatRoom);
     }
 
-    public ChatRoomsPageResponse getChatRooms(Long userId, PageGetRequest pageGetRequest) {
-        PageRequest pageRequest = PageRequest.of(pageGetRequest.page(), pageGetRequest.size(), Sort.by(Sort.Direction.ASC, "exitAt"));
+    public ChatRoomsPageResponse getChatRooms(Long userId, int page, int size) {
+        PageRequest pageRequest = PageRequest.of(page, size, Sort.by(Sort.Direction.ASC, "exitAt"));
 
         Slice<ChatRoomUser> chatRoomUserSlice = chatRoomUserRepository.findAllByUserId(userId, pageRequest);