[Fix] 버그수정

src/main/java/kutaverse/game/chat/domain/Chat.java

@@ -2,6 +2,8 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
 import lombok.experimental.WithBy;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -11,6 +13,8 @@
 @Document(collation = "chat")
 @AllArgsConstructor
 @Builder
+@Getter
+@ToString
 public class Chat {
 
     @Id

src/main/java/kutaverse/game/chat/service/ChatService.java

@@ -18,9 +18,14 @@ public class ChatService {
     public Mono<Chat> save(ChatRequestDto chatRequestDto){
         Chat chat=Chat.builder()
                 .senderUserId(chatRequestDto.getUserId())
+                .nickname(chatRequestDto.getNickname())
                 .content(chatRequestDto.getContent())
                 .createdAt(LocalDateTime.now())
                 .build();
-        return chatRepository.insert(chat);
+        return chatRepository.insert(chat)
+                .doOnNext(savedChat -> {
+                    System.out.println("Saved chat: " + savedChat);
+                });
+
     }
 }

src/main/java/kutaverse/game/websocket/chat/ChatWebSocketHandler.java

@@ -1,6 +1,7 @@
 package kutaverse.game.websocket.chat;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import kutaverse.game.chat.domain.Chat;
 import kutaverse.game.chat.service.ChatService;
 import kutaverse.game.websocket.chat.dto.request.ChatRequestDto;
 import kutaverse.game.websocket.chat.dto.response.ChatResponseDto;
@@ -9,6 +10,7 @@
 import org.springframework.web.reactive.socket.WebSocketSession;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -26,6 +28,7 @@ public ChatWebSocketHandler(ChatService chatService){
     public Mono<Void> handle(WebSocketSession session) {
         sessions.put(session.getId(), session);
         ObjectMapper objectMapper=new ObjectMapper();
+
         session.receive()
                 .map(WebSocketMessage::getPayloadAsText)
                 .map(data-> {
@@ -36,19 +39,33 @@ public Mono<Void> handle(WebSocketSession session) {
                     }
                 })
                 .doOnNext(System.out::println)
-                .map(chatRequest -> {
-                    chatService.save(chatRequest).subscribe();
-                    ChatResponseDto response = new ChatResponseDto(chatRequest.getUserId(), chatRequest.getNickname(), chatRequest.getContent());
-                    try {
-                        return objectMapper.writeValueAsString(response);
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
+                .flatMap(chatRequest -> {
+                    //chatService.save(chatRequest).subscribe();
+                    return chatService.save(chatRequest).map(savedChat -> {
+                        // 저장된 결과를 기반으로 응답 생성
+                        System.out.println(savedChat.getId());
+                        ChatResponseDto response = new ChatResponseDto(savedChat.getSenderUserId(), savedChat.getNickname(), savedChat.getContent());
+                        try {
+                            return objectMapper.writeValueAsString(response);
+                        } catch (Exception e) {
+                            throw new RuntimeException(e);
+                        }
+                    });
                 })
                 .flatMap(data->{
-                    Flux.fromIterable(sessions.values())
-                            .flatMap(wsSession -> wsSession.send(Mono.just(wsSession.textMessage(data)))).subscribe();
-                    return Mono.never();
+                    return Flux.fromIterable(sessions.entrySet())
+                            .flatMap(entry -> {
+                                WebSocketSession wsSession = entry.getValue();
+                                String key = entry.getKey();
+                                if(!wsSession.isOpen()) {
+                                    wsSession.close().subscribe();
+                                    sessions.remove(key);
+                                    return Mono.never();
+                                }
+                                else
+                                    return wsSession.send(Mono.just(wsSession.textMessage(data)));
+                            }).then();
+                    //return Mono.never();
                 })
                 .subscribe();