logic for matching works, but state not being updated

Author: charltonator

MatchingService/src/matching/matching.service.ts

@@ -1,5 +1,6 @@
 import { Server, Socket } from 'socket.io';
 
+
 // Your existing matching service logic
 export function initializeMatchingService(io: Server) {
   // Maintain an array to store active users seeking a match
@@ -27,7 +28,23 @@ export function initializeMatchingService(io: Server) {
   });
 
   function tryMatchForUser(socket: Socket, preferences: any) {
-    const { difficulty, category } = preferences;
+
+    // const getQuestions = async () => {
+    //   const questions = await getAllQuestions();
+    //   const filteredQuestions = questions.data.filter((q: any) =>
+    //       q.difficulty === difficulty && q.categories.includes("Strings"));
+    //   console.log(questions)
+    //   const randomIndex = Math.floor(Math.random() * filteredQuestions.length);
+    //   const selectedQuestion = filteredQuestions[randomIndex];
+    //   console.log(selectedQuestion)
+    //   if (!selectedQuestion) {
+    //       return 1
+    //   }
+    //   const selectedId = selectedQuestion.id;
+    //   return selectedId
+
+
+    const { difficulty, category} = preferences;
 
     // Iterate through active users to find a match
     const matchedUser = activeUsers.find((user) => {
@@ -42,10 +59,10 @@ export function initializeMatchingService(io: Server) {
       // Remove both users from the active list
       removeUserFromActiveList(socket);
       removeUserFromActiveList(matchedUser.socket);
-
+      const randomSeed = Date.now();
       // Emit "matchFound" to both users
-      socket.emit('matchFound', matchedUser.preferences);
-      matchedUser.socket.emit('matchFound', preferences);
+      socket.emit('matchFound', {matchedUserPreferences: matchedUser.preferences, seed: randomSeed});
+      matchedUser.socket.emit('matchFound', {matchedUserPreferences: preferences, seed: randomSeed});
     } else {
       // Handle the case when no match is found for the user
       // You can emit a "noMatchFound" event or handle it differently

QuestionService/javascript/question/question.service.js

@@ -49,8 +49,7 @@ function addQuestion(question) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             let questionDoc = question;
-            const docRef = (0, firestore_1.doc)(exports.db, "questions", question.title);
-            yield (0, firestore_1.setDoc)(docRef, questionDoc);
+            const docRef = yield (0, firestore_1.addDoc)((0, firestore_1.collection)(exports.db, "questions"), questionDoc);
             for (let i = 0; i < question.examples.length; i++) {
                 const add = (0, firestore_1.setDoc)((0, firestore_1.doc)(docRef, "examples", (i + 1).toString()), question.examples[i]);
             }

frontend/src/components/MatchingService/MatchingForm.tsx

@@ -7,6 +7,10 @@ import FormControl from '@mui/material/FormControl';
 import Select, { SelectChangeEvent } from '@mui/material/Select';
 import { useNavigate } from 'react-router-dom'; // Import useNavigate for redirection
 import socket from './socket';
+import { getAllQuestions } from '../../api/questions/data';
+import { useAuth } from '../../auth/auth.context'
+import { sha256 } from "js-sha256";
+
 
 const style = {
     position: 'absolute' as 'absolute',
@@ -26,21 +30,27 @@ const style = {
 };
 
 const MatchingForm = React.forwardRef(function MatchingForm() {
-    const [difficulty, setDifficulty] = React.useState('');
-    const [category, setCategory] = React.useState('');
+    const [difficulty, setDifficulty] = React.useState('Easy');
+    const [category, setCategory] = React.useState('Strings');
     const [isMatching, setIsMatching] = React.useState(false); // Track matching state
     const navigate = useNavigate(); // Get navigate for redirection
-
+    const { user } = useAuth();
+    const userEmail = user?.email
     const handleDiffChange = (event: SelectChangeEvent) => {
+   
         setDifficulty(event.target.value);
+   
     };
 
     const handleCatChange = (event: SelectChangeEvent) => {
+     
         setCategory(event.target.value);
+  
     };
 
     const handleConnect = () => {
         const preferences = {
+            userEmail,
             difficulty,
             category,
         };
@@ -52,21 +62,54 @@ const MatchingForm = React.forwardRef(function MatchingForm() {
         setIsMatching(true);
     };
 
+
+    const generateConsistentRandomIndex = (seed: any, arrayLength: number) => {
+        // This is a simple example. In real-world scenarios, consider a more complex and predictable pseudo-random function
+        return seed % arrayLength;
+    }
     // Handle the "matchFound" event from the server
+    const getQuestions = async (seed: any) => {
+        const questions = await getAllQuestions();
+        console.log(difficulty)
+        console.log(category)
+        const filteredQuestions = questions.data.filter((q: any) => {
+            // console.log(difficulty);
+            // console.log(q.difficulty);
+            return  q.categories.includes(category) && q.difficulty === difficulty
+            
+        }); 
+        
+        const randomIndex = generateConsistentRandomIndex(seed, filteredQuestions.length)
+        console.log(randomIndex)
+        const selectedQuestion = filteredQuestions[randomIndex];
+        console.log(selectedQuestion)
+        if (!selectedQuestion) {
+            return 1
+        }
+        const selectedId = selectedQuestion.id;
+        return selectedId
+    }
     React.useEffect(() => {
-        socket.on('matchFound', (matchedUserPreferences) => {
+        socket.on('matchFound', async (matchedUserPreferences) => {
             // Handle the matched user's preferences here
             console.log('Match Found:', matchedUserPreferences);
+            const seed = matchedUserPreferences.seed;
+            const matchedUser = matchedUserPreferences.matchedUserPreferences;
+            console.log(seed)
             setIsMatching(false); // Set matching state to false
             // Redirect to the question page with the code editor
-            navigate('/question'); // Update the route as needed
+            const qId = await getQuestions(seed);
+            const hashedEmailOne = sha256(userEmail || "");
+            const hashedEmailTwo = sha256(matchedUser.userEmail)
+            navigate(`/collab/question/${qId}/${hashedEmailOne}/${hashedEmailTwo}`); // Update the route as needed
+            
         });
 
         // Clean up the event listener when the component unmounts
         return () => {
             socket.off('matchFound');
         };
-    }, [navigate]);
+    }, []);
 
     return (
         <Box sx={style}>
@@ -79,6 +122,7 @@ const MatchingForm = React.forwardRef(function MatchingForm() {
                     id="demo-simple-select-helper"
                     value={difficulty}
                     label="Difficulty"
+                    
                     onChange={handleDiffChange}
                 >
                     <MenuItem value="">
@@ -101,8 +145,8 @@ const MatchingForm = React.forwardRef(function MatchingForm() {
                     <MenuItem value="">
                         <em>None</em>
                     </MenuItem>
-                    <MenuItem value={'Algo'}>Algo</MenuItem>
-                    <MenuItem value={'ML'}>ML</MenuItem>
+                    <MenuItem value={'Strings'}>Strings</MenuItem>
+                    <MenuItem value={'Algorithms'}>Algorithms</MenuItem>
                 </Select>
             </FormControl>
             {isMatching ? (