Merge pull request #13 from CS3219-AY2425S1/chore/migrate-db-configs

Add central DB config

Author: SeeuSim

.env.local

@@ -0,0 +1,8 @@
+USER_PGDATA="/data/user-db"
+USER_EXPRESS_DB_PORT=5431
+
+QUESTION_PGDATA="/data/qn-db"
+QUESTION_EXPRESS_DB_PORT=5433
+
+COLLAB_PGDATA="/data/collab-db"
+COLLAB_EXPRESS_DB_PORT=5434

backend/collaboration/.env.local

@@ -0,0 +1,7 @@
+EXPRESS_ENV="local"
+EXPRESS_DB_HOST="localhost"
+EXPRESS_DB_PORT=5434
+POSTGRES_DB="collaboration"
+POSTGRES_USER="peerprep-collab-express"
+POSTGRES_PASSWORD="/86awM+Izo6949YgEQIls8HU+j5RlFYEInRy8auiNa8="
+PGDATA="/data/collab-db"

backend/collaboration/docker-compose.yml

@@ -1,35 +1,41 @@
+# Command: docker-compose --env-file .env.local up -d
+
 services:
-  postgres:
-    hostname: postgres
-    image: postgres:16.4
-    container_name: 'collaboration_db'
+  collab-db:
+    hostname: "collab-db"
+    image: "postgres:16.4"
+    container_name: "collab-db"
     build:
       context: ./src/lib/db
-    environment:
-      POSTGRES_DB: 'Collaboration'
-      POSTGRES_USER: 'user'
-      POSTGRES_PASSWORD: 'user'
-      PGDATA: '/data/collaboration-db'
+    env_file:
+      - ./.env.local
     volumes:
-      - 'collaboration-db-docker:/data/collaboration-db'
+      - "collab-db-docker:/${PGDATA}"
       #  - ./init.sql:/docker-entrypoint-initdb.d/init.sql
     ports:
-      - '5434:5432'
+      - "${EXPRESS_DB_PORT}:5432"
     restart: unless-stopped
 
-  express:
-    image: 'collaboration-express'
-    container_name: 'collaboration-express'
+  collab-express:
+    image: "collab-express"
+    container_name: "collab-express"
     build:
       context: ./
       dockerfile: ./express.Dockerfile
       target: build
+      args:
+        # For building with the correct env vars
+        - env=${EXPRESS_ENV}
     ports:
-      - '9003:8001'
+      - "9003:8001"
     command: node dist/index.js
+    env_file:
+      - ./.env.local
+    environment:
+      # Docker Compose Specific
+      - EXPRESS_DB_HOST=collab-db
+      - EXPRESS_DB_PORT=5432
     depends_on:
-      postgres:
-        condition: service_started
-        restart: true
+      - collab-db
 volumes:
-  collaboration-db-docker:
+  collab-db-docker:

backend/collaboration/drizzle.config.ts

@@ -1,14 +1,16 @@
 import { defineConfig } from 'drizzle-kit';
 
+const config = {
+  host: process.env.EXPRESS_DB_HOST!,
+  port: Number.parseInt(process.env.EXPRESS_DB_PORT!),
+  database: process.env.POSTGRES_DB!,
+  user: process.env.POSTGRES_USER,
+  password: process.env.POSTGRES_PASSWORD,
+};
+
 export default defineConfig({
   schema: './src/lib/db/schema.ts',
   out: './drizzle',
   dialect: 'postgresql',
-  dbCredentials: {
-    host: 'localhost',
-    port: 5434,
-    database: 'Collaboration',
-    user: 'user',
-    password: 'user',
-  },
+  dbCredentials: config,
 });

backend/collaboration/drizzle.migrate.mts

@@ -0,0 +1,21 @@
+import postgres from 'postgres';
+import { drizzle } from 'drizzle-orm/postgres-js';
+import { migrate } from 'drizzle-orm/postgres-js/migrator';
+
+const config = {
+  host: process.env.EXPRESS_DB_HOST!,
+  port: Number.parseInt(process.env.EXPRESS_DB_PORT!),
+  database: process.env.POSTGRES_DB,
+  user: process.env.POSTGRES_USER,
+  password: process.env.POSTGRES_PASSWORD,
+};
+const migrationConnection = postgres({ ...config, max: 1 });
+
+const db = drizzle(migrationConnection);
+
+const main = async () => {
+  await migrate(db, { migrationsFolder: 'drizzle' });
+  await migrationConnection.end();
+};
+
+void main();

backend/collaboration/drizzle.migrate.ts

@@ -1,14 +1,17 @@
 FROM node:lts-alpine AS build
-WORKDIR /data/user-express
+WORKDIR /data/collab-express
 COPY package*.json ./
 RUN npm install
 COPY . .
 RUN npm run build
 
 FROM node:lts-alpine AS production
-WORKDIR /data/user-express
-COPY --from=build /data/user-express/package*.json ./
+WORKDIR /data/collab-express
+COPY --from=build /data/collab-express/package*.json ./
 RUN npm ci --omit=dev
-COPY --from=build --chown=node:node /data/user-express/dist ./dist
+COPY --from=build --chown=node:node /data/collab-express/dist ./dist
+
+ARG env
+COPY ".env.${env}" .
 EXPOSE 8001
-ENTRYPOINT ["node", "dist/index.js"]
+CMD [ "npm", "run", "start" ]

backend/collaboration/express.Dockerfile

@@ -3,12 +3,15 @@
   "version": "1.0.0",
   "main": "dist/index.js",
   "scripts": {
-    "dev": "nodemon src/index.ts | pino-pretty",
-    "build": "tsc",
-    "start": "node dist/index.js",
+    "dev": "env-cmd -f .env.local nodemon src/index.ts | pino-pretty",
+    "build": "env-cmd -f .env.local tsc && tsc-alias",
+    "start": "env-cmd -f .env.local node dist/index.js",
+    "build:prod": "env-cmd -f .env.prod tsc && tsc-alias",
+    "start:prod": "env-cmd -f .env.local node dist/index.js",
+    "db:generate": "env-cmd -f .env.local drizzle-kit generate",
+    "db:migrate": "env-cmd -f .env.local tsx drizzle.migrate.ts",
+    "db:inspect": "env-cmd -f .env.local drizzle-kit studio",
     "fmt": "prettier --config .prettierrc src --write",
-    "db:generate": "drizzle-kit generate",
-    "db:migrate": "tsx drizzle.migrate.mts",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
@@ -17,6 +20,7 @@
   "description": "",
   "dependencies": {
     "drizzle-orm": "^0.33.0",
+    "env-cmd": "^10.1.0",
     "express": "^4.21.0",
     "pino": "^9.4.0",
     "pino-http": "^10.3.0",
@@ -28,6 +32,7 @@
     "drizzle-kit": "^0.24.2",
     "nodemon": "^3.1.4",
     "pino-pretty": "^11.2.2",
-    "ts-node": "^10.9.2"
+    "ts-node": "^10.9.2",
+    "tsc-alias": "^1.8.10"
   }
 }

backend/collaboration/package.json

@@ -1,13 +1,15 @@
 import { drizzle } from 'drizzle-orm/postgres-js';
 import postgres from 'postgres';
 
-const queryClient = postgres({
-  host: 'localhost',
-  port: 5434,
-  database: 'Collaboration',
-  user: 'user',
-  password: 'user',
-});
+export const config = {
+  host: process.env.EXPRESS_DB_HOST!,
+  port: Number.parseInt(process.env.EXPRESS_DB_PORT!),
+  database: process.env.POSTGRES_DB,
+  user: process.env.POSTGRES_USER,
+  password: process.env.POSTGRES_PASSWORD,
+};
+
+const queryClient = postgres(config);
 
 export const db = drizzle(queryClient);
 

backend/collaboration/src/lib/db/index.ts

@@ -4,7 +4,7 @@ import express, { json } from 'express';
 import pino from 'pino-http';
 import { sql } from 'drizzle-orm';
 
-import { db } from '@/lib/db';
+import { config, db } from '@/lib/db';
 import { logger } from '@/lib/utils';
 
 const app = express();
@@ -24,6 +24,7 @@ export const dbHealthCheck = async () => {
   } catch (error) {
     const { message } = error as Error;
     logger.error('Cannot connect to DB: ' + message);
+    logger.error(`DB Config: ${JSON.stringify({ ...config, password: '<REDACTED>' })}`);
     exit(1);
   }
 };