Merge pull request #66 from CS3219-AY2425S1/bug/match-logic

bug/match-logic: Fix matching clause bug

Author: SeeuSim

backend/matching/src/workers/matcher.ts

@@ -133,7 +133,7 @@ async function match() {
       sendNotif([requestorSocketPort], MATCHING_EVENT.MATCHING);
       await redisClient.hSet(getPoolKey(requestorUserId), 'pending', 'false');
 
-      const clause = [`-@userId:(${requestorUserId}) @pending:(true)`];
+      let clause = [`-@userId:(${requestorUserId})`, '@pending:(true)'];
 
       if (difficulty) {
         clause.push(`@difficulty:{${difficulty}}`);
@@ -143,6 +143,9 @@ async function match() {
         clause.push(`@topic:{${topic}}`);
       }
 
+      // Push UserID clause to the back.
+      clause = clause.reverse();
+
       const searchParams = {
         LIMIT: { from: 0, size: 1 },
         SORTBY: { BY: 'timestamp', DIRECTION: 'ASC' },