adding cancel endpoint for matching

Author: sembcorpp

backend/matching/src/controllers/cancel-request.ts

@@ -0,0 +1,47 @@
+import { Request, Response } from 'express';
+
+import { client as redisClient } from '../lib/db';
+
+export const cancelMatchRequestController = async (req: Request, res: Response) => {
+  const { userId } = req.body; // Only check for userId
+
+  if (!userId) {
+    return res.status(400).json({ message: 'User ID is required' }); // No need for roomId
+  }
+
+  try {
+    if (!redisClient.isOpen) {
+      await redisClient.connect();
+    }
+
+    // Check pending status using only userId
+    const exists = await redisClient.exists(`match:${userId}`);
+
+    if (exists) {
+      console.log(`Redis key for user ${userId} exists.`);
+    } else {
+      console.error(`Redis key for user ${userId} does NOT exist!`);
+    }
+
+    const pendingStatus = await redisClient.hGet(`match:${userId}`, 'pending');
+    console.log(pendingStatus);
+    const data = await redisClient.hGetAll(`match:${userId}`);
+    console.log(`Data stored in Redis for user ${userId}:`, data);
+
+    if (pendingStatus === 'true') {
+      // Allow cancellation and remove from queue based on userId
+      await redisClient.del(`match:${userId}`);
+      console.log(`User ${userId} has canceled their match.`);
+      return res.status(200).json({ message: 'Match canceled successfully' });
+    } else {
+      // If the match is no longer pending, deny cancellation
+      console.log(`User ${userId} is no longer pending and cannot cancel.`);
+      return res
+        .status(403)
+        .json({ message: 'Match cancellation failed: Request is not pending.' });
+    }
+  } catch (error) {
+    console.error('Error canceling match:', error);
+    return res.status(500).json({ message: 'Server error, please try again later' });
+  }
+};

backend/matching/src/routes/match.ts

@@ -1,9 +1,11 @@
 import { Router } from 'express';
 
+import { cancelMatchRequestController } from '@/controllers/cancel-request';
 import { matchRequestController } from '@/controllers/match-request';
 
 const route = Router();
 
 route.post('/request', matchRequestController);
+route.post('/cancel', cancelMatchRequestController);
 
 export default route;

backend/matching/src/workers/matcher.ts

@@ -58,6 +58,16 @@ async function processMatch(
         continue;
       }
 
+      const setPendingToFalse = async (userId: string) => {
+        await redisClient.hSet(`match:${userId}`, 'pending', 'false');
+        console.log(`User ${userId} is now in MATCHING state, pending set to false.`);
+      };
+
+      await Promise.all([
+        setPendingToFalse(requestorUserId), // Set pending to false for requester
+        setPendingToFalse(matchedUserId), // Set pending to false for matched user
+      ]);
+
       // To block cancellation
       sendNotif([matchedSocketPort], MATCHING_EVENT.MATCHING);
 
@@ -81,7 +91,6 @@ async function processMatch(
         matchedUserId
       );
       logger.info(`Generated Match - ${JSON.stringify(matchItems)}`);
-
       sendNotif([requestorSocketPort, matchedSocketPort], MATCHING_EVENT.SUCCESS, matchItems);
       sendNotif([requestorSocketPort, matchedSocketPort], MATCHING_EVENT.DISCONNECT);