Integrate collaboration service with matching service

backend/collaboration-service/.env.sample

@@ -1,12 +1,11 @@
 # Port numbers
-PORT = 5003
-SOCKET_PORT = 8000
+PORT=5003
 
 # Firebase
-PRIVATE_KEY =
+PRIVATE_KEY=
 
 # Rabbit MQ
-RABBIT_PASSWORD =
+RABBIT_PASSWORD=
 
 # Service URL
-URL_QUESTION_SERVICE =
+URL_QUESTION_SERVICE=

backend/collaboration-service/handler/socketHandler.js

@@ -1,33 +1,36 @@
 // Author(s): Xue Ling, Xiu Jia
-const { createMatch } = require("../controller/matchController");
 const { getRandomQuestion, getComplexity } = require("../service/questionService");
 
+let socketMap = {};
+
 const handleSocketIO = (io) => {
   io.on("connection", (socket) => {
     console.log(`A user connected with socket ID: ${socket.id}`);
 
-    // Temporary in here because no match service right now
-    socket.on("match_found", async (data) => {
+    socket.on("createSocketRoom", async ({ data, id, currentUser }) => {
+      // Store the socket id for the user
+      socketMap[currentUser] = socket.id;
+
       const { user1, user2 } = data;
-      const { roomId } = await createMatch(user1, user2);
 
       const complexity = getComplexity(user1, user2);
 
       const questionData = await getRandomQuestion(user1.category, complexity);
 
-      socket.join(roomId);
+      socket.join(id);
+
+      console.log(`User with socket ID ${socket.id} joined room with ID ${id}`);
 
-      socket.emit("readyForCollab", { 
-        roomId,
+      socket.emit("readyForCollab", {
+        id: id,
         user1,
         user2,
         questionData
-       });
-      console.log(`User with socket ID ${socket.id} joined room with ID ${roomId}`);
+      });
     });
 
-    socket.on("sendContent", ({ roomId, content }) => {
-      socket.to(roomId).emit("receiveContent", { content });
+    socket.on("sendContent", ({ id, content }) => {
+      socket.to(id).emit("receiveContent", { content: content });
     });
 
     // Handle disconnection

backend/collaboration-service/index.js

@@ -3,8 +3,7 @@ require("dotenv").config();
 
 const http = require("http");
 const { Server } = require("socket.io");
-const port = process.env.PORT; // 5003
-const socketPort = process.env.SOCKET_PORT; // 8000
+const port = process.env.PORT || 5003;
 
 // Import the socket handler
 const { handleSocketIO } = require("./handler/socketHandler.js");
@@ -13,7 +12,7 @@ const { handleSocketIO } = require("./handler/socketHandler.js");
 const server = http.createServer();
 
 // Initialize the Socket.IO server
-const io = new Server(socketPort, {
+const io = new Server(server, {
   cors: {
     origin: "*", // Allow all origins, adjust as needed
     methods: ["GET", "POST"],

backend/collaboration-service/service/questionService.js

@@ -6,12 +6,12 @@ const url_question_service = process.env.URL_QUESTION_SERVICE;
 const getRandomQuestion = async (category, complexity = "") => {
   const qnURL = `${url_question_service}/random/${category}/${complexity}`
 
-  console.log("qnURL", qnURL);
+  // console.log("qnURL", qnURL);
   const response = await fetch(qnURL).then((response) => {
     return response.json();
   });
 
-  console.log("response", response);
+  // console.log("response", response);
   return response;
 };
 

backend/matching-service/.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+npm-debug.log

backend/matching-service/.env.sample

@@ -0,0 +1,9 @@
+# Port numbers
+PORT=5002
+
+# Firebase
+PRIVATE_KEY=
+
+# Rabbit MQ
+RABBIT_HOSTNAME=
+RABBIT_PASSWORD=

backend/matching-service/Dockerfile

@@ -0,0 +1,20 @@
+# Use an official Node.js runtime as a parent image
+FROM node:20-alpine
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy package.json and package-lock.json
+COPY package*.json ./
+
+# Install any dependencies
+RUN npm install
+
+# Bundle app source inside the Docker image
+COPY . .
+
+# Make port 5001 available to the world outside this container
+EXPOSE 5002
+
+# Define the command to run your app
+CMD ["npm", "start"]

backend/matching-service/config/firebase.js

@@ -0,0 +1,24 @@
+// Author(s): Andrew, Xiu Jia
+require("dotenv").config();
+const admin = require("firebase-admin");
+
+const firebaseConfig = {
+  type: "service_account",
+  project_id: "cs3219-d4ee1",
+  private_key_id: "d9899e20a23a397cdce523437f42d50696aede61",
+  private_key: process.env.PRIVATE_KEY,
+  client_email: "firebase-adminsdk-hba0d@cs3219-d4ee1.iam.gserviceaccount.com",
+  client_id: "106098472779235960036",
+  auth_uri: "https://accounts.google.com/o/oauth2/auth",
+  token_uri: "https://oauth2.googleapis.com/token",
+  auth_provider_x509_cert_url: "https://www.googleapis.com/oauth2/v1/certs",
+  client_x509_cert_url: "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-hba0d%40cs3219-d4ee1.iam.gserviceaccount.com",
+  universe_domain: "googleapis.com"
+};
+
+admin.initializeApp({
+  credential: admin.credential.cert(firebaseConfig)
+});
+const db = admin.firestore();
+
+module.exports = db;

backend/collaboration-service/config/rabbitMQ.js → backend/matching-service/config/rabbitMQ.js

@@ -4,7 +4,7 @@ const amqp = require('amqplib');
 
 const rabbitSettings = {
   protocol: 'amqp',
-  hostname: process.env.HOSTNAME || 'localhost',
+  hostname: `rabbitmq` || process.env.RABBIT_HOSTNAME || 'localhost',
   port: 5672,
   username: 'guest',
   password: process.env.RABBIT_PASSWORD,

backend/matching-service/controller/matchController.js

@@ -0,0 +1,46 @@
+// Author(s): Calista, Xiu Jia, Xue Ling
+const db = require("../config/firebase");
+const matchCollection = db.collection("matches");
+
+/**
+ * POST /add
+ *
+ * Creates match and stores in firebase
+ *
+ * Responses:
+ * - 500: Server error if something goes wrong while fetching data.
+ */
+const createMatch = async (user1, user2) => {
+  try {
+    const matchJson = {
+      user1: {
+        email: user1.email,
+        category: user1.topic,
+        complexity: user1.difficultyLevel,
+        isAny: user1.isAny
+      },
+      user2: {
+        email: user2.email,
+        category: user2.topic,
+        complexity: user2.difficultyLevel,
+        isAny: user2.isAny
+      },
+      createdAt: new Date().toLocaleString("en-SG")
+    };
+
+    const matchRef = await matchCollection.doc();
+
+    await matchRef.set(matchJson);
+
+    // Get match id
+    const id = matchRef.id;
+
+    return { status: 200, msg: "Match created successfully", matchData: matchJson, id };
+  } catch (error) {
+    return { status: 500, error: error.message };
+  }
+}
+
+module.exports = {
+  createMatch
+};