From 55dfe7b7e9566135baafd4bd2db95df50fa622e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=AC=EC=9E=AC=EC=97=BD?= <jysim0326@ajou.ac.kr> Date: Tue, 10 Dec 2024 02:23:41 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=B0=B8=EA=B0=80=ED=95=9C=20?= =?UTF-8?q?=EC=B1=84=ED=8C=85=EB=B0=A9=20=EB=AA=A9=EB=A1=9D=EB=A7=8C=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/chatController.js | 7 ++++++- routes/chatRoute.js | 2 +- services/chatService.js | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/controllers/chatController.js b/controllers/chatController.js index bfcca38..33eac1e 100644 --- a/controllers/chatController.js +++ b/controllers/chatController.js @@ -13,7 +13,12 @@ exports.createChatRoom = async (params) => { // 梨꾪똿諛� 紐⑸줉 議고쉶 exports.getChatRooms = async (req, res) => { try { - const roomData = await chatService.getChatRooms(); + + const name = req.user.name; // Google 濡쒓렇�몄뿉�� 媛��몄삩 email + console.log("name", name); + + // 蹂몄씤�� 李멸��먮줈 �ы븿�� 梨꾪똿諛⑸쭔 媛��몄삤湲� + const roomData = await chatService.getChatRooms(name); res.json(roomData); } catch (err) { console.error('Error fetching rooms:', err); diff --git a/routes/chatRoute.js b/routes/chatRoute.js index ed55aa5..5551447 100644 --- a/routes/chatRoute.js +++ b/routes/chatRoute.js @@ -4,7 +4,6 @@ const chatController = require('../controllers/chatController'); const { isLoggedIn } = require('../middlewares/auth'); router.post('/create-room', chatController.createChatRoom); -router.get('/rooms', chatController.getChatRooms); router.post('/update-status', chatController.updateStatus); router.post('/update-read-status', chatController.updateReadStatus); router.get('/unread-messages/:nickname', chatController.getUnreadMessages); @@ -13,6 +12,7 @@ router.post('/update-status-and-logid', chatController.updateStatusAndLogId); router.post('/update-read-log-id', chatController.updateReadLogId); router.use(isLoggedIn); +router.get('/rooms', chatController.getChatRooms); router.post('/:chatRoomId/notices', chatController.addNotice); router.get('/:chatRoomId/notices/latest', chatController.getLatestNotice); diff --git a/services/chatService.js b/services/chatService.js index f67ee42..b8a3af8 100644 --- a/services/chatService.js +++ b/services/chatService.js @@ -30,8 +30,11 @@ class ChatService { } // 梨꾪똿諛� 紐⑸줉 議고쉶 - async getChatRooms() { - const rooms = await ChatRooms.find({}, { chatRoomId: 1, chatRoomName: 1, messages: { $slice: -1 } }); + async getChatRooms(name) { + const rooms = await ChatRooms.find( + { "participants.name": name }, + { chatRoomId: 1, chatRoomName: 1, messages: { $slice: -1 } } + ); return rooms.map(room => { const lastMessage = room.messages[0] || {}; return { -- GitLab