Merge pull request #186 from CS3219-AY2425S1/feat/collab-service/add-chathistory

Clean up useless heartbeat and add chat-history endpoint.

Author: SelwynAng

collab-service/app/controller/collab-controller.js

@@ -1,8 +1,8 @@
 import {
   newRoom,
   getRoomId,
-  heartbeat,
   getAllRooms,
+  fetchRoomChatHistory,
   getQuestionIdByRoomId,
 } from "../model/repository.js";
 import crypto from "crypto";
@@ -47,23 +47,6 @@ export async function getRoomByUser(req, res) {
   }
 }
 
-// Update heartbeat for a room
-export async function updateHeartbeat(req, res) {
-  const { roomId } = req.params;
-
-  if (!roomId) {
-    return res.status(400).json({ error: "Room ID is required" });
-  }
-
-  const updatedRoom = await heartbeat(roomId);
-
-  if (updatedRoom) {
-    res.status(200).json(updatedRoom);
-  } else {
-    res.status(404).json({ error: `Room with ID ${roomId} not found` });
-  }
-}
-
 // Get all rooms
 export async function getAllRoomsController(req, res) {
   const rooms = await getAllRooms();
@@ -75,14 +58,24 @@ export async function getAllRoomsController(req, res) {
   }
 }
 
-// Get QuestionId from the room based on the roomId
-export async function getQuestionId(req, res) {
+export async function getRoomChatHistory(req, res) {
   const { roomId } = req.params;
 
   if (!roomId) {
     return res.status(400).json({ error: "Room ID is required" });
   }
 
+  const room = await fetchRoomChatHistory(roomId);
+
+  if (room) {
+    res.status(200).json(room);
+  } else {
+    res.status(404).json({ error: `Room not found for ID: ${roomId}` });
+  }
+}
+
+// Get QuestionId from the room based on the roomId
+export async function getQuestionId(req, res) {
   const questionId = await getQuestionIdByRoomId(roomId);
 
   if (questionId) {

collab-service/app/model/repository.js

@@ -35,17 +35,6 @@ export async function getRoomId(user) {
   }
 }
 
-export async function heartbeat(roomId) {
-  try {
-    const room = await UsersSession.findOne({ roomId: roomId });
-    room.lastUpdated = new Date();
-    await room.save();
-    return room;
-  } catch (error) {
-    console.error("Error updating room ${roomId}:", error);
-    return null;
-  }
-}
 
 export async function getAllRooms() {
   try {
@@ -107,6 +96,15 @@ export async function addMessageToChat(roomId, userId, text) {
   }
 }
 
+export async function fetchRoomChatHistory(roomId) {
+  try {
+    const room = await UsersSession.findOne({ roomId });
+    return room.chatHistory;
+  } catch (error) {
+    console.error("Error finding room chat history:", error);
+  }
+}
+
 export async function getQuestionIdByRoomId(roomId) {
   try {
     const room = await UsersSession.findOne({ roomId });

collab-service/app/model/usersSession-model.js

@@ -15,11 +15,6 @@ const messageSchema = new Schema({
     type: String,
     required: true,
   },
-  // timestamp: {
-  //   type: Date,
-  //   default: Date.now,
-  //   required: true
-  // }
 });
 
 const usersSessionSchema = new Schema({

collab-service/app/routes/collab-routes.js

@@ -2,8 +2,8 @@ import express from "express";
 import {
   createRoom,
   getRoomByUser,
-  updateHeartbeat,
   getAllRoomsController,
+  getRoomChatHistory,
   getQuestionId
 } from "../controller/collab-controller.js";
 
@@ -13,10 +13,10 @@ router.post("/create-room", createRoom);
 
 router.get("/user/:user", getRoomByUser);
 
-router.patch("/heartbeat/:roomId", updateHeartbeat);
-
 router.get("/rooms", getAllRoomsController);
 
+router.get("/chat-history/:roomId", getRoomChatHistory);
+
 router.get("/rooms/:roomId/questionId", getQuestionId);
 
 export default router;