Merge branch 'development_branch' of https://github.com/CS3219-AY2425…

…S1/cs3219-ay2425s1-project-g38 into development_branch

collaboration-service/src/controller/session-controller.ts

@@ -131,12 +131,16 @@ export const sessionController = {
         const { sessionId } = req.body;
 
         try {
-            const session = await Session.findOne({ session_id: sessionId, active: false });
+            const session = await Session.findOne({ session_id: sessionId});
 
             if (!session) {
                 return res.status(404).json({ message: 'Session not found' });
             }
 
+            if (session.active) {
+                return res.status(400).json({ message: 'Session is still ongoing' });
+            }
+
             const yDoc = new Y.Doc();
             const yDocBuffer = session.yDoc;
 

kubernetes/collab-service/collab-service-deployment.yaml

@@ -30,6 +30,6 @@ spec:
             - secretRef:
                 name: collab-secrets
           resources:
-            requests:
-              memory: "250Mi"
-              cpu: "100m"
+            limits:
+              memory: "1Gi"
+              cpu: "250m"

kubernetes/matching-service/matching-service-deployment.yaml

@@ -31,5 +31,5 @@ spec:
                 name: matching-secrets
           resources:
             requests:
-              memory: "250Mi"
-              cpu: "100m"
+              memory: "1Gi"
+              cpu: "250m"

kubernetes/question-service/question-service-deployment.yaml

@@ -31,5 +31,5 @@ spec:
                 name: app-secrets
           resources:
             requests:
-              memory: "250Mi"
-              cpu: "100m"
+              memory: "1Gi"
+              cpu: "250m"

kubernetes/user-service/user-service-deployment.yaml

@@ -31,5 +31,5 @@ spec:
                 name: user-secrets
           resources:
             requests:
-              memory: "250Mi"
-              cpu: "100m"
+              memory: "1Gi"
+              cpu: "250m"

question-service/Dockerfile

@@ -10,4 +10,6 @@ COPY ./src ./src
 
 COPY ./tsconfig.json ./
 
+RUN npm run build
+
 CMD ["npm", "start"]

question-service/package.json

@@ -5,7 +5,7 @@
   "main": "dist/server.js",
   "scripts": {
     "build": "npx tsc",
-    "start": "ts-node src/server.ts",
+    "start": "node dist/server.js",
     "dev": "nodemon src/server.ts",
     "test": "echo \"Error: no test specified\" && exit 1"
   },