resolve: resolve conflict

chat-server/src/queue-manager/manager.service.ts

@@ -66,6 +66,11 @@ export class ManagerService {
   getSocket(name: string): Socket {
     return this.socketMap.get(name);
   }
+  // 온라인인 유저 상태 관리 -> 그래야 send 이벤트를 발생을 시켜서 값을 가져오니깐
+  // 온라인이면 -> 바로 전송
+  // 오프라인이면 -> 큐에 누적
+
+  // 지금 Cache Module에서 사용하는건, 레디스인데, Cache Module 메모리와 레디스를 함께 쓸 순 없을까?
 
   setSocket(userId: string, socket: Socket): void {
     this.socketMap.set(userId, socket);

chat-server/src/socket.gateway.ts

@@ -51,6 +51,7 @@ export class SocketGateway implements OnGatewayDisconnect {
           done();
         });
       } catch (err) {}
+      console.log(queue);
       await queue.resume();
     }
     // + 이전 메시지를 리버스 인피니트 스크롤로 보내주기

chat-server/src/socket.service.ts

@@ -30,11 +30,12 @@ export class SocketService {
   }
 
   async getRecentMessage(recruitId: number, page = 1, unReadCount = 0) {
+    console.log('unreadCount: ', unReadCount);
     const response = await this.chatModel
       .find({ recruitId })
       .sort({ createdAt: -1 })
-      .skip((page - 1) * 20 + unReadCount)
-      .limit(20);
+      .skip((page - 1) * 10 + unReadCount)
+      .limit(10);
     return response.reverse();
   }
 

client/src/pages/ChatTest.tsx

@@ -0,0 +1,53 @@
+import { useRef, useState } from "react";
+import { io, Socket } from "socket.io-client";
+
+type Chat = {
+    id: number;
+    sender: string; // userId
+    recruitId: number;
+    content: string;
+    createdAt: Date;
+};
+
+const ChatTest = () => {
+    const socket = useRef<Socket | null>(null);
+
+    const [recruitId, setRecruitId] = useState("");
+    const [message, setMessage] = useState("");
+    const [history, setHistory] = useState<Chat[]>([]);
+    const [userId, setUserId] = useState("");
+    const connect = () => {
+        socket.current = io(`http://localhost:8080/chat`);
+        socket.current.emit("join", { userId, recruitId });
+        socket.current.once("server_sent_recent", (message: Chat[]) => setHistory((prev) => [...prev, ...message]));
+        socket.current.on("server_sent", (message: Chat) => setHistory((prev) => [...prev, message]));
+    };
+
+    const onClickSend = () => {
+        if (!socket.current) return;
+        socket.current.emit("client_sent", { content: message });
+    };
+
+    return (
+        <div>
+            <div>
+                <input placeholder="userId" onChange={(e) => setUserId(e.target.value)} />
+                <input placeholder="recruitId" onChange={(e) => setRecruitId(e.target.value)} />
+                <button onClick={connect}>소켓연결</button>
+            </div>
+            <input placeholder="message" onChange={(e) => setMessage(e.target.value)}></input>
+            <button onClick={onClickSend}>전송</button>
+            {history.map((msg) => {
+                return (
+                    <>
+                        <div>sender : {msg.sender}</div>
+                        <div>content : {msg.content}</div>
+                        <br />
+                    </>
+                );
+            })}
+        </div>
+    );
+};
+
+export default ChatTest;