fix: local docker compose setup

Migrations are done automatically when starting the server and should not be applied in the local docker compose image itself

Revert "fix: local docker compose setup"

This reverts commit 96a82e3fe7b6fab9140788bef7eee9ded989f6ba.

a

Author: kevcodez

docker/compose.yml

@@ -10,4 +10,3 @@ services:
       POSTGRES_PASSWORD: postgres
     volumes:
       - ./db/migrations/schema.sql:/docker-entrypoint-initdb.d/0000_schema.sql
-      - ../db/migrations:/docker-entrypoint-initdb.d

src/server.ts

@@ -3,7 +3,6 @@ import { Server, IncomingMessage, ServerResponse } from 'node:http'
 import { runMigrations } from './utils/migrate'
 import { createServer } from './app'
 import { getConfig } from './utils/config'
-import { Client } from 'pg'
 import { logger } from './logger'
 
 const config = getConfig()
@@ -16,30 +15,10 @@ const main = async () => {
     requestIdHeader: 'Request-Id',
   })
 
-  // Init config
-  const port = getConfig().PORT
-
-  // Init DB
-  const dbConfig = {
-    connectionString: config.DATABASE_URL,
-    connectionTimeoutMillis: 10_000,
-  }
-  const client = new Client(dbConfig)
-
-  // Run migrations
-  try {
-    await client.connect()
-
-    // Ensure schema exists, not doing it via migration to not break current migration checksums
-    await client.query(`CREATE SCHEMA IF NOT EXISTS ${config.SCHEMA};`)
-
-    await runMigrations(client)
-  } finally {
-    await client.end()
-  }
+  await runMigrations()
 
   // Start the server
-  app.listen({ port: Number(port), host: '0.0.0.0' }, (err, address) => {
+  app.listen({ port: Number(config.PORT), host: '0.0.0.0' }, (err, address) => {
     if (err) {
       console.error(err)
       process.exit(1)

src/utils/migrate.ts

@@ -27,13 +27,26 @@ async function connectAndMigrate(client: Client, migrationsDirectory: string, lo
   }
 }
 
-export async function runMigrations(client: Client): Promise<void> {
+export async function runMigrations(): Promise<void> {
+  // Init DB
+  const dbConfig = {
+    connectionString: config.DATABASE_URL,
+    connectionTimeoutMillis: 10_000,
+  }
+  const client = new Client(dbConfig)
+
   try {
+    // Run migrations
+    await client.connect()
+
+    // Ensure schema exists, not doing it via migration to not break current migration checksums
+    await client.query(`CREATE SCHEMA IF NOT EXISTS ${config.SCHEMA};`)
+
     console.log('Running migrations')
+
     await connectAndMigrate(client, './db/migrations')
-  } catch (error) {
-    throw error
   } finally {
+    await client.end()
     console.log('Finished migrations')
   }
 }

test/webhooks.test.ts

@@ -5,6 +5,7 @@ import { createServer } from '../src/app'
 import { getConfig } from '../src/utils/config'
 import stripeMock from './helpers/stripe'
 import 'dotenv/config'
+import { runMigrations } from '../src/utils/migrate'
 
 jest.doMock('stripe', () => {
   return jest.fn(() => stripeMock)
@@ -18,6 +19,7 @@ describe('/webhooks', () => {
 
   beforeAll(async () => {
     server = await createServer()
+    await runMigrations()
   })
 
   afterAll(async () => {