Merge pull request #90 from rjkoh/random-question

fix user-service nodemailer import, get random question, fix matching…

Author: Nephelite

backend/matching-service/controllers/matchingController.ts

@@ -94,11 +94,11 @@ export function setupSocketListeners() {
                 }
 
                 if (category === "") {
-                    category = "Any";
+                    category = "all";
                 }
 
                 if (difficulty === "") {
-                    category = "Any";
+                    difficulty = "all";
                 }
 
                 const socketId = socket.id;
@@ -304,8 +304,8 @@ async function handleMatchEvent(
 
             socket1.emit(SOCKET_EVENTS.MATCH_FOUND, {
                 message: `You have been matched with User ID: ${user2.userId}`,
-                category: user1.category || user2.category || "Any",
-                difficulty: user1.difficulty || user2.difficulty || "Any",
+                category: user1.category || user2.category || "all",
+                difficulty: user1.difficulty || user2.difficulty || "all",
                 attemptStartedAt: Date.now(),
                 matchId: matchId,
                 roomId: roomId,
@@ -315,8 +315,8 @@ async function handleMatchEvent(
 
             socket2.emit(SOCKET_EVENTS.MATCH_FOUND, {
                 message: `You have been matched with User ID: ${user1.userId}`,
-                category: user2.category || user1.category || "Any",
-                difficulty: user2.difficulty || user1.difficulty || "Any",
+                category: user2.category || user1.category || "all",
+                difficulty: user2.difficulty || user1.difficulty || "all",
                 attemptStartedAt: Date.now(),
                 matchId: matchId,
                 roomId: roomId,

backend/matching-service/workers/matchWorker.ts

@@ -174,9 +174,9 @@ function getRelaxedCriteria(
                 difficulty: userData.difficulty,
             };
         case 1:
-            return { category: userData.category, difficulty: "Any" };
+            return { category: userData.category, difficulty: "all" };
         case 2:
-            return { category: "Any", difficulty: userData.difficulty };
+            return { category: "all", difficulty: userData.difficulty };
         default:
             return {
                 category: userData.category,
@@ -196,10 +196,10 @@ function isCriteriaSatisfied(
     relaxedCriteria: { category: string; difficulty: string }
 ): boolean {
     const categoryMatch =
-        relaxedCriteria.category === "Any" ||
+        relaxedCriteria.category === "all" ||
         user.category === relaxedCriteria.category;
     const difficultyMatch =
-        relaxedCriteria.difficulty === "Any" ||
+        relaxedCriteria.difficulty === "all" ||
         user.difficulty === relaxedCriteria.difficulty;
     return categoryMatch && difficultyMatch;
 }
@@ -227,8 +227,8 @@ async function handleMatch(user1: any, user2: any) {
         );
         console.log(messagesBefore);
 
-        const category = user1.category || user2.category || "Any";
-        const difficulty = user1.difficulty || user2.difficulty || "Any";
+        const category = user1.category == 'all' ? user2.category : user1.category;
+        const difficulty = user1.difficulty == 'all' ? user2.difficulty : user1.difficulty;
 
         const matchingEvent = new MatchingEventModel({
             category: category,

backend/question-service/controllers/questionsController.ts

@@ -3,6 +3,7 @@ import categoryModel from "../models/Category";
 import { Request, Response, NextFunction } from "express";
 import { EachMessagePayload } from "kafkajs";
 import { producer, QUESTION_TOPIC } from "../utils/kafkaClient";
+import { Types } from "mongoose";
 
 const DIFFICULTIES = ["easy", "medium", "hard"];
 
@@ -238,46 +239,51 @@ async function findSuitableQuestion(categoryName: string, difficulty: string) {
             }
         }
 
-        // If difficulty is "any", return any question from the category
-        if (difficulty.toLowerCase() === "all") {
-            return await questionModel.findOne({
-                ...(category ? { categories: category._id } : {}),
-            });
+        const query: { categories?: Types.ObjectId; difficulty?: RegExp } = {
+            ...(category ? { categories: category._id } : {}),
+        };
+
+        if (difficulty.toLowerCase() !== "all") {
+            query.difficulty = new RegExp(`^${difficulty}$`, "i");
         }
+        console.log(query);
 
-        let question = await questionModel.findOne({
-            ...(category ? { categories: category._id } : {}),
-            difficulty: new RegExp(`^${difficulty}$`, "i"),
-        });
+        // Attempt to find a question with the exact specified difficulty
+        let questions = await questionModel.aggregate([
+            { $match: query },
+            { $sample: { size: 1 } },
+        ]);
 
-        if (question) {
-            return question;
+        if (questions.length > 0) {
+            return questions[0];
         }
 
         const difficultyIndex = DIFFICULTIES.indexOf(difficulty.toLowerCase());
         if (difficultyIndex === -1) {
             throw new Error(`Invalid difficulty level: ${difficulty}`);
         }
 
-        // Find lower difficulty question if exact match is not found
+        // Adjust the search to find the nearest difficulty level, starting with lower levels
         for (let i = difficultyIndex - 1; i >= 0; i--) {
-            question = await questionModel.findOne({
-                ...(category ? { categories: category._id } : {}),
-                difficulty: new RegExp(`^${DIFFICULTIES[i]}$`, "i"),
-            });
-            if (question) {
-                return question;
+            query.difficulty = new RegExp(`^${DIFFICULTIES[i]}$`, "i"); // Case-insensitive exact match for lower difficulty
+            questions = await questionModel.aggregate([
+                { $match: query },
+                { $sample: { size: 1 } },
+            ]);
+            if (questions.length > 0) {
+                return questions[0];
             }
         }
 
-        // Find higher difficulty question if lower difficulty not found
+        // Check higher difficulty levels if lower levels are unavailable
         for (let i = difficultyIndex + 1; i < DIFFICULTIES.length; i++) {
-            question = await questionModel.findOne({
-                ...(category ? { categories: category._id } : {}),
-                difficulty: new RegExp(`^${DIFFICULTIES[i]}$`, "i"),
-            });
-            if (question) {
-                return question;
+            query.difficulty = new RegExp(`^${DIFFICULTIES[i]}$`, "i"); // Case-insensitive exact match for higher difficulty
+            questions = await questionModel.aggregate([
+                { $match: query },
+                { $sample: { size: 1 } },
+            ]);
+            if (questions.length > 0) {
+                return questions[0];
             }
         }