From 01cd784a0e99586b1cc25b53993e159765915fba Mon Sep 17 00:00:00 2001 From: Mark Moffat Date: Sun, 9 Jun 2019 22:02:22 +0930 Subject: [PATCH] Fixed test scripts --- lib/common.js | 9 +++++++++ lib/testdata.js | 13 +------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/common.js b/lib/common.js index ce23378..41e2656 100755 --- a/lib/common.js +++ b/lib/common.js @@ -633,6 +633,15 @@ exports.indexOrders = (app, cb) => { }); }; +exports.fixProductDates = (products) => { + let index = 0; + products.forEach((product) => { + products[index].productAddedDate = new Date(); + index++; + }); + return products; +}; + // start indexing products and orders exports.runIndexing = (app) => { console.info(colors.yellow('Setting up indexes..')); diff --git a/lib/testdata.js b/lib/testdata.js index d9020a3..276d61e 100644 --- a/lib/testdata.js +++ b/lib/testdata.js @@ -3,8 +3,6 @@ const { initDb } = require('./db'); const fs = require('fs'); const path = require('path'); -console.log('__dirname', path.join(__dirname, '..', 'bin', 'testdata.json')); - const testData = fs.readFileSync(path.join(__dirname, '..', 'bin', 'testdata.json'), 'utf-8'); const jsonData = JSON.parse(testData); @@ -22,7 +20,7 @@ initDb(config.databaseConnectionString, (err, db) => { Promise.all([ db.users.insertMany(jsonData.users), db.customers.insertMany(jsonData.customers), - db.products.insertMany(fixProductDates(jsonData.products)), + db.products.insertMany(common.fixProductDates(jsonData.products)), db.menu.insertOne(jsonData.menu) ]) .then(() => { @@ -40,12 +38,3 @@ initDb(config.databaseConnectionString, (err, db) => { }); }); -// Adds current date to product added date when smashing into DB -function fixProductDates(products){ - let index = 0; - products.forEach((product) => { - products[index].productAddedDate = new Date(); - index++; - }); - return products; -}