From 6f574acd9c06194dd1615494e4a3ffb9fb732094 Mon Sep 17 00:00:00 2001
From: Julian Gruber <julian@juliangruber.com>
Date: Tue, 11 Jun 2024 23:55:34 +0200
Subject: [PATCH] clean up

---
 .github/workflows/ci.yml |  2 --
 README.md                |  6 ------
 common/db.js             | 21 ++++++++++++++++-----
 observer/bin/migrate.js  | 13 -------------
 observer/package.json    |  1 -
 package.json             |  1 -
 stats/bin/migrate.js     | 13 -------------
 stats/package.json       |  1 -
 8 files changed, 16 insertions(+), 42 deletions(-)
 delete mode 100644 observer/bin/migrate.js
 delete mode 100644 stats/bin/migrate.js

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4913744..3c36b2c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,6 @@ jobs:
         with:
           node-version: 20
       - run: npm ci
-      - run: npm run migrate
       - run: npm test
 
   build-observer:
@@ -63,7 +62,6 @@ jobs:
         with:
           node-version: 20
       - run: npm ci
-      - run: npm run migrate
       - run: npm test
 
   lint-all:
diff --git a/README.md b/README.md
index db37a58..1662c9d 100644
--- a/README.md
+++ b/README.md
@@ -75,12 +75,6 @@ Next, you need to create `spark_evaluate` database.
 psql postgres://localhost:5432/ -c "CREATE DATABASE spark_evaluate"
 ```
 
-Finally, run database schema migration scripts.
-
-```bash
-npm run migrate
-```
-
 ### Run the test suite
 
 ```sh
diff --git a/common/db.js b/common/db.js
index 5d34767..b49c7a7 100644
--- a/common/db.js
+++ b/common/db.js
@@ -1,5 +1,6 @@
-import { migrateWithPgClient } from '@filecoin-station/spark-stats-db-migrations'
 import pg from 'pg'
+import { migrateWithPgClient as migrateEvaluateDB } from 'spark-evaluate/lib/migrate.js'
+import { migrateWithPgClient as migrateStatsDB } from '@filecoin-station/spark-stats-db-migrations'
 
 const {
 // DATABASE_URL points to `spark_stats` database managed by this monorepo
@@ -37,7 +38,7 @@ export const getStats = async () => {
     connectionString: DATABASE_URL
   })
   stats.on('error', onError)
-  await migrateWithPgClient(stats)
+  await migrateStatsDB(stats)
   return stats
 }
 
@@ -47,9 +48,7 @@ export const getEvaluate = async () => {
     connectionString: EVALUATE_DB_URL
   })
   evaluate.on('error', onError)
-
-  // Check that we can talk to the database
-  await evaluate.query('SELECT 1')
+  await migrateEvaluateDB(evaluate)
   return evaluate
 }
 
@@ -63,3 +62,15 @@ export const getPgPools = async () => {
 
   return { stats, evaluate, end }
 }
+
+export const migrate = async () => {
+  const pgPools = await getPgPools()
+
+  console.log('Migrating spark_evaluate database')
+  await migrateEvaluateDB(pgPools.evaluate)
+
+  console.log('Migrating spark_stats database')
+  await migrateStatsDB(pgPools.stats)
+
+  await pgPools.end()
+}
diff --git a/observer/bin/migrate.js b/observer/bin/migrate.js
deleted file mode 100644
index 01924ed..0000000
--- a/observer/bin/migrate.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { getPgPools } from '../../common/db.js'
-import { migrateWithPgClient as migrateEvaluateDB } from 'spark-evaluate/lib/migrate.js'
-import { migrateWithPgClient as migrateStatsDB } from '@filecoin-station/spark-stats-db-migrations'
-
-const pgPools = await getPgPools()
-
-console.log('Migrating spark_evaluate database')
-await migrateEvaluateDB(pgPools.evaluate)
-
-console.log('Migrating spark_stats database')
-await migrateStatsDB(pgPools.stats)
-
-await pgPools.end()
diff --git a/observer/package.json b/observer/package.json
index bb84490..a183c07 100644
--- a/observer/package.json
+++ b/observer/package.json
@@ -3,7 +3,6 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "migrate": "node bin/migrate.js",
     "start": "node bin/spark-observer.js",
     "lint": "standard",
     "test": "mocha"
diff --git a/package.json b/package.json
index a7ac74f..fa27ee6 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,6 @@
     "stats"
   ],
   "scripts": {
-    "migrate": "npm run migrate --workspaces --if-present",
     "lint": "standard",
     "test:observer": "npm t -w observer",
     "test:stats": "npm t -w stats",
diff --git a/stats/bin/migrate.js b/stats/bin/migrate.js
deleted file mode 100644
index 01924ed..0000000
--- a/stats/bin/migrate.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { getPgPools } from '../../common/db.js'
-import { migrateWithPgClient as migrateEvaluateDB } from 'spark-evaluate/lib/migrate.js'
-import { migrateWithPgClient as migrateStatsDB } from '@filecoin-station/spark-stats-db-migrations'
-
-const pgPools = await getPgPools()
-
-console.log('Migrating spark_evaluate database')
-await migrateEvaluateDB(pgPools.evaluate)
-
-console.log('Migrating spark_stats database')
-await migrateStatsDB(pgPools.stats)
-
-await pgPools.end()
diff --git a/stats/package.json b/stats/package.json
index c744938..f71a09a 100644
--- a/stats/package.json
+++ b/stats/package.json
@@ -3,7 +3,6 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "migrate": "node bin/migrate.js",
     "start": "node bin/spark-stats.js",
     "lint": "standard",
     "test": "mocha"