Revert "Add confirmMatch event"

This reverts commit 8e2f51e.

Author: evanyan13

backend/gateway-service/package-lock.json

@@ -34,8 +34,7 @@
     "ioredis": "^5.4.1",
     "passport-jwt": "^4.0.1",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "^7.8.1",
-    "uuid": "^10.0.0"
+    "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@nestjs/cli": "^10.0.0",
@@ -45,7 +44,6 @@
     "@types/jest": "^29.5.2",
     "@types/node": "^20.3.1",
     "@types/supertest": "^2.0.12",
-    "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.42.0",

backend/gateway-service/package.json

@@ -18,10 +18,10 @@ import {
   MATCH_CONFIRMED,
   MATCH_TIMEOUT,
   MATCH_REQUESTED,
+  MATCH_ERROR,
   EXCEPTION,
 } from './match.event';
-import { CANCEL_MATCH, CONFIRM_MATCH, FIND_MATCH } from './match.message';
-import { v4 as uuidv4 } from 'uuid';
+import { CANCEL_MATCH, FIND_MATCH } from './match.message';
 
 @WebSocketGateway({
   namespace: '/match',
@@ -35,15 +35,6 @@ import { v4 as uuidv4 } from 'uuid';
 export class MatchGateway implements OnGatewayInit {
   @WebSocketServer() server: Server;
   private userSockets: Map<string, string> = new Map();
-  private matchConfirmations: Map<
-    string,
-    {
-      user1: string;
-      user2: string;
-      user1Confirmed: boolean;
-      user2Confirmed: boolean;
-    }
-  > = new Map();
 
   constructor(
     @Inject('MATCHING_SERVICE') private matchingClient: ClientProxy,
@@ -54,9 +45,7 @@ export class MatchGateway implements OnGatewayInit {
   afterInit() {
     // Subscribe to Redis Pub/Sub for match notifications
     this.redisService.subscribeToMatchEvents((matchedUsers) => {
-      const matchId = this.generateMatchId(); // Generate matchId
-      this.notifyUsersMatchFound(matchId, matchedUsers); // Notify users of match with matchId
-      this.trackMatchConfirmation(matchId, matchedUsers); // Track match confirmation
+      this.notifyUsersWithMatch(matchedUsers);
     });
 
     this.redisService.subscribeToTimeoutEvents((timedOutUsers) => {
@@ -74,7 +63,7 @@ export class MatchGateway implements OnGatewayInit {
       !payload.selectedTopic ||
       !payload.selectedDifficulty
     ) {
-      client.emit(EXCEPTION, 'Invalid payload for match request.');
+      client.emit(EXCEPTION, 'Invalid match request payload.');
       return;
     }
 
@@ -106,7 +95,10 @@ export class MatchGateway implements OnGatewayInit {
     @MessageBody() payload: { userId: string },
   ) {
     if (!payload.userId) {
-      client.emit(EXCEPTION, 'Invalid userId.');
+      client.emit(
+        EXCEPTION,
+        'Invalid userId. Please check your payload and try again.',
+      );
       return;
     }
 
@@ -133,45 +125,36 @@ export class MatchGateway implements OnGatewayInit {
     }
   }
 
-  @SubscribeMessage(CONFIRM_MATCH)
-  async handleConfirmMatch(
-    @ConnectedSocket() client: Socket,
-    @MessageBody() payload: { userId: string; matchId: string },
-  ) {
-    if (!payload.userId || !payload.matchId) {
-      client.emit(EXCEPTION, 'Invalid message payload for match confirmation.');
-      return;
-    }
-
-    const { userId, matchId } = payload;
-    if (!this.validateUserId(client, userId)) {
-      return;
-    }
-
-    // Get the confirmation state of the users
-    const confirmationState = this.matchConfirmations.get(matchId);
-    if (!confirmationState) {
-      client.emit(EXCEPTION, 'Invalid Match Id.');
-      return;
-    }
-
-    // Checks which user is confirming the match
-    if (confirmationState.user1 === payload.userId) {
-      confirmationState.user1Confirmed = true;
-    } else if (confirmationState.user2 === payload.userId) {
-      confirmationState.user2Confirmed = true;
-    } else {
-      client.emit(EXCEPTION, 'Invalid userId for this match.');
-      return;
+  // Notify both matched users via WebSocket
+  notifyUsersWithMatch(matchedUsers: string[]) {
+    const [user1, user2] = matchedUsers;
+    const user1SocketId = this.getUserSocketId(user1);
+    const user2SocketId = this.getUserSocketId(user2);
+    if (user1SocketId && user2SocketId) {
+      this.server.to(user1SocketId).emit(MATCH_FOUND, {
+        message: `You have been matched with user ${user2}`,
+        matchedUserId: user2,
+      });
+      this.server.to(user2SocketId).emit(MATCH_FOUND, {
+        message: `You have been matched with user ${user1}`,
+        matchedUserId: user1,
+      });
     }
+  }
 
-    // Check if both users have confirmed
-    if (confirmationState.user1Confirmed && confirmationState.user2Confirmed) {
-      this.notifyUsersMatchConfirmed(payload.matchId, confirmationState);
-    }
+  notifyUsersWithTimeout(timedOutUsers: string[]) {
+    timedOutUsers.forEach((user) => {
+      const socketId = this.getUserSocketId(user);
+      if (socketId) {
+        this.server.to(socketId).emit(MATCH_TIMEOUT, {
+          message: `You have been timed out.`,
+          timedOutUserId: user,
+        });
+      }
+    });
   }
 
-  async handleConnect(@ConnectedSocket() client: Socket) {
+  async handleConnection(@ConnectedSocket() client: Socket) {
     const id = client.handshake.query.userId as string;
 
     if (!id) {
@@ -200,8 +183,10 @@ export class MatchGateway implements OnGatewayInit {
         return;
       }
 
-      this.userSockets.set(id as string, client.id);
-      console.log(`User ${id} connected with socket ID ${client.id}`);
+      if (id) {
+        this.userSockets.set(id as string, client.id);
+        console.log(`User ${id} connected with socket ID ${client.id}`);
+      }
     } catch (error) {
       this.emitExceptionAndDisconnect(client, error.message);
       return;
@@ -245,73 +230,6 @@ export class MatchGateway implements OnGatewayInit {
     }
   }
 
-  trackMatchConfirmation(matchId: string, matchedUsers: string[]) {
-    const confirmationState = {
-      user1: matchedUsers[0],
-      user2: matchedUsers[1],
-      user1Confirmed: false,
-      user2Confirmed: false,
-    };
-
-    this.matchConfirmations.set(matchId, confirmationState);
-  }
-
-  notifyUsersMatchFound(matchId: string, matchedUsers: string[]) {
-    const [user1, user2] = matchedUsers;
-    const user1SocketId = this.getUserSocketId(user1);
-    const user2SocketId = this.getUserSocketId(user2);
-    if (user1SocketId && user2SocketId) {
-      this.server.to(user1SocketId).emit(MATCH_FOUND, {
-        message: `You have been matched with user ${user2}`,
-        matchId,
-      });
-      this.server.to(user2SocketId).emit(MATCH_FOUND, {
-        message: `You have been matched with user ${user1}`,
-        matchId,
-      });
-    }
-  }
-
-  notifyUsersWithTimeout(timedOutUsers: string[]) {
-    timedOutUsers.forEach((user) => {
-      const socketId = this.getUserSocketId(user);
-      if (socketId) {
-        this.server.to(socketId).emit(MATCH_TIMEOUT, {
-          message: `You have been timed out.`,
-          timedOutUserId: user,
-        });
-      }
-    });
-  }
-
-  notifyUsersMatchConfirmed(matchId: string, confirmationState: any) {
-    const user1SocketId = this.getUserSocketId(confirmationState.user1);
-    const user2SocketId = this.getUserSocketId(confirmationState.user2);
-
-    const sessionId = this.generateSessionId(); // TODO - To be substituted with collab-service method in next MS
-
-    if (user1SocketId && user2SocketId) {
-      this.server.to(user1SocketId).emit(MATCH_CONFIRMED, {
-        message: 'Both users have confirmed the match.',
-        sessionId,
-      });
-      this.server.to(user2SocketId).emit(MATCH_CONFIRMED, {
-        message: 'Both users have confirmed the match.',
-        sessionId,
-      });
-    }
-
-    this.matchConfirmations.delete(matchId);
-  }
-
-  private generateMatchId(): string {
-    return uuidv4();
-  }
-
-  private generateSessionId(): string {
-    return uuidv4();
-  }
-
   private getUserSocketId(userId: string): string | undefined {
     return this.userSockets.get(userId);
   }

backend/gateway-service/src/modules/match/match.controller.ts

@@ -1,3 +1,2 @@
 export const FIND_MATCH = 'findMatch';
 export const CANCEL_MATCH = 'cancelMatch';
-export const CONFIRM_MATCH = 'confirmMatch';