Merge pull request #48 from CS3219-AY2425S1/hist

Hist

Author: ketamethane

Backend/.gitignore

@@ -1,6 +1,7 @@
 QuestionService/.env
 user-service/.env
 MatchingService/.env
+HistoryService/.env
 QuestionService/insert_questions_script.py
 
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
@@ -10,6 +11,7 @@ QuestionService/node_modules
 user-service/node_modules
 MatchingService/node_modules
 CollabService/node_modules
+HistoryService/node_modules
 /.pnp
 .pnp.js
 

Backend/CollabService/utils/roomManager.js

@@ -12,9 +12,12 @@ function manageRoom(ws, roomId, userId, type) {
             // userIds -> track users in room
             // matchedUserIds -> check authorized users
             if (!rooms[roomId]) {
-                rooms[roomId] = { sockets: [], userIds: [], matchedUserIds: []};
+                rooms[roomId] = { sockets: [], userIds: [], matchedUserIds: [], startTime: new Date().toISOString()};
             }
 
+            // Broadcast start time to the newly joined user
+            broadcastRoomStartTime(ws, roomId);
+
             console.log(`BEFORE room Info: userIds[${rooms[roomId].userIds}] || matchedusers[${rooms[roomId].matchedUserIds}]`)
 
             const numOfMatchedUsers = rooms[roomId].matchedUserIds.length
@@ -114,6 +117,16 @@ function manageRoom(ws, roomId, userId, type) {
             }
         })
     }
+
+
+    function broadcastRoomStartTime(ws, roomId) {
+        const startTime = rooms[roomId].startTime;
+
+        ws.send(JSON.stringify({
+            type: 'roomStartTime',
+            startTime: startTime
+        }));
+    }
 }
 
 function getRoom(roomId) {

Backend/CollabService/websocket/roomManagerSocket.js

@@ -13,11 +13,11 @@ function setupWebSocket(server) {
             switch (data.type) {
                 case 'joinRoom':
                     // add user into room with roomId
-                    manageRoom(ws, data.roomId, data.userId, "join");
+                    manageRoom(ws, data.roomId, data.username, "join");
                     break;
                 case 'leaveRoom':
                     // remove user from room with roomId
-                    manageRoom(ws, data.roomId, data.userId, "leave");
+                    manageRoom(ws, data.roomId, data.username, "leave");
                     break;
                 case 'requestUserList':
                     const users = getUsersInRoom(data.roomId);

Backend/HistoryService/Dockerfile

@@ -0,0 +1,11 @@
+FROM node:20
+
+WORKDIR /app
+
+COPY package*.json ./
+RUN npm install
+
+COPY . .
+
+EXPOSE 3005
+CMD ["npm", "start"]

Backend/HistoryService/app.js

@@ -0,0 +1,43 @@
+const express = require('express')
+const mongoose = require('mongoose')
+const cors = require('cors')
+const dotenv = require("dotenv")
+const historyRouter = require("./controllers/histories")
+
+dotenv.config()
+
+const app = express()
+app.use(cors())
+app.use(express.json())
+
+const mongoURI = `mongodb+srv://${process.env.DB_USERNAME}:${process.env.DB_PASSWORD}@cs3219.rrxz3.mongodb.net/History-DB?retryWrites=true&w=majority&appName=CS3219`
+mongoose.connect(mongoURI)
+.then(() => console.log('MongoDB connected'))
+.catch(err => console.error('MongoDB connection error:', err));
+
+app.use('/api/histories', historyRouter)
+
+app.get("/", (req, res, next) => {
+    console.log("Sending Greetings!");
+    res.json({
+      message: "Hello World from history-service",
+    });
+  });
+  
+// Handle When No Route Match Is Found
+app.use((req, res, next) => {
+    const error = new Error("Route Not Found");
+    error.status = 404;
+    next(error);
+});
+
+app.use((error, req, res, next) => {
+    res.status(error.status || 500);
+    res.json({
+      error: {
+        message: error.message,
+      },
+    });
+});
+
+module.exports = app

Backend/HistoryService/controllers/histories.js

@@ -0,0 +1,37 @@
+const historyRouter = require('express').Router();
+const HistoryModel = require('../models/Histories');
+
+// Assuming Express.js
+historyRouter.get('/user/:userId', async (req, res) => {
+    const { userId } = req.params;
+    try {
+        const attempts = await HistoryModel.find({ user: userId }); // Fetch by user object ID
+        res.json(attempts);
+    } catch (error) {
+        res.status(500).json({ error: 'Failed to fetch attempt history' });
+    }
+});
+
+
+// Post a new history entry when a user exits a session
+historyRouter.post("/", async (req, res) => {
+    const { user, matchedUsername, questionTitle, startTime, duration, code } = req.body;
+
+    try {
+        const newHistory = new HistoryModel({
+            user,
+            matchedUsername,
+            questionTitle,
+            startTime,
+            duration,
+            code
+        });
+
+        await newHistory.save();
+        res.status(201).json(newHistory);
+    } catch (error) {
+        res.status(500).json({ error: error.message });
+    }
+});
+
+module.exports = historyRouter;

Backend/HistoryService/index.js

@@ -0,0 +1,6 @@
+const app = require('./app')
+
+// Change the port number to listen to a different port but remember to change the port number in frontend too!
+app.listen(3005, () => {
+    console.log("Server is Running")
+})

Backend/HistoryService/models/Histories.js

@@ -0,0 +1,33 @@
+const mongoose = require('mongoose');
+
+const HistorySchema = new mongoose.Schema({
+    user: { 
+        type: mongoose.Schema.Types.ObjectId, 
+        ref: 'User', 
+        required: true // The user for whom this history entry is being created
+    },
+    matchedUsername: { 
+        type: String,
+        required: true
+    },
+    questionTitle: {
+        type: String,
+        required: true
+    },
+    startTime: {
+        type: Date, // Time when the session started
+        default: Date.now
+    },
+    duration: {
+        type: Number, // Duration in minutes for the individual user
+        required: true
+    },
+    code: {
+    type: Number, // Store the code as binary file
+    required: true
+    }
+});
+
+// Create the History model
+const HistoryModel = mongoose.model('History', HistorySchema, 'History');
+module.exports = HistoryModel;