Add dependency on QuestionService to MatchingService

Author: yuxuanleong

Backend/MatchingService/rabbitmq/setup.js

@@ -7,7 +7,7 @@ const dead_letter_queue_name = "dead_letter_queue";
 // const cancel_queue_name = "cancel_queue";
 const difficulties = ["easy", "medium", "hard", "any"];
 const axios = require('axios');
-const categoryAPIUrl = 'http://localhost:3001/api/categories';
+const categoryAPIUrl = 'http://question-service:3001/api/categories';
 
 let queueNamesPromise = axios.get(categoryAPIUrl)
     .then(response => {

Backend/MatchingService/rabbitmq/subscriber.js

@@ -5,7 +5,7 @@ const { notifyUsers } = require('../websocket/websocket');
 const { v4: uuidv4 } = require('uuid');
 // matchingService/fetchQuestion.js
 const axios = require('axios');
-const questionAPIUrl = 'http://localhost:3001/api/questions';
+const questionAPIUrl = 'http://question-service:3001/api/questions';
 
 
 // TODO: Subscribe and acknowledge messages with user info when timeout/user matched
@@ -77,15 +77,19 @@ function matchUsers(channel, msg, userId, difficulty, category) {
 
     // Try matching with category only if no difficulty match is found
     if (waitingUsers[criteriaKey].length < 2) {
-        waitingUsers[categoryKey].push({ userId, msg, channel });
-        console.log(`Fallback: User ${userId} added to ${categoryKey}. Waiting list: ${waitingUsers[categoryKey].length}`);
-        if (waitingUsers[categoryKey].length >= 2) {
-            const matchedUsers = waitingUsers[categoryKey].splice(0, 2);
-            removeMatchedUsersFromOtherLists(matchedUsers, categoryKey);
-            console.log("waitingusers after lenient matching: ", waitingUsers)
-            notifyMatch(channel, matchedUsers, category, difficulty);
-            return true;
-        }
+        // Add a 5-second delay before adding the user to waitingUsers[categoryKey]
+        setTimeout(() => {
+            waitingUsers[categoryKey].push({ userId, msg, channel });
+            console.log(`Fallback: User ${userId} added to ${categoryKey}. Waiting list: ${waitingUsers[categoryKey].length}`);
+    
+            if (waitingUsers[categoryKey].length >= 2) {
+                const matchedUsers = waitingUsers[categoryKey].splice(0, 2);
+                removeMatchedUsersFromOtherLists(matchedUsers, categoryKey);
+                console.log("waitingusers after lenient matching: ", waitingUsers)
+                notifyMatch(channel, matchedUsers, category, difficulty);
+                return true;
+            }
+        }, 5000); // 5-second delay
     }
 
     return false;

Backend/QuestionService/app.js

@@ -26,6 +26,10 @@ app.get("/", (req, res, next) => {
     });
   });
 
+app.get('/health', (req, res) => {
+  res.status(200).json({ status: 'healthy' });
+});
+
 // Handle When No Route Match Is Found
 app.use((req, res, next) => {
     const error = new Error("Route Not Found");

Frontend/src/services/categories.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-const baseCategoryUrl = 'http://localhost:3001/api/categories';
+const baseCategoryUrl = 'http://question-service:3001/api/categories';
 
 export const getAllCategories = async () => {
     console.log("getAllCategories func called")

Frontend/src/services/questions.js

@@ -1,6 +1,6 @@
 import axios from 'axios'
 
-const baseUrl = 'http://localhost:3001/api/questions'
+const baseUrl = 'http://question-service:3001/api/questions'
 
 const getAll = () => {
     const request = axios.get(baseUrl);

docker-compose.yml

@@ -5,6 +5,11 @@ services:
       dockerfile: Dockerfile
     ports:
       - "3001:3001"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://question-service:3001/health"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
   user-service:
     build:
@@ -19,6 +24,9 @@ services:
       dockerfile: Dockerfile
     ports:
       - "8080:8080"
+    depends_on:
+      question-service:
+        condition: service_healthy
 
   collab-service:
     build: