mirror of
https://github.com/arnaucube/commonroutesServer.git
synced 2026-02-28 05:26:42 +01:00
comments inside travel json
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
'secret': process.env.SECRET,// production version
|
/*'secret': process.env.SECRET,// production version
|
||||||
'database': process.env.MONGO_DSN,
|
'database': process.env.MONGO_DSN,*/
|
||||||
/*'secret': 'secretfortoken',// local version
|
'secret': 'secretfortoken',// local version
|
||||||
'database': 'mongodb://localhost/comunalcar',*/
|
'database': 'mongodb://localhost/comunalcar',
|
||||||
"port" : process.env.PORT || 3000
|
"port" : process.env.PORT || 3000
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -135,22 +135,7 @@ exports.addJoin = function(req, res) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
exports.doUnjoin = 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){
|
travelModel.findById(req.params.travelId, function(err, travel){
|
||||||
for(var i=0; i<travel.joins.length; i++)
|
for(var i=0; i<travel.joins.length; i++)
|
||||||
{
|
{
|
||||||
@@ -192,7 +177,7 @@ exports.getJoinsByTravelId = function(req, res) {
|
|||||||
|
|
||||||
/* comment */
|
/* comment */
|
||||||
exports.addComment = function(req, res) {
|
exports.addComment = function(req, res) {
|
||||||
var comment = new commentModel({
|
/*var comment = new commentModel({
|
||||||
travelId: req.params.travelId,
|
travelId: req.params.travelId,
|
||||||
commentUserId: req.body.commentUserId,
|
commentUserId: req.body.commentUserId,
|
||||||
commentUsername: req.body.commentUsername,
|
commentUsername: req.body.commentUsername,
|
||||||
@@ -203,6 +188,26 @@ exports.addComment = function(req, res) {
|
|||||||
comment.save(function(err, comment) {
|
comment.save(function(err, comment) {
|
||||||
if(err) return res.send(500, err.message);
|
if(err) return res.send(500, err.message);
|
||||||
res.status(200).jsonp(comment);
|
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);
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ apiRoutes.route('/travels/:travelId/join')
|
|||||||
apiRoutes.route('/travels/:travelId/unjoin')
|
apiRoutes.route('/travels/:travelId/unjoin')
|
||||||
.post(travelCtrl.doUnjoin);
|
.post(travelCtrl.doUnjoin);
|
||||||
|
|
||||||
apiRoutes.route('/travels/comment/:travelId')
|
apiRoutes.route('/travels/:travelId/comment')
|
||||||
.post(travelCtrl.addComment);
|
.post(travelCtrl.addComment);
|
||||||
|
|
||||||
app.use('/api', apiRoutes);
|
app.use('/api', apiRoutes);
|
||||||
|
|||||||
Reference in New Issue
Block a user