matching service notification

Author: sembcorpp

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

@@ -43,3 +43,34 @@ export const matchRequestController = async (req: Request, res: Response) => {
 
   logQueueStatus(logger, redisClient, `Queue Status Before Matching: <PLACEHOLDER>`);
 };
+
+export const cancelMatchController = async (req: Request, res: Response) => {
+  const { requestId, userId } = req.body;
+
+  if (!requestId && !userId) {
+    return res.status(StatusCodes.UNPROCESSABLE_ENTITY).json('Malformed Request');
+  }
+
+  if (!redisClient || !redisClient.isOpen || !redisClient.isReady) {
+    redisClient = await client.connect();
+  }
+
+  try {
+    // Remove the user from the match queue
+    const queueKey = `matchQueue:${requestId || userId}`;
+    const result = await redisClient.del(queueKey);
+
+    if (result > 0) {
+      logger.info(`Cancelled match request with requestId: ${requestId} or userId: ${userId}`);
+      res.status(StatusCodes.OK).json({ message: 'Match request cancelled successfully.' });
+    } else {
+      logger.warn(`No match request found for requestId: ${requestId} or userId: ${userId}`);
+      res.status(StatusCodes.NOT_FOUND).json({ error: 'No active match request found to cancel.' });
+    }
+  } catch (error) {
+    logger.error('Error cancelling match request:', error);
+    res
+      .status(StatusCodes.INTERNAL_SERVER_ERROR)
+      .json({ error: 'Failed to cancel match request.' });
+  }
+};

backend/matching/src/routes/match.ts

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

backend/matching/src/services/create-notif-socket.ts

@@ -1,4 +1,5 @@
 export const createNotifSocket = (userId: string) => {
-  // TODO: Assign proper socket room
-  return userId;
+  const dateString = Date.now().toString(36);
+  const roomId = `${userId}_${dateString}`;
+  return roomId;
 };

backend/matching/src/ws.ts

@@ -7,17 +7,33 @@ export const createWs = (server: ReturnType<(typeof http)['createServer']>) => {
   io.on('connection', (socket) => {
     logger.info(`${socket.id} connected`);
 
-    socket.on('joinRoom', (room) => {
-      socket.join(room);
-      logger.info(`Client joined room: ${room}`);
-      socket.to(room).emit('message', `A new user has joined room: ${room}`);
+    socket.on('joinRoom', (roomId) => {
+      if (!roomId) {
+        logger.warn('joinRoom event received without a roomId');
+        return;
+      }
+      socket.join(roomId);
+      logger.info(`Socket ${socket.id} joined room: ${roomId}`);
+      socket.emit('joinedRoom', roomId);
     });
     // socket.on('create', (room) => {
     //   socket.join(room);
     // });
+    socket.on('cancelRoom', (roomId) => {
+      if (roomId) {
+        io.in(roomId).socketsLeave(roomId);
+        logger.info(`Room ${roomId} has been cancelled and closed.`);
+        socket.emit('roomCancelled', roomId);
+      } else {
+        logger.warn('No room ID provided for cancellation');
+      }
+    });
     socket.on('leave', (room) => {
       socket.leave(room);
     });
+    socket.on('disconnect', () => {
+      logger.info(`Client disconnected: ${socket.id}`);
+    });
   });
   return io;
 };