From a8756d591977ddd133d92377ef0762d1029a86e5 Mon Sep 17 00:00:00 2001 From: Kory Dondzila Date: Wed, 6 Jun 2018 15:27:13 -0400 Subject: [PATCH] fix(seed): Fixes database seeding issue (#17472) --- package.json | 2 +- server/boot/home.js | 29 ++++++++++++++++------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 0b396bc34c..cde2158dc4 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "lint-utils": "jsonlint-cli server/utils/*.json", "lint-js": "eslint --ext=.js,.jsx gulpfile.js server/ common/ config/ client/", "lint-json": "npm run lint-server && npm run lint-challenges && npm run lint-resources && npm run lint-utils", - "only-once": "npm run prelint-js && echo '/****/' && echo 'Seeding Database' && echo '/****/' && node seed/index.js && echo '/****/' && echo 'Seeding Completed' && echo '/****/'", + "only-once": "npm run prelint-js && echo '/****/' && echo 'Seeding Database' && echo '/****/' && SEEDING=true node seed/index.js && echo '/****/' && echo 'Seeding Completed' && echo '/****/'", "postonly-once": "gulp generate-migration-map", "postseed": "gulp generate-migration-map", "prelint-js": "npm run ensure-env", diff --git a/server/boot/home.js b/server/boot/home.js index 065f8db816..9bea627305 100644 --- a/server/boot/home.js +++ b/server/boot/home.js @@ -9,19 +9,22 @@ module.exports = function(app, done) { const { About } = app.models; const router = app.loopback.Router(); let challengeCount = 0; - cachedMap(app.models) - .do(({ entities: { challenge } }) => { - challengeCount = Object.keys(challenge).length; - }) - .subscribe( - () => {}, - err => {throw new Error(err);}, - () => { - router.get('/', addDefaultImage, index); - app.use(router); - done(); - } - ); + + if (!process.env.SEEDING) { + cachedMap(app.models) + .do(({ entities: { challenge } }) => { + challengeCount = Object.keys(challenge).length; + }) + .subscribe( + () => {}, + err => {throw new Error(err);}, + () => { + router.get('/', addDefaultImage, index); + app.use(router); + done(); + } + ); + } function addDefaultImage(req, res, next) { if (!req.user || req.user.picture) {