From 61e38fca05bb4ff0844925abd0f52765a7c3d1fb Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 13:08:10 -0700 Subject: [PATCH 01/15] Setup node enviroment --- lab-eddie/.gitignore | 128 +++++++++++++++++++++++++++++++++++++++++ lab-eddie/package.json | 27 +++++++++ lab-eddie/server.js | 0 3 files changed, 155 insertions(+) create mode 100644 lab-eddie/.gitignore create mode 100644 lab-eddie/package.json create mode 100644 lab-eddie/server.js diff --git a/lab-eddie/.gitignore b/lab-eddie/.gitignore new file mode 100644 index 0000000..e19c8ab --- /dev/null +++ b/lab-eddie/.gitignore @@ -0,0 +1,128 @@ + +# Created by https://www.gitignore.io/api/osx,vim,node,windows + +### Node ### +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Typescript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + + +### OSX ### +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Vim ### +# swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-v][a-z] +[._]sw[a-p] +# session +Session.vim +# temporary +.netrwhist +*~ +# auto-generated tag files +tags + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.gitignore.io/api/osx,vim,node,windows +data \ No newline at end of file diff --git a/lab-eddie/package.json b/lab-eddie/package.json new file mode 100644 index 0000000..32df5e5 --- /dev/null +++ b/lab-eddie/package.json @@ -0,0 +1,27 @@ +{ + "name": "lab-eddie", + "version": "1.0.0", + "description": "", + "main": "server.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "start": "node server.js" + }, + "keywords": [], + "author": "", + "license": "ISC", + "dependencies": { + "bluebird": "^3.5.0", + "body-parser": "^1.17.2", + "debug": "^2.6.8", + "express": "^4.15.3", + "http-errors": "^1.6.1", + "morgan": "^1.8.2", + "uuid": "^3.1.0" + }, + "devDependencies": { + "chai": "^4.1.0", + "mocha": "^3.5.0", + "superagent": "^3.5.2" + } +} diff --git a/lab-eddie/server.js b/lab-eddie/server.js new file mode 100644 index 0000000..e69de29 From 60c500463d4b71436cb84c97b9eee389ccb6cf74 Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 13:11:31 -0700 Subject: [PATCH 02/15] Required minimum dependancies for server to be active --- lab-eddie/server.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lab-eddie/server.js b/lab-eddie/server.js index e69de29..122ff10 100644 --- a/lab-eddie/server.js +++ b/lab-eddie/server.js @@ -0,0 +1,18 @@ +'use strict'; + +const express = require('express'); +const debug = require('debug')('app:server'); +const morgan = require('morgan'); +const PORT = process.env.PORT || 3000; + +const app = express(); + + + + + + + +app.listen(PORT, () => { + debug(console.log('Server active: ', PORT)); +}) \ No newline at end of file From 420e547627c036293c7e4fdb755ab2fd6d26fc57 Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 13:18:33 -0700 Subject: [PATCH 03/15] Created band member model --- lab-eddie/model/band-member.js | 13 +++++++++++++ lab-eddie/server.js | 8 +++----- 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 lab-eddie/model/band-member.js diff --git a/lab-eddie/model/band-member.js b/lab-eddie/model/band-member.js new file mode 100644 index 0000000..1b47f66 --- /dev/null +++ b/lab-eddie/model/band-member.js @@ -0,0 +1,13 @@ +'use strict'; + +const uuid = require('uuid/v4'); + +const BandMember = module.exports = function(first, last, ...instruments) { + + this.first = first; + this.last = last; + this.instruments = instruments; + this.id = uuid(); + +}; + diff --git a/lab-eddie/server.js b/lab-eddie/server.js index 122ff10..efc725b 100644 --- a/lab-eddie/server.js +++ b/lab-eddie/server.js @@ -3,15 +3,13 @@ const express = require('express'); const debug = require('debug')('app:server'); const morgan = require('morgan'); +const creatError = require('http-errors'); const PORT = process.env.PORT || 3000; -const app = express(); - - - - +const app = express(); +app.use(morgan('dev')); app.listen(PORT, () => { debug(console.log('Server active: ', PORT)); From e2c8e2519feb0509781260e0307a4f559a0e0518 Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 13:21:29 -0700 Subject: [PATCH 04/15] Instantiated js files in lib directory to use as modules --- lab-eddie/lib/auto-direct.js | 0 lab-eddie/lib/cors.js | 0 lab-eddie/lib/errors.js | 0 lab-eddie/lib/member-router.js | 0 lab-eddie/lib/param-errors.js | 0 lab-eddie/lib/storage.js | 0 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 lab-eddie/lib/auto-direct.js create mode 100644 lab-eddie/lib/cors.js create mode 100644 lab-eddie/lib/errors.js create mode 100644 lab-eddie/lib/member-router.js create mode 100644 lab-eddie/lib/param-errors.js create mode 100644 lab-eddie/lib/storage.js diff --git a/lab-eddie/lib/auto-direct.js b/lab-eddie/lib/auto-direct.js new file mode 100644 index 0000000..e69de29 diff --git a/lab-eddie/lib/cors.js b/lab-eddie/lib/cors.js new file mode 100644 index 0000000..e69de29 diff --git a/lab-eddie/lib/errors.js b/lab-eddie/lib/errors.js new file mode 100644 index 0000000..e69de29 diff --git a/lab-eddie/lib/member-router.js b/lab-eddie/lib/member-router.js new file mode 100644 index 0000000..e69de29 diff --git a/lab-eddie/lib/param-errors.js b/lab-eddie/lib/param-errors.js new file mode 100644 index 0000000..e69de29 diff --git a/lab-eddie/lib/storage.js b/lab-eddie/lib/storage.js new file mode 100644 index 0000000..e69de29 From ac9ccfd488e02a728faa15efed84f98e099aef16 Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 13:46:59 -0700 Subject: [PATCH 05/15] Added wrapper methods for bandMember model --- lab-eddie/lib/auto-direct.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 lab-eddie/lib/auto-direct.js diff --git a/lab-eddie/lib/auto-direct.js b/lab-eddie/lib/auto-direct.js deleted file mode 100644 index e69de29..0000000 From a706acaa9f517ef36930653da8b4a3645c426856 Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 13:47:04 -0700 Subject: [PATCH 06/15] Added wrapper methods for bandMember model --- lab-eddie/model/band-member.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lab-eddie/model/band-member.js b/lab-eddie/model/band-member.js index 1b47f66..08b096a 100644 --- a/lab-eddie/model/band-member.js +++ b/lab-eddie/model/band-member.js @@ -1,8 +1,12 @@ 'use strict'; const uuid = require('uuid/v4'); +const storage = require('../lib/storage'); +const debug = require('debug')('app:band-members') const BandMember = module.exports = function(first, last, ...instruments) { + debug('member constructor'); + if(arguments.length < 3) return new Error('Expected at least3 arguments'); this.first = first; this.last = last; @@ -11,3 +15,23 @@ const BandMember = module.exports = function(first, last, ...instruments) { }; +BandMember.fetchMember = function(id) { + debug('fetchMember'); + storage.fetchItem('bandMember', id); +}; + +BandMember.createMember = function(...params) { + debug('createMember'); + try { + let member = new BandMember(...params); + return storage.createItem('bandMember', member); + } catch(err) { + return Promise.reject(err); + } +}; + +BandMember.deleteMember = function(id) { + debug('deleteMember'); + + storage.deleteItem('bandMember', id); +} \ No newline at end of file From cb7f42eba13d25a207e750dce9577837159244d0 Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 15:18:37 -0700 Subject: [PATCH 07/15] Created storage.js and wrote file management methods --- lab-eddie/lib/storage.js | 53 ++++++++++++++++++++++++++++++++++ lab-eddie/model/band-member.js | 30 +++++++++++++++---- 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/lab-eddie/lib/storage.js b/lab-eddie/lib/storage.js index e69de29..2d3a852 100644 --- a/lab-eddie/lib/storage.js +++ b/lab-eddie/lib/storage.js @@ -0,0 +1,53 @@ +'use strict' + +const debug = require('debug')('app:storage'); +const Promise = require('bluebird'); +const fs = Promise.promisifyAll(require('fs'), {suffix: 'Prom'}); +const createError = require('http-errors'); + +const storage = module.exports = {}; + +storage.fetchItem = function(category, id) { + debug('fetchItem') + if(!category) return Promise.reject(createError(404, 'Expeced Category')); + if(!id) return storage.fetchAll(category); + + return fs.readFileProm(`${__dirname}/../data/${category}/${id}.json`) + .then(data => { + try { + return JSON.parse(data.toString()); + } catch (err) { + return Promise.reject(createError(400, 'Bad Request')); + } + }) + .catch(err => Promise.reject(createError(404, 'resource not found'))); +}; + +storage.createItem = function(category, item) { + debug('createItem'); + if(!category) return Promise.reject(createError(404, 'Expected Category')); + if(!item) return Promise.reject(createError(404, 'Expected item')); + + json = JSON.stringify(item); + return fs.writeFileProm(`${__dirname}/../data/${category}/${item.id}.json`, json) + .then(() => item) + .catch(err => Promise.reject(createError(500, 'Something broke'))); + +}; + +storage.deleteItem = function(category, id) { + debug('deleteItem') + if(!category) return Promise.reject(createError(404, 'Expected Category')); + if(!id) return Promise.reject(createError(404, 'Expected id')); + + return fs.unlinkProm(`${__dirname}/../data/${category}/${id}.json`) + .catch(err => Promise.reject(createError(404, 'Item not found'))); + +}; + +storage.fetchAll = function(category) { + if(!category) Promise.reject(createError(404, 'Expected Category')); + + return fs.readdirProm(`${__dirname}/../data/${category}`) + .then(dir => dir.map(file => file.split('.json')[0])); +}; \ No newline at end of file diff --git a/lab-eddie/model/band-member.js b/lab-eddie/model/band-member.js index 08b096a..6a6a100 100644 --- a/lab-eddie/model/band-member.js +++ b/lab-eddie/model/band-member.js @@ -2,7 +2,8 @@ const uuid = require('uuid/v4'); const storage = require('../lib/storage'); -const debug = require('debug')('app:band-members') +const createError = require('http-errors'); +const debug = require('debug')('app:band-members'); const BandMember = module.exports = function(first, last, ...instruments) { debug('member constructor'); @@ -17,7 +18,7 @@ const BandMember = module.exports = function(first, last, ...instruments) { BandMember.fetchMember = function(id) { debug('fetchMember'); - storage.fetchItem('bandMember', id); + return storage.fetchItem('bandMember', id); }; BandMember.createMember = function(...params) { @@ -26,12 +27,31 @@ BandMember.createMember = function(...params) { let member = new BandMember(...params); return storage.createItem('bandMember', member); } catch(err) { - return Promise.reject(err); + return Promise.reject(createError(400, err.message)); } }; BandMember.deleteMember = function(id) { debug('deleteMember'); - storage.deleteItem('bandMember', id); -} \ No newline at end of file + return storage.deleteItem('bandMember', id); +} + +BandMember.updateMember = function(id, _member) { + debug('updateMember'); + + return storage.fetchItem('bandMember', id) + .catch( err => Promise.reject(createError(404, err.message))) + .then( member => { + for (var key in member) { + if (member === 'id') continue; + if (_member[key]) member[key] = _member[key]; + } + return storage.createItem('bandMember', member); + }); +}; + +BandMember.fetchAll = function() { + debug('fetchAll'); + return storage.fetchItem('bandMembers'); +}; From 84079a361cd5f2f8293df34322ba762c100087ed Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 15:19:39 -0700 Subject: [PATCH 08/15] Added promise catch to storage.fetchall method --- lab-eddie/lib/storage.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lab-eddie/lib/storage.js b/lab-eddie/lib/storage.js index 2d3a852..8497931 100644 --- a/lab-eddie/lib/storage.js +++ b/lab-eddie/lib/storage.js @@ -49,5 +49,6 @@ storage.fetchAll = function(category) { if(!category) Promise.reject(createError(404, 'Expected Category')); return fs.readdirProm(`${__dirname}/../data/${category}`) - .then(dir => dir.map(file => file.split('.json')[0])); + .then(dir => dir.map(file => file.split('.json')[0])) + .catch(err => Promise.reject(createError(404, 'Model not found'))); }; \ No newline at end of file From 40eb4279c2fc2b11c8829fcdee287d2e9231ffdc Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 15:40:02 -0700 Subject: [PATCH 09/15] Wrote member routes method, created cors module --- lab-eddie/lib/cors.js | 7 +++++ lab-eddie/lib/member-router.js | 49 ++++++++++++++++++++++++++++++++++ lab-eddie/lib/param-errors.js | 0 3 files changed, 56 insertions(+) delete mode 100644 lab-eddie/lib/param-errors.js diff --git a/lab-eddie/lib/cors.js b/lab-eddie/lib/cors.js index e69de29..4ee4326 100644 --- a/lab-eddie/lib/cors.js +++ b/lab-eddie/lib/cors.js @@ -0,0 +1,7 @@ +'use strict'; + +module.exports = function(req, res, next) { + res.append('Access-Control-Allow-Origin', '*'); + res.append('Access-Control-Allow-Headers', '*'); + next(); +} \ No newline at end of file diff --git a/lab-eddie/lib/member-router.js b/lab-eddie/lib/member-router.js index e69de29..34c3ce0 100644 --- a/lab-eddie/lib/member-router.js +++ b/lab-eddie/lib/member-router.js @@ -0,0 +1,49 @@ +'use strict'; + +const Router = require('express').Router; +const jsonParser = require('body-parser').json(); +const BandMember = require('../model/band-member.js'); +const debug = require('debug'); +const memberRouter = new Router(); + +memberRouter.post('api/band-member/:first/:last:/:instruments', jsonParser, function(req, res, next) { + debug('POST: api/band-member'); + + BandMember.createMember(...req.params) + .then(member => res.json(member)) + .catch(err => next(err)); +}); + +memberRouter.get('api/band-member/:id', function(req, res, next) { + debug('GET: api/band-member/:id'); + + BandMember.fetchMember(req.params.id) + .then(member => res.json(member)) + .catch(err => next(err)); +}); + +memberRouter.get('api/band-member', function(req, res, next) { + debug('GET: api/band-member/'); + + BandMember.fetchAll() + .then(band => res.json(band)) + .catch(err => next(err)); +}); + +memberRouter.put('api/band-member/:id/:name/:first/:last:/instruments', jsonParser, function(req, res, next){ + debug('PUT: api/band-member'); + + BandMember.updateMember(...req.params) + .then(member = res.json(member)) + .catch(err => next(err)); + +}); + +memberRouter.delete('api/band-member/:id', function(req, res, next) { + debug('DELETE: api/band-member/:id'); + BandMember.deleteMember(req.params.id) + .then(member => res.json(member)) + .catch(err => next(err)); +}) + +module.exports = memberRouter; diff --git a/lab-eddie/lib/param-errors.js b/lab-eddie/lib/param-errors.js deleted file mode 100644 index e69de29..0000000 From 3590b36cb3cb577ccbe2d94ca001c5b4a5aed20e Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 15:43:51 -0700 Subject: [PATCH 10/15] Added errors middleware and created test file for band members --- lab-eddie/lib/errors.js | 21 +++++++++++++++++++++ lab-eddie/server.js | 9 +++++++-- lab-eddie/test/band-members-test.js | 0 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 lab-eddie/test/band-members-test.js diff --git a/lab-eddie/lib/errors.js b/lab-eddie/lib/errors.js index e69de29..c8d54b5 100644 --- a/lab-eddie/lib/errors.js +++ b/lab-eddie/lib/errors.js @@ -0,0 +1,21 @@ +'use strict'; + +const createError = require('http-errors'); +const debug = require('debug')('note:error-middleware'); + +module.exports = function(err, req, res, next) { + console.error(err.message); + + if (err.status) { + debug('user error'); + + res.status(err.status).send(err.name); + next(); + return; + } + + debug('server error'); + err = createError(500, err.message); + res.status(err.status).send(err.name); + next(); +}; \ No newline at end of file diff --git a/lab-eddie/server.js b/lab-eddie/server.js index efc725b..3816f6e 100644 --- a/lab-eddie/server.js +++ b/lab-eddie/server.js @@ -5,11 +5,16 @@ const debug = require('debug')('app:server'); const morgan = require('morgan'); const creatError = require('http-errors'); const PORT = process.env.PORT || 3000; - - const app = express(); +const myRouter = require('./lib/member-router.js'); +const cors = require('./lib/cors.js'); +const errors = require('./lib/errors.js'); + app.use(morgan('dev')); +app.use(cors); +app.use(myRouter); +app.use(errors); app.listen(PORT, () => { debug(console.log('Server active: ', PORT)); diff --git a/lab-eddie/test/band-members-test.js b/lab-eddie/test/band-members-test.js new file mode 100644 index 0000000..e69de29 From 4bb051ca8fac0153e3df972a32f3b250582dc3c8 Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 16:52:18 -0700 Subject: [PATCH 11/15] Wrote successful get test --- lab-eddie/lib/member-router.js | 18 +++++++----- lab-eddie/lib/storage.js | 7 +++-- lab-eddie/model/band-member.js | 2 +- lab-eddie/server.js | 1 + lab-eddie/test/band-members-test.js | 44 +++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+), 11 deletions(-) diff --git a/lab-eddie/lib/member-router.js b/lab-eddie/lib/member-router.js index 34c3ce0..aae7e87 100644 --- a/lab-eddie/lib/member-router.js +++ b/lab-eddie/lib/member-router.js @@ -6,23 +6,26 @@ const BandMember = require('../model/band-member.js'); const debug = require('debug'); const memberRouter = new Router(); -memberRouter.post('api/band-member/:first/:last:/:instruments', jsonParser, function(req, res, next) { - debug('POST: api/band-member'); - BandMember.createMember(...req.params) +memberRouter.post('/api/band-member/*', jsonParser, function(req, res, next) { + debug('POST: api/band-member'); + console.log(req.params[0].split('/')) + BandMember.createMember(...req.params[0].split('/')) .then(member => res.json(member)) .catch(err => next(err)); }); -memberRouter.get('api/band-member/:id', function(req, res, next) { +memberRouter.get('/api/band-member/:id', function(req, res, next) { debug('GET: api/band-member/:id'); + console.log(req); + BandMember.fetchMember(req.params.id) .then(member => res.json(member)) .catch(err => next(err)); }); -memberRouter.get('api/band-member', function(req, res, next) { +memberRouter.get('/api/band-member', function(req, res, next) { debug('GET: api/band-member/'); BandMember.fetchAll() @@ -30,7 +33,7 @@ memberRouter.get('api/band-member', function(req, res, next) { .catch(err => next(err)); }); -memberRouter.put('api/band-member/:id/:name/:first/:last:/instruments', jsonParser, function(req, res, next){ +memberRouter.put('/api/band-member/:id/:name/:first/:last:/instruments', jsonParser, function(req, res, next){ debug('PUT: api/band-member'); BandMember.updateMember(...req.params) @@ -39,11 +42,12 @@ memberRouter.put('api/band-member/:id/:name/:first/:last:/instruments', jsonPars }); -memberRouter.delete('api/band-member/:id', function(req, res, next) { +memberRouter.delete('/api/band-member/:id', function(req, res, next) { debug('DELETE: api/band-member/:id'); BandMember.deleteMember(req.params.id) .then(member => res.json(member)) .catch(err => next(err)); }) + module.exports = memberRouter; diff --git a/lab-eddie/lib/storage.js b/lab-eddie/lib/storage.js index 8497931..3c616fc 100644 --- a/lab-eddie/lib/storage.js +++ b/lab-eddie/lib/storage.js @@ -28,10 +28,10 @@ storage.createItem = function(category, item) { if(!category) return Promise.reject(createError(404, 'Expected Category')); if(!item) return Promise.reject(createError(404, 'Expected item')); - json = JSON.stringify(item); + let json = JSON.stringify(item); return fs.writeFileProm(`${__dirname}/../data/${category}/${item.id}.json`, json) .then(() => item) - .catch(err => Promise.reject(createError(500, 'Something broke'))); + .catch(err => Promise.reject(createError(500, err.message))); }; @@ -47,8 +47,9 @@ storage.deleteItem = function(category, id) { storage.fetchAll = function(category) { if(!category) Promise.reject(createError(404, 'Expected Category')); + console.log(category) return fs.readdirProm(`${__dirname}/../data/${category}`) .then(dir => dir.map(file => file.split('.json')[0])) - .catch(err => Promise.reject(createError(404, 'Model not found'))); + .catch(err => Promise.reject(createError(404, err.message))); }; \ No newline at end of file diff --git a/lab-eddie/model/band-member.js b/lab-eddie/model/band-member.js index 6a6a100..be7d28e 100644 --- a/lab-eddie/model/band-member.js +++ b/lab-eddie/model/band-member.js @@ -53,5 +53,5 @@ BandMember.updateMember = function(id, _member) { BandMember.fetchAll = function() { debug('fetchAll'); - return storage.fetchItem('bandMembers'); + return storage.fetchItem('bandMember'); }; diff --git a/lab-eddie/server.js b/lab-eddie/server.js index 3816f6e..6f2b275 100644 --- a/lab-eddie/server.js +++ b/lab-eddie/server.js @@ -4,6 +4,7 @@ const express = require('express'); const debug = require('debug')('app:server'); const morgan = require('morgan'); const creatError = require('http-errors'); + const PORT = process.env.PORT || 3000; const app = express(); diff --git a/lab-eddie/test/band-members-test.js b/lab-eddie/test/band-members-test.js index e69de29..8114d43 100644 --- a/lab-eddie/test/band-members-test.js +++ b/lab-eddie/test/band-members-test.js @@ -0,0 +1,44 @@ +'use strict'; + +const expect = require('chai').expect; +const request = require('superagent'); +const BandMember = require('../model/band-member.js'); +const url = 'http://localhost:3000'; +require('../server.js'); + +const testMember = ["Eddie", "DelRio", ...['guitar']]; + +describe('Band-Member routes', function(){ + + describe('GET /api/band-member', function() { + before( done => { + BandMember.createMember(...testMember) + .then(member => { + this.tempObj = member; + done(); + }) + .catch(err => done(err)); + }); + + after(done => { + BandMember.deleteMember(this.tempObj.id) + .then(() => done()) + .catch(err => done(err)); + }); + + it('Should return a band-member', (done) => { + request.get(`${url}/api/band-member/${this.tempObj.id}`) + .end((err, res) => { + if (err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.id).to.equal(this.tempObj.id); + expect(res.body.first).to.equal(this.tempObj.first); + expect(res.body.last).to.equal(this.tempObj.last); + expect(res.body.istruments).to.deep.equal(this.tempObj.istruments) + done(); + }); + }); + }); + +}); + From bd1ccdcb07e8b8d05d16daf78d7d7d553b75b3e6 Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 16:57:55 -0700 Subject: [PATCH 12/15] Wrote test to pass req with invalid ID --- lab-eddie/lib/member-router.js | 1 - lab-eddie/test/band-members-test.js | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lab-eddie/lib/member-router.js b/lab-eddie/lib/member-router.js index aae7e87..d97038c 100644 --- a/lab-eddie/lib/member-router.js +++ b/lab-eddie/lib/member-router.js @@ -18,7 +18,6 @@ memberRouter.post('/api/band-member/*', jsonParser, function(req, res, next) { memberRouter.get('/api/band-member/:id', function(req, res, next) { debug('GET: api/band-member/:id'); - console.log(req); BandMember.fetchMember(req.params.id) .then(member => res.json(member)) diff --git a/lab-eddie/test/band-members-test.js b/lab-eddie/test/band-members-test.js index 8114d43..48b1fc4 100644 --- a/lab-eddie/test/band-members-test.js +++ b/lab-eddie/test/band-members-test.js @@ -39,6 +39,17 @@ describe('Band-Member routes', function(){ }); }); }); + describe('With an invalid id', function() { + it('Should respond with 404 coed', (done) => { + request.get(`${url}/api/band-member/1234`) + .end((err) => { + if (err) { + expect(err.status).to.equal(404); + done(); + } + }); + }); + }); }); From 3c925e26e8bd6370321cad1dc91828f2573f040c Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 17:11:24 -0700 Subject: [PATCH 13/15] Wrote test to check POST routes for band-members model --- lab-eddie/test/band-members-test.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/lab-eddie/test/band-members-test.js b/lab-eddie/test/band-members-test.js index 48b1fc4..940d503 100644 --- a/lab-eddie/test/band-members-test.js +++ b/lab-eddie/test/band-members-test.js @@ -51,5 +51,33 @@ describe('Band-Member routes', function(){ }); }); + describe('POST: /api/band-member', function() { + describe('with a valid body', function() { + after( done => { + console.log('Something is not missing', this.tempMember) + if (this.tempMember) { + BandMember.deleteMember(this.tempMember.id) + .then( ()=> done()) + .catch( err => done(err)); + } + }); + + it('Should create a new member', done => { + request.post(`${url}/api/band-member/Eddie/DelRio/Guitar/Bass/Drums`) + .end((err, res) => { + if(err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.first).to.equal('Eddie'); + expect(res.body.last).to.equal('DelRio'); + expect(res.body.instruments).to.deep.equal(['Guitar', 'Bass', 'Drums']); + console.log('I came first'); + this.tempMember = res.body; + done() + }) + }) + }) + }) + + }); From b02f6fb8cca69058b54249dbd9322c770550fc54 Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 18:08:34 -0700 Subject: [PATCH 14/15] Wrote test for put path --- lab-eddie/lib/member-router.js | 8 +++---- lab-eddie/model/band-member.js | 9 ++++++-- lab-eddie/test/band-members-test.js | 36 +++++++++++++++++++++++++---- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/lab-eddie/lib/member-router.js b/lab-eddie/lib/member-router.js index d97038c..06e778e 100644 --- a/lab-eddie/lib/member-router.js +++ b/lab-eddie/lib/member-router.js @@ -9,7 +9,7 @@ const memberRouter = new Router(); memberRouter.post('/api/band-member/*', jsonParser, function(req, res, next) { debug('POST: api/band-member'); - console.log(req.params[0].split('/')) + BandMember.createMember(...req.params[0].split('/')) .then(member => res.json(member)) .catch(err => next(err)); @@ -32,11 +32,11 @@ memberRouter.get('/api/band-member', function(req, res, next) { .catch(err => next(err)); }); -memberRouter.put('/api/band-member/:id/:name/:first/:last:/instruments', jsonParser, function(req, res, next){ +memberRouter.put('/api/band-member/*', jsonParser, function(req, res, next){ debug('PUT: api/band-member'); - BandMember.updateMember(...req.params) - .then(member = res.json(member)) + BandMember.updateMember(...req.params[0].split('/')) + .then(member => res.json(member)) .catch(err => next(err)); }); diff --git a/lab-eddie/model/band-member.js b/lab-eddie/model/band-member.js index be7d28e..fe7f07d 100644 --- a/lab-eddie/model/band-member.js +++ b/lab-eddie/model/band-member.js @@ -37,14 +37,19 @@ BandMember.deleteMember = function(id) { return storage.deleteItem('bandMember', id); } -BandMember.updateMember = function(id, _member) { +BandMember.updateMember = function(..._member) { debug('updateMember'); + let id = _member.shift(); + _member = new BandMember(..._member); + _member.id = id; + + return storage.fetchItem('bandMember', id) .catch( err => Promise.reject(createError(404, err.message))) .then( member => { for (var key in member) { - if (member === 'id') continue; + if (key === 'id') continue; if (_member[key]) member[key] = _member[key]; } return storage.createItem('bandMember', member); diff --git a/lab-eddie/test/band-members-test.js b/lab-eddie/test/band-members-test.js index 940d503..8d46a65 100644 --- a/lab-eddie/test/band-members-test.js +++ b/lab-eddie/test/band-members-test.js @@ -54,7 +54,6 @@ describe('Band-Member routes', function(){ describe('POST: /api/band-member', function() { describe('with a valid body', function() { after( done => { - console.log('Something is not missing', this.tempMember) if (this.tempMember) { BandMember.deleteMember(this.tempMember.id) .then( ()=> done()) @@ -70,14 +69,43 @@ describe('Band-Member routes', function(){ expect(res.body.first).to.equal('Eddie'); expect(res.body.last).to.equal('DelRio'); expect(res.body.instruments).to.deep.equal(['Guitar', 'Bass', 'Drums']); - console.log('I came first'); this.tempMember = res.body; - done() + done(); }) }) }) - }) + describe('PUT api/band-member', function(){ + describe('With valid id and body', function() { + before(done => { + BandMember.createMember(...testMember) + .then(member => { + this.tempMember = member; + done(); + }) + .catch(err => done(err)); + }); + + after(done => { + BandMember.deleteMember(this.tempMember.id) + .then(() => done()) + .catch(err => done(err)); + }) + it('Should return a band-member', done => { + request.put(`${url}/api/band-member/${this.tempMember.id}/Edwin/DelRio/Piano`) + .end((err, res) => { + if(err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.id).to.equal(this.tempMember.id); + expect(res.body.first).to.not.equal(this.tempMember.first); + expect(res.body.last).to.equal(this.tempMember.last); + expect(res.body.instruments).to.not.deep.equal(this.tempMember.instruments); + done() + }); + }); + }); + }); + }); }); From 00e4f6ed05334495579a8f9775eba749495c3224 Mon Sep 17 00:00:00 2001 From: Edwin Del Rio Date: Tue, 1 Aug 2017 20:19:06 -0700 Subject: [PATCH 15/15] Added read me file --- lab-eddie/.eslintignore | 6 ++++++ lab-eddie/.eslintrc | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 lab-eddie/.eslintignore create mode 100644 lab-eddie/.eslintrc diff --git a/lab-eddie/.eslintignore b/lab-eddie/.eslintignore new file mode 100644 index 0000000..ae8da71 --- /dev/null +++ b/lab-eddie/.eslintignore @@ -0,0 +1,6 @@ + +**/node_modules/* +**/vendor/* +**/*.min.js +**/coverage/* +**/build/* diff --git a/lab-eddie/.eslintrc b/lab-eddie/.eslintrc new file mode 100644 index 0000000..8dc6807 --- /dev/null +++ b/lab-eddie/.eslintrc @@ -0,0 +1,21 @@ +{ + "rules": { + "no-console": "off", + "indent": [ "error", 2 ], + "quotes": [ "error", "single" ], + "semi": ["error", "always"], + "linebreak-style": [ "error", "unix" ] + }, + "env": { + "es6": true, + "node": true, + "mocha": true, + "jasmine": true + }, + "ecmaFeatures": { + "modules": true, + "experimentalObjectRestSpread": true, + "impliedStrict": true + }, + "extends": "eslint:recommended" +}