up/downVotes done

Author: Kevbyte

client/js/controllers/post-ctrl.js

@@ -32,28 +32,29 @@ angular.module('RDash')
     Comments.addComment($scope.comment)
     .then(function(resp) {
       resp._source.created_at = new Date(resp._source.created_at).toString();
+      resp.votes = resp.votes || 0;
       $scope.data.comments.push(resp);
     })
     .catch(function(error) {
       console.log(error);
     });
   };
 
-  $rootScope.$on('showComments', function(event){
-      $scope.fetch()
-    });
-
   $scope.upVote = function(commentID) {
-    console.log("commentID ===== ", commentID)
     //use commentID to send the user into the comment.upVotes array
-    Comments.upVote(commentID)
+    Comments.upVote(commentID).then(function() {
+      $scope.fetch();
+    });
+    
   };
 
-  // $scope.downVote = function() {
-  //   Comments.downVote($stateParams.postID, user.id, function(resp){
-  //     $scope.data.comment.votes = resp.upVotes.length - resp.downVotes.length;
-  //   })
-  // };
+  $scope.downVote = function(commentID) {
+    Comments.downVote(commentID).then(function() {
+      // debugger
+      $scope.fetch();
+    });
+    
+  };
 
   $scope.$on('$viewContentLoaded', function(){
     $scope.simplemde = new SimpleMDE({

client/js/services/services.js

@@ -79,28 +79,23 @@ angular.module('RDash.services', [])
     });
   };
 
-  var upVote = function(commentID, cb){
+  var upVote = function(commentID){
     return $http({
       method: 'POST',
       url: '/api/comments/'+commentID+'/upvote'
-    }).then(function (resp) {
-      cb(resp.data);
     });
   };
 
-  // var downVote = function(commentID, user, cb){
-  //   return $http({
-  //     method: 'POST',
-  //     url: '/api/comments'+commentID,
-  //     data: user
-  //   }).then(function (resp) {
-  //     cb(resp.data);
-  //   });
-  // };
+  var downVote = function(commentID){
+    return $http({
+      method: 'POST',
+      url: '/api/comments/'+commentID+'/downvote'
+    });
+  };
 
   return {
     upVote: upVote,
-    // downVote: downVote,
+    downVote: downVote,
     getComments: getComments,
     addComment: addComment
   };

client/templates/post.html

@@ -64,12 +64,12 @@
                   <div ng-click='upVote(comment._id)'>
                     <img src="http://icons.iconarchive.com/icons/icons8/windows-8/32/Hands-Thumbs-Up-icon.png"/>
                   </div>
-                  <div ng-click="downVote()">
+                  <div ng-click="downVote(comment._id)">
                     <img src="http://icons.iconarchive.com/icons/icons8/windows-8/32/Hands-Thumbs-Down-icon.png"/>
                   </div>
                 </div>
                 <div class="pull-right" ng-model="comment.votes">
-                  {{comment._source.votes}}
+                  {{comment.votes}}
                 </div>
               </div>
             </rd-widget-body>

server/controllers/comments.controllers.server.js

@@ -5,7 +5,6 @@ var path = require('path');
 var client = require(path.resolve('./lib/elasticsearch'));
 
 exports.renderComments = function(req, res) {
-  console.log("I am rendering Comments")
   var postID = req.query.postID;
   var search;
 
@@ -22,14 +21,13 @@ exports.renderComments = function(req, res) {
     search.body.sort = {"created_at" : {"order" : "desc"}};
 
     client.search(search).then(function (results){
-      console.log("in !postID")
       res.send(results.hits.hits);
     });
   } else {
     search = {};
     search.index = 'comments';
     search.type = 'comment';
-    search.size = 10;
+    search.size = 1000;
     search.body = {};
       search.body.query = {};
         search.body.query.match = {};
@@ -42,11 +40,9 @@ exports.renderComments = function(req, res) {
 
     client.search(search).then(function (result) {
       var hits = result.hits.hits;
-      console.log(hits);
       for(var i=0; i<hits.length; i++) {
         hits[i].votes = hits[i]._source.upvotes.length - hits[i]._source.downvotes.length;
       }
-      console.log("hits === ", hits);
       res.json(hits);
     });
   }
@@ -88,55 +84,55 @@ exports.storeComment = function(req, res) {
 };
 
 exports.upvoteComment = function(req, res) {
-  console.log("req.comment ==== ", req.comment)
+
   var comment = req.comment;
-  if(!comment.upvotes) {
-    comment.upvotes = [];
+  if(!comment._source.upvotes) {
+    comment._source.upvotes = [];
   }
-  if(!comment.downvotes) {
-    comment.downvotes = [];
+  if(!comment._source.downvotes) {
+    comment._source.downvotes = [];
   }
-  if(comment.downvotes.indexOf(req.session.user.id) > -1) {
-    comment.downvotes.splice(comment.downvotes.indexOf(req.session.user.id), 1);
+  if(comment._source.downvotes.indexOf(req.session.user.id) > -1) {
+    comment._source.downvotes.splice(comment._source.downvotes.indexOf(req.session.user.id), 1);
   }
-  if(comment.upvotes.indexOf(req.session.user.id) === -1) {
-    comment.upvotes.push(req.session.user.id);
+  if(comment._source.upvotes.indexOf(req.session.user.id) === -1) {
+    comment._source.upvotes.push(req.session.user.id);
   }
   var update = {};
   update.index = 'comments';
   update.type = 'comment';
   update.id = comment._id;
   update.body = {};
   update.body.doc = {};
-  update.body.upvotes = comment.upvotes;
-  update.body.downvotes = comment.downvotes;
+  update.body.doc.upvotes = comment._source.upvotes;
+  update.body.doc.downvotes = comment._source.downvotes;
   client.update(update).then(function (result) {
     res.send(result);
   });
 };
 
 exports.downvoteComment = function(req, res) {
   var comment = req.comment;
-  if(!comment.downvotes) {
-    comment.downvotes = [];
+  if(!comment._source.downvotes) {
+    comment._source.downvotes = [];
   }
-  if(!comment.upvotes) {
-    comment.upvotes = [];
+  if(!comment._source.upvotes) {
+    comment._source.upvotes = [];
   }
-  if(comment.upvotes.indexOf(req.session.user.id) > -1) {
-    comment.upvotes.splice(comment.upvotes.indexOf(req.session.user.id), 1);
+  if(comment._source.upvotes.indexOf(req.session.user.id) > -1) {
+    comment._source.upvotes.splice(comment._source.upvotes.indexOf(req.session.user.id), 1);
   }
-  if(comment.downvotes.indexOf(req.session.user.id) === -1) {
-    comment.downvotes.push(req.session.user.id);
+  if(comment._source.downvotes.indexOf(req.session.user.id) === -1) {
+    comment._source.downvotes.push(req.session.user.id);
   }
   var update = {};
   update.index = 'comments';
   update.type = 'comment';
   update.id = comment._id;
   update.body = {};
   update.body.doc = {};
-  update.body.upvotes = comment.upvotes;
-  update.body.downvotes = comment.downvotes;
+  update.body.doc.upvotes = comment._source.upvotes;
+  update.body.doc.downvotes = comment._source.downvotes;
   client.update(update).then(function (result) {
     res.send(result);
   });