Merge pull request #33 from CS3219-AY2425S1/PEER-255-Dockerize-DBs

PEER-255 Add docker-compose config for user-db and user-service

Author: SeeuSim

.env.local

@@ -6,3 +6,18 @@ QUESTION_EXPRESS_DB_PORT=5433
 
 COLLAB_PGDATA="/data/collab-db"
 COLLAB_EXPRESS_DB_PORT=5434
+
+MATCHING_PGDATA="/data/collab-db"
+MATCHING_EXPRESS_DB_PORT=5434
+
+USER_EXPRESS_ENV=compose
+USER_EXPRESS_PORT=9001
+
+QUESTION_EXPRESS_ENV=compose
+QUESTION_EXPRESS_PORT=9002
+
+COLLAB_EXPRESS_ENV=compose
+COLLAB_EXPRESS_PORT=9003
+
+MATCHING_EXPRESS_ENV=compose
+MATCHING_EXPRESS_PORT=9003

Makefile

@@ -7,8 +7,14 @@ migrate-seed:
 
 db-up:
 	./scripts/ensure-volume.sh
-	docker compose --env-file .env.local up -d
+	docker compose --env-file .env.local -f docker-compose.local.yaml up -d
 
 db-down:
-	docker compose --env-file .env.local down
+	docker compose --env-file .env.local -f docker-compose.local.yaml down
+
+up:
+	./scripts/ensure-volume.sh
+	docker compose --env-file .env.local up -d
 
+down:
+	docker compose --env-file .env.local down

backend/collaboration/.env.local

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

backend/collaboration/package.json

@@ -9,7 +9,7 @@
     "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:migrate": "env-cmd -f .env.local tsx ./src/lib/db/migrate.ts",
     "db:inspect": "env-cmd -f .env.local drizzle-kit studio",
     "fmt": "prettier --config .prettierrc src --write",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -19,14 +19,17 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
+    "cors": "^2.8.5",
     "drizzle-orm": "^0.33.0",
     "env-cmd": "^10.1.0",
     "express": "^4.21.0",
+    "http-status-codes": "^2.3.0",
     "pino": "^9.4.0",
     "pino-http": "^10.3.0",
     "postgres": "^3.4.4"
   },
   "devDependencies": {
+    "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/node": "^22.5.5",
     "drizzle-kit": "^0.24.2",

backend/collaboration/src/config.ts

@@ -0,0 +1,15 @@
+import 'dotenv/config';
+
+export const JWT_SECRET_KEY = process.env.EXPRESS_JWT_SECRET_KEY!;
+
+export const UI_HOST = process.env.PEERPREP_UI_HOST!;
+
+export const EXPRESS_PORT = process.env.EXPRESS_PORT;
+
+export const dbConfig = {
+  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,
+};

backend/collaboration/src/index.ts

@@ -1,7 +1,8 @@
+import { EXPRESS_PORT } from '@/config';
 import { logger } from '@/lib/utils';
 import app, { dbHealthCheck } from '@/server';
 
-const port = process.env.PORT || 8001;
+const port = Number.parseInt(EXPRESS_PORT || '8001');
 
 const listenMessage = `App listening on port: ${port}`;
 app.listen(port, () => {

backend/collaboration/drizzle.migrate.ts renamed to backend/collaboration/src/lib/db/migrate.ts

@@ -1,21 +1,27 @@
 import { exit } from 'process';
 
+import cors from 'cors';
+import { sql } from 'drizzle-orm';
 import express, { json } from 'express';
+import { StatusCodes } from 'http-status-codes';
 import pino from 'pino-http';
-import { sql } from 'drizzle-orm';
 
 import { config, db } from '@/lib/db';
 import { logger } from '@/lib/utils';
+import { UI_HOST } from './config';
 
 const app = express();
 app.use(pino());
 app.use(json());
+app.use(
+  cors({
+    origin: [UI_HOST],
+    credentials: true,
+  })
+);
 
-app.get('/', async (_req, res) => {
-  res.json({
-    message: 'OK',
-  });
-});
+// Health Check for Docker
+app.get('/health', (_req, res) => res.status(StatusCodes.OK).send('OK'));
 
 export const dbHealthCheck = async () => {
   try {

backend/collaboration/src/server.ts

@@ -1,3 +1,15 @@
+DO $$ BEGIN
+ CREATE TYPE "public"."action" AS ENUM('SEED');
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "admin" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"created_at" timestamp DEFAULT now(),
+	"action" "action" NOT NULL
+);
+--> statement-breakpoint
 CREATE TABLE IF NOT EXISTS "questions" (
 	"id" serial PRIMARY KEY NOT NULL,
 	"title" varchar(255) NOT NULL,

backend/question/drizzle/0000_initial_schema.sql

@@ -1,9 +1,40 @@
 {
-  "id": "537c03f5-13dd-427a-ae0d-cfd203da09ed",
+  "id": "84b2ca8d-3021-496f-8769-bbc4dada6468",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
   "tables": {
+    "public.admin": {
+      "name": "admin",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "action": {
+          "name": "action",
+          "type": "action",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
     "public.questions": {
       "name": "questions",
       "schema": "",
@@ -59,7 +90,15 @@
       "uniqueConstraints": {}
     }
   },
-  "enums": {},
+  "enums": {
+    "public.action": {
+      "name": "action",
+      "schema": "public",
+      "values": [
+        "SEED"
+      ]
+    }
+  },
   "schemas": {},
   "sequences": {},
   "_meta": {