diff --git a/api.test.js b/api.test.js new file mode 100644 index 0000000..72479da --- /dev/null +++ b/api.test.js @@ -0,0 +1,37 @@ +const request = require('superagent'); +const brewData = require('./server/brew.data.js'); + +const path = 'localhost:8000'; + +request.post(`${path}/api/brew`) + .send({ + text : 'new brew' + }) + .end((err, res) => { + console.log(err, res && res.body); + + console.log('creaitng brew'); + + //creating brew + brewData.create({ + text : 'yeah yeah' + }) + .then((brew) => { + console.log(brew); + }) + .catch((e) => { + console.log(e); + }) + + /* + res.body.text = 'check it'; + brewData.update(res.body) + .then((newBrew) => { + console.log(newBrew); + }) + .catch((e) => { + console.log(e); + }) + */ + }) + diff --git a/server.js b/server.js index 77623d9..015334e 100644 --- a/server.js +++ b/server.js @@ -36,6 +36,9 @@ app.use(require('./server/interface.routes.js')); //app.use(require('./server/admin.api.js')); +//Error Handler +app.use(require('./server/error.js').expressHandler); + const PORT = process.env.PORT || 8000; app.listen(PORT); console.log(`server on port:${PORT}`); \ No newline at end of file diff --git a/server/brew.api.js b/server/brew.api.js index 2af9a23..cf606a1 100644 --- a/server/brew.api.js +++ b/server/brew.api.js @@ -9,6 +9,7 @@ router.get('/api/brew', (req, res, next) => { //TODO + }); //Get diff --git a/server/brew.data.js b/server/brew.data.js index 37c074b..b5db957 100644 --- a/server/brew.data.js +++ b/server/brew.data.js @@ -78,6 +78,7 @@ const BrewData = { return Brew.findOne(query).exec(); }, create : (brew) => { + console.log('here'); delete brew.shareId; delete brew.editId; diff --git a/server/error.js b/server/error.js new file mode 100644 index 0000000..993f3e7 --- /dev/null +++ b/server/error.js @@ -0,0 +1,26 @@ + +const ApiError = require('egads').extend('Server Error', 500, 'Generic Server Error'); + +ApiError.noBrew = ApiError.extend('Can not find a brew with that id', 404); + + + + + +ApiError.expressHandler = (err, req, res, next) => { + if(err instanceof ApiError){ + return res.status(err.status).send({ + type : err.name, + message : err.message + }); + } + //If server error, print the whole stack for debugging + return res.status(500).send({ + message : err.message, + stack : err.stack + }); +}; + + + +module.exports = ApiError; \ No newline at end of file diff --git a/server/errors.js b/server/errors.js deleted file mode 100644 index a380a37..0000000 --- a/server/errors.js +++ /dev/null @@ -1,14 +0,0 @@ -const egads = require('egads'); - - -const Error = egads.extend('Server Error', 500, 'Generic Server Error'); - -Error.noBrew = Error.extend('Can not find a brew with that id', 404); - - - - - - - -module.exports = Error; \ No newline at end of file