Merge branch 'main' into profile-and-hostory-pages

Author: LimZiJia

.env.sample

@@ -24,6 +24,10 @@ COLLAB_DB_LOCAL_URI=mongodb://collaboration-db:27017/collaboration-service
 YJS_DB_CLOUD_URI=mongodb+srv://<username>:<password>@cluster0.h5ukw.mongodb.net/yjs-documents?retryWrites=true&w=majority&appName=Cluster0
 YJS_DB_LOCAL_URI=mongodb://collaboration-db:27017/yjs-documents
 
+# History Service
+HISTORY_DB_CLOUD_URI=<FILL-THIS-IN>
+HISTORY_DB_LOCAL_URI=mongodb://history-db:27017/history
+
 # Will use cloud MongoDB Atlas database
 ENV=PROD
 

.github/workflows/backend.yml

@@ -0,0 +1,64 @@
+name: Deploy Backend Services
+
+on:
+  push:
+    branches: [ 'production' ]
+
+  workflow_dispatch:
+
+permissions:
+  id-token: write   # This is required for requesting the JWT
+  contents: read    # This is required for actions/checkout
+
+env:
+  AWS_REGION: ap-southeast-1
+  ECS_CLUSTER: backend-cluster
+
+jobs:
+  deploy:
+    name: Deploy Backend Service
+    runs-on: ubuntu-latest
+    environment: production
+
+    strategy:
+      matrix:
+        service: [ 'question', 'user', 'match', 'collaboration' ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Configure AWS credentials
+        id: aws-configure
+        uses: aws-actions/[email protected]
+        with:
+          role-to-assume: ${{ secrets.AWS_BACKEND_ROLE }}
+          role-session-name: GitHub_to_AWS_via_FederatedOIDC
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to AWS ECR
+        id: login-ecr
+        uses: aws-actions/[email protected]
+
+      - name: Build and push ${{ matrix.service }} image to AWS ECR
+        id: build-image
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          ECR_REPOSITORY: ${{ matrix.service }}
+          IMAGE_TAG: latest
+        run: |
+          echo "Building $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG ./services/${{ matrix.service }}
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+
+      - name: Update AWS Service (${{ matrix.service }}) # Trigger re-deployment with latest image
+        id: update-service
+        env:
+          ECS_SERVICE: ${{ matrix.service }}-service
+        run: |
+          echo "Updating $ECS_SERVICE for $ECS_CLUSTER"
+          aws ecs update-service \
+            --cluster $ECS_CLUSTER \
+            --service $ECS_SERVICE \
+            --force-new-deployment \
+            --region $AWS_REGION

.github/workflows/frontend.yml

@@ -0,0 +1,44 @@
+name: Deploy Frontend
+
+on:
+  push:
+    branches: [ 'production' ]
+
+  workflow_dispatch:
+
+permissions:
+  id-token: write   # This is required for requesting the JWT
+  contents: read    # This is required for actions/checkout
+
+env:
+  AWS_REGION: ap-southeast-1
+  S3_BUCKET_NAME: app.peerprep.org
+
+jobs:
+  deploy:
+    name: Deploy Frontend
+    runs-on: ubuntu-latest
+    environment: production
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Configure AWS credentials
+        id: aws-configure
+        uses: aws-actions/[email protected]
+        with:
+          role-to-assume: ${{ secrets.AWS_FRONTEND_ROLE }}
+          role-session-name: GitHub_to_AWS_via_FederatedOIDC
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Build frontend distribution
+        working-directory: frontend
+        run: npm ci && npm run build
+
+      - name: Sync distribution to S3
+        run: |
+          aws s3 sync ./frontend/dist/frontend/browser/ s3://$S3_BUCKET_NAME --delete
+
+      - name: Invalidate Cloudfront Cache
+        run: |
+          aws cloudfront create-invalidation --distribution-id ${{ secrets.AWS_CLOUDFRONT_ID }} --paths "/*"

.github/workflows/tests.yml

@@ -36,3 +36,22 @@ jobs:
         run: cd ${{ matrix.service }} && npm run lint
       - name: Build App
         run: cd ${{ matrix.service }} && npm run build
+
+          
+  build-history:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.node-version }}
+      - name: Install Node Modules
+        run: cd services/history && npm ci
+      - name: Linting
+        run: cd services/history && npm run lint
+      - name: Build App
+        run: cd services/history && npm run build
+      - name: Run tests
+        run: cd services/history && npm run test

compose.dev.yml

@@ -47,6 +47,26 @@ services:
     volumes:
       - /app/node_modules
       - ./services/collaboration:/app
+    
+  collaboration-db:
+    ports:
+      - 27020:27017
+  
+  collaboration-db:
+    ports:
+      - 27020:27017
+  
+  history:
+    command: npm run dev
+    ports:
+      - 8086:8086
+    volumes:
+      - /app/node_modules
+      - ./services/history:/app
+  
+  history-db:
+    ports:
+      - 27021:27017
 
   broker:
     ports:

compose.yml

@@ -21,6 +21,7 @@ services:
       - user
       - match
       - collaboration
+      - history
     networks:
       - gateway-network
     restart: always
@@ -167,12 +168,39 @@ services:
     networks:
       - collaboration-db-network
     restart: always
+  
+  history:
+    container_name: history
+    image: history
+    build:
+      context: services/history
+      dockerfile: Dockerfile
+    environment:
+      DB_CLOUD_URI: ${HISTORY_DB_CLOUD_URI}
+      DB_LOCAL_URI: ${HISTORY_DB_LOCAL_URI}
+      BROKER_URL: ${BROKER_URL}
+      JWT_SECRET: ${JWT_SECRET}
+    depends_on:
+      broker:
+        condition: service_healthy
+    networks:
+      - gateway-network
+      - history-db-network
+
+  history-db:
+    container_name: history-db
+    image: mongo:7.0.14
+    volumes:
+      - history-db:/data/db
+    networks:
+      - history-db-network
 
 volumes:
   question-db:
   user-db:
   match-db:
   collaboration-db:
+  history-db:
 
 networks:
   gateway-network:
@@ -184,4 +212,6 @@ networks:
   match-db-network:
     driver: bridge
   collaboration-db-network:
-    driver: bridge
+    driver: bridge
+  history-db-network:
+    driver: bridge

frontend/angular.json

@@ -37,8 +37,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "2MB",
-                  "maximumError": "3MB"
+                  "maximumWarning": "7MB",
+                  "maximumError": "10MB"
                 },
                 {
                   "type": "anyComponentStyle",