working

Author: anunayajoshi

backend/matching/.env.docker

@@ -5,5 +5,9 @@ EXPRESS_PORT=9004
 MATCHING_DB_HOSTNAME=host.docker.internal
 MATCHING_DB_PORT=6379
 
+USER_SERVER_ENDPOINT=http://localhost:9001
+QUESTION_SERVER_ENDPOINT=http://localhost:9002
+COLLAB_SERVICE_ENDPOINT=http://localhost:9003
+
 # MATCHING_DB_USERNAME=peerprep-match-express
 # MATCHING_DB_PASSWORD=G7jBgyz9wGAFQ5La

backend/matching/.env.local

@@ -5,9 +5,9 @@ EXPRESS_PORT=9004
 MATCHING_DB_HOSTNAME="localhost"
 MATCHING_DB_PORT=6379
 
-USER_SERVER_ENDPOINT="http://localhost:9003"
+USER_SERVER_ENDPOINT="http://localhost:9001"
 QUESTION_SERVER_ENDPOINT="http://localhost:9002"
-COLLAB_SERVER_ENDPOINT="http://localhost:9004"
+COLLAB_SERVER_ENDPOINT="http://localhost:9003"
 
 
 # MATCHING_DB_USERNAME="peerprep-match-express"

backend/matching/README.md

@@ -7,6 +7,9 @@
     docker build \
       -t match-express-local \
       --build-arg port=9004 \
+      --build-arg USER_SERVER_ENDPOINT=http://host.docker.internal:9001 \
+      --build-arg QUESTION_SERVER_ENDPOINT=http://host.docker.internal:9002 \
+      --build-arg COLLAB_SERVICE_ENDPOINT=http://host.docker.internal:9003 \
       -f express.Dockerfile .
     ```
 2. Run this command, from the root folder:

backend/matching/package.json

@@ -19,6 +19,7 @@
   "description": "",
   "dependencies": {
     "async": "^3.2.6",
+    "axios": "^1.7.7",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "env-cmd": "^10.1.0",

backend/matching/src/services/get-match-items.ts

@@ -7,6 +7,13 @@ interface IGetRandomQuestionPayload {
   topic?: string;
 }
 
+
+interface IServiceResponse<T> {
+    success: boolean;
+    data?: T;
+    error?: { message: string };
+  }
+
 interface IQuestion {
   id: number;
   title: string;
@@ -15,25 +22,19 @@ interface IQuestion {
   topic: string[];
 }
 
-interface IServiceResponse<T> {
-  success: boolean;
-  data?: T;
-  error?: { message: string };
-}
-
 interface IMatchItemsResponse {
-  roomId: string;
-  questionId: number;
-  question: IQuestion;
+    roomName: string;
+    questionId: number;
+    question: IQuestion;
 }
 
 export const getMatchItems = async (
-  searchIdentifier: IMatchType,
-  topic?: string,
-  difficulty?: string,
-  userId1?: string,
-  userId2?: string
-): Promise<IServiceResponse<IMatchItemsResponse>> => {
+    searchIdentifier: IMatchType,
+    topic?: string,
+    difficulty?: string,
+    userId1?: string,
+    userId2?: string
+): Promise<IMatchItemsResponse | undefined> => {
   const userEndpoint = `${process.env.USER_SERVER_ENDPOINT}`;
   const questionEndpoint = `${process.env.QUESTION_SERVER_ENDPOINT}`;
   const collabServerEndpoint = `${process.env.COLLAB_SERVER_ENDPOINT}`;
@@ -68,11 +69,11 @@ export const getMatchItems = async (
 
     // Query the question endpoint using the /random endpoint
     const questionResponse = await axios.post<IServiceResponse<{ question: IQuestion }>>(
-      `${questionEndpoint}/random`,
+      `${questionEndpoint}/questions/random`,
       payload
     );
 
-    if (!questionResponse.data.success || !questionResponse.data.data?.question) {
+    if (questionResponse.status !== 200 || !questionResponse.data.data) {
       throw new Error(questionResponse.data.error?.message || 'Failed to get a random question');
     }
 
@@ -85,56 +86,48 @@ export const getMatchItems = async (
     ]);
 
     // Query the collab server for the room ID
-    const roomResponse = await axios.get<IServiceResponse<{ roomId: string }>>(
-      `${collabServerEndpoint}/rooms`,
+    const roomResponse = await axios.get<{ roomName: string }>(
+      `${collabServerEndpoint}/room`,
       {
         params: {
-          userId1,
-          userId2,
-          questionId: questionId.toString(),
+          userid1: userId1,
+          userid2: userId2,
+          questionid: questionId.toString(),
         }
       }
-    );
-
-    if (!roomResponse.data.success || !roomResponse.data.data?.roomId) {
-      throw new Error(roomResponse.data.error?.message || 'Failed to create room');
+    );    
+    if (roomResponse.status !== 200 || !roomResponse.data?.roomName) {
+      throw new Error('Failed to create room');
     }
 
+    console.log("Succesfully got match items");
     return {
-      success: true,
-      data: {
-        roomId: roomResponse.data.data.roomId,
+        roomName: roomResponse.data.roomName,
         questionId: questionId,
         question: questionResponse.data.data.question,
       }
-    };
   } catch (error) {
     console.error('Error in getMatchItems:', error);
-    return {
-      success: false,
-      error: {
-        message: error instanceof Error ? error.message : 'An unknown error occurred',
-      }
-    };
-  }
 };
+}
 
 async function fetchAttemptedQuestions(userEndpoint: string, userId: string): Promise<number[]> {
-  const response = await axios.get<IServiceResponse<{ attemptedQuestions: number[] }>>(
+  const response = await axios.get<number[]>(
     `${userEndpoint}/user/${userId}/attempted-questions`
   );
-  if (!response.data.success || !response.data.data?.attemptedQuestions) {
+  if (response.status !== 200 || !response.data) {
     throw new Error(`Failed to fetch attempted questions for user ${userId}`);
   }
-  return response.data.data.attemptedQuestions;
+  return response.data || []
 }
 
 async function updateAttemptedQuestions(userEndpoint: string, userId: string, questionId: number): Promise<void> {
-  const response = await axios.post<IServiceResponse<{ message: string }>>(
-    `${userEndpoint}/user/${userId}/attempted-question`,
+  const response = await axios.post<unknown>(
+    `${userEndpoint}/user/${userId}/attempt-question`,
     { questionId }
   );
-  if (!response.data.success) {
-    throw new Error(`Failed to update attempted questions for user ${userId}`);
+  if (response.status !== 200 || !response.data) {
+    throw new Error(`Failed to fetch attempted questions for user ${userId}`);
   }
+    return;
 }

backend/matching/src/workers/matcher.ts

@@ -74,7 +74,9 @@ async function processMatch(
       ]);
 
       // Notify both sockets
-      const { ...matchItems } = getMatchItems(searchIdentifier, topic, difficulty, requestorUserId, matchedUserId);
+      const { ...matchItems } = await getMatchItems(searchIdentifier, topic, difficulty, requestorUserId, matchedUserId);
+      logger.info(`matchItems: ${JSON.stringify(matchItems)}`);
+      
       sendNotif([requestorSocketPort, matchedSocketPort], MATCH_SVC_EVENT.SUCCESS, matchItems);
       sendNotif([requestorSocketPort, matchedSocketPort], MATCH_SVC_EVENT.DISCONNECT);
 
@@ -89,6 +91,7 @@ async function processMatch(
 
 async function match() {
   const redisClient = await connectClient(client);
+  
   const stream = await redisClient.xReadGroup(
     STREAM_GROUP,
     STREAM_WORKER,

backend/user/src/routes/auth.ts

@@ -2,7 +2,6 @@ import express from 'express';
 
 import { checkEmailValid, checkUsernameValid, login, logout, register } from '@/controllers/auth';
 import { limiter } from '@/lib/ratelimit';
-import { getAttemptedQuestions, addAttemptedQuestion } from '@/controllers/questions';
 
 const router = express.Router();
 
@@ -12,8 +11,7 @@ router.post('/register', register);
 router.post('/username-valid', checkUsernameValid);
 router.post('/email-valid', checkEmailValid);
 
-router.post('/attempted-questions', getAttemptedQuestions)
-router.post('/attempt-question', addAttemptedQuestion)
+
 router.use(limiter);
 
 export default router;

backend/user/src/routes/user.ts

@@ -0,0 +1,11 @@
+import express from 'express';
+
+import { getAttemptedQuestions, addAttemptedQuestion } from '@/controllers/questions';
+
+
+const router = express.Router();
+
+router.get('/:userId/attempted-questions/', getAttemptedQuestions)
+router.post('/:userId/attempt-question', addAttemptedQuestion)
+
+export default router;

backend/user/src/server.ts

@@ -12,6 +12,7 @@ import { dbConfig, UI_HOST } from '@/config';
 import { db } from '@/lib/db';
 import { logger } from '@/lib/utils';
 import authRoutes from '@/routes/auth';
+import userRoutes from '@/routes/user';
 import authCheckRoutes from '@/routes/auth-check';
 
 const app = express();
@@ -28,6 +29,7 @@ app.use(
 
 app.use('/auth', authRoutes);
 app.use('/auth-check', authCheckRoutes);
+app.use('/user', userRoutes)
 
 // Health Check for Docker
 app.get('/health', (_req, res) => res.status(StatusCodes.OK).send('OK'));

backend/user/src/services/questions/index.ts

@@ -24,7 +24,7 @@ interface IAddAttemptedQuestionResponse {
       const user = await db
         .select({ attemptedQuestions: users.attemptedQuestions })
         .from(users)
-        .where(eq(users.id, userId))
+        .where(eq(users.username, userId))
         .limit(1);
 
       if (user.length === 0) {
@@ -49,14 +49,7 @@ interface IAddAttemptedQuestionResponse {
         .set({
           attemptedQuestions: sql`array_append(${users.attemptedQuestions}, ${questionId})`,
         })
-        .where(eq(users.id, userId));
-  
-      if (result.length === 0) {
-        return {
-          code: StatusCodes.NOT_FOUND,
-          error: new Error('Failed to update user'),
-        };
-      }
+        .where(eq(users.username, userId))
 
       return {
         code: StatusCodes.OK,
@@ -76,7 +69,7 @@ export const getAttemptedQuestionsService = async (userId: string): Promise<IGet
     const result = await db
       .select({ attemptedQuestions: users.attemptedQuestions })
       .from(users)
-      .where(eq(users.id, userId))
+      .where(eq(users.username, userId))
       .limit(1);
 
     if (result.length === 0) {