Fetch Qn by category and complexity

Author: yuxuanleong

Backend/MatchingService/rabbitmq/subscriber.js

@@ -71,7 +71,7 @@ function matchUsers(channel, msg, userId, difficulty, category) {
         const matchedUsers = waitingUsers[criteriaKey].splice(0, 2);
         removeMatchedUsersFromOtherLists(matchedUsers, criteriaKey);
         console.log("waitingusers after strict matching: ", waitingUsers)
-        notifyMatch(channel, matchedUsers, category);
+        notifyMatch(channel, matchedUsers, category, difficulty);
         return true;
     } 
 
@@ -83,7 +83,7 @@ function matchUsers(channel, msg, userId, difficulty, category) {
             const matchedUsers = waitingUsers[categoryKey].splice(0, 2);
             removeMatchedUsersFromOtherLists(matchedUsers, categoryKey);
             console.log("waitingusers after lenient matching: ", waitingUsers)
-            notifyMatch(channel, matchedUsers, category);
+            notifyMatch(channel, matchedUsers, category, difficulty);
             return true;
         }
     }
@@ -102,16 +102,18 @@ function removeMatchedUsersFromOtherLists(matchedUsers, keyToSkip) {
     console.log("waiting users after removing: ", waitingUsers);
 }
 
-async function notifyMatch(channel, matchedUsers, category) {
+async function notifyMatch(channel, matchedUsers, category, complexity) {
     const roomId = uuidv4();
 
     try {
         // Fetch a question from QuestionService based on category
-        const response = await axios.get(`${questionAPIUrl}/by-category`, {
-            params: { category: category }
+        console.log(`fetching question by ${category} ${complexity}`)
+        const response = await axios.get(`${questionAPIUrl}/by-category-and-complexity`, {
+            params: { category: category, complexity: complexity }
         });
 
         const questions = response.data;
+        console.log("questions fetch from db: ", questions)
         const randomIndex = Math.floor(Math.random() * questions.length);
 
         // Notify matched users with the roomId, question, and other details

Backend/QuestionService/controllers/questions.js

@@ -1,14 +1,18 @@
 const questionsRouter = require('express').Router()
 const QuestionModel = require('../models/Questions')
 
-questionsRouter.get("/by-category", async (req, res) => {
-    const { category } = req.query;
+questionsRouter.get("/by-category-and-complexity", async (req, res) => {
+    let { category, complexity } = req.query;
     try {
-        const query = category ? { category: { $in: [new RegExp(`^${category}$`, "i")] } } : {};
+        const query = {}
+        category = category.replace(/-/g, " ");
+        query.category = { $in: [new RegExp(`^${category}$`, "i")] };
+        query.complexity = { $in: [new RegExp(`^${complexity}$`, "i")] };
+
         const questions = await QuestionModel.find(query);
         res.status(200).json(questions);
     } catch (error) {
-        console.error("Error fetching questions by category:", error);
+        console.error("Error fetching questions by category & complexity:", error);
         res.status(500).json({ error: error.message });
     }
 });