From 408812b265b18a76a3abdbcb958875b0d6c78652 Mon Sep 17 00:00:00 2001
From: idoctnef <idoctnef@openmailbox.org>
Date: Thu, 6 Oct 2016 21:23:23 +0200
Subject: [PATCH] comments inside travel json

---
 config.js                       |  8 +++----
 controllers/travelController.js | 37 +++++++++++++++++++--------------
 server.js                       |  2 +-
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/config.js b/config.js
index 7b004bc..d0108f3 100644
--- a/config.js
+++ b/config.js
@@ -1,8 +1,8 @@
 module.exports = {
-    'secret': process.env.SECRET,// production version
-    'database': process.env.MONGO_DSN,
-    /*'secret': 'secretfortoken',// local version
-    'database': 'mongodb://localhost/comunalcar',*/
+    /*'secret': process.env.SECRET,// production version
+    'database': process.env.MONGO_DSN,*/
+    'secret': 'secretfortoken',// local version
+    'database': 'mongodb://localhost/comunalcar',
     "port" : process.env.PORT || 3000
 
 };
diff --git a/controllers/travelController.js b/controllers/travelController.js
index e215822..770b68c 100644
--- a/controllers/travelController.js
+++ b/controllers/travelController.js
@@ -135,22 +135,7 @@ exports.addJoin = function(req, res) {
 };
 
 exports.doUnjoin = function(req, res) {
-	/*joinModel.find({
-		travelId: req.params.travelId
-	}, function(err, joins) {
-		for(var i=0; i<joins.length; i++)
-		{
-			if(joins[i].joinedUsername==req.body.joinedUsername)
-			{
-				joins[i].remove(function(err) {
-					if(err) return res.send(500, err.message);
-		      		res.status(200).jsonp('removed');
-				    console.log('DELETE /unjoin/' + req.params.id);
-				})
-			}
-		}
 
-	});*/
 	travelModel.findById(req.params.travelId, function(err, travel){
 		for(var i=0; i<travel.joins.length; i++)
 		{
@@ -192,7 +177,7 @@ exports.getJoinsByTravelId = function(req, res) {
 
 /* comment */
 exports.addComment = function(req, res) {
-	var comment = new commentModel({
+	/*var comment = new commentModel({
 		travelId: req.params.travelId,
 		commentUserId: req.body.commentUserId,
 		commentUsername: req.body.commentUsername,
@@ -203,6 +188,26 @@ exports.addComment = function(req, res) {
 	comment.save(function(err, comment) {
 		if(err) return res.send(500, err.message);
     res.status(200).jsonp(comment);
+	});*/
+
+	travelModel.findById(req.params.travelId, function(err, travel){
+		console.log(travel.title);
+		var comment = {
+			commentUserId: req.body.commentUserId,
+			commentUsername: req.body.commentUsername,
+			comment: req.body.comment,
+			commentAvatar: req.body.commentAvatar
+		};
+		travel.comments.push(comment);
+
+		travel.save(function(err, travel) {
+			if(err) return res.send(500, err.message);
+	    //res.status(200).jsonp(travel);
+			travelModel.find(function(err, travels) {
+			    if(err) res.send(500, err.message);
+					res.status(200).jsonp(travels);
+			});
+		});
 	});
 };
 
diff --git a/server.js b/server.js
index f09500c..d09c5f0 100755
--- a/server.js
+++ b/server.js
@@ -132,7 +132,7 @@ apiRoutes.route('/travels/:travelId/join')
 apiRoutes.route('/travels/:travelId/unjoin')
     .post(travelCtrl.doUnjoin);
 
-apiRoutes.route('/travels/comment/:travelId')
+apiRoutes.route('/travels/:travelId/comment')
     .post(travelCtrl.addComment);
 
 app.use('/api', apiRoutes);