Merge pull request #61 from CS3219-AY2425S1/release/milestone-4

Author: SeeuSim

backend/matching/src/services/collab.ts

@@ -1,23 +1,12 @@
-import axios from 'axios';
-
-import { PEERPREP_COLLAB_HOST } from '@/config';
+import crypto from 'crypto';
 
 export async function createRoom(
   userId1: string,
   userId2: string,
   questionId: string
 ): Promise<string> {
-  const response = await axios.get<{ roomName: string }>(`${PEERPREP_COLLAB_HOST}/room`, {
-    params: {
-      userid1: userId1,
-      userid2: userId2,
-      questionid: questionId,
-    },
-  });
-
-  if (response.status !== 200 || !response.data?.roomName) {
-    throw new Error('Failed to create room');
-  }
-
-  return response.data.roomName;
+  const combinedString = `uid1=${userId1}|uid2=${userId2}|qid=${questionId}`;
+  const hash = crypto.createHash('sha256');
+  const uniqueRoomName = hash.update(combinedString).digest('hex');
+  return uniqueRoomName;
 }

backend/matching/src/workers/matcher.ts

@@ -149,7 +149,11 @@ async function match() {
       } as const;
       const requestorParams = { requestorUserId, requestorStreamId, requestorSocketPort };
 
-      const exactMatches = await redisClient.ft.search(POOL_INDEX, clause.join(' '), searchParams);
+      const exactMatches = await redisClient.ft.search(
+        POOL_INDEX,
+        clause.reverse().join(' '),
+        searchParams
+      );
       const exactMatchFound = await processMatch(
         redisClient,
         requestorParams,
@@ -186,7 +190,7 @@ async function match() {
       // Match on Difficulty
       const difficultyMatches = await redisClient.ft.search(
         POOL_INDEX,
-        `@difficulty:${difficulty} -@userId:(${requestorUserId})`,
+        `@difficulty:{${difficulty}} -@userId:(${requestorUserId})`,
         searchParams
       );
       const hasDifficultyMatch = await processMatch(

docker-compose.yaml

@@ -42,24 +42,6 @@ services:
       start_period: 30s
       timeout: 10s
 
-  collab-db:
-    hostname: 'collab-db'
-    image: postgres:16.4
-    container_name: 'collab-db'
-    env_file:
-      - ./backend/collaboration/.env.local
-    volumes:
-      - 'collab-db-docker:${COLLAB_PGDATA}'
-    restart: unless-stopped
-    networks:
-      - collab-db-network
-    healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -U peerprep-collab-express -d collab']
-      interval: 10s
-      retries: 5
-      start_period: 30s
-      timeout: 10s
-
   match-db:
     hostname: 'match-db'
     # To enable Admin UI for cluster ↙️
@@ -139,37 +121,6 @@ services:
       retries: 5       
       start_period: 5s
 
-  collab-service:
-    image: 'collab-express'
-    container_name: '${COLLAB_SERVICE_NAME}'
-    build:
-      context: ./backend/collaboration
-      dockerfile: express.Dockerfile
-      target: production
-      args: 
-        # For building with the correct env vars
-        - port=${COLLAB_EXPRESS_PORT}
-    env_file:
-      - ./backend/collaboration/.env.compose
-    environment:
-      # Docker Compose Specific for Service Discovery
-      - EXPRESS_DB_HOST=collab-db
-      - EXPRESS_DB_PORT=5432
-      - PEERPREP_UI_HOST=http://${FRONTEND_SERVICE_NAME}:${FRONTEND_PORT}
-    depends_on:
-      collab-db:
-        condition: service_healthy
-        restart: true
-    networks:
-      - collab-db-network
-      - collab-api-network
-    healthcheck:
-      test: wget --no-verbose --tries=1 --spider http://localhost:${COLLAB_EXPRESS_PORT}/health || exit 1
-      interval: 30s 
-      timeout: 10s   
-      retries: 5       
-      start_period: 5s
-
   matching-service:
     image: 'match-express'
     container_name: '${MATCHING_SERVICE_NAME}'
@@ -189,18 +140,15 @@ services:
       - PEERPREP_UI_HOST=http://${FRONTEND_SERVICE_NAME}:${FRONTEND_PORT}
       - PEERPREP_USER_HOST=http://${USER_SERVICE_NAME}:${USER_EXPRESS_PORT}
       - PEERPREP_QUESTION_HOST=http://${QUESTION_SERVICE_NAME}:${QUESTION_EXPRESS_PORT}
-      - PEERPREP_COLLAB_HOST=http://${COLLAB_SERVICE_NAME}:${COLLAB_EXPRESS_PORT}
     depends_on:
       - match-db
       - user-service
       - question-service
-      - collab-service
     networks:
       - match-db-network
       - match-api-network
       - user-api-network
       - question-api-network
-      - collab-api-network
     healthcheck:
       test: wget --no-verbose --tries=1 --spider http://localhost:${MATCHING_EXPRESS_PORT}/health || exit 1
       interval: 30s 
@@ -225,7 +173,6 @@ services:
     environment:
       - VITE_USER_SERVICE=http://${USER_SERVICE_NAME}:${USER_EXPRESS_PORT}
       - VITE_QUESTION_SERVICE=http://${QUESTION_SERVICE_NAME}:${QUESTION_EXPRESS_PORT}
-      - VITE_COLLAB_SERVICE=http://${COLLAB_SERVICE_NAME}:${COLLAB_EXPRESS_PORT}
       - VITE_MATCHING_SERVICE=http://${MATCHING_SERVICE_NAME}:${MATCHING_EXPRESS_PORT}
       - FRONTEND_PORT=${FRONTEND_PORT}
     depends_on:
@@ -235,16 +182,12 @@ services:
       question-service:
         condition: service_healthy
         restart: true
-      collab-service:
-        condition: service_healthy
-        restart: true
       matching-service:
         condition: service_healthy
         restart: true
     networks:
       - user-api-network
       - question-api-network
-      - collab-api-network
       - match-api-network
 
 volumes:
@@ -253,9 +196,6 @@ volumes:
     external: true
   question-db-docker:
     external: true 
-  # Collab WS Server
-  collab-db-docker:
-    external: true
   # Redis Match server
   match-db-docker:
     external: true
@@ -268,8 +208,6 @@ networks:
     driver: bridge
   match-db-network:
     driver: bridge
-  collab-db-network:
-    driver: bridge
 
   # View-Controller Networks
   user-api-network:
@@ -278,5 +216,3 @@ networks:
     driver: bridge
   match-api-network:
     driver: bridge
-  collab-api-network:
-    driver: bridge