Merge pull request #46 from CS3219-AY2425S1/branch-rubesh-collabInteg…

…ration

Add relevant code for CORS between question-service and matching

peerprep/backend/docker-compose.yaml

@@ -34,4 +34,8 @@ services:
       - "1234:1234"
       - "3003:3003"
     env_file:
-      - ./collab-service/.env
+      - ./collab-service/.env
+
+networks:
+  my-network:
+    driver: bridge

peerprep/backend/matching-service/package.json

@@ -10,6 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "axios": "^1.7.7",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.21.1",

peerprep/backend/matching-service/src/services/queueManager2.ts

@@ -72,6 +72,7 @@ export const getStatus = async (userId: string) => {
     try {
       const sessionID = await getSessionStatus(userId);
       if (sessionID !== null) {
+        // inject the question finder here, and return tgt with sessionID
         return "matched on Session ID: " + sessionID;
       } else {
         const requestStatus = await getRequestStatus(userId);
@@ -85,4 +86,40 @@ export const getStatus = async (userId: string) => {
       console.error('Error in getStatus:', error);
       throw new Error("Failed to retrieve the status of the user's match request");
     }
-}
+}
+
+/*
+export const getStatus = async (userId: string, topic: string, difficulty: string) => {
+  try {
+    const sessionID = await getSessionStatus(userId);
+    if (sessionID !== null) {
+      // Fetch a random question based on topic and difficulty
+      const question = await getRandomQuestionByTopicAndDifficulty(topic, difficulty);
+
+      // If a question is found, return it with the session ID
+      if (question) {
+        return {
+          status: "matched",
+          sessionId: sessionID,
+          question: {
+            id: question.questionId,
+            title: question.title,
+            description: question.description
+          }
+        };
+      } else {
+        return { status: "matched", sessionId: sessionID, question: null };
+      }
+    } else {
+      const requestStatus = await getRequestStatus(userId);
+      if (requestStatus !== null) {
+        return { status: requestStatus };
+      }
+      return { status: "none" };
+    }
+  } catch (error) {
+    console.error('Error in getStatus:', error);
+    throw new Error("Failed to retrieve the status of the user's match request");
+  }
+};
+*/

peerprep/backend/matching-service/src/utils/redisUtils3.ts

@@ -1,4 +1,5 @@
 import { ChainableCommander } from "ioredis";
+import axios from 'axios';
 import connectRedis from "../../config/redis";
 import { Session } from "../models/Session";
 import { Redis } from 'ioredis';
@@ -304,7 +305,7 @@ const createSession = async (
   ): Promise<string> =>{
     const sessionId = "lol";
     try {
-      const sessionId = `${userId1}-${userId2}-${Date.now()}`;
+      let sessionId = `${userId1}-${userId2}-${Date.now()}`;
       const session: Session = {
         sessionId: sessionId,
         userId1,
@@ -313,6 +314,13 @@ const createSession = async (
         difficulty,
         timestamp: Date.now(),
       };
+
+      /* RANDOM QUESTION STARTS HERE @MAHI
+      const randomQuestion = await getRandomQuestionFromQuestionService(topic, difficulty);
+      console.log("Random Question:", randomQuestion?.title);
+      sessionId = sessionId + "Q" + randomQuestion?.title
+      */
+
       await saveSession(session);
       // return sessionId as string
       // convert to string to match the return type
@@ -323,6 +331,19 @@ const createSession = async (
     }
   };
 
+  export const getRandomQuestionFromQuestionService = async (topic: string, difficulty: string) => {
+    try {
+      //const response = await axios.get(`http://localhost:8080/api/questions/random-question`, {
+      const response = await axios.get(`http://question-service:8080/api/questions/random-question`, {
+        params: { topic: topic, difficulty: difficulty }
+      });
+      return response.data;
+    } catch (error) {
+      console.error('Error fetching random question from question-service:', error);
+      throw new Error('Failed to fetch random question from question service');
+    }
+  };
+
 export const findMatchInQueueByTopic = async (
   userId: string
 ): Promise<String | null> => {