Merge remote-tracking branch 'origin/main' into PEER-236-Messaging-UI

Author: cyiting

.github/workflows/build-docker.yaml renamed to .github/workflows/build-deploy-docker.yaml

@@ -105,7 +105,7 @@ jobs:
         echo "Outputs Generated: $formatted_matrix"
         echo "matrix=$formatted_matrix" >> $GITHUB_OUTPUT
 
-  build-and-push-image:
+  build-push-deploy-image:
     needs: changes
     if: ${{ fromJson(needs.changes.outputs.matrix)[0] != null }}
     runs-on: ubuntu-latest
@@ -168,6 +168,10 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ matrix.image }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Build and push Docker images for PeerPrep Services
         uses: docker/build-push-action@v6
@@ -182,14 +186,61 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
+      - name: Auth GCloud
+        id: gcloud-auth
+        uses: google-github-actions/auth@v2
+        if: ${{ contains(github.ref, 'main') && github.event.pull_request.title != 'Feedback' }}
+        with:
+          credentials_json: '${{ secrets.GKE_CJSON }}'
+        continue-on-error: true
+
+      - name: Detect GKE Cluster
+        id: gcloud-detect-gke
+        if: ${{ contains(github.ref, 'main') && github.event.pull_request.title != 'Feedback' }}
+        run: |-
+          prev_step_success="${{ steps.gcloud-auth.outcome }}"
+          if [[ "$prev_step_success" != "success" ]]; then
+            echo "is_up=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+        
+          clusters="$(gcloud container clusters list)"
+          is_up="$(echo $clusters | grep ${{ secrets.GKE_CLUSTER }})"
+          if [[ -z "$is_up" ]]; then
+            echo "is_up=false" >> $GITHUB_OUTPUT
+          else
+            echo "is_up=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Get GKE creds
+        id: gcloud-get-gke-creds
+        uses: google-github-actions/get-gke-credentials@v2
+        if: ${{ contains(github.ref, 'main') && github.event.pull_request.title != 'Feedback' && steps.gcloud-detect-gke.outputs.is_up == 'true' }}
+        with:
+          cluster_name: ${{ secrets.GKE_CLUSTER }}
+          location: ${{ secrets.GKE_ZONE }}
+      
+      - name: Deploy to GKE
+        id: gcloud-deploy-gke
+        if: ${{ contains(github.ref, 'main') && github.event.pull_request.title != 'Feedback' && steps.gcloud-detect-gke.outputs.is_up == 'true' }}
+        run: |-
+          service="${{ matrix.package }}"
+          deployment="frontend"
+          if [[ "$service" == "collaboration" ]]; then
+            deployment="collab-service"
+          elif [[ "$service" != "frontend" ]]; then
+            deployment="$service-service"
+          fi
+          kubectl -n peerprep rollout restart deployment "$deployment"
+
   results:
     if: ${{ always() && !github.event.pull_request.draft }}
     runs-on: ubuntu-latest
     name: Final Results
-    needs: build-and-push-image
+    needs: build-push-deploy-image
     steps:
       - run: |
-          result="${{ needs.build-and-push-image.result }}"
+          result="${{ needs.build-push-deploy-image.result }}"
           if [[ $result == "success" || $result == "skipped" ]]; then
             exit 0
           else

Makefile

@@ -11,10 +11,18 @@ db-up:
 
 db-down:
 	docker compose --env-file .env.local -f docker-compose.local.yaml down
+	echo 'y' | docker volume prune
 
 up:
 	./scripts/ensure-volume.sh
 	docker compose --env-file .env.local up -d
 
 down:
 	docker compose --env-file .env.local down
+	echo 'y' | docker volume prune
+
+k8s-up:
+	./scripts/k8s-up.sh
+
+k8s-down:
+	./scripts/k8s-down.sh

backend/collaboration/.env.compose

@@ -3,7 +3,7 @@
 
 EXPRESS_PORT=9003
 EXPRESS_DB_HOST="collab-db"
-EXPRESS_DB_PORT=5435
+EXPRESS_DB_PORT=5432
 POSTGRES_DB="collab"
 POSTGRES_USER="peerprep-collab-express"
 POSTGRES_PASSWORD="6rYE0nIzI2ThzDO"

backend/matching/.env.compose

@@ -7,4 +7,4 @@ EXPRESS_PORT=9004
 
 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"
+REDIS_ARGS="--requirepass G7jBgyz9wGAFQ5La --user peerprep-match-express on >G7jBgyz9wGAFQ5La ~* allcommands --user default off nopass nocommands"

backend/matching/src/lib/db/client.ts

@@ -13,9 +13,14 @@ class RedisClient {
         host: DB_HOSTNAME,
         port: DB_PORT,
       },
-    }).on('error', (err) => {
-      logger.error(`Redis Client error: ${err}`);
-    });
+    })
+      .on('error', (err) => {
+        const { name, message, stack, cause } = err as Error;
+        logger.error({ name, message, stack, cause }, 'Redis Client error');
+      })
+      .on('connect', () => {
+        logger.info('Redis Client connected');
+      });
   }
 }
 

backend/matching/src/lib/db/seed.ts

@@ -24,7 +24,6 @@ const main = async () => {
     return;
   }
 
-  logger.info('Connected');
   const isSeeded = await redisClient.hGetAll(SEED_KEY);
 
   if (Object.keys(isSeeded).length > 0) {

backend/matching/src/workers/matcher.ts

@@ -133,7 +133,7 @@ async function match() {
       sendNotif([requestorSocketPort], MATCHING_EVENT.MATCHING);
       await redisClient.hSet(getPoolKey(requestorUserId), 'pending', 'false');
 
-      const clause = [`-@userId:(${requestorUserId}) @pending:(true)`];
+      let clause = [`-@userId:(${requestorUserId})`, '@pending:(true)'];
 
       if (difficulty) {
         clause.push(`@difficulty:{${difficulty}}`);
@@ -143,6 +143,9 @@ async function match() {
         clause.push(`@topic:{${topic}}`);
       }
 
+      // Push UserID clause to the back.
+      clause = clause.reverse();
+
       const searchParams = {
         LIMIT: { from: 0, size: 1 },
         SORTBY: { BY: 'timestamp', DIRECTION: 'ASC' },

backend/question/.env.compose

@@ -2,8 +2,8 @@
 # PEERPREP_UI_HOST="http://frontend:3000"  
 
 EXPRESS_PORT=9002
-EXPRESS_DB_HOST="qn-db"
-EXPRESS_DB_PORT=5433
+EXPRESS_DB_HOST="question-db"
+EXPRESS_DB_PORT=5432
 POSTGRES_DB="question"
 POSTGRES_USER="peerprep-qn-express"
 POSTGRES_PASSWORD="Xk8qEcEI2sizjfEn/lF6mLqiyBECjIHY3q6sdXf9poQ="

backend/question/src/config.ts

@@ -11,3 +11,5 @@ export const dbConfig = {
   user: process.env.POSTGRES_USER,
   password: process.env.POSTGRES_PASSWORD,
 };
+
+export const LOAD_TEST_POD = process.env.LOAD_TEST_POD || 'http://question-service-load-test';

backend/question/src/server.ts

@@ -7,7 +7,7 @@ import helmet from 'helmet';
 import { StatusCodes } from 'http-status-codes';
 import pino from 'pino-http';
 
-import { UI_HOST } from '@/config';
+import { LOAD_TEST_POD, UI_HOST } from '@/config';
 import { config, db } from '@/lib/db';
 import { logger } from '@/lib/utils';
 import questionsRouter from '@/routes/question';
@@ -32,7 +32,7 @@ app.use(json());
 app.use(helmet());
 app.use(
   cors({
-    origin: [UI_HOST],
+    origin: [UI_HOST, LOAD_TEST_POD],
     credentials: true,
   })
 );