Merge pull request #106 from lakshyabatman/development

Logic for upvotes and downvotes are updated

Author: capedcrusader23

controller/profile.controller.js

@@ -31,80 +31,25 @@ module.exports = {
             res.redirect('/profile/profileview/' + req.user.Eid);
         })
     },
-    upvote: function (req, res) {
-
-        var p = 0;
-
-        var check = 0;
-        var comment = " ";
-        for (q = 0; q < proj.downvote.length; q++) {
-            if (req.body.client == proj.downvote[q]) {
-                comment = "Cannot upvote and downvote a post ";
-                check = 1;
-                break;
-            }
-
-        }
-
-        if (check == 1) {
-            res.send({ proj, comment });
-        }
-        else {
-            for (v = 0; v < proj.upvote.length; v++) {
-                if (req.body.client == proj.upvote[v]) {
-                    p = 1;
-                    proj.upvote.pop(req.body.client);
-                    proj.save();
-                    console.log("already present");
-                    break;
-                }
-            }
-
-            if (p == 0) {
-                proj.upvote.push(req.body.client);
-                proj.save();
-            }
-
-            res.send({ comment, proj });
-        }
-    },
-    downvote: function(req,res){
-        proj.findOne({ proid: req.body.project }).then(function (proj) {
-
-            var p = 0;
-            var check = 0;
-            var comment = '';
-
-            for (q = 0; q < proj.upvote.length; q++) {
-                if (req.body.client == proj.upvote[q]) {
-                    comment = "Cannot do upvote downvote at same post"
-                    check = 1;
-                    break;
-                }
-            }
-
-            if (check == 1) {
-                res.send({ comment, proj });
-            }
-            else {
-                for (v = 0; v < proj.downvote.length; v++) {
-                    if (req.body.client == proj.downvote[v]) {
-                        p = 1;
-                        proj.downvote.pop(req.body.client);
-                        proj.save();
-                        console.log("already present");
-                        break;
-                    }
-                }
-
-                if (p == 0) {
-                    proj.downvote.push(req.body.client);
-                    proj.save();
-                }
-
-                res.send({ comment, proj });
-            }
-        });
+    upDownVote: function (req,res) {
+      proj.findOne({proid: req.body.project}).then((pro)=>{
+          if(pro.upDownVote.get(req.body.client)){
+              if(pro.upDownVote.get(req.body.client)=="-1"){
+                  pro.upDownVote.set(req.body.client,"+1")
+                  return pro.save()
+                  
+              }else{
+                  pro.upDownVote.set(req.body.client,"-1")
+                  return pro.save()
+                  
+              }
+          }else{
+              pro.upDownVote.set(req.body.client,req.body.vote)
+              return pro.save()
+          }
+      }).catch((err)=>{
+          return err
+      })
     },
     ch2 : function(req,res){
         res.render('main-landing', { sign: req.user });

db/projects.txt

@@ -1,11 +1,6 @@
 {
     "_id" : ObjectId("5b5201258bf7024f24e85126"),
-    "upvote" : [ 
-        ""
-    ],
-    "downvote" : [ 
-        ""
-    ],
+    "upDownVote":{},
     "pname" : "My first project",
     "pid" : "104495411584749551646",
     "github" : "xyz",
@@ -16,13 +11,7 @@
 },
 {
     "_id" : ObjectId("5b4f8beb7186aa40844df9b2"),
-    "upvote" : [ 
-        "", 
-        "104495411584749551646"
-    ],
-    "downvote" : [ 
-        ""
-    ],
+    "upDownVote" :{},
     "pname" : "My first project",
     "pid" : "104495411584749551646",
     "github" : "xyz",
@@ -33,13 +22,7 @@
 },
 {
     "_id" : ObjectId("5b5c2a66bb47f62b54a8ee40"),
-    "upvote" : [ 
-        ""
-    ],
-    "downvote" : [ 
-        "", 
-        "104495411584749551646"
-    ],
+    "upDownVote":{},
     "pname" : "My first project",
     "pid" : "115169838008905885474",
     "github" : "xyz",
@@ -50,13 +33,7 @@
 },
 {
     "_id" : ObjectId("5b5c83880380e426bce91822"),
-    "upvote" : [ 
-        ""
-    ],
-    "downvote" : [ 
-        "", 
-        "104495411584749551646"
-    ],
+    "upDownVote":{},
     "pname" : "My first ",
     "pid" : "104495411584749551646",
     "github" : "",

package-lock.json

@@ -25,9 +25,9 @@ route.get('/profileview/:sd', auth, url, profileController.profileViewSd);
 
 route.post('/publish',auth ,url, profileController.publish);
 
-route.post('/upvote', auth,url, jsonParser, profileController.upvote);
 
-route.post('/downvote', url, jsonParser, profileController.downvote);
+route.post('/upDownVote',auth,url,jsonParser,profileController.upDownVote);
+
 
 route.get('/ch2',auth, profileController.ch2);
 

routes/profile.routes.js

@@ -20,11 +20,9 @@ Lang:{
 content:{
   type:String
 },
-upvote:{
-  type:[String]
-},
-downvote:{
-  type:[String]
+upDownVote:{
+  type:Map,
+  of: String,
 },
 proid:{
   type:Number