Merge branch 'main' into disable-rejoin-room-frontend

Author: Nephelite

backend/matching-service/controllers/roomController.ts

@@ -1,10 +1,11 @@
+import { AuthenticatedRequest } from "middlewares/auth";
 import roomModel from "../models/RoomSchema";
-import { Request, Response, NextFunction } from "express";
+import { Response, NextFunction } from "express";
 
 const ROOM_LIFESPAN = parseInt(process.env.ROOM_LIFESPAN || "86400000"); // 86400000ms = 1 day
 
 export async function getRoomDetails(
-    request: Request,
+    request: AuthenticatedRequest,
     response: Response,
     next: NextFunction
 ) {
@@ -13,11 +14,14 @@ export async function getRoomDetails(
         console.log(roomId)
         const room = await roomModel.findOne({ roomId });
         if (!room) {
-            throw new Error("Room not found");
+            throw new Error("Room not found.");
+        }
+        if (room.participants.every((participant) => participant !== request.userId)) {
+            throw new Error("Non-matched user cannot enter this room.");
         }
         if (Date.now() - room.createdAt.getTime() > ROOM_LIFESPAN) {
-            throw new Error("Room has expired");
-        } 
+            throw new Error("Room has expired.");
+        }
         response.status(200).json({
             roomId, 
             attemptStartedAt: room.createdAt.getTime(),

backend/question-service/controllers/historyController.ts

@@ -17,12 +17,20 @@ export const getUserHistoryEntries = async (req: any, res: Response) => {
         model: "category",
       },
     });
-    const historyViewModels = historyEntries.map((entry) => {
+    
+    historyEntries.forEach(async (entry) => {
+      if (entry.question === null) {
+        await historyEntryModel.findByIdAndDelete({_id: entry._id});
+      }
+    })
+    
+    const historyViewModels = historyEntries
+    .filter((entry) => !(entry.question === null))
+    .map((entry) => {
       const attemptStartDate = new Date(entry.attemptStartedAt);
       const timeDiffMs = Date.now() - attemptStartDate.getTime();
-
       const isWithin24Hours = timeDiffMs < 86400000; // 1 Day; Same as ROOM_LIFESPAN in MatchingService. Can be different if desired.
-
+      
       return {
         id: entry._id,
         key: entry._id,
@@ -32,6 +40,7 @@ export const getUserHistoryEntries = async (req: any, res: Response) => {
         title: entry.question.title,
         difficulty: entry.question.difficulty,
         topics: entry.question.categories.map((cat: any) => cat.name),
+        description: entry.question.description,
         attemptCodes: entry.attemptCodes.filter((attemptCode) => attemptCode && attemptCode !== ""),
       };
     });
@@ -90,26 +99,6 @@ export const createOrUpdateUserHistoryEntry = async (req: any, res: Response) =>
   }
 };
 
-export const removeRoomIdPresence = async (req: any, res: Response) => {
-  try {
-    const userId = req.userId;
-    const { roomId } = req.params;
-
-    const existingEntries = await historyEntryModel.find({ roomId });
-    const updatedEntries: string[] = [];
-
-    existingEntries.forEach(async (entry) => {
-      entry.roomId = "";
-      await entry.save();
-      updatedEntries.push(entry._id.toString());
-    });
-
-    return res.status(200).json({ updatedEntries });
-  } catch (error) {
-    return res.status(500).json({ error: getErrorMessage(error) });
-  }
-};
-
 export const deleteUserHistoryEntry = async (req: any, res: Response) => {
   try {
     const userId = req.userId;

backend/question-service/controllers/questionsController.ts

@@ -4,6 +4,7 @@ import { Request, Response, NextFunction } from "express";
 import { EachMessagePayload } from "kafkajs";
 import { producer, QUESTION_TOPIC } from "../utils/kafkaClient";
 import { Types } from "mongoose";
+import historyEntryModel from "../models/HistoryEntry";
 
 const DIFFICULTIES = ["easy", "medium", "hard"];
 
@@ -143,6 +144,7 @@ export async function deleteQuestion(
     const { id } = request.params;
 
     try {
+        await historyEntryModel.deleteMany({ question: id });
         const deletedQuestion = await questionModel.findOneAndDelete({
             _id: id,
         });

backend/question-service/routes/historyRoutes.ts

@@ -5,15 +5,13 @@ import {
   deleteUserHistoryEntry,
   deleteUserHistoryEntries,
   deleteAllUserHistoryEntries,
-  removeRoomIdPresence,
 } from "../controllers/historyController";
 import { verifyAccessToken } from "../middlewares/basic-access-control";
 
 const router = express.Router();
 
 router.get("/", verifyAccessToken, getUserHistoryEntries);
 router.post("/", verifyAccessToken, createOrUpdateUserHistoryEntry);
-router.post("/room/:id", verifyAccessToken, removeRoomIdPresence);
 router.delete("/user/:id", verifyAccessToken, deleteUserHistoryEntry);
 router.delete("/user", verifyAccessToken, deleteUserHistoryEntries);
 router.delete("/all", verifyAccessToken, deleteAllUserHistoryEntries);

frontend/src/domain/entities/HistoryEntry.ts

@@ -7,5 +7,6 @@ export interface HistoryEntry {
     title: string;
     difficulty: 'Easy' | 'Medium' | 'Hard';
     topics: string[];
+    description: string;
     attemptCodes: string[];
 }

frontend/src/presentation/components/RecentAttemptsTable.tsx

@@ -8,7 +8,7 @@ import { historyUseCases } from "domain/usecases/HistoryUseCases";
 import { ReactMarkdown } from "./common/ReactMarkdown";
 import TabPane from "antd/es/tabs/TabPane";
 import { useNavigate } from "react-router-dom";
-import { EyeOutlined, TeamOutlined } from "@ant-design/icons"; // Importing additional icons
+import { EyeOutlined, TeamOutlined } from "@ant-design/icons";
 
 const formatDate = (dateString: string): string => {
   const options: Intl.DateTimeFormatOptions = {
@@ -42,7 +42,7 @@ const calculateDuration = (start: string, end: string): string => {
 };
 
 export const RecentAttemptsTable: React.FC = () => {
-  const navigate = useNavigate(); // Initialized navigate
+  const navigate = useNavigate();
 
   // State Definitions
   const [recentAttemptsData, setRecentAttemptsData] = useState<HistoryEntry[]>([]);
@@ -53,6 +53,10 @@ export const RecentAttemptsTable: React.FC = () => {
   const [isModalVisible, setIsModalVisible] = useState<boolean>(false);
   const [currentCodes, setCurrentCodes] = useState<string[]>([]);
 
+  // Modal State for Viewing Description
+  const [isDescriptionModalVisible, setIsDescriptionModalVisible] = useState<boolean>(false);
+  const [currentDescription, setCurrentDescription] = useState<string>('');
+
   // Fetch Recent Attempts on Component Mount
   useEffect(() => {
     fetchRecentAttempts();
@@ -130,6 +134,18 @@ export const RecentAttemptsTable: React.FC = () => {
     setCurrentCodes([]);
   };
 
+  // Function to Show Description Modal
+  const showDescriptionModal = (description: string) => {
+    setCurrentDescription(description);
+    setIsDescriptionModalVisible(true);
+  };
+
+  // Function to Close Description Modal
+  const handleDescriptionModalClose = () => {
+    setIsDescriptionModalVisible(false);
+    setCurrentDescription('');
+  };
+
   // Define Columns for the Table
   const columns: ColumnsType<HistoryEntry> = [
     {
@@ -169,7 +185,11 @@ export const RecentAttemptsTable: React.FC = () => {
       title: 'Title',
       dataIndex: 'title',
       key: 'title',
-      render: (text: string) => <Typography.Text>{text}</Typography.Text>,
+      render: (text: string, record: HistoryEntry) => (
+        <Typography.Link onClick={() => showDescriptionModal(record.description)}>
+          {text}
+        </Typography.Link>
+      ),
     },
     {
       title: 'Difficulty',
@@ -308,6 +328,18 @@ export const RecentAttemptsTable: React.FC = () => {
           <Empty description="No code available" />
         )}
       </Modal>
+
+      <Modal
+        title="Question Description"
+        open={isDescriptionModalVisible}
+        onCancel={handleDescriptionModalClose}
+        footer={null}
+        width={800}
+      >
+        <div style={{ height: '100%', overflow: 'auto', padding: '16px' }}>
+          <ReactMarkdown isReadOnly value={currentDescription} />
+        </div>
+      </Modal>
     </div>
   );
 };