feature/match: Add request ID to prep for cancellation logic

Signed-off-by: SeeuSim <[email protected]>

Author: SeeuSim

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

@@ -19,17 +19,24 @@ export const matchRequestController = async (req: Request, res: Response) => {
 
   // TODO: Assign a proper socket to the user
   const socketRoom = createNotifSocket(userId);
+  const timestamp = `${Date.now()}`;
 
-  // TODO: Test if room logic works and notif socket can connect
   // Send socket to user first for them to subscribe
   res
     .status(StatusCodes.OK)
     .json({
       socketPort: socketRoom,
+      requestId: timestamp, // Queue ID
     })
     .end();
 
   // TODO: Wait for user to connect to notif socket, or add a time buffer
 
-  await queueingService(redisClient, { userId, difficulty, topic, socketPort: socketRoom });
+  await queueingService(redisClient, {
+    userId,
+    difficulty,
+    topic,
+    socketPort: socketRoom,
+    timestamp,
+  });
 };

backend/matching/src/lib/utils/get-redis-payload.ts

@@ -1,6 +1,6 @@
 import type { IPoolTicket } from '@/types';
 
-export const getRedisPayload = (payload: Omit<IPoolTicket, 'timestamp'>) => {
+export const getRedisPayload = (payload: IPoolTicket) => {
   const { topic, difficulty, ...rest } = payload;
   // eslint-disable-next-line  @typescript-eslint/no-empty-object-type
   const difficultyField: { difficulty: string } | {} = difficulty ? { difficulty } : {};
@@ -10,6 +10,5 @@ export const getRedisPayload = (payload: Omit<IPoolTicket, 'timestamp'>) => {
       ? { topic: topic.join(',') }
       : { topic }
     : {};
-  const timestamp = `${Date.now()}`;
-  return { ...rest, ...topicField, ...difficultyField, timestamp };
+  return { ...rest, ...topicField, ...difficultyField };
 };

backend/matching/src/types/index.ts

@@ -13,12 +13,10 @@ export type IRequestMatchPayload = {
 export type IQueueRequest = Partial<Pick<IRequestMatchPayload, 'topic' | 'difficulty'>> &
   Pick<IRequestMatchPayload, 'userId'> & {
     socketPort: string;
+    timestamp: string;
   };
 
-export type IPoolTicket = IQueueRequest & {
-  socketPort: string;
-  timestamp: string;
-};
+export type IPoolTicket = IQueueRequest;
 
 export type IRedisClient = Awaited<ReturnType<(typeof client)['connect']>>;