Chat test fix

.github/workflows/deploy.yml

@@ -0,0 +1,127 @@
+name: CI/CD - Build and Deploy
+
+on:
+  push:
+    branches:
+      - kubernetes-config
+  workflow_dispatch:
+
+jobs:
+  ci:
+    name: Build and Push Docker Images
+
+    runs-on: ubuntu-latest
+
+    timeout-minutes: 10
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Authenticate to Google Cloud
+        uses: google-github-actions/auth@v1
+        with:
+          credentials_json: ${{ secrets.GCP_SA_KEY }}
+
+      - name: Set up Google Cloud SDK
+        uses: google-github-actions/setup-gcloud@v1
+        with:
+          project_id: ${{ secrets.GCP_PROJECT_ID }}
+
+      - name: Configure Docker for GCR
+        run: gcloud auth configure-docker
+
+      - name: Submit Cloud Build
+        run: gcloud builds submit --config=cloudbuild.yaml .
+
+  cd:
+    name: Deploy to GKE
+
+    runs-on: ubuntu-latest
+
+    needs: ci
+
+    timeout-minutes: 10
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.sha }}
+
+      - name: Authenticate to Google Cloud
+        uses: google-github-actions/auth@v1
+        with:
+          credentials_json: ${{ secrets.GCP_SA_KEY }}
+
+      - name: Set up Google Cloud SDK
+        uses: google-github-actions/setup-gcloud@v1
+        with:
+          project_id: ${{ secrets.GCP_PROJECT_ID }}
+
+      - name: Install gke-gcloud-auth-plugin
+        run: gcloud components install gke-gcloud-auth-plugin
+
+      - name: Get GKE Credentials
+        run: gcloud container clusters get-credentials ${{ secrets.GKE_CLUSTER_NAME }} --zone ${{ secrets.GKE_CLUSTER_ZONE }}
+
+      - name: Set kubectl context
+        run: kubectl config set-context $(kubectl config current-context) --namespace=default
+
+      - name: Create Mongo-User Secret in Kubernetes
+        env:
+          MONGO_ROOT_USERNAME: ${{ secrets.MONGO_ROOT_USERNAME }}
+          MONGO_ROOT_PASSWORD: ${{ secrets.MONGO_ROOT_PASSWORD }}
+        run: |
+          kubectl create secret generic mongo-user-secret \
+            --from-literal=MONGO_INITDB_ROOT_USERNAME=$MONGO_ROOT_USERNAME \
+            --from-literal=MONGO_INITDB_ROOT_PASSWORD=$MONGO_ROOT_PASSWORD \
+            --namespace default --dry-run=client -o yaml | kubectl apply -f -
+
+      - name: Create Mongo-Question Secret in Kubernetes
+        env:
+          MONGO_ROOT_USERNAME: ${{ secrets.MONGO_ROOT_USERNAME }}
+          MONGO_ROOT_PASSWORD: ${{ secrets.MONGO_ROOT_PASSWORD }}
+        run: |
+          kubectl create secret generic mongo-question-secret \
+            --from-literal=MONGO_INITDB_ROOT_USERNAME=$MONGO_ROOT_USERNAME \
+            --from-literal=MONGO_INITDB_ROOT_PASSWORD=$MONGO_ROOT_PASSWORD \
+            --namespace default --dry-run=client -o yaml | kubectl apply -f -
+
+      - name: Create Secrets for question-service and user-service in Kubernetes
+        env:
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+          DB_LOCAL_URI: ${{ secrets.DB_LOCAL_URI }}
+          MONGO_URI: ${{ secrets.MONGO_URI }}
+        run: |
+          kubectl create secret generic user-service-secret \
+            --from-literal=JWT_SECRET=$JWT_SECRET \
+            --from-literal=DB_LOCAL_URI=$DB_LOCAL_URI \
+            --namespace default --dry-run=client -o yaml | kubectl apply -f -
+
+          kubectl create secret generic question-service-secret \
+            --from-literal=MONGO_URI=$MONGO_URI \
+            --namespace default --dry-run=client -o yaml | kubectl apply -f -
+
+      - name: Deploy to GKE
+        run: |
+          kubectl apply -f k8s/mongo-user-db/
+          kubectl apply -f k8s/mongo-question-db/
+          kubectl apply -f k8s/user-service/
+          kubectl apply -f k8s/question-service/
+          kubectl apply -f k8s/frontend/
+          kubectl apply -f k8s/matching-service/
+          kubectl apply -f k8s/collaboration-service/
+          kubectl apply -f k8s/chat-service/
+
+      - name: Force Restart Deployment
+        run: |
+          kubectl rollout restart deployment user-service
+          kubectl rollout restart deployment mongo-question
+          kubectl rollout restart deployment frontend
+          kubectl rollout restart deployment matching-service
+          kubectl rollout restart deployment collaboration-service
+          kubectl rollout restart deployment chat-service
+          kubectl rollout restart deployment question-service
+
+

.github/workflows/integration-tests.yml

@@ -0,0 +1,20 @@
+name: Integration Test
+on: [push]
+jobs:
+  integration-tests:
+    name: integration-tests
+    runs-on: ubuntu-latest
+    steps:
+      # Check out the repository
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Run Docker Compose Action
+      - name: Run integration tests
+        uses: adambirds/[email protected]
+        with:
+          compose-file: "./docker-compose-tests.yaml"
+          up-flags: "--build"
+          down-flags: "--volumes"
+          test-container: "tests"
+          test-command: "pytest --log-cli-level=DEBUG"

.gitignore

@@ -0,0 +1,4 @@
+.idea
+.vscode
+node_modules
+k8s/k8s_deploy.sh

ChatService/app.js

@@ -0,0 +1,35 @@
+import express from 'express';
+import { Server } from 'socket.io';
+import http from 'http';
+import cors from 'cors';
+import socket from './config/socket.js';
+
+const app = express();
+const port = 3003;
+const server = http.createServer(app);
+const frontendURL = process.env.FRONTEND_URL || "http://localhost:8080";  
+
+const io = process.env.FRONTEND_URL
+    ? new Server(server, {
+        cors: {
+            origin: frontendURL,  
+            methods: ['GET', 'POST'],
+            credentials: true     
+        }
+      })
+    : new Server(server);
+
+if (process.env.FRONTEND_URL) {
+    app.use(cors({
+        origin: frontendURL, 
+        credentials: true     
+    }));
+}
+
+app.use(express.json());
+socket.createSocket(io);
+
+server.listen(port, () => {
+    console.log(`Server listening on port ${port}`);
+});
+

ChatService/config/redis.js

@@ -0,0 +1,21 @@
+
+import { createClient } from 'redis';
+
+function createRedisConnection() {
+    try {
+        const client = createClient({
+            socket: {
+                host: 'redis-chat',
+                port: 6379
+            }
+        });
+        client.connect();
+        console.log("Successfully connected to Redis-Chat");
+        return client;
+    } catch (error) {
+        console.log("Error connecting to Redis-Chat ", error);
+        return null;
+    }
+}
+
+export default createRedisConnection;

ChatService/config/socket.js

@@ -0,0 +1,58 @@
+import roomService from '../services/roomService.js';
+const { createRoom, getRoom, addMessage } = roomService;
+
+async function createSocket(io) {
+    io.on('connection', (socket) => {
+        console.log('User connected:', socket.id);
+        const userId = socket.handshake.query.userId;
+
+        socket.on('joinRoom', async ({ roomId }) => {
+            console.log(`User ${socket.id} attempting to join room: ${roomId}`);
+            socket.join(roomId);
+
+            // Get the number of clients currently in the room
+            const clients = io.sockets.adapter.rooms.get(roomId)?.size || 0;
+
+            // If there are now two clients, create the room and broadcast the content to all clients in the room
+            if (clients > 1) {
+                const room = await createRoom(roomId, userId, userId); // Assuming you pass the user IDs here
+
+                // Broadcast to everyone in the room including the joining client
+                io.to(roomId).emit('load_room_content', { 
+                    messages: room.messages,
+                });
+            } else {
+                const room = await getRoom(roomId); // Await for the room data to be retrieved
+                if (room) {
+                    // If the room exists, broadcast the content to the joining client
+                    socket.emit('load_room_content', { 
+                        messages: room.messages,
+                    });
+                } else {
+                    console.error(`Room ${roomId} does not exist.`);
+                }
+            }
+        });
+
+        socket.on('chat message', async ({ roomId, msg, username }) => {
+            console.log(`User ${socket.id} sending message in room: ${roomId}`);
+            const room = await getRoom(roomId); // Await for the room data to be retrieved
+
+            if (room) {
+                const newMessage = await addMessage(roomId, msg, username); // Ensure the message is added asynchronously
+                console.log(`Updated chat content in room ${roomId}. Broadcasting to other users.`);
+
+                // Emit the updated message to the room
+                socket.to(roomId).emit('chat message', { newMessage });
+                // Emit to the client who sent the message
+                socket.emit('chat message', { newMessage });
+            } else {
+                console.error(`Failed to update chat for room ${roomId} by user ${socket.id}. Room or content may be missing.`);
+            }
+        });
+    });
+}
+
+export default { 
+    createSocket 
+};

ChatService/dockerfile

@@ -0,0 +1,9 @@
+FROM node:22
+
+WORKDIR /app
+COPY package.json /app
+RUN npm install
+COPY . /app
+
+EXPOSE 3003
+ENTRYPOINT ["npm", "start"]

ChatService/models/room-model.js

@@ -0,0 +1,29 @@
+class Room {
+    constructor(roomId, user1Id, user2Id) {
+        this.roomId = roomId;
+        this.users = [user1Id, user2Id];
+        this.messages = []; // Initialize an empty array to store messages
+    }
+
+
+    addMessage(content, senderUsername) {
+        const message = {
+            content,
+            senderUsername,
+            timestamp: new Date().toISOString() // Add a timestamp in ISO format
+        };
+        this.messages.push(message); // Add the structured message to the messages array
+        return message;
+    }
+
+
+    getRoomState() {
+        return {
+            roomId: this.roomId,
+            users: this.users,
+            messages: this.messages, // Return the list of messages
+        };
+    }
+}
+
+export default Room;