Fix docker compose test

Author: nicolelim02

backend/user-service/config/redis.ts

@@ -3,7 +3,10 @@ import dotenv from "dotenv";
 
 dotenv.config();
 
-const REDIS_URI = process.env.REDIS_URI || "redis://localhost:6379";
+const REDIS_URI =
+  process.env.NODE_ENV === "test"
+    ? process.env.REDIS_URI_TEST
+    : process.env.REDIS_URI || "redis://localhost:6379";
 
 const client = createClient({ url: REDIS_URI });
 

backend/user-service/model/repository.ts

@@ -31,6 +31,7 @@ export async function createUser(
     email,
     password,
     isAdmin,
+    isVerified,
   });
   return user.save();
 }

backend/user-service/scripts/seed.ts

@@ -38,6 +38,7 @@ export async function seedAdminAccount() {
       adminUsername,
       adminEmail,
       hashedPassword,
+      true,
       true
     );
     console.log("Admin account created successfully.");

backend/user-service/tests/authRoutes.spec.ts

@@ -4,6 +4,8 @@ import supertest from "supertest";
 import app from "../app";
 import UserModel from "../model/user-model";
 
+jest.setTimeout(10000);
+
 const request = supertest(app);
 
 const AUTH_BASE_URL = "/api/auth";
@@ -25,6 +27,7 @@ const insertAdminUser = async () => {
     email,
     password: hashedPassword,
     isAdmin: true,
+    isVerified: true,
   }).save();
 
   return { email, password };
@@ -37,6 +40,7 @@ const insertNonAdminUser = async () => {
     lastName,
     email,
     password: hashedPassword,
+    isVerified: true,
   }).save();
 
   return { email, password };

docker-compose-test.yml

@@ -1,13 +1,15 @@
+name: peerprep-test
+
 services:
   test-user-service:
     image: peerprep/user-service
     build: ./backend/user-service
     env_file: ./backend/user-service/.env
     environment:
-      - MONGO_URI_TEST=mongodb://mongo:mongo@mongo:27017/
+      - MONGO_URI_TEST=mongodb://mongo:mongo@test-mongo:27017/
     depends_on:
-      - mongo
-      - redis
+      - test-mongo
+      - test-redis
     networks:
       - peerprep-network
     volumes:
@@ -16,17 +18,17 @@ services:
     restart: on-failure
     command: ["npm", "test"]
 
-  mongo:
+  test-mongo:
     image: mongo
     restart: always
     networks:
       - peerprep-network
     env_file:
       - ./backend/.env
 
-  redis:
+  test-redis:
     image: redis:8.0-M01
-    container_name: redis
+    container_name: test-redis
     networks:
       - peerprep-network
     healthcheck: