Merge pull request #1158 from hngprojects/dev

Merge branch 'dev' into staging

.env.local

@@ -33,7 +33,7 @@ PORT=3000
 DB_USERNAME=username
 DB_PASSWORD=password
 DB_TYPE=postgres
-DB_DATABASE=database
+DB_NAME=database
 DB_HOST=localhost
 DB_PORT=5432
 DB_ENTITIES=dist/src/modules/**/entities/**/*.entity{.ts,.js}

.github/Unused/pr-deploy.yaml

@@ -0,0 +1,27 @@
+# name: PR Deploy
+# on:
+#   pull_request_target:
+#     branches:
+#       - dev
+
+# jobs:
+#   deploy-pr-for-testing:
+#     environment:
+#       name: preview
+#       url: ${{ steps.deploy.outputs.preview-url }}
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Checkout to branch
+#         uses: actions/checkout@v4
+#       - id: deploy
+#         name: Pull Request Deploy
+#         uses: hngprojects/pr-deploy@dev
+#         with:
+#           server_host: ${{ secrets.HOST }}
+#           server_username: ${{ secrets.USERNAME }}
+#           server_password: ${{ secrets.PASSWORD }}
+#           comment: false
+#           context: .
+#           dockerfile: Dockerfile
+#           exposed_port: 5000
+#           github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/main-deployment.yaml

@@ -0,0 +1,21 @@
+name: Production Deployment
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy-prod:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy on server
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          password: ${{ secrets.PASSWORD }}
+          script: |
+            cd main
+            chmod +x deployment.sh
+            ./deployment.sh main

.github/workflows/scheduled-test.yaml

@@ -0,0 +1,22 @@
+name: Scheduled Test
+
+on:
+  schedule:
+    - cron: '*/15 * * * *'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Run test script
+        env:
+          POSTMAN_API_KEY: ${{ secrets.POSTMAN_API_KEY }}
+          API_URL: ${{ secrets.API_URL }}
+        run: |
+          cd qa
+          chmod +x test.sh
+          ./test.sh

.github/workflows/staging-deployment.yaml

@@ -1,41 +1,13 @@
 name: Staging Deployment
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - staging
 
 jobs:
-  build-and-push:
-    if: github.event.repository.fork == false
+  deploy-staging:
     runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Build Docker image
-        run: docker build -t nestjs_staging:green .
-
-      - name: Save and compress Docker image
-        run: |
-          docker save nestjs_staging:green | gzip > nestjs_staging.tar.gz
-
-      - name: Copy image to server
-        uses: appleboy/scp-action@master
-        with:
-          host: ${{ secrets.HOST }}
-          username: ${{ secrets.USERNAME }}
-          password: ${{ secrets.PASSWORD }}
-          source: 'nestjs_staging.tar.gz'
-          target: '/tmp'
-
-  deploy:
-    needs: build-and-push
-    runs-on: ubuntu-latest
-    environment:
-      name: 'staging'
-      url: ${{ vars.URL }}
     steps:
       - name: Deploy on server
         uses: appleboy/ssh-action@master
@@ -44,5 +16,6 @@ jobs:
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PASSWORD }}
           script: |
-            cd ~/hng_boilerplate_nestjs
-            ./deploy.sh staging
+            cd staging
+            chmod +x deployment.sh
+            ./deployment.sh staging

.vscode/settings.json

@@ -10,9 +10,14 @@
     "statusBar.background": "#1a1f15",
     "statusBarItem.hoverBackground": "#333d2a",
     "statusBar.foreground": "#e7e7e7",
-    "panel.border": "#333d2a",
-    "sideBar.border": "#333d2a",
-    "editorGroup.border": "#333d2a"
+    "commandCenter.border": "#e7e7e799",
+    "sash.hoverBorder": "#333d2a",
+    "statusBarItem.remoteBackground": "#1a1f15",
+    "statusBarItem.remoteForeground": "#e7e7e7",
+    "titleBar.activeBackground": "#1a1f15",
+    "titleBar.activeForeground": "#e7e7e7",
+    "titleBar.inactiveBackground": "#1a1f1599",
+    "titleBar.inactiveForeground": "#e7e7e799"
   },
   "peacock.color": "#1a1f15",
   "eslint.validate": [
@@ -28,6 +33,6 @@
     "source.fixAll": "explicit"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
   }
 }

compose.yaml → compose/compose.yaml

@@ -12,7 +12,7 @@ services:
       redis:
         condition: service_healthy
     healthcheck:
-      test: "wget -qO- http://app:${PORT}"
+      test: 'wget -qO- http://app:${PORT}'
       interval: 10s
       timeout: 10s
       retries: 3
@@ -28,7 +28,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
-      test: "pg_isready -U postgres"
+      test: 'pg_isready -U postgres'
       interval: 5s
       timeout: 5s
       retries: 3
@@ -41,7 +41,7 @@ services:
     volumes:
       - redis_data:/data
     healthcheck:
-      test: "redis-cli ping | grep PONG"
+      test: 'redis-cli ping | grep PONG'
       interval: 5s
       timeout: 5s
       retries: 3
@@ -55,7 +55,7 @@ services:
       app:
         condition: service_healthy
     healthcheck:
-      test: "wget -qO- http://nginx:80"
+      test: 'wget -qO- http://nginx:80'
       interval: 5s
       timeout: 5s
       retries: 3

deployment.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+BRANCH=$1
+
+# checkout
+git checkout $BRANCH;
+
+git pull origin $BRANCH;
+
+# install dependencies
+npm install --include=dev;
+
+# run build
+npm run build;
+
+
+git stash
+
+# run migration
+npm run migration:run;
+
+# run start
+pm2 restart $BRANCH-ecosystem-config.json ||  pm2 start $BRANCH-ecosystem-config.json;

main-ecosystem-config.json

@@ -1,11 +1,11 @@
 {
   "apps": [
     {
-      "name": "team-alpha-prod",
+      "name": "nestjs-prod",
       "script": "npm run start:prod",
       "log_file": "~/.pm2/logs/team-alpha-prod-out.log",
       "combine_logs": true,
       "log_date_format": "YYYY-MM-DD HH:mm:ss Z"
     }
   ]
-}
+}