Resolve merge conflict.

Author: laihuiqi

CollaborationService/client-side/client.js

@@ -144,6 +144,22 @@ const updateCollaborativeInput = async (sessionId, codes) => {
 	}
 };
 
+const updateInitTime = async (sessionId, initTime) => {
+	try {
+		const collaborativeInput = await CollaborativeInput.findOne({
+			sessionId: sessionId,
+		});
+
+		collaborativeInput.initTime = initTime;
+
+		await collaborativeInput.save();
+
+		console.log(`Successfully updated:`, collaborativeInput);
+	} catch (error) {
+		console.log(`Failed to update init time for ${sessionId}`);
+	}
+}
+
 const updateCollaborativeLanguage = async (sessionId, language) => {
 	try {
 		let collaborativeInput = await CollaborativeInput.findOne({
@@ -212,6 +228,7 @@ module.exports = {
 	getCollaborativeInput,
 	getCollaborativeInputByLine,
 	initCollaborativeCode,
+	updateInitTime,
 	updateCollaborativeLineInput,
 	updateCollaborativeInput,
 	updateCollaborativeLanguage,

CollaborationService/client-side/index.html

@@ -1,5 +1,6 @@
 const {
 	initCollaborativeCode,
+	updateInitTime,
 	updateCollaborativeInput,
 	updateCollaborativeLineInput,
 	updateCollaborativeLanguage,
@@ -13,6 +14,7 @@ let initSession = new Map();
 let sessionTracker = new Map();
 
 const startCollaboration = async (socket, io) => {
+	console.log(`Starting collaboration for socket ${socket.id}`);
 	const collaborationSessionExist = await verifyCurrentSession(
 		socket.handshake.query.sessionId,
 		socket.handshake.query.userId
@@ -62,6 +64,7 @@ const startCollaboration = async (socket, io) => {
 				initSession.get(sessionId)[0],
 				initSession.get(sessionId)[1]
 			);
+			await updateInitTime(sessionId, initSession.get(sessionId)[0]);
 			timerDelay = 1000;
 		} else {
 			console.log(`init session ${sessionId}`);