rename everywhere

Author: anunayajoshi

backend/matching/.env.docker

@@ -5,9 +5,9 @@ EXPRESS_PORT=9004
 MATCHING_DB_HOSTNAME=host.docker.internal
 MATCHING_DB_PORT=6379
 
-USER_SERVER_ENDPOINT=http://host.docker.internal:9001
-QUESTION_SERVER_ENDPOINT=http://host.docker.internal:9002
-COLLAB_SERVICE_ENDPOINT=http://host.docker.internal:9003
+PEERPREP_USER_HOST=http://host.docker.internal:9001
+PEERPREP_QUESTION_HOST=http://host.docker.internal:9002
+PEERPREP_COLLAB_HOST=http://host.docker.internal:9003
 
 # MATCHING_DB_USERNAME=peerprep-match-express
 # MATCHING_DB_PASSWORD=G7jBgyz9wGAFQ5La

backend/matching/.env.local

@@ -5,9 +5,11 @@ EXPRESS_PORT=9004
 MATCHING_DB_HOSTNAME="localhost"
 MATCHING_DB_PORT=6379
 
-USER_SERVER_ENDPOINT="http://localhost:9001"
-QUESTION_SERVER_ENDPOINT="http://localhost:9002"
-COLLAB_SERVER_ENDPOINT="http://localhost:9003"
+
+PEERPREP_USER_HOST="http://localhost:9001"
+PEERPREP_QUESTION_HOST="http://localhost:9002"
+PEERPREP_COLLAB_HOST="http://localhost:9003"
+
 
 
 # MATCHING_DB_USERNAME="peerprep-match-express"

backend/matching/src/services/collab.ts

@@ -1,10 +1,10 @@
 import axios from 'axios';
+import { PEERPREP_COLLAB_HOST } from '@/config';
 
-const collabServerEndpoint = `${process.env.COLLAB_SERVER_ENDPOINT}`;
 
 export async function createRoom(userId1: string, userId2: string, questionId: string): Promise<string> {
   const response = await axios.get<{ roomName: string }>(
-    `${collabServerEndpoint}/room`,
+    `${PEERPREP_COLLAB_HOST}/room`,
     {
       params: {
         userid1: userId1,

backend/matching/src/services/question.ts

@@ -1,11 +1,10 @@
 import axios from 'axios';
 import { IServiceResponse, IQuestion, IGetRandomQuestionPayload } from '../types/index';
-
-const questionEndpoint = `${process.env.QUESTION_SERVER_ENDPOINT}`;
+import { PEERPREP_QUESTION_HOST } from '@/config';
 
 export async function getRandomQuestion(payload: IGetRandomQuestionPayload): Promise<IQuestion> {
   const response = await axios.post<IServiceResponse<{ question: IQuestion }>>(
-    `${questionEndpoint}/questions/random`,
+    `${PEERPREP_QUESTION_HOST}/questions/random`,
     payload
   );
 

backend/matching/src/services/user.ts

@@ -1,10 +1,10 @@
 import axios from 'axios';
 
-const userEndpoint = `${process.env.USER_SERVER_ENDPOINT}`;
+import { PEERPREP_USER_HOST } from '@/config';
 
 export async function fetchAttemptedQuestions(userId: string): Promise<number[]> {
   const response = await axios.post<number[]>(
-    `${userEndpoint}/user/attempted-question/get`,
+    `${PEERPREP_USER_HOST}/user/attempted-question/get`,
     {userId}
   );
   if (response.status !== 200 || !response.data) {
@@ -15,7 +15,7 @@ export async function fetchAttemptedQuestions(userId: string): Promise<number[]>
 
 export async function updateAttemptedQuestions(userIds: string[], questionId: number): Promise<void> {
   const response = await axios.post<unknown>(
-    `${userEndpoint}/user/attempted-question/add`,
+    `${PEERPREP_USER_HOST}/user/attempted-question/add`,
     { questionId, userIds }
   );
   if (response.status !== 200 || !response.data) {

docker-compose.yaml

@@ -187,9 +187,9 @@ services:
       - MATCHING_DB_HOSTNAME=match-db
       - MATCHING_DB_PORT=6379
       - PEERPREP_UI_HOST=http://${FRONTEND_SERVICE_NAME}:${FRONTEND_PORT}
-      - USER_SERVER_ENDPOINT=http://${USER_SERVICE_NAME}:${USER_EXPRESS_PORT}
-      - QUESTION_SERVER_ENDPOINT=http://${QUESTION_SERVICE_NAME}:${QUESTION_EXPRESS_PORT}
-      - COLLAB_SERVER_ENDPOINT=http://${COLLAB_SERVICE_NAME}:${COLLAB_EXPRESS_PORT}
+      - PEERPREP_USER_HOST=http://${USER_SERVICE_NAME}:${USER_EXPRESS_PORT}
+      - PEERPREP_QUESTION_HOST=http://${QUESTION_SERVICE_NAME}:${QUESTION_EXPRESS_PORT}
+      - PEERPREP_COLLAB_HOST=http://${COLLAB_SERVICE_NAME}:${COLLAB_EXPRESS_PORT}
     depends_on:
       - match-db
       - user-service