API Code Cleanup + Alt Endpoints

Added 2 new API Endpoints as alternatives to existing ones:
- PUT /api/:id (same as PUT /api/update/:id)
- DELETE /api/:id (same as GET /api/remove/:id)

server/homebrew.api.js

@@ -3,127 +3,128 @@ const HomebrewModel = require('./homebrew.model.js').model;
 const router = require('express').Router();
 const zlib = require('zlib');
 
-// const getTopBrews = (cb)=>{
+// const getTopBrews = (cb) => {
 // 	HomebrewModel.find().sort({ views: -1 }).limit(5).exec(function(err, brews) {
 // 		cb(brews);
 // 	});
 // };
 
-const getGoodBrewTitle = (text)=>{
+const getGoodBrewTitle = (text) => {
 	const titlePos = text.indexOf('# ');
-	if(titlePos !== -1){
+	if (titlePos !== -1) {
 		const ending = text.indexOf('\n', titlePos);
 		return text.substring(titlePos + 2, ending);
 	} else {
-		return _.find(text.split('\n'), (line)=>{
+		return _.find(text.split('\n'), line => line);
-			return line;
-		});
 	}
 };
 
-
+const newBrew = (req, res) => {
-
+	let authors = (req.account) ? [req.account.username] : [];
-router.post('/api', (req, res)=>{
-
-	let authors = [];
-	if(req.account) authors = [req.account.username];
 
 	const newHomebrew = new HomebrewModel(_.merge({},
 		req.body,
 		{ authors: authors }
 	));
 
-	if(!newHomebrew.title){
+	if (!newHomebrew.title) {
 		newHomebrew.title = getGoodBrewTitle(newHomebrew.text);
 	}
 
-	newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text);	// Compress brew text to binary before saving
+	// Compress brew text to binary before saving
-	newHomebrew.text = undefined;									// Delete the non-binary text field since it's not needed anymore
+	newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text);
+	// Delete the non-binary text field since it's not needed anymore
+	newHomebrew.text = undefined;
 
-	newHomebrew.save((err, obj)=>{
+	newHomebrew.save((err, obj) => {
-		if(err){
+		if (err) {
 			console.error(err, err.toString(), err.stack);
 			return res.status(500).send(`Error while creating new brew, ${err.toString()}`);
 		}
 		return res.json(obj);
 	});
-});
+};
 
-router.put('/api/update/:id', (req, res)=>{
+router.post('/api', newBrew);
+
+const updateBrew = (req, res) => {
 	HomebrewModel.get({ editId: req.params.id })
-		.then((brew)=>{
+		.then((brew) => {
 			brew = _.merge(brew, req.body);
-			brew.textBin = zlib.deflateRawSync(req.body.text);	// Compress brew text to binary before saving
+			// Compress brew text to binary before saving
-			brew.text = undefined;								// Delete the non-binary text field since it's not needed anymore
+			brew.textBin = zlib.deflateRawSync(req.body.text);
+			// Delete the non-binary text field since it's not needed anymore
+			brew.text = undefined;
 			brew.updatedAt = new Date();
 
-			if(req.account) brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
+			if (req.account) {
+				brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
+			}
 
 			brew.markModified('authors');
 			brew.markModified('systems');
 
-			brew.save((err, obj)=>{
+			brew.save((err, obj) => {
-				if(err) throw err;
+				if (err) throw err;
 				return res.status(200).send(obj);
 			});
 		})
-		.catch((err)=>{
+		.catch((err) => {
-			console.log(err);
+			console.error(err);
 			return res.status(500).send('Error while saving');
 		});
-});
+};
 
-router.get('/api/remove/:id', (req, res)=>{
+router.put('/api/update/:id', updateBrew);
-	HomebrewModel.find({ editId: req.params.id }, (err, objs)=>{
+router.put('/api/:id', updateBrew);
-		if(!objs.length || err) return res.status(404).send('Can not find homebrew with that id');
+
+const deleteBrew = (req, res) => {
+	HomebrewModel.find({ editId: req.params.id }, (err, objs) => {
+		if (!objs.length || err)
+			return res.status(404).send('Can not find homebrew with that id');
 		const brew = objs[0];
 
 		// Remove current user as author
-		if(req.account){
+		if (req.account) {
 			brew.authors = _.pull(brew.authors, req.account.username);
 			brew.markModified('authors');
 		}
 
-		// Delete brew if there are no authors left
+		if (brew.authors.length === 0) {
-		if(!brew.authors.length)
+			// Delete brew if there are no authors left
-			brew.remove((err)=>{
+			brew.remove((err) => {
-				if(err) return res.status(500).send('Error while removing');
+				if (err) return res.status(500).send('Error while removing');
 				return res.status(200).send();
 			});
-		// Otherwise, save the brew with updated author list
+		} else {
-		else
+			// Otherwise, save the brew with updated author list
-			brew.save((err, savedBrew)=>{
+			brew.save((err, savedBrew) => {
-				if(err) throw err;
+				if (err) throw err;
 				return res.status(200).send(savedBrew);
 			});
+		}
 	});
-});
+};
 
+router.get('/api/remove/:id', deleteBrew);
+router.delete('/api/:id', deleteBrew);
 
 module.exports = router;
 
 /*
-
+module.exports = function(app) {
-
-
-module.exports = function(app){
-
 	app;
 
-
+	app.get('/api/search', mw.adminOnly, function(req, res) {
-
-
-	app.get('/api/search', mw.adminOnly, function(req, res){
-
 		var page = req.query.page || 0;
 		var count = req.query.count || 20;
 
 		var query = {};
-		if(req.query && req.query.id){
+		if (req.query && req.query.id) {
 			query = {
-				"$or" : [{
+				"$or": [{
 					editId : req.query.id
-				},{
+				}, {
 					shareId : req.query.id
 				}]
 			};
@@ -134,21 +135,17 @@ module.exports = function(app){
 		}, {
 			skip: page*count,
 			limit: count*1
-		}, function(err, objs){
+		}, function(err, objs) {
-			if(err) console.log(err);
+			if (err) console.error(err);
 			return res.json({
 				page : page,
 				count : count,
 				total : homebrewTotal,
 				brews : objs
 			});
-
 		});
 	})
 
-
-
-
 	return app;
 }
 */