Merge branch 'test-updated-merge' of https://github.com/CS3219-AY2324S1/ay2324s1-course-assessment-g16 into test-updated-merge

Author: Aishwarya Nair

MatchingService/config/config.js

@@ -5,8 +5,8 @@ module.exports = {
   mongodbUri: "mongodb://matching-service-database:27017/peer-prep",
   // mongodbUri: "mongodb://127.0.0.1:27020/peer-prep",
   // mongodbUri: "mongodb://127.0.0.1:27017/peer-prep",
-  rabbitmqUrl: "amqp://rabbitmq:5672",
-  // rabbitmqUrl: "amqp://127.0.0.1:5672",
+  // rabbitmqUrl: "amqp://rabbitmq:5672",
+  rabbitmqUrl: "amqp://127.0.0.1:5672",
   refreshDuration: 3000, // 3 seconds
   waitingDuration: 3000,
   matchingDuration: 57000,

MatchingService/controllers/matchingController.js

@@ -55,7 +55,7 @@ async function getActiveSession(req, res, next) {
 
         }
     } catch (error) {
-        next(error);
+        await res.status(500).json({ sessionId: null })
     }
 }
 
@@ -78,7 +78,7 @@ async function getSession(req, res, next) {
 
         }
     } catch (error) {
-        next(error);
+        await res.status(500).json({ sessionId: null, session: null});
     }
 }
 
@@ -100,7 +100,7 @@ async function endSession(req, res, next) {
 
         }
     } catch (error) {
-        next(error);
+        await res.status(500).json({ status: 'error', message: 'Failed to end session' });
     }
 }
 
@@ -116,7 +116,7 @@ async function cancelMatch(req, res, next) {
 
         }
     } catch (error) {
-        next(error);
+        await res.status(500).json({ message: 'Failed to cancel match' });
     }
 }