Merge branch 'merge-services' into test-updated-merge

Author: Aishwarya Nair

CollaborationService/controllers/collaborationController.js

@@ -1,4 +1,5 @@
 const collaborationService = require('../services/collaborationService');
+const collaborationDB = require('../database/collaborativeInputDb');
 
 async function getHistory(req, res, next) {
     try {
@@ -28,6 +29,28 @@ async function getHistory(req, res, next) {
     }
 }
 
+async function deleteHistory(req, res, next) {
+    try {
+        const sessionId = req.params.sessionId;
+
+        const response = await collaborationDB.deleteCollaborativeInput(sessionId);
+
+        if (!response) {
+            
+            await res.status(500).json({ status: 'error', message: 'Collaboration data does not exist'});
+
+        } else {
+            await res.status(200).json({ status: 'success', message: 'Collaboration data deleted'});
+        }
+
+    } catch (error) {
+        console.log(error);
+
+        await res.status(500).json({ status: 'error', message: error })
+    }
+}
+
 module.exports = {
     getHistory,
+    deleteHistory,
 };

CollaborationService/routes/collaborationRoute.js

@@ -2,6 +2,12 @@ const express = require('express');
 const router = express.Router();
 const controller = require('../controllers/collaborationController');
 
+router.get('/', (req, res) => {
+    res.status(200).send('<h1>Collaboration Service is up!</h1>');
+});
+
 router.get('/getCollaborationHistory/:sessionId', controller.getHistory);
 
+router.delete('/deleteSessionHistory/:sessionId', controller.deleteHistory);
+
 module.exports = router;

CommunicationService/server.js

@@ -15,12 +15,12 @@ const io = new Server(server, {
   });
 
 app.use(cors());
-app.use(express.static(__dirname + '/services')); // change after done to app.use(express.static(__dirname);
+app.use(express.static(__dirname)); 
 app.use(express.urlencoded({ extended: true })); // use express's built-in middleware
 app.use(express.json()); // This is the middleware to handle JSON payloads
 
 app.get('/', (req, res) => {
-  res.sendFile(join(__dirname, 'services', 'index.html'));
+  res.status(200).send('<h1>Communication service is up!</h1>');
 });
 
 io.on('connection', async(socket) => {

GptService/routes/gptRoute.js

@@ -2,6 +2,10 @@ const express = require('express');
 const router = express.Router();
 const controller = require('../controllers/gptController');
 
+router.get('/', (req, res) => {
+    res.status(200).send('<h1>GPT Service is up!</h1>');
+});
+
 router.post('/generate', controller.getResponse);
 
 router.delete('/exitGpt/:userId', controller.exitSession);

MatchingService/routes/matchingRoute.js

@@ -2,6 +2,10 @@ const express = require('express');
 const router = express.Router();
 const controller = require('../controllers/matchingController');
 
+router.get('/', (req, res) => {
+    res.status(200).send('<h1>Matching Service is up!</h1>');
+});
+
 router.post('/home/:userId', controller.findMatch);
 
 router.get('/getMatchSession/:userId', controller.getActiveSession);

QuestionService/controllers/questionController.js

@@ -26,7 +26,7 @@ const getMatchQuestion = async (req, res) => {
     if (language === "SQL") {
       actualLanguage = "SQL";
     } else {
-      actualLanguage = "Other Languages";
+      actualLanguage = language;
     }
     aggregationPipeline.push({ $match: { language: actualLanguage } });
   }