Merge remote-tracking branch 'origin/collab-fix' into test-updated-merge

Author: Aishwarya Nair

.gitignore

@@ -1,4 +1 @@
-node_modules
-.vscode
-.gitignore
-.github
+node_modules

CollaborationService/config/config.js

@@ -16,7 +16,11 @@ const SYSTEM_TERMINATE_TIMEOUT = 10 * 1000; // 10 secsS
 module.exports = {
   PORT: 3005,
   serverAddress: "http://collaboration-service:3005",
+<<<<<<< HEAD
   //  serverAddress: "http://127.0.0.1:3005",
+=======
+  // serverAddress: "http://127.0.0.1:3005",
+>>>>>>> origin/collab-fix
   matchingServiceUrl: "http://matching-service:3004",
   // matchingServiceUrl: "http://127.0.0.1:3004",
   questionServiceUrl: "http://question-service:3003/api/questions",

CollaborationService/controllers/collaborationController.js

@@ -5,18 +5,19 @@ async function getHistory(req, res, next) {
     try {
         const sessionId = req.params.sessionId;
 
-        const response = await collaborationService.getCollaborationHistory(sessionId);
+        const response = collaborationService.getCollaborationHistory(sessionId);
 
         if (response[0] === 'None') {
 
             await res.status(500).json({ status: 'error', message: 'Collaboration data does not exist'});
 
         } else {
+
             const jsonRes = {
                 status: "success",
-                initTime: response[0],
-                language: response[1],
-                codes: response[2],
+                initTime: response.initTime,
+                language: response.language,
+                codes: response.codes,
             }
 
             await res.status(200).json(jsonRes);

CollaborationService/database/collaborativeInputDb.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 const {
 	CollaborativeInput,
 	LineInput,
@@ -214,4 +215,150 @@ module.exports = {
 	updateCollaborativeLanguage,
 	deleteCollaborativeInput,
 	deleteCollaborativeLineInput,
-};
+};
+=======
+const CollaborativeInput = require('../models/collaborationCodeModel');
+const axios = require('axios');
+const config = require('../config/config');
+
+const getCollaborativeInput = async(sessionId) => {
+    try {
+        const dataOutput = await CollaborativeInput.findOne({ sessionId: sessionId });
+
+        console.log(`Get collaborative input for session ${sessionId}`);
+
+        return [dataOutput.initTime, dataOutput.language, dataOutput.codes];
+
+    } catch (error) {
+        console.log(`Error getting collaborative input for session ${sessionId}`);
+
+        return ["None", "", ""];
+    }
+}
+
+const getCollaborativeInputByLine = async(sessionId, line) => {
+    try {
+        const dataOutput = await CollaborativeInput.findOne({ sessionId: sessionId, 'codes.line': line });
+
+        console.log(`Get collaborative input for session ${sessionId} line ${line}`);
+
+        return [dataOutput.language, line, dataOutput.codes[line].code];
+
+    } catch (error) {
+        console.error(`Error getting collaborative input by line for session ${sessionId}`);
+
+        return ["None", line, ""];
+    }
+}
+
+const initCollaborativeCode = async(initTime, sessionId, language) => {
+    try {
+        const input = await getCollaborativeInput(sessionId);
+
+        if (input[0] === "None") {
+            const collaborativeInput = new CollaborativeInput(
+                { sessionId: sessionId, initTime: initTime, language: language, codes: [] });
+
+            await collaborativeInput.save();
+
+            console.log(`Successfully added:`, collaborativeInput);
+
+            return [collaborativeInput.initTime, language, []];
+
+        } else {
+            console.log(`Collaborative input already exists for ${sessionId}`);
+
+            return input;
+        }
+
+    } catch (error) {
+        console.log(`Failed to add collaborative input for ${sessionId}`);
+
+        return ["None", ""];
+    }
+}
+
+const updateCollaborativeLineInput = async(sessionId, line, code, lastModifier) => {
+    try {
+        let collaborativeInput = await CollaborativeInput.findOne(
+            { sessionId: sessionId, 'codes.line': line });
+
+        if (collaborativeInput) {
+            await CollaborativeInput.updateOne(
+                { sessionId: sessionId, 'codes.line': line },
+                { $set: { 'codes.$.code': code, 'codes.$.lastModifier': lastModifier } }
+            );
+
+        } else {
+            await CollaborativeInput.updateOne(
+                { sessionId: sessionId },
+                { $push: { codes: { line: line, code: code, lastModifier: lastModifier } } }
+            );
+        }
+
+        console.log(`Successfully updated line:`, line);
+
+    } catch (error) {
+        console.log(`Failed to update collaborative input for ${sessionId} line ${line}`);
+    }
+}
+
+const updateCollaborativeInput = async(sessionId, codes) => {
+    try {
+        let collaborativeInput = await CollaborativeInput.findOne({ sessionId: sessionId });
+        const sessionReq = await axios.get(`${config.matchingServiceUrl}/getSession/${sessionId}`);
+
+        const session = sessionReq.data.session;
+
+        if (collaborativeInput.codes !== null) {
+            collaborativeInput.codes = codes;
+
+        } else {
+            collaborativeInput = new CollaborativeInput({ sessionId: sessionId, initTime: session.initTime, language: session.language, codes: codes });
+        }
+
+        await collaborativeInput.save();
+
+        console.log(`Successfully updated:`, collaborativeInput);
+
+    } catch (error) {
+        console.log(`Failed to update collaborative input for ${sessionId}`);
+    }
+}
+
+const deleteCollaborativeInput = async(sessionId) => {
+    try {
+        const result = await CollaborativeInput.deleteOne({ sessionId: sessionId });
+
+        console.log(`Successfully deleted:`, result);
+
+    } catch (error) {
+        console.log(`Failed to delete collaborative input for ${sessionId}`);
+    }
+}
+
+const deleteCollaborativeLineInput = async(sessionId, line) => {
+    try {
+        const collaborativeInput = await CollaborativeInput.findOne({ sessionId: sessionId });
+
+        collaborativeInput.codes.splice(line, 1);
+
+        await collaborativeInput.save();
+
+        console.log(`Successfully deleted:`, collaborativeInput);
+        
+    } catch (error) {
+        console.log(`Failed to delete collaborative input for ${sessionId} line ${line}`);
+    }
+}
+
+module.exports = {
+    getCollaborativeInput,
+    getCollaborativeInputByLine,
+    initCollaborativeCode,
+    updateCollaborativeLineInput,
+    updateCollaborativeInput,
+    deleteCollaborativeInput,
+    deleteCollaborativeLineInput
+}
+>>>>>>> origin/collab-fix

CollaborationService/models/collaborationCodeModel.js

@@ -1,22 +1,17 @@
-const mongoose = require("mongoose");
+const mongoose = require('mongoose');
 
 const lineInputSchema = new mongoose.Schema({
-	line: Number,
-	code: String,
-	lastModifier: String,
+    line: Number,
+    code: String,
+    lastModifier: String
 });
 
 const collaborativeInputSchema = new mongoose.Schema({
-	sessionId: String,
-	initTime: Number,
-	language: String,
-	codes: [lineInputSchema],
+    sessionId: String,
+    initTime: Number,
+    language: String,
+    codes: [lineInputSchema]
 });
 
-const CollaborativeInput = mongoose.model(
-	"CollaborativeInput",
-	collaborativeInputSchema
-);
-const LineInput = mongoose.model("LineInput", lineInputSchema);
 
-module.exports = {CollaborativeInput, LineInput};
+module.exports = mongoose.model('CollaborativeInput', collaborativeInputSchema);

Frontend/src/Components/Collaboration/CodeEditor.jsx

@@ -1,5 +1,6 @@
 import "./CodeEditor.css";
 import Editor from "@monaco-editor/react";
+<<<<<<< HEAD
 import React, {useState, useEffect} from "react";
 import {getUserId} from "../../User/UserState";
 
@@ -12,6 +13,20 @@ const CodeEditor = ({
 	socket,
 }) => {
 	const OriginalResizeObserver = window.ResizeObserver;
+=======
+import React from "react";
+
+const CodeEditor = ({code, setCode, language, isReadOnly}) => {
+    const OriginalResizeObserver = window.ResizeObserver;
+
+    // Monaco Editor Resize Fix (https://github.com/microsoft/vscode/issues/183324#issuecomment-1575484617)
+    window.ResizeObserver = function (callback) {
+        const wrappedCallback = (entries, observer) => {
+            window.requestAnimationFrame(() => {
+                callback(entries, observer);
+            });
+        };
+>>>>>>> origin/collab-fix
 
 	const [originalCode, setOriginalCode] = useState(code);
 	const [originalLanguage, setOriginalLanguage] = useState(language);
@@ -25,6 +40,7 @@ const CodeEditor = ({
 		}
 	}, [code]);
 
+<<<<<<< HEAD
 	// Monaco Editor Resize Fix (https://github.com/microsoft/vscode/issues/183324#issuecomment-1575484617)
 	window.ResizeObserver = function (callback) {
 		const wrappedCallback = (entries, observer) => {
@@ -115,6 +131,25 @@ const CodeEditor = ({
 			/>
 		</div>
 	);
+=======
+    return (
+        <div className="code-editor">
+            <Editor
+                language={language}
+                theme="vs-light"
+                value={code}
+                onChange={e => {setCode(code)}}
+                options={{
+                    inlineSuggest: true,
+                    fontSize: "16px",
+                    formatOnType: true,
+                    minimap: { enabled: false },
+                    readOnly: isReadOnly 
+                }}
+            />
+        </div>
+    );
+>>>>>>> origin/collab-fix
 };
 
 export default CodeEditor;