Merge branch 'main' of github.com:CS3219-AY2425S1/cs3219-ay2425s1-project-g16 into PEER-223-Matching-Cancellation-Endpoint

Signed-off-by: SeeuSim <[email protected]>

Author: SeeuSim

.env.local

@@ -17,7 +17,7 @@ MATCHING_SERVICE_NAME=match-express
 MATCHING_EXPRESS_PORT=9004
 MATCHING_DB_USERNAME="peerprep-match-express"
 MATCHING_DB_PASSWORD="password"
-MATCHING_DB_HOST_PORT=6379
+MATCHING_DB_HOST_PORT=6378
 MATCHING_DB_HOST_MGMT_PORT=3001
 
 FRONTEND_SERVICE_NAME=frontend

backend/matching/.env.compose

@@ -5,7 +5,6 @@
 
 EXPRESS_PORT=9004
 
-MATCHING_DB_USERNAME=peerMatc
-MATCHING_DB_PASSWORD=iZnm6K5k
-REDIS_ARGS="--requirepass iZnm6K5k --user peerMatc on >iZnm6K5k ~* allcommands --user default off nopass nocommands"
-
+MATCHING_DB_USERNAME="peerprep-match-express"
+MATCHING_DB_PASSWORD="G7jBgyz9wGAFQ5La"
+REDIS_ARGS="--requirepass G7jBgyz9wGAFQ5La --user ${MATCHING_DB_USERNAME} on >G7jBgyz9wGAFQ5La ~* allcommands --user default off nopass nocommands"

backend/matching/.env.docker

@@ -2,13 +2,12 @@ PEERPREP_UI_HOST=http://host.docker.internal:5173
 
 EXPRESS_PORT=9004
 
-MATCHING_DB_HOSTNAME=host.docker.internal
-MATCHING_DB_PORT=6379
-
 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=peerMatc
-MATCHING_DB_PASSWORD=iZnm6K5k
-REDIS_ARGS="--requirepass iZnm6K5k --user peerMatc on >iZnm6K5k ~* allcommands --user default off nopass nocommands"
+MATCHING_DB_HOSTNAME=host.docker.internal
+MATCHING_DB_PORT=6378
+
+MATCHING_DB_USERNAME=peerprep-match-express
+MATCHING_DB_PASSWORD=G7jBgyz9wGAFQ5La

backend/matching/.env.local

@@ -2,13 +2,13 @@ PEERPREP_UI_HOST=http://localhost:5173
 
 EXPRESS_PORT=9004
 
-MATCHING_DB_HOSTNAME=localhost
-MATCHING_DB_PORT=6379
-
 PEERPREP_USER_HOST=http://localhost:9001
 PEERPREP_QUESTION_HOST=http://localhost:9002
 PEERPREP_COLLAB_HOST=http://localhost:9003
 
-MATCHING_DB_USERNAME=peerMatc
-MATCHING_DB_PASSWORD=iZnm6K5k
-REDIS_ARGS="--requirepass iZnm6K5k --user peerMatc on >iZnm6K5k ~* allcommands --user default off nopass nocommands"
+MATCHING_DB_HOSTNAME=localhost
+MATCHING_DB_PORT=6378
+
+MATCHING_DB_USERNAME="peerprep-match-express"
+MATCHING_DB_PASSWORD="G7jBgyz9wGAFQ5La"
+REDIS_ARGS="--requirepass G7jBgyz9wGAFQ5La --user ${MATCHING_DB_USERNAME} on >G7jBgyz9wGAFQ5La ~* allcommands --user default off nopass nocommands"

backend/matching/src/config.ts

@@ -12,8 +12,6 @@ export const DB_HOSTNAME = process.env.MATCHING_DB_HOSTNAME;
 export const DB_PORT = Number.parseInt(process.env.MATCHING_DB_PORT ?? '6379');
 export const DB_USERNAME = process.env.MATCHING_DB_USERNAME;
 export const DB_PASSWORD = process.env.MATCHING_DB_PASSWORD;
-// export const DB_URL = `redis://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}`;
-// export const DB_URL = `redis://${DB_HOSTNAME}:${DB_PORT}`;
 
 export const NODE_ENV = process.env.NODE_ENV;