diff --git a/server/src/database.ts b/server/src/database.ts index b83616dc4473709bc07bf19558d2b3b81862e476..be83ed0038669bfc4f7d2db6513475a0850d2c76 100644 --- a/server/src/database.ts +++ b/server/src/database.ts @@ -4,8 +4,8 @@ import knex from 'knex'; import { environment } from './config'; import config from './knexconfig'; -const database = knex(config[environment]); -database.migrate.latest(); +export const database = knex(config[environment]); +export const migrated = database.migrate.latest(); export default database; diff --git a/server/src/v1/user.test.ts b/server/src/v1/user.test.ts index 2983bbd0636bcceee84e9c0980492c543cc3e460..c9c59054a216e00ca9d347a930266576cc69c49f 100644 --- a/server/src/v1/user.test.ts +++ b/server/src/v1/user.test.ts @@ -1,9 +1,14 @@ import { api } from '../api'; +import { migrated } from '../database'; import supertest from 'supertest'; const request = supertest(api); +beforeAll(async () => { + await migrated; +}); + test('non existant username returns 404 for /v1/user/name/', async () => { const response = await request.get('/v1/user/name/__NO_REAL_NAME__'); expect(response.status).toEqual(404); diff --git a/server/src/v1/user.ts b/server/src/v1/user.ts index 8e596c226e059b2568ec479ce6e6caef51d6c8d5..8599d130df125d05f4e1420bd9611f93933921cf 100644 --- a/server/src/v1/user.ts +++ b/server/src/v1/user.ts @@ -32,6 +32,7 @@ user.get('/name/:username', async (req, res) => { }); } } catch (e) { + console.log(e); res.status(400).json({ status: 'error', message: 'failed get user',