FEAT: 웹소켓 + stomp 채팅 기능

Dongnaebangnae · Apr 6, 2024 · e50abd2 · e50abd2
1 parent de03de6
commit e50abd2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/src/main/java/com/nawabali/nawabali/controller/ChatController.java b/src/main/java/com/nawabali/nawabali/controller/ChatController.java
@@ -55,10 +55,4 @@ public void message(ChatDto.ChatMessageDto message) {
 
         messagingTemplate.convertAndSend("/sub/chat/room/" + message.getRoomId(), message);
     }
-
-    @GetMapping("/chat/room/{roomId}/message")
-    public List<ChatDto.ChatMessageDto> loadMessage (@PathVariable Long roomId,
-                                                     @AuthenticationPrincipal UserDetailsImpl userDetails) {
-        return chatMessageService.loadMessage(roomId, userDetails.getUser());
-    }
 }
diff --git a/src/main/java/com/nawabali/nawabali/controller/ChatRoomController.java b/src/main/java/com/nawabali/nawabali/controller/ChatRoomController.java
@@ -1,7 +1,9 @@
 package com.nawabali.nawabali.controller;
 
 import com.nawabali.nawabali.dto.ChatDto;
+import com.nawabali.nawabali.repository.ChatMessageRepository;
 import com.nawabali.nawabali.repository.ChatRoomRepository;
+import com.nawabali.nawabali.service.ChatMessageService;
 import com.nawabali.nawabali.service.ChatRoomService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Controller;
@@ -17,6 +19,7 @@ public class ChatRoomController {
 
     private final ChatRoomService chatRoomService;
     private final ChatRoomRepository chatRoomRepository;
+    private final ChatMessageService chatMessageService;
 
     // 채팅 리스트 화면
     @GetMapping("/room")
@@ -58,4 +61,10 @@ public List<ChatDto.ChatRoomDto> roomInfo(@RequestParam String name) {
         return chatRoomService.roomInfo(name);
 //        return chatRoomRepository.findRoomById(roomId);
     }
+
+        // ChatController는 웹소켓 endpoint를 담당해서 일반적인 http요청을 처리하지 않아 이곳으로 옮겨 놓음.
+//    @GetMapping("/room/{roomId}/message")
+//    public List<ChatDto.ChatMessageDto> loadMessage (@PathVariable Long roomId) {
+//        return chatMessageService.loadMessage(roomId);
+//    }
 }
diff --git a/src/main/java/com/nawabali/nawabali/service/ChatMessageService.java b/src/main/java/com/nawabali/nawabali/service/ChatMessageService.java
@@ -26,9 +26,6 @@ public class ChatMessageService {
     private final ChatMessageRepository chatMessageRepository;
     private final ChatRoomRepository chatRoomRepository;
 
-
-
-
     // 대화 조회
     public List<ChatDto.ChatMessageDto> loadMessage(Long roomId, User user) {
 

diff --git a/src/main/java/com/nawabali/nawabali/service/UserService.java b/src/main/java/com/nawabali/nawabali/service/UserService.java
@@ -73,7 +73,7 @@ public ResponseEntity<SignupDto.SignupResponseDto> signup(SignupDto.SignupReques
                 .build();
         userRepository.save(user);
         User responseUser = userRepository.findByEmail(user.getEmail())
-                .orElseThrow(() -> new CustomException(ErrorCode.MEMBER_NOT_FOUND));
+                .orElseThrow(()-> new CustomException(ErrorCode.MEMBER_NOT_FOUND));
         return ResponseEntity.ok(new SignupDto.SignupResponseDto(responseUser.getId()));
     }