Merge branch 'main' into feat/collab-service/ai-chat

Author: dylkaw

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,29 @@ export async function getAllRoomsController(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 { roomId } = req.params;
 
   if (!roomId) {
     return res.status(400).json({ error: "Room ID is required" });
   }
-
   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;

frontend/components/collab/code-editor.tsx

@@ -9,6 +9,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
+import { Button } from "@/components/ui/button";
 import * as Y from "yjs";
 import { WebsocketProvider } from "y-websocket";
 import { MonacoBinding } from "y-monaco";
@@ -42,33 +43,28 @@ const languages: Record<string, LanguageEntry> = {
 export default function CodeEditor({ roomId }: { roomId: string }) {
   const monaco = useMonaco();
   const [language, setLanguage] = useState<string>("Javascript");
+  const [theme, setTheme] = useState<string>("light");
   const ydoc = useMemo(() => new Y.Doc(), []);
   const [editor, setEditor] =
     useState<MonacoEditor.IStandaloneCodeEditor | null>(null);
   const [provider, setProvider] = useState<WebsocketProvider | null>(null);
   const languageMap = useMemo(() => ydoc.getMap("language"), [ydoc]);
 
-  // this effect manages the lifetime of the Yjs document and the provider
   useEffect(() => {
     const provider = new WebsocketProvider(
       "ws://localhost:3002/yjs",
       roomId,
       ydoc
     );
-    console.log(provider);
     setProvider(provider);
     return () => {
       provider?.destroy();
       ydoc.destroy();
     };
   }, [ydoc, roomId]);
 
-  // this effect manages the lifetime of the editor binding
   useEffect(() => {
-    if (provider == null || editor == null) {
-      console.log(provider, editor);
-      return;
-    }
+    if (provider == null || editor == null) return;
     const monacoBinding = new MonacoBinding(
       ydoc.getText(),
       editor.getModel()!,
@@ -80,9 +76,7 @@ export default function CodeEditor({ roomId }: { roomId: string }) {
     };
   }, [ydoc, provider, editor]);
 
-  // Sync language changes across clients
   useEffect(() => {
-    // Update language when languageMap changes
     const handleLanguageChange = () => {
       const newLanguage = languageMap.get("selectedLanguage") as string;
       if (newLanguage && newLanguage !== language) {
@@ -96,7 +90,6 @@ export default function CodeEditor({ roomId }: { roomId: string }) {
     };
   }, [languageMap, language]);
 
-  // Apply language change in the editor model
   useEffect(() => {
     if (editor && monaco) {
       const model = editor.getModel();
@@ -106,6 +99,12 @@ export default function CodeEditor({ roomId }: { roomId: string }) {
     }
   }, [language, editor, monaco]);
 
+  useEffect(() => {
+    if (monaco) {
+      monaco.editor.setTheme(theme === "dark" ? "vs-dark" : "light");
+    }
+  }, [theme, monaco]);
+
   return (
     <div className="w-3/5 p-4">
       <Card className="h-full flex flex-col">
@@ -126,6 +125,12 @@ export default function CodeEditor({ roomId }: { roomId: string }) {
                 ))}
               </SelectContent>
             </Select>
+            <Button
+              onClick={() => setTheme(theme === "light" ? "dark" : "light")}
+              variant={theme === "light" ? "secondary" : "default"}
+            >
+              {theme === "light" ? "Light" : "Dark"} Mode
+            </Button>
           </div>
           <div className="flex-1 h-7/5">
             <Editor
@@ -134,6 +139,7 @@ export default function CodeEditor({ roomId }: { roomId: string }) {
               onMount={(editor) => {
                 setEditor(editor);
               }}
+              theme={theme === "dark" ? "vs-dark" : "light"}
             />
           </div>
         </CardContent>

matching-service/app/logic/matching.py

@@ -135,7 +135,6 @@ async def fetch_random_question(topic: str, difficulty: str) -> str:
         return question_data["id"]
 
 async def create_room(user1: str, user2: str, question_id: str) -> str:
-    logger.debug("Test!")
     async with httpx.AsyncClient() as client:
         response = await client.post(
             f"{COLLAB_SVC_URL}/collab/create-room",