Merge pull request #80 from CS3219-AY2324S1/add-timeout-matching-service

Add timeout matching service

Author: wilburrito

MatchingService/src/matching/matching.service.ts

@@ -54,7 +54,7 @@ export function initializeMatchingService(io: Server) {
         user.preferences.category === category
       );
     });
-
+    let timeoutId: NodeJS.Timeout;
     if (matchedUser) {
       // Remove both users from the active list
       removeUserFromActiveList(socket);
@@ -64,6 +64,11 @@ export function initializeMatchingService(io: Server) {
       socket.emit('matchFound', {matchedUserPreferences: matchedUser.preferences, seed: randomSeed});
       matchedUser.socket.emit('matchFound', {matchedUserPreferences: preferences, seed: randomSeed});
     } else {
+      
+      timeoutId = setTimeout(() => {
+        socket.emit('noMatchFound');
+        removeUserFromActiveList(socket);
+      }, 30000);
       // Handle the case when no match is found for the user
       // You can emit a "noMatchFound" event or handle it differently
     }

frontend/src/components/MatchingService/MatchingForm.tsx

@@ -17,16 +17,23 @@ const style = {
   transform: "translate(-50%, -50%)",
   width: "50%",
   display: "flex-wrap",
-  maxHeight: "60%",
+  // Remove or adjust the maxHeight value
+  //maxHeight: "60%",  
   justifyContent: "center",
   textAlign: "center",
   bgcolor: "background.paper",
   border: "2px solid #000",
   boxShadow: 24,
-  overflow: "auto",
   p: 4,
 };
 
+const snackbarStyle = {
+  position: "absolute" as "absolute",
+  top: 3,
+  left: "50%",
+  transform: "translate(-50%, 0)"
+};
+
 
 
 const titleStyle = {
@@ -57,6 +64,7 @@ const MatchingForm = React.forwardRef(function MatchingForm() {
   const { user } = useAuth();
   const userEmail = user?.email;
   const [openSnackbar, setOpenSnackbar] = React.useState(false);
+  const [snackbarMessage, setSnackbarMessage] = React.useState("");
 
   const handleConnect = async () => {
     const preferences = {
@@ -73,6 +81,7 @@ const MatchingForm = React.forwardRef(function MatchingForm() {
     });
 
     if (filteredQuestions.length === 0) {
+      setSnackbarMessage("No questions match the selected difficulty and category.");
       setOpenSnackbar(true);
       return;
     }
@@ -138,6 +147,20 @@ const MatchingForm = React.forwardRef(function MatchingForm() {
     };
   }, [difficulty, category, userEmail, navigate]);
 
+  React.useEffect(() => {
+    socket.on("noMatchFound", () => {
+      console.log("Match Not Found");
+      setIsMatching(false);
+      setSnackbarMessage("No eligible match found within the given timeframe.");
+      setOpenSnackbar(true);
+
+    });
+
+    return () => {
+      socket.off("noMatchFound");
+    };
+  });
+
   return (
     <Box sx={style}>
       <h2 style={titleStyle}>
@@ -188,6 +211,7 @@ const MatchingForm = React.forwardRef(function MatchingForm() {
       )}
 
       <Snackbar
+        style={snackbarStyle}
         open={openSnackbar}
         autoHideDuration={6000}
         onClose={() => setOpenSnackbar(false)}
@@ -198,7 +222,7 @@ const MatchingForm = React.forwardRef(function MatchingForm() {
           severity="warning"
           sx={{ width: "100%" }}
         >
-          No questions match the selected difficulty and category.
+          {snackbarMessage}
         </Alert>
       </Snackbar>
     </Box>