Prevent matching same users after rematch request

Author: ruiqi7

backend/matching-service/src/handlers/matchHandler.ts

@@ -30,13 +30,15 @@ export interface MatchRequestItem {
   languages: string[];
   sentTimestamp: number;
   ttlInSecs: number;
+  rejectedPartnerId?: string;
 }
 
 const matches = new Map<string, Match>();
 
 export const sendMatchRequest = async (
   matchRequest: MatchRequest,
-  requestId: string
+  requestId: string,
+  rejectedPartnerId?: string
 ): Promise<boolean> => {
   const { user, complexities, categories, languages, timeout } = matchRequest;
 
@@ -48,6 +50,7 @@ export const sendMatchRequest = async (
     languages: languages,
     sentTimestamp: Date.now(),
     ttlInSecs: timeout,
+    rejectedPartnerId: rejectedPartnerId,
   };
 
   const sent = await sendRabbitMq(matchItem);

backend/matching-service/src/handlers/websocketHandler.ts

@@ -140,6 +140,7 @@ export const handleWebsocketMatchEvents = (socket: Socket) => {
     MatchEvents.REMATCH_REQUEST,
     async (
       matchId: string,
+      partnerId: string,
       rematchRequest: MatchRequest,
       callback: (result: boolean) => void
     ) => {
@@ -156,7 +157,7 @@ export const handleWebsocketMatchEvents = (socket: Socket) => {
         requestId: requestId,
       });
 
-      const sent = await sendMatchRequest(rematchRequest, requestId);
+      const sent = await sendMatchRequest(rematchRequest, requestId, partnerId);
       if (!sent) {
         socket.emit(MatchEvents.MATCH_REQUEST_ERROR);
       }

backend/matching-service/src/utils/mq_utils.ts

@@ -24,6 +24,13 @@ export const matchUsers = (newRequest: string) => {
       return;
     }
 
+    if (
+      uid === newRequestJson.rejectedPartnerId ||
+      newRequestUid === pendingRequest.rejectedPartnerId
+    ) {
+      continue;
+    }
+
     if (isMatch(newRequestJson, pendingRequest)) {
       matchingRequests.delete(uid);
       createMatch(pendingRequest, newRequestJson);

frontend/src/contexts/MatchContext.tsx

@@ -373,6 +373,7 @@ const MatchProvider: React.FC<{ children?: React.ReactNode }> = (props) => {
     matchSocket.emit(
       MatchEvents.REMATCH_REQUEST,
       matchId,
+      partner?.id,
       rematchRequest,
       (requested: boolean) => {
         clearTimeout(requestTimeout);