Merge pull request #102 from CS3219-AY2324S1/revert-100-feat/add-noti…

…fication

Revert "Feat/add notification"

apps/backend/chat/src/controllers/messageController.ts

@@ -13,18 +13,13 @@ class MessageController {
 
   handleConnection(socket: Socket) {
     socket.on("connectToChatroom", async ({ chatroomId }) => {
-      this.io.to(chatroomId).emit("other user connecting");
       socket.join(chatroomId);
       const messages = await this.chatroomService.getMessages(chatroomId);
       console.log(messages);
       socket.emit("receiveMessage", { messages });
       socket.on("sendMessage", (message) =>
         this.handleSendMessage(message, chatroomId)
       );
-      socket.on("disconnect", () => {
-        console.log("starting to disconnect");
-        this.io.to(chatroomId).emit("other user disconnecting");
-      });
     });
     socket.emit("connected");
   }

apps/backend/question/src/controllers/api/questionRouter.ts

@@ -179,20 +179,7 @@ questionRouter.put(
   }
 );
 
-questionRouter.get(
-  "/random-question/:difficulty/:language",
-  async (req, res, next) => {
-    const difficulty = req.params.difficulty;
-    console.log(difficulty);
-    const languageId = req.params.language
-
-    const questions = await Question.aggregate([{ 
-      $match: { 
-        complexity: difficulty,
-        'starterCode.languageId': Number(languageId),
-      }
-    },
-    { $sample: { size: 1 } }]);
-    res.status(200).json({questions});
-  }
+questionRouter.post(
+  "/:id/run",
+
 )

apps/backend/queue/src/queue/queue.ts

@@ -3,32 +3,21 @@ import axios from "axios";
 import { SESSION_URL } from "../utils/config";
 import Producer from "../message-queue/Producer";
 import Consumer from "../message-queue/Consumer";
-import { ProgrammingLanguages } from "../enum/ProgrammingLanguages";
-import { Difficulty } from "../enum/Difficulty";
 
 export class Queue {
   waitList: number[];
   socketMap: Map<number, Socket>;
   nameSpace: string;
   producer: Producer;
   consumer: Consumer;
-  diff: Difficulty;
-  language: ProgrammingLanguages;
   next?: Queue;
 
-  constructor(
-    nameSpace: string,
-    diff: Difficulty,
-    language: ProgrammingLanguages,
-    nextQueue?: Queue
-  ) {
+  constructor(nameSpace: string, nextQueue?: Queue) {
     this.nameSpace = nameSpace;
     this.waitList = [];
     this.socketMap = new Map();
     this.producer = new Producer(nameSpace);
     this.consumer = new Consumer(nameSpace, (uid) => this.matchUsers(uid));
-    this.diff = diff;
-    this.language = language;
     this.next = nextQueue;
   }
 
@@ -129,11 +118,7 @@ export class Queue {
 
   private async generateSession(user1: number, user2: number) {
     const sessionID = await axios
-      .post(SESSION_URL, {
-        users: [user1, user2],
-        difficulty: this.diff,
-        language: this.language,
-      })
+      .post(SESSION_URL, { users: [user1, user2] })
       .then((response) => {
         return response.data.sessionId;
       })

apps/backend/queue/src/services/queueService.ts

@@ -8,14 +8,14 @@ class QueueService {
 
   constructor() {
     this.queues = new Map();
-    // this.queues.set(Difficulty.EASY, new Queue(Difficulty.EASY));
-    // this.queues.set(Difficulty.MEDIUM, new Queue(Difficulty.MEDIUM));
-    // this.queues.set(Difficulty.HARD, new Queue(Difficulty.HARD));
+    this.queues.set(Difficulty.EASY, new Queue(Difficulty.EASY));
+    this.queues.set(Difficulty.MEDIUM, new Queue(Difficulty.MEDIUM));
+    this.queues.set(Difficulty.HARD, new Queue(Difficulty.HARD));
 
     for (const diff of Object.values(Difficulty)) {
       for (const language of Object.values(ProgrammingLanguages)) {
         const nameSpace = diff + "/" + language;
-        this.queues.set(nameSpace, new Queue(nameSpace, diff, language));
+        this.queues.set(nameSpace, new Queue(nameSpace, this.queues.get(diff)));
       }
     }
   }

apps/backend/session/.env.sample

@@ -2,5 +2,3 @@ SESSION_PORT= # Port that session microservice is hosted on
 WS_PORT= # Port that websocket microservice is hosted on
 HOST= # Hostname of the server
 MONGODB_URI= # MongoDB URI
-QUESTION_URL= # Question microservice URL
-USER_SERVICE_URL= # User microservice URL

apps/backend/session/src/controllers/sessionController.ts

@@ -26,14 +26,7 @@ export class SessionController {
   ) {
     logger.info(req.body);
     const [user1, user2] = req.body.users;
-    const difficulty = req.body.difficulty;
-    const language = req.body.language;
-    const sessionId = await this.sessionManager.createNewSession(
-      user1,
-      user2,
-      difficulty,
-      language
-    );
+    const sessionId = await this.sessionManager.createNewSession(user1, user2);
     console.log(`Created a sessionId: ${sessionId}`);
     res.status(200).json({ sessionId: sessionId.toString() });
   }
@@ -72,23 +65,4 @@ export class SessionController {
     console.log("Saving to database");
     await this.sessionManager.saveToDatabase();
   }
-
-  public async handleGetSessionsForUser(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    console.log(req.params.user);
-    const uid = Number(req.params.user);
-    if (!uid) {
-      return res.status(500).json({ err: "UID passed in was not valid." });
-    }
-    const sessions = await this.sessionManager.getAllSessionsForUser(uid);
-    if (!sessions) {
-      return res.status(500).json({
-        err: "Something went wrong when searching for the sessions for this user.",
-      });
-    }
-    return res.status(200).json({ sessions });
-  }
 }

apps/backend/session/src/model/Session.ts

@@ -1,11 +1,9 @@
 import mongoose, { Document, Schema } from "mongoose";
 
-export interface SessionEntity extends Document {
+interface Session extends Document {
   users: number[];
   chatroomId: string;
   code: string;
-  question: string;
-  language: string;
 }
 
 const sessionSchema = new Schema({
@@ -23,20 +21,12 @@ const sessionSchema = new Schema({
   code: {
     type: String,
   },
-  question: {
-    type: String,
-    required: true,
-  },
-  language: {
-    type: String,
-    required: true,
-  },
 });
 
-const SessionModel = mongoose.model<SessionEntity>(
+const SessionModel = mongoose.model<Session>(
   "Session",
   sessionSchema,
   "sessions"
 );
 
-export default SessionModel;
+export default SessionModel;