From 4e8690f00af74a5357d4a8fa353f47dcbbee9f29 Mon Sep 17 00:00:00 2001
From: Jamesbillard12 <jamesbillard12@hotmail.com>
Date: Tue, 1 Aug 2017 13:48:34 -0700
Subject: [PATCH 01/12] added basic structure of repo

---
 .eslintignore           |   5 ++
 .eslintrc               |  21 +++++++
 .gitignore              | 136 ++++++++++++++++++++++++++++++++++++++++
 lib/cors-middleware.js  |   0
 lib/error-middleware.js |   0
 lib/storage.js          |   0
 model/beer.js           |   0
 package.json            |  35 +++++++++++
 router/beer-router.js   |   0
 server.js               |   0
 test/beer-route-test.js |   0
 11 files changed, 197 insertions(+)
 create mode 100644 .eslintignore
 create mode 100644 .eslintrc
 create mode 100644 .gitignore
 create mode 100644 lib/cors-middleware.js
 create mode 100644 lib/error-middleware.js
 create mode 100644 lib/storage.js
 create mode 100644 model/beer.js
 create mode 100644 package.json
 create mode 100644 router/beer-router.js
 create mode 100644 server.js
 create mode 100644 test/beer-route-test.js

diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000..05b1cf3
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,5 @@
+**/node_modules/*
+**/vendor/*
+**/*.min.js
+**/coverage/*
+**/build/*
diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000..8dc6807
--- /dev/null
+++ b/.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"
+}
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..345130c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,136 @@
+# Created by https://www.gitignore.io/api/osx,vim,node,macos,windows
+
+### macOS ###
+*.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
+
+### 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 ###
+
+# Icon must end with two \r
+
+# Thumbnails
+
+# Files that might appear in the root of a volume
+
+# Directories potentially created on remote AFP share
+
+### 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,macos,windows
diff --git a/lib/cors-middleware.js b/lib/cors-middleware.js
new file mode 100644
index 0000000..e69de29
diff --git a/lib/error-middleware.js b/lib/error-middleware.js
new file mode 100644
index 0000000..e69de29
diff --git a/lib/storage.js b/lib/storage.js
new file mode 100644
index 0000000..e69de29
diff --git a/model/beer.js b/model/beer.js
new file mode 100644
index 0000000..e69de29
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..8924078
--- /dev/null
+++ b/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "12-express-middleware",
+  "version": "1.0.0",
+  "description": "![cf](https://i.imgur.com/7v5ASc8.png) 12: Express Middleware ======",
+  "main": "server.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "node server.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Jamesbillard12/12-express-middleware.git"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/Jamesbillard12/12-express-middleware/issues"
+  },
+  "homepage": "https://github.com/Jamesbillard12/12-express-middleware#readme",
+  "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/router/beer-router.js b/router/beer-router.js
new file mode 100644
index 0000000..e69de29
diff --git a/server.js b/server.js
new file mode 100644
index 0000000..e69de29
diff --git a/test/beer-route-test.js b/test/beer-route-test.js
new file mode 100644
index 0000000..e69de29

From d8eaa80a871a439155647ecbeb5dadcd40b0c1e2 Mon Sep 17 00:00:00 2001
From: Jamesbillard12 <jamesbillard12@hotmail.com>
Date: Tue, 1 Aug 2017 15:00:00 -0700
Subject: [PATCH 02/12] finished storage.js

---
 lib/storage.js | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 model/beer.js  |  6 ++++++
 server.js      | 14 ++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/lib/storage.js b/lib/storage.js
index e69de29..fe1e1fe 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -0,0 +1,51 @@
+'use strict';
+
+const Promise = require('bluebird');
+const fs = Promise.promisifyAll(require('fs'), {suffix: 'Prom'});
+const createError = require('http-errors');
+const debug = require('dubug')('beer: storage');
+
+module.exports = exports = {};
+
+exports.createItem = function(schemaName, item) {
+  debug('createItem');
+
+  if(!schemaName) return Promise.reject(createError(400, 'expected schema name'));
+  if(!item) return Promise.reject(createError(400, 'expected item'));
+
+  let json = JSON.stingify(item);
+  return fs.writeFileProm(`${__dirname}/../data/${schemaName}/${item.id}.json`, json)
+  .then( () => item)
+  .catch( err => Promise.reject(createError(500, err.message)));
+};
+
+exports.fretchItem = function(schemaName, id) {
+  debug('fretchItem');
+
+  if(!schemaName) return Promise.reject(createError(400, 'expected schema name'));
+  if(!id) return Promise.reject(createError(400, 'expected id'));
+
+  return fs.readFileProm(`${__dirname}/../data/${schemaName}/${id}.json`)
+  .then( data => {
+    try{
+      let item = JSON.parse(data.toSting);
+    } catch (err){
+      return Promise.reject(createError(500, err.message));
+    }
+  })
+  .catch(err => Promise.reject(createError(404, err.message)));
+};
+
+exports.deleteItem = function(schemaName, id){
+  if(!schemaName) return Promise.reject(createError(400, 'expected schema name'));
+  if(!id) return Promise.reject(createError(400, 'expected id'));
+
+  return fs.unlinkProm(`${__dirname}/../data/${schemaName}/${id}.json`)
+  .catch(err => Promise.reject(createError(404, err.message)));
+};
+
+exports.availIDs = function(schemaName){
+  fs.readDirProm(`${__dirname}/../data/${schemaName}`)
+  .then( files => files.map(name => name.split('.json')[0]))
+  .catch( err => Promise.reject(createError(404, err.message)));
+};
diff --git a/model/beer.js b/model/beer.js
index e69de29..20ab3eb 100644
--- a/model/beer.js
+++ b/model/beer.js
@@ -0,0 +1,6 @@
+'use strict';
+
+const uuid = require('uuid');
+const createError = require('http-errors');
+const debug = require('debug')('beer: beer');
+const storage = require('../lib/storage.js');
diff --git a/server.js b/server.js
index e69de29..5ba2ea9 100644
--- a/server.js
+++ b/server.js
@@ -0,0 +1,14 @@
+'use strict';
+
+const morgan = require('morgan');
+const express = require('express');
+const createError = require('http-errors');
+const debug = require('debug')('beer:server');
+
+
+const PORT = process.env.PORT || 3000;
+const app = express();
+
+app.listen(PORT, () => {
+  console.log(`server up ${PORT}`);
+});

From 77cf9a6875ef1be58d3e0659960d15a9ad6be8f9 Mon Sep 17 00:00:00 2001
From: Jamesbillard12 <jamesbillard12@hotmail.com>
Date: Tue, 1 Aug 2017 15:33:11 -0700
Subject: [PATCH 03/12] fnished beer.js

---
 model/beer.js | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/model/beer.js b/model/beer.js
index 20ab3eb..ee2754a 100644
--- a/model/beer.js
+++ b/model/beer.js
@@ -4,3 +4,54 @@ const uuid = require('uuid');
 const createError = require('http-errors');
 const debug = require('debug')('beer: beer');
 const storage = require('../lib/storage.js');
+
+const Beer = module.exports = function(name, style, ibu) {
+  debug('beer constructor');
+  if(!name) throw new Error('expected name');
+  if(!style) throw new Error('expected style');
+  if(!ibu) throw new Error('expected ibu');
+
+  this.name = name;
+  this.style = style;
+  this.ibu = ibu;
+};
+
+Beer.createBeer = function (_beer) {
+  debug('createBeer');
+
+  try{
+    let beer = new Beer(_beer.name, _beer.style, _beer.ibu);
+    return storage.createItem('beer', beer);
+  } catch err => {
+    return Promise.reject(err);
+  }
+}
+
+Beer.fetchBeer = function(id) {
+  debug('fetchBeer');
+  return storage.fretchItem('beer', id);
+}
+
+Beer.updateBeer = function(id, _beer) {
+  debug('updateBeer');
+
+  return storage.fretchItem('beer', id)
+  .then( beer => {
+    for (var prop in beer) {
+      if(prop === id) continue;
+      if(_beer[prop]) beer[prop] = _beer[prop];
+    }
+    return storage.createItem('beer', beer);
+  })
+  .catch( err => Promise.reject(createError(404, err.message)));
+}
+
+Beer.deleteBeer = function(id){
+  debug('deleteBeer');
+  return storage.deleteItem('beer', id);
+}
+
+Beer.fetchIDs = function() {
+  debug('fetchIDs');
+  return storage.availIDs('beer');
+}

From e271d3a070b144cb2b305bd978163f23e2ec7620 Mon Sep 17 00:00:00 2001
From: Jamesbillard12 <jamesbillard12@hotmail.com>
Date: Tue, 1 Aug 2017 16:07:02 -0700
Subject: [PATCH 04/12] beer-router.js complete

---
 route/beer-router.js  | 56 +++++++++++++++++++++++++++++++++++++++++++
 router/beer-router.js |  0
 2 files changed, 56 insertions(+)
 create mode 100644 route/beer-router.js
 delete mode 100644 router/beer-router.js

diff --git a/route/beer-router.js b/route/beer-router.js
new file mode 100644
index 0000000..506c9be
--- /dev/null
+++ b/route/beer-router.js
@@ -0,0 +1,56 @@
+'use strict';
+
+const Router = require('express').Router;
+const jsonParser = require('body-parser').json();
+const debug = require('debug')('beer:beer-router');
+const Beer = require('../model/beer.js');
+const beerRouter = new Router();
+
+beerRouter.post('/api/beer', jsonParser, function(req, res, next){
+  debug('POST: /api/beer');
+
+  Beer.createBeer(req.body)
+  .then( beer => res.json(beer))
+  .catch( err => next(err));
+});
+
+beerRouter.get('/api/beer/:id', function(req, res, next){
+  debug('GET: /api/beer/:id');
+
+  Beer.fetchBeer(req.params.id)
+  .then( beer => res.json(beer))
+  .catch( err => next(err));
+});
+
+beerRouter.get('/api/beer', function(req, res, next){
+  debug('GET: /api/beer');
+
+  Beer.fetchBeer(req.params.id)
+  .then( beer => res.json(beer))
+  .catch( err => next(err));
+});
+
+beerRouter.getIDs('/api/beer', function(req, res, next)){
+  debug('GETIDS: /api/beer');
+
+  Beer.fetchIDs()
+  .then( beerIDs => res.json(beerIDs))
+  .catch( err => next(err));
+};
+
+beerRouter.put('/api/beer', function(req, res, next){
+  debug('PUT: /api/beer');
+
+  Beer.updateBeer(req.query.id, req.body)
+  .next( beer => res.json(beer))
+  .catch( err => next(err));
+});
+
+beerRouter.delete('/api/beer', function(req, res, next){
+  debug('DELETE: api/beer');
+
+  Beer.deleteBeer(req.params.id)
+  .catch(err => next(err));
+});
+
+module.exports = beerRouter;
diff --git a/router/beer-router.js b/router/beer-router.js
deleted file mode 100644
index e69de29..0000000

From aca0549645dfd4bddd21354f8627753a83328f49 Mon Sep 17 00:00:00 2001
From: Jamesbillard12 <jamesbillard12@hotmail.com>
Date: Tue, 1 Aug 2017 16:25:14 -0700
Subject: [PATCH 05/12] finished corsmid and changed getids route

---
 lib/cors-middleware.js |  7 +++++++
 route/beer-router.js   | 11 ++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/cors-middleware.js b/lib/cors-middleware.js
index e69de29..6661797 100644
--- a/lib/cors-middleware.js
+++ b/lib/cors-middleware.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();
+};
diff --git a/route/beer-router.js b/route/beer-router.js
index 506c9be..755c4f9 100644
--- a/route/beer-router.js
+++ b/route/beer-router.js
@@ -22,21 +22,14 @@ beerRouter.get('/api/beer/:id', function(req, res, next){
   .catch( err => next(err));
 });
 
+
 beerRouter.get('/api/beer', function(req, res, next){
   debug('GET: /api/beer');
 
-  Beer.fetchBeer(req.params.id)
-  .then( beer => res.json(beer))
-  .catch( err => next(err));
-});
-
-beerRouter.getIDs('/api/beer', function(req, res, next)){
-  debug('GETIDS: /api/beer');
-
   Beer.fetchIDs()
   .then( beerIDs => res.json(beerIDs))
   .catch( err => next(err));
-};
+});
 
 beerRouter.put('/api/beer', function(req, res, next){
   debug('PUT: /api/beer');

From 525f4601b65e8dca5e3a17f629aa170ee44eb7c1 Mon Sep 17 00:00:00 2001
From: Jamesbillard12 <jamesbillard12@hotmail.com>
Date: Tue, 1 Aug 2017 16:41:56 -0700
Subject: [PATCH 06/12] finished errormid

---
 lib/error-middleware.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/lib/error-middleware.js b/lib/error-middleware.js
index e69de29..b7810d8 100644
--- a/lib/error-middleware.js
+++ b/lib/error-middleware.js
@@ -0,0 +1,22 @@
+'use strict';
+
+const createError = require('http-errors');
+const debug = require('debug')('beer: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();
+};

From bf89dac477f68d68f0468d84a3ab77daa796d32f Mon Sep 17 00:00:00 2001
From: Jamesbillard12 <jamesbillard12@hotmail.com>
Date: Tue, 1 Aug 2017 16:46:09 -0700
Subject: [PATCH 07/12] finished server file

---
 server.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/server.js b/server.js
index 5ba2ea9..b6bc1aa 100644
--- a/server.js
+++ b/server.js
@@ -5,10 +5,18 @@ const express = require('express');
 const createError = require('http-errors');
 const debug = require('debug')('beer:server');
 
+const beerRouter = require('.route/beer-router.js');
+const cors = require('./lib/cors-middleware.js');
+const errors = require('./lib/error-middleware.js');
 
 const PORT = process.env.PORT || 3000;
 const app = express();
 
+app.use(morgan('dev'));
+app.use(cors);
+app.use(beerRouter);
+app.use(errors);
+
 app.listen(PORT, () => {
   console.log(`server up ${PORT}`);
 });

From b2cdf864888cec47dd1b163ab31796e246bf0935 Mon Sep 17 00:00:00 2001
From: Jamesbillard12 <jamesbillard12@hotmail.com>
Date: Tue, 1 Aug 2017 17:52:02 -0700
Subject: [PATCH 08/12] first test works

---
 lib/storage.js          | 11 +++++-----
 model/beer.js           | 19 +++++++++--------
 package.json            |  4 ++--
 server.js               |  2 +-
 test/beer-route-test.js | 46 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/lib/storage.js b/lib/storage.js
index fe1e1fe..48064c8 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -3,7 +3,7 @@
 const Promise = require('bluebird');
 const fs = Promise.promisifyAll(require('fs'), {suffix: 'Prom'});
 const createError = require('http-errors');
-const debug = require('dubug')('beer: storage');
+const debug = require('debug')('beer: storage');
 
 module.exports = exports = {};
 
@@ -13,14 +13,14 @@ exports.createItem = function(schemaName, item) {
   if(!schemaName) return Promise.reject(createError(400, 'expected schema name'));
   if(!item) return Promise.reject(createError(400, 'expected item'));
 
-  let json = JSON.stingify(item);
+  let json = JSON.stringify(item);
   return fs.writeFileProm(`${__dirname}/../data/${schemaName}/${item.id}.json`, json)
   .then( () => item)
   .catch( err => Promise.reject(createError(500, err.message)));
 };
 
-exports.fretchItem = function(schemaName, id) {
-  debug('fretchItem');
+exports.fetchItem = function(schemaName, id) {
+  debug('fetchItem');
 
   if(!schemaName) return Promise.reject(createError(400, 'expected schema name'));
   if(!id) return Promise.reject(createError(400, 'expected id'));
@@ -28,7 +28,8 @@ exports.fretchItem = function(schemaName, id) {
   return fs.readFileProm(`${__dirname}/../data/${schemaName}/${id}.json`)
   .then( data => {
     try{
-      let item = JSON.parse(data.toSting);
+      let item = JSON.parse(data.toString());
+      return item;
     } catch (err){
       return Promise.reject(createError(500, err.message));
     }
diff --git a/model/beer.js b/model/beer.js
index ee2754a..1b7333f 100644
--- a/model/beer.js
+++ b/model/beer.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const uuid = require('uuid');
+const uuidv4 = require('uuid/v4');
 const createError = require('http-errors');
 const debug = require('debug')('beer: beer');
 const storage = require('../lib/storage.js');
@@ -11,6 +11,7 @@ const Beer = module.exports = function(name, style, ibu) {
   if(!style) throw new Error('expected style');
   if(!ibu) throw new Error('expected ibu');
 
+  this.id = uuidv4();
   this.name = name;
   this.style = style;
   this.ibu = ibu;
@@ -22,20 +23,20 @@ Beer.createBeer = function (_beer) {
   try{
     let beer = new Beer(_beer.name, _beer.style, _beer.ibu);
     return storage.createItem('beer', beer);
-  } catch err => {
+  } catch (err) {
     return Promise.reject(err);
   }
-}
+};
 
 Beer.fetchBeer = function(id) {
   debug('fetchBeer');
-  return storage.fretchItem('beer', id);
-}
+  return storage.fetchItem('beer', id);
+};
 
 Beer.updateBeer = function(id, _beer) {
   debug('updateBeer');
 
-  return storage.fretchItem('beer', id)
+  return storage.fetchItem('beer', id)
   .then( beer => {
     for (var prop in beer) {
       if(prop === id) continue;
@@ -44,14 +45,14 @@ Beer.updateBeer = function(id, _beer) {
     return storage.createItem('beer', beer);
   })
   .catch( err => Promise.reject(createError(404, err.message)));
-}
+};
 
 Beer.deleteBeer = function(id){
   debug('deleteBeer');
   return storage.deleteItem('beer', id);
-}
+};
 
 Beer.fetchIDs = function() {
   debug('fetchIDs');
   return storage.availIDs('beer');
-}
+};
diff --git a/package.json b/package.json
index 8924078..7a2d37d 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
   "description": "![cf](https://i.imgur.com/7v5ASc8.png) 12: Express Middleware ======",
   "main": "server.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node server.js"
+    "test": "DEBUG='beer*' mocha",
+    "start": "DEBUG='beer*' node server.js"
   },
   "repository": {
     "type": "git",
diff --git a/server.js b/server.js
index b6bc1aa..3ad17df 100644
--- a/server.js
+++ b/server.js
@@ -5,7 +5,7 @@ const express = require('express');
 const createError = require('http-errors');
 const debug = require('debug')('beer:server');
 
-const beerRouter = require('.route/beer-router.js');
+const beerRouter = require('./route/beer-router.js');
 const cors = require('./lib/cors-middleware.js');
 const errors = require('./lib/error-middleware.js');
 
diff --git a/test/beer-route-test.js b/test/beer-route-test.js
index e69de29..b3ceb50 100644
--- a/test/beer-route-test.js
+++ b/test/beer-route-test.js
@@ -0,0 +1,46 @@
+'use strict';
+
+const expect = require('chai').expect;
+const request = require('superagent');
+const Beer = require('../model/beer.js');
+const url = 'http://localhost:8000';
+
+require('../server.js');
+
+const exampleBeer = {
+  name: 'example name',
+  style: 'example style',
+  ibu: 'example ibu'
+};
+
+describe('New Routes', function() {
+  describe('with a valid id', function() {
+    before( done => {
+      Beer.createBeer(exampleBeer)
+      .then(note => {
+        this.tempBeer = note;
+        console.log(this.tempBeer);
+        done();
+      })
+      .catch (err => done(err));
+    });
+    after( done => {
+      Beer.deleteBeer(this.tempBeer.id)
+      .then( () => done())
+      .catch( err => done(err));
+    });
+
+    it('should return a beer', done => {
+      request.get(`${url}/api/beer/${this.tempBeer.id}`)
+      .end((err, res) => {
+        if(err) return done(err);
+        expect(res.status).to.equal(200);
+        expect(res.body.id).to.equal(this.tempBeer.id);
+        expect(res.body.name).to.equal(this.tempBeer.name);
+        expect(res.body.style).to.equal(this.tempBeer.style);
+        expect(res.body.ibu).to.equal(this.tempBeer.ibu);
+        done();
+      });
+    });
+  });
+});

From 09c1051c52d3ca154034084cd94f11fba2af430c Mon Sep 17 00:00:00 2001
From: Jamesbillard12 <jamesbillard12@hotmail.com>
Date: Tue, 1 Aug 2017 18:08:50 -0700
Subject: [PATCH 09/12] test two working

---
 server.js               |  3 ---
 test/beer-route-test.js | 10 ++++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/server.js b/server.js
index 3ad17df..84c8936 100644
--- a/server.js
+++ b/server.js
@@ -2,9 +2,6 @@
 
 const morgan = require('morgan');
 const express = require('express');
-const createError = require('http-errors');
-const debug = require('debug')('beer:server');
-
 const beerRouter = require('./route/beer-router.js');
 const cors = require('./lib/cors-middleware.js');
 const errors = require('./lib/error-middleware.js');
diff --git a/test/beer-route-test.js b/test/beer-route-test.js
index b3ceb50..d00f012 100644
--- a/test/beer-route-test.js
+++ b/test/beer-route-test.js
@@ -42,5 +42,15 @@ describe('New Routes', function() {
         done();
       });
     });
+
+    describe('with an invalid id', function() {
+      it('should respond with 404 status code', done => {
+        request.get(`${url}/api/beer/123456789`)
+        .end((err, res) => {
+          expect(res.status).to.equal(404);
+          done();
+        });
+      });
+    });
   });
 });

From 6b4a1c6fa532c80e14ad38092ab1bd22709f9974 Mon Sep 17 00:00:00 2001
From: Jamesbillard12 <jamesbillard12@hotmail.com>
Date: Tue, 1 Aug 2017 18:49:09 -0700
Subject: [PATCH 10/12] all test are working

---
 lib/storage.js          |  4 +++
 model/beer.js           | 10 +++----
 route/beer-router.js    |  5 ++--
 test/beer-route-test.js | 65 +++++++++++++++++++++++++++++++++++++++--
 4 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/lib/storage.js b/lib/storage.js
index 48064c8..ed15f6a 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -27,8 +27,12 @@ exports.fetchItem = function(schemaName, id) {
 
   return fs.readFileProm(`${__dirname}/../data/${schemaName}/${id}.json`)
   .then( data => {
+    console.log('this is data', data);
     try{
+      console.log('this is data$$$$$$$', data);
+
       let item = JSON.parse(data.toString());
+      console.log(item);
       return item;
     } catch (err){
       return Promise.reject(createError(500, err.message));
diff --git a/model/beer.js b/model/beer.js
index 1b7333f..f32b58c 100644
--- a/model/beer.js
+++ b/model/beer.js
@@ -34,17 +34,17 @@ Beer.fetchBeer = function(id) {
 };
 
 Beer.updateBeer = function(id, _beer) {
-  debug('updateBeer');
+  debug('updateNote');
 
   return storage.fetchItem('beer', id)
+  .catch( err => Promise.reject(createError(404, err.message)))
   .then( beer => {
     for (var prop in beer) {
-      if(prop === id) continue;
-      if(_beer[prop]) beer[prop] = _beer[prop];
+      if (prop === 'id') continue;
+      if (_beer[prop]) beer[prop] = _beer[prop];
     }
     return storage.createItem('beer', beer);
-  })
-  .catch( err => Promise.reject(createError(404, err.message)));
+  });
 };
 
 Beer.deleteBeer = function(id){
diff --git a/route/beer-router.js b/route/beer-router.js
index 755c4f9..ba37f89 100644
--- a/route/beer-router.js
+++ b/route/beer-router.js
@@ -31,11 +31,12 @@ beerRouter.get('/api/beer', function(req, res, next){
   .catch( err => next(err));
 });
 
-beerRouter.put('/api/beer', function(req, res, next){
+
+beerRouter.put('/api/beer', jsonParser, function(req, res, next) {
   debug('PUT: /api/beer');
 
   Beer.updateBeer(req.query.id, req.body)
-  .next( beer => res.json(beer))
+  .then( beer => res.json(beer))
   .catch( err => next(err));
 });
 
diff --git a/test/beer-route-test.js b/test/beer-route-test.js
index d00f012..d00c866 100644
--- a/test/beer-route-test.js
+++ b/test/beer-route-test.js
@@ -17,8 +17,8 @@ describe('New Routes', function() {
   describe('with a valid id', function() {
     before( done => {
       Beer.createBeer(exampleBeer)
-      .then(note => {
-        this.tempBeer = note;
+      .then(beer => {
+        this.tempBeer = beer;
         console.log(this.tempBeer);
         done();
       })
@@ -54,3 +54,64 @@ describe('New Routes', function() {
     });
   });
 });
+
+describe('POST: /api/beer', function() {
+  describe('with a valid body', function() {
+    after( done => {
+      if (this.tempBeer) {
+        Beer.deleteBeer(this.tempBeer.id)
+        .then( ()=> done())
+        .catch( err => done(err));
+      }
+    });
+
+    it('should return a beer', done => {
+      request.post(`${url}/api/beer`)
+      .send(exampleBeer)
+      .end((err, res) => {
+        if (err) return done(err);
+        expect(res.status).to.equal(200);
+        expect(res.body.name).to.equal(exampleBeer.name);
+        expect(res.body.content).to.equal(exampleBeer.content);
+        this.tempBeer = res.body;
+        done();
+      });
+    });
+  });
+});
+
+describe('PUT: /api/beer', function() {
+  describe('with a valid id and body', function() {
+    before( done => {
+      Beer.createBeer(exampleBeer)
+      .then( beer => {
+        this.tempBeer = beer;
+        done();
+      })
+      .catch( err => done(err));
+    });
+
+    after( done => {
+      if (this.tempBeer) {
+        Beer.deleteBeer(this.tempBeer.id)
+        .then( ()=> done())
+        .catch(done);
+      }
+    });
+
+    it('should return a beer', done => {
+      let updateBeer = { name: 'new name', style: 'new style', ibu: 'new ibu' };
+      request.put(`${url}/api/beer?id=${this.tempBeer.id}`)
+      .send(updateBeer)
+      .end((err, res) => {
+        if (err) return done(err);
+        expect(res.status).to.equal(200);
+        expect(res.body.id).to.equal(this.tempBeer.id);
+        for (var prop in updateBeer) {
+          expect(res.body[prop]).to.equal(updateBeer[prop]);
+        }
+        done();
+      });
+    });
+  });
+});

From 92ebea9ac04784efb9df1b9540d6520e9fc8d9b0 Mon Sep 17 00:00:00 2001
From: Jamesbillard12 <jamesbillard12@hotmail.com>
Date: Tue, 1 Aug 2017 19:13:37 -0700
Subject: [PATCH 11/12] finished readme

---
 README.md      | 128 +++++++++++++++++++++++++++++++++++--------------
 lib/storage.js |   3 --
 2 files changed, 93 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index 8d00d0f..fdc4890 100644
--- a/README.md
+++ b/README.md
@@ -1,35 +1,93 @@
-![cf](https://i.imgur.com/7v5ASc8.png) 12: Express Middleware
-======
-
-## Submission Instructions
-  * fork this repository & create a new branch for your work
-  * write all of your code in a directory named `lab-` + `<your name>` **e.g.** `lab-susan`
-  * push to your repository
-  * submit a pull request to this repository
-  * submit a link to your PR in canvas
-  * write a question and observation on canvas
-
-## Learning Objectives  
-* students will be able to work with application, router, and 3rd party middleware through the use of express.js
-* students will be able to implement custom middleware through the use of express.js
-* students will be able to create custom routers for a specific resource
-
-## Requirements
-
-#### Configuration
-* `package.json`
-* `.eslintrc`
-* `.gitignore`
-* `README.md`
-  * your `README.md` should include detailed instructions on how to use your API
-
-#### Feature Tasks
-* create a single resource `express` API that can handle **GET**, **POST**, and **PUT** requests
-* use the `http-errors` module to create new errors and associate them with a proper status code
-* create an `error-middleware` module to handle errors and *use* it in your server file
-* create a `cors-middleware` module that will allow for public use of your API
-* create the `deleteItem` and `availIDs` methods and add them to your `storage` module
-  * these methods should be used to delete a resource (`deleteItem`) and return an array of id's from persisted resource filenames (`availIDs`)
-* create the `updateNote`, `fetchNote`, and `fetchIDs` static methods as part of your `Note` model
-* create a series of `note-route-tests` to test your **GET**, **POST**, and **PUT** routes
-  * **hint:** *you'll want to use the `before` and `after` hooks provided by `mocha` in order to create a test note and delete the note after the test has completed*
+# Vanilla API Persistence - 09 Lab
+
+## Description:
+This app builds out an API where data is stored in the file system. This API stores beer data with the schema of name, style, and IBU.
+
+## API:
+The URL endpoint to access the api is `/api/beer`.  Using REST architecture the data is read, written and deleted using `GET`, `POST` and `DELETE` requests.
+
+### POST:
+
+```
+request.post('localhost:8000/api/beer')
+.send({ name: 'Have a Nice Day IPA', style: 'IPA', IBU: '43' })
+```
+
+This is a representation of the POST method. You can see that we first make a request to post to
+```
+localhost:8000
+```
+with a route of
+```
+/api/beer
+```
+Once the connection has bee made we send our beer in
+```
+.send({ name: 'Have a Nice Day IPA', style: 'IPA', IBU: '43' })
+```
+format. This will respond with 200 if the request was made or 400 if not.
+
+### GET
+#### With ID
+```
+request.get(`localhost:8000/api/beer?id=${beer.id}`)
+```
+This is a representation of the GET method. You can see that we first make a request to post to
+
+```
+localhost:8000
+```
+with a route of
+
+```
+/api/beer
+```
+
+finally with finish the request with reference to a specific id which was generated with uuid
+
+```
+?id=${beer.id}
+```
+
+This will respond with 200 if the request was made, 404 if not found or 400 if the request was made in wrong format.
+
+#### Without ID
+
+```
+request.get(`localhost:8000/api/beer`)
+```
+This is a representation of the GET method without an ID. This will respond with all the available IDs. You can see that we first make a request to post to
+
+```
+localhost:8000
+```
+with a route of
+
+```
+/api/beer
+```
+
+This will respond with 200 if the request was made, 404 if not found or 400 if the request was made in wrong format.
+
+### DELETE
+
+```
+request.delete(`localhost:8000/api/beer?id=${beer.id}`)
+```
+
+This is a representation of the POST method. You can see that we first make a request to post to
+
+```
+localhost:8000
+```
+with a route of
+
+```
+/api/beer
+```
+finally with finish the request with reference to a specific id which was generated with uuid
+```
+?id=${beer.id}
+```
+
+This will respond with 200 if the request was made, 404 if not found or 400 if the request was made in wrong format.
diff --git a/lib/storage.js b/lib/storage.js
index ed15f6a..da28cc7 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -27,10 +27,7 @@ exports.fetchItem = function(schemaName, id) {
 
   return fs.readFileProm(`${__dirname}/../data/${schemaName}/${id}.json`)
   .then( data => {
-    console.log('this is data', data);
     try{
-      console.log('this is data$$$$$$$', data);
-
       let item = JSON.parse(data.toString());
       console.log(item);
       return item;

From 7925850bc169d33cba9fcf0a01ec475e47fbe699 Mon Sep 17 00:00:00 2001
From: Jamesbillard12 <jamesbillard12@hotmail.com>
Date: Tue, 1 Aug 2017 19:14:44 -0700
Subject: [PATCH 12/12] added title

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fdc4890..2cd8e90 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Vanilla API Persistence - 09 Lab
+# 12: Express Middleware
 
 ## Description:
 This app builds out an API where data is stored in the file system. This API stores beer data with the schema of name, style, and IBU.