Merge pull request #18 from UMC6th-TeamC/chat

Chat update

src/main/java/com/umc/teamC/domain/chat/controller/ChatController.java

@@ -1,35 +1,43 @@
 package com.umc.teamC.domain.chat.controller;
 
-
 import com.umc.teamC.domain.chat.entity.Chat;
 import com.umc.teamC.domain.chat.service.ChatService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.HashMap;
 import java.util.Map;
 
+@Slf4j
 @Controller
 @RequiredArgsConstructor
 //@CrossOrigin("*")
 public class ChatController {
 
     private final ChatService chatService;
 
-    //메세지 보내기 컨트롤러
-    @MessageMapping("/chat.message")
-    @SendTo("/topic/public")
-    public Map<String, Object> sendMessage(Map<String, Object> message) {
-//        System.out.println(message);
+    // 메시지 보내기 컨트롤러
+    @MessageMapping("/chat.message/{chatRoomId}")
+    @SendTo("/topic/{chatRoomId}")
+    public Map<String, Object> sendMessage(
+            @PathVariable Long chatRoomId,
+            Map<String, Object> message) {
+        // 메시지 확인 로그
+        log.info("Received message: {}", message);
         String sender = message.get("sender").toString();
         String content = message.get("content").toString();
+
         Chat message1 = Chat.builder()
                 .sender(sender)
                 .content(content)
+                .chatId(chatRoomId)
                 .build();
+
         Chat chat = chatService.saveMessage(message1);
         Map<String, Object> result = new HashMap<>();
         result.put("id", chat.getChatId());
@@ -38,9 +46,10 @@ public Map<String, Object> sendMessage(Map<String, Object> message) {
         return result;
     }
 
-    @MessageMapping("/chat.addUser")
-    @SendTo("/topic/public")
-    public Chat addUser(Chat chat) {
+    @MessageMapping("/chat.addUser/{chatRoomId}")
+    @SendTo("/topic/{chatRoomId}")
+    public Chat addUser(@PathVariable Long chatRoomId, Chat chat) {
+        chat.setId(chatRoomId);
         return chat;
     }
 }

src/main/java/com/umc/teamC/domain/chat/converter/ChatRoomConverter.java

@@ -18,6 +18,7 @@ public class ChatRoomConverter {
 
     public static ChatRoomDto.ChatRoomResponseDto toChatRoomResponseDto(ChatRoom chatRoom, String lastMessage, Integer memberCount) {
         return ChatRoomDto.ChatRoomResponseDto.builder()
+                .chatRoomId(chatRoom.getRoomId())
                 .dateTime(chatRoom.getDateTime())
                 .region(chatRoom.getRegion())
                 .lastMessage(lastMessage)

src/main/java/com/umc/teamC/domain/chat/dto/ChatRoomDto.java

@@ -15,6 +15,7 @@ public record ChatRoomListResponseDto (
 
     @Builder
     public record ChatRoomResponseDto (
+            Long chatRoomId,
             LocalDateTime dateTime,
             String region,
             String lastMessage,

src/main/java/com/umc/teamC/domain/chat/entity/Chat.java

@@ -21,4 +21,8 @@ public class Chat extends BaseEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "chat_room_id")
     private ChatRoom chatRoom;
+
+    public void setId(Long id) {
+        chatId = id;
+    }
 }

src/main/java/com/umc/teamC/domain/chat/handler/WebsocketHandler.java

@@ -0,0 +1,25 @@
+package com.umc.teamC.domain.chat.handler;
+
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
+
+public class WebsocketHandler extends TextWebSocketHandler {
+
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) throws Exception {
+        System.out.println("Connected: " + session.getId());
+    }
+
+    @Override
+    protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
+        System.out.println("Received: " + message.getPayload());
+        session.sendMessage(new TextMessage("Hello, client!"));
+    }
+
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
+        System.out.println("Disconnected: " + session.getId());
+    }
+}

src/main/java/com/umc/teamC/domain/user/controller/UserController.java

@@ -14,7 +14,6 @@
 
 @Controller
 @ResponseBody
-//@CrossOrigin("*")
 public class UserController {
     private final UserService userService;