From cf61a55b92231546abdad47ffad06f9aca736c29 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Tue, 20 Oct 2015 19:53:08 -0700 Subject: [PATCH] Fix first start for new devs also removes job seed --- index.js | 98 +++++++++++---------------------------------------- nonprofits.js | 29 +++++++++++++++ 2 files changed, 50 insertions(+), 77 deletions(-) create mode 100644 nonprofits.js diff --git a/index.js b/index.js index 464242c26e..8300b97245 100644 --- a/index.js +++ b/index.js @@ -1,55 +1,34 @@ /* eslint-disable no-process-exit */ require('babel/register'); require('dotenv').load(); + var fs = require('fs'), + Rx = require('rx'), _ = require('lodash'), path = require('path'), - app = require('../server/server'), - nonprofits = require('./nonprofits.json'), - jobs = require('./jobs.json'); + app = require('../server/server'); function getFilesFor(dir) { return fs.readdirSync(path.join(__dirname, '/' + dir)); } var Challenge = app.models.Challenge; -var Nonprofit = app.models.Nonprofit; -var Job = app.models.Job; -var counter = 0; var challenges = getFilesFor('challenges'); -// plus two accounts for nonprofits and jobs seed. -var numberToSave = challenges.length + 1; +var destroy = Rx.Observable.fromNodeCallback(Challenge.destroyAll, Challenge); +var create = Rx.Observable.fromNodeCallback(Challenge.create, Challenge); -function completionMonitor() { - // Increment counter - counter++; - - // Exit if all challenges have been checked - if (counter >= numberToSave) { - process.exit(0); - } - - // Log where in the seed order we're currently at - console.log('Call: ' + counter + '/' + numberToSave); -} - -Challenge.destroyAll(function(err, info) { - if (err) { - throw err; - } else { - console.log('Deleted ', info); - } - challenges.forEach(function(file) { +destroy() + .flatMap(function() { return Rx.Observable.from(challenges); }) + .flatMap(function(file) { var challengeSpec = require('./challenges/' + file); var order = challengeSpec.order; var block = challengeSpec.name; var isBeta = !!challengeSpec.isBeta; + console.log('parsed %s successfully', file); // challenge file has no challenges... if (challengeSpec.challenges.length === 0) { - console.log('file %s has no challenges', file); - completionMonitor(); - return; + return Rx.Observable.just([{ block: 'empty ' + block }]); } var challenges = challengeSpec.challenges @@ -73,50 +52,15 @@ Challenge.destroyAll(function(err, info) { return challenge; }); - Challenge.create( - challenges, - function(err) { - if (err) { - throw err; - } else { - console.log('Successfully parsed %s', file); - completionMonitor(err); - } - } - ); - }); -}); - -Nonprofit.destroyAll(function(err, info) { - if (err) { - console.error(err); - } else { - console.log('Deleted ', info); - } - Nonprofit.create(nonprofits, function(err, data) { - if (err) { - throw err; - } else { - console.log('Saved ', data); + return create(challenges); + }) + .subscribe( + function(challenges) { + console.log('%s successfully saved', challenges[0].block); + }, + function(err) { throw err; }, + function() { + console.log('challenge seed completed'); + process.exit(0); } - completionMonitor(err); - console.log('nonprofits'); - }); -}); - -Job.destroyAll(function(err, info) { - if (err) { - throw err; - } else { - console.log('Deleted ', info); - } - Job.create(jobs, function(err, data) { - if (err) { - console.log('error: ', err); - } else { - console.log('Saved ', data); - } - console.log('jobs'); - completionMonitor(err); - }); -}); + ); diff --git a/nonprofits.js b/nonprofits.js new file mode 100644 index 0000000000..a30cdcfbd2 --- /dev/null +++ b/nonprofits.js @@ -0,0 +1,29 @@ +/* eslint-disable no-process-exit */ +require('babel/register'); +require('dotenv').load(); + +var Rx = require('rx'); +var app = require('../server/server'); + +var Nonprofits = app.models.Challenge; +var nonprofits = require('./nonprofits.json'); +var destroy = Rx.Observable.fromNodeCallback(Nonprofits.destroyAll, Nonprofits); +var create = Rx.Observable.fromNodeCallback(Nonprofits.create, Nonprofits); + +destroy() + .flatMap(function() { + if (!nonprofits) { + return Rx.Observable.throw(new Error('No nonprofits found')); + } + return create(nonprofits); + }) + .subscribe( + function(nonprofits) { + console.log('successfully saved %d nonprofits', nonprofits.length); + }, + function(err) { throw err; }, + function() { + console.log('nonprofit seed completed'); + process.exit(0); + } + );