Update ci

Author: nicolelim02

.github/workflows/ci.yml

@@ -7,21 +7,34 @@ on:
 
 env:
   NODE_VERSION: 20
-  FIREBASE_PROJECT_ID: ${{ secrets.FIREBASE_PROJECT_ID }}
-  FIREBASE_PRIVATE_KEY: ${{ secrets.FIREBASE_PRIVATE_KEY }}
-  FIREBASE_CLIENT_EMAIL: ${{ secrets.FIREBASE_CLIENT_EMAIL }}
-  FIREBASE_STORAGE_BUCKET: ${{ secrets.FIREBASE_STORAGE_BUCKET }}
-  JWT_SECRET: ${{ secrets.JWT_SECRET }}
 
 permissions:
   contents: read
 
 jobs:
-  ci:
+  frontend-ci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setting node version
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - name: Install dependencies
+        working-directory: frontend
+        run: npm install
+      - name: Linting
+        working-directory: frontend
+        run: npm run lint
+      - name: Frontend tests
+        working-directory: frontend
+        run: docker compose -f docker-compose-test.yml run --rm test-frontend
+  backend-ci:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        service: [frontend, backend/question-service, backend/user-service]
+        service: [question-service, user-service]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -30,21 +43,16 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
       - name: Install dependencies
-        working-directory: ${{ matrix.service }}
+        working-directory: backend/${{ matrix.service }}
         run: npm install
       - name: Linting
-        working-directory: ${{ matrix.service }}
+        working-directory: backend/${{ matrix.service }}
         run: npm run lint
-      - name: Set .env variables
-        working-directory: ${{ matrix.service }}
-        run: |
-          touch .env
-          echo "FIREBASE_PROJECT_ID=${{ env.FIREBASE_PROJECT_ID }}" >> .env
-          echo "FIREBASE_PRIVATE_KEY=${{ env.FIREBASE_PRIVATE_KEY }}" >> .env
-          echo "FIREBASE_CLIENT_EMAIL=${{ env.FIREBASE_CLIENT_EMAIL }}" >> .env
-          echo "FIREBASE_CLIENT_EMAIL=${{ env.FIREBASE_CLIENT_EMAIL }}" >> .env
-          echo "FIREBASE_STORAGE_BUCKET=${{ env.FIREBASE_STORAGE_BUCKET }}" >> .env
-          echo "JWT_SECRET=${{ env.JWT_SECRET }}" >> .env
-      - name: Tests
-        working-directory: ${{ matrix.service }}
-        run: npm test
+      - name: Backend tests
+        env:
+          FIREBASE_PROJECT_ID: ${{ secrets.FIREBASE_PROJECT_ID }}
+          FIREBASE_PRIVATE_KEY: ${{ secrets.FIREBASE_PRIVATE_KEY }}
+          FIREBASE_CLIENT_EMAIL: ${{ secrets.FIREBASE_CLIENT_EMAIL }}
+          FIREBASE_STORAGE_BUCKET: ${{ secrets.FIREBASE_STORAGE_BUCKET }}
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+        run: docker compose -f docker-compose-test.yml run --rm test-${{ matrix.service }}

backend/question-service/.env.sample

@@ -12,3 +12,5 @@ FIREBASE_STORAGE_BUCKET=>FIREBASE_STORAGE_BUCKET>
 ORIGINS=http://localhost:5173,http://127.0.0.1:5173
 
 USER_SERVICE_URL=http://user-service:3001/api
+
+MONGO_URI_TEST=mongodb://mongo:mongo@test-mongo:27017/

backend/question-service/tests/setup.ts

@@ -1,11 +1,8 @@
 import mongoose from "mongoose";
-import { MongoMemoryServer } from "mongodb-memory-server";
-
-let mongo: MongoMemoryServer;
 
 beforeAll(async () => {
-  mongo = await MongoMemoryServer.create();
-  const mongoUri = mongo.getUri();
+  const mongoUri =
+    process.env.MONGO_URI_TEST || "mongodb://mongo:mongo@test-mongo:27017/";
 
   if (mongoose.connection.readyState !== 0) {
     await mongoose.disconnect();
@@ -24,9 +21,5 @@ afterEach(async () => {
 });
 
 afterAll(async () => {
-  if (mongo) {
-    await mongo.stop();
-  }
-
   await mongoose.connection.close();
 });

backend/user-service/.env.sample

@@ -29,7 +29,7 @@ USER=EMAIL_ADDRESS
 PASS=PASSWORD
 
 # Redis configuration
-REDIS_URI=REDIS_URI
+REDIS_URI=redis://redis:6379
 
 # Test
 MONGO_URI_TEST=mongodb://mongo:mongo@test-mongo:27017/

docker-compose-test.yml

@@ -4,7 +4,22 @@ services:
   test-user-service:
     image: peerprep/user-service
     build: ./backend/user-service
-    env_file: ./backend/user-service/.env
+    # env_file: ./backend/user-service/.env
+    environment:
+      - NODE_ENV=test
+      - PORT=3001
+      - JWT_SECRET
+      - ADMIN_FIRST_NAME=Admin
+      - ADMIN_LAST_NAME=User
+      - ADMIN_USERNAME=administrator
+      - [email protected]
+      - ADMIN_PASSWORD=Admin@123
+      - FIREBASE_PROJECT_ID
+      - FIREBASE_PRIVATE_KEY
+      - FIREBASE_CLIENT_EMAIL
+      - FIREBASE_STORAGE_BUCKET
+      - MONGO_URI_TEST=mongodb://mongo:mongo@test-mongo:27017/
+      - REDIS_URI_TEST=redis://test-redis:6379
     depends_on:
       - test-mongo
       - test-redis
@@ -16,6 +31,39 @@ services:
     restart: on-failure
     command: ["npm", "test"]
 
+  test-question-service:
+    image: peerprep/question-service
+    build: ./backend/question-service
+    # env_file: ./backend/question-service/.env
+    environment:
+      - NODE_ENV=test
+      - PORT=3000
+      - FIREBASE_PROJECT_ID
+      - FIREBASE_PRIVATE_KEY
+      - FIREBASE_CLIENT_EMAIL
+      - FIREBASE_STORAGE_BUCKET
+      - MONGO_URI_TEST=mongodb://mongo:mongo@test-mongo:27017/
+    depends_on:
+      - test-mongo
+    networks:
+      - peerprep-network
+    volumes:
+      - ./backend/question-service:/question-service
+      - /question-service/node_modules
+    restart: on-failure
+    command: ["npm", "test"]
+
+  test-frontend:
+    image: peerprep/frontend
+    build: ./frontend
+    networks:
+      - peerprep-network
+    volumes:
+      - ./frontend:/frontend
+      - /frontend/node_modules
+    restart: on-failure
+    command: ["npm", "test"]
+
   test-mongo:
     image: mongo
     restart: always