Merge pull request #68 from crux-bphc/fix-prod-staging-postgres-port-…

…clash

Move postgres port to env var to avoid clash between staging and prod db

.env.example

@@ -2,6 +2,7 @@ POSTGRES_USER=""
 PGUSER="" # should be same as POSTGRES_USER
 POSTGRES_PASSWORD=""
 POSTGRES_DB="" # should be same as POSTGRES_USER for some reason
+POSTGRES_PORT=5432
 DB_HOST="db"
 NODE_ENV="development"
 PROD_URL="http://localhost:3000"

.env.testing

@@ -2,6 +2,7 @@ POSTGRES_USER="chrono"
 PGUSER="chrono" # should be same as POSTGRES_USER
 POSTGRES_PASSWORD="aSBrbm93IHdoYXQgeW91IGFyZQ=="
 POSTGRES_DB="chrono" # should be same as POSTGRES_USER for some reason
+POSTGRES_PORT=5432
 DB_HOST="db-testing"
 NODE_ENV="development"
 PROD_URL="http://localhost:3000"

README.md

@@ -16,6 +16,7 @@ POSTGRES_USER="chrono"
 PGUSER="chrono" # should be same as POSTGRES_USER
 POSTGRES_PASSWORD="aSBrbm93IHdoYXQgeW91IGFyZQ=="
 POSTGRES_DB="chrono" # should be same as POSTGRES_USER for some reason
+POSTGRES_PORT=5432
 DB_HOST="db"
 NODE_ENV="development"
 PROD_URL="http://localhost:3000"

docker-compose.yml

@@ -6,7 +6,7 @@ services:
     env_file:
       - .env
     ports:
-      - "5432:5432"
+      - "${POSTGRES_PORT}:5432"
     healthcheck:
       test: ["CMD", "pg_isready", "-d", "${POSTGRES_DB}"]
       interval: 10s

src/config/schema.ts

@@ -11,6 +11,7 @@ export const serverSchema = z.object({
   POSTGRES_USER: z.string().min(1),
   POSTGRES_PASSWORD: z.string().min(1),
   POSTGRES_DB: z.string().min(1),
+  POSTGRES_PORT: z.coerce.number().default(5432),
   DB_HOST: z.string().min(1),
   PROD_URL: z.string().url().min(1),
   FRONTEND_URL: z.string().url().min(1),

src/db.ts

@@ -9,7 +9,7 @@ import { SearchHistory } from "./entity/SearchHistory";
 
 export const AppDataSource = new DataSource({
   type: "postgres",
-  url: `postgres://${env.POSTGRES_USER}:${env.POSTGRES_PASSWORD}@${env.DB_HOST}:5432?db=${env.POSTGRES_DB}`,
+  url: `postgres://${env.POSTGRES_USER}:${env.POSTGRES_PASSWORD}@${env.DB_HOST}:${env.POSTGRES_PORT}?db=${env.POSTGRES_DB}`,
   synchronize: true,
   logging: false,
   entities: [User, Timetable, Course, Section, SearchHistory],