Resolve conflicts

Author: njxue

.github/workflows/collab.yml

@@ -0,0 +1,34 @@
+name: Collaboration Service CI
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "backend/collaboration-service/**"
+  pull_request:
+    branches:
+      - main
+    paths:
+      - "backend/collaboration-service/**"
+
+jobs:
+  run-tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "18.x"
+
+      - name: Install dependencies
+        run: npm ci
+        working-directory: backend/collaboration-service
+
+      - name: Run Tests
+        run: npm test
+        working-directory: backend/collaboration-service

.github/workflows/frontend.yml

@@ -0,0 +1,34 @@
+name: Frontend CI
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "frontend/**"
+  pull_request:
+    branches:
+      - main
+    paths:
+      - "frontend/**"
+
+jobs:
+  run-eslint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "18.x"
+
+      - name: Install dependencies
+        run: npm ci
+        working-directory: frontend
+
+      - name: Run ESLint
+        run: npm run lint
+        working-directory: frontend

backend/collaboration-service/__tests__/controllers/collaborationController.test.ts

@@ -5,6 +5,7 @@ import { createSession, handleMatchNotification } from '../../controllers/collab
 import Session from '../../models/Session';
 import { producer } from '../../utils/kafkaClient';
 import { EachMessagePayload, KafkaMessage } from 'kafkajs';
+ 
 
 // Mock the kafka producer
 jest.mock('../../utils/kafkaClient', () => ({