before lunch merge

Author: SterlingChin

controllers/kataCtrl.js

@@ -66,33 +66,51 @@ module.exports = {
     },
 
     voteKata: (req, res, next) => {
-        db.create.kata_likes([req.body.userid, req.body.kataid, req.body.vote], (err, rating) => {
+        db.read.check_kata_vote([req.body.userid, req.body.kataid], (err, data) => {
             if (err) return next(err);
-            db.read.get_kata_likes([req.body.kataid], (err, likes) => {
+            if (data.length > 0) {
+                db.update.change_kata_vote([req.body.userid, req.body.kataid, req.body.vote], (err, change) => {
+                    if (err) return next(err);
+                })
+            } else {
+                db.create.kata_likes([req.body.userid, req.body.kataid, req.body.vote], (err, rating) => {
+                    if (err) return next(err);
+                })
+            }
+        })
+        db.read.get_kata_likes([req.body.kataid], (err, likes) => {
+            if (err) return next(err);
+            db.read.get_kata_dislikes([req.body.kataid], (err, dislikes) => {
                 if (err) return next(err);
-                db.read.get_kata_dislikes([req.body.kataid], (err, dislikes) => {
+                db.read.get_kata_votes([req.body.kataid], (err, votes) => {
                     if (err) return next(err);
-                    db.read.get_kata_votes([req.body.kataid], (err, votes) => {
-                        if (err) return next(err);
-                        return res.status(200).json({likes: likes[0].likes, dislikes: dislikes[0].dislikes, votes: votes[0].votes});
-                    })
+                    return res.status(200).json({likes: likes[0].likes, dislikes: dislikes[0].dislikes, votes: votes[0].votes});
                 })
             })
         })
     },
 
     voteSolution: (req, res, next) => {
-        db.create.solution_likes([req.body.userid, req.body.solutionid, req.body.vote], (err, rating) => {
+        db.read.check_solution_vote([req.body.userid, req.body.solutionid], (err, data) => {
             if (err) return next(err);
-            db.read.get_solution_likes([req.body.solutionid], (err, likes) => {
+            if (data.length > 0) {
+                db.update.change_solution_vote([req.body.userid, req.body.solutionid, req.body.vote], (err, change) => {
+                    if (err) return next(err);
+                })
+            } else {
+                db.create.solution_likes([req.body.userid, req.body.solutionid, req.body.vote], (err, rating) => {
+                    if (err) return next(err);
+                })
+            }
+        })
+        db.read.get_solution_likes([req.body.solutionid], (err, likes) => {
+            if (err) return next(err);
+            db.read.get_solution_dislikes([req.body.solutionid], (err, dislikes) => {
                 if (err) return next(err);
-                db.read.get_solution_dislikes([req.body.solutionid], (err, dislikes) => {
+                db.read.get_solution_votes([req.body.solutionid], (err, votes) => {
                     if (err) return next(err);
-                    db.read.get_solution_votes([req.body.solutionid], (err, votes) => {
-                        if (err) return next(err);
-                        return res.status(200).json({likes: likes[0].likes, dislikes: dislikes[0].dislikes, votes: votes[0].votes});
-                    })
-                }) 
+                    return res.status(200).json({likes: likes[0].likes, dislikes: dislikes[0].dislikes, votes: votes[0].votes});
+                })
             })
         })
     },

db/create/kata_likes.sql

@@ -1 +1,2 @@
-INSERT INTO kata_ratings (user_id, kata_id, liked) VALUES ($1, $2, $3);
+INSERT INTO kata_ratings (user_id, kata_id, liked)
+VALUES ($1, $2, $3);

db/create/solution_likes.sql

@@ -1 +1,8 @@
-INSERT INTO sol_ratings (user_id, solution_id, liked) VALUES ($1, $2, $3);
+INSERT INTO sol_ratings (user_id, solution_id, liked) 
+VALUES ($1, $2, $3);
+
+
+
+
+
+

db/read/check_kata_vote.sql

@@ -0,0 +1,2 @@
+SELECT * FROM kata_ratings
+WHERE user_id = $1 AND kata_id = $2;

db/read/check_solution_vote.sql

@@ -0,0 +1,2 @@
+SELECT * FROM sol_ratings
+WHERE user_id = $1 AND solution_id = $2;

db/update/change_kata_vote.sql

@@ -0,0 +1,2 @@
+UPDATE kata_ratings SET liked = $3
+WHERE user_id = $1 AND kata_id = $2;

db/update/change_solution_vote.sql

@@ -0,0 +1,2 @@
+UPDATE sol_ratings SET liked = $3
+WHERE user_id = $1 AND solution_id = $2;

server.js

@@ -105,7 +105,7 @@ app.post('/api/test/suite/:kataid', testCtrl.testKata);
 app.post('/api/test/examples', testCtrl.testExamplesKata);
 app.post('/api/submit-answer/:kataid', kataCtrl.sumbitAnswer);
 app.post('/api/kata-by-name', kataCtrl.searchByKatasName);
-app.post('/api/kata-votes/:kataid', kataCtrl.voteKata);
+app.post('/api/kata-votes', kataCtrl.voteKata);
 app.post('/api/solution-votes', kataCtrl.voteSolution);
 
 app.put('/api/points', kataCtrl.addPointsToUser);

src/components/mainService.js

@@ -57,7 +57,7 @@ angular.module('app').service('mainService', function($http, $q, $sce, $state) {
   this.voteKata = (userid, kataid, vote) => {
     return $http({
       method: 'POST',
-      url: `/api/kata-votes/` + kataid,
+      url: `/api/kata-votes`,
       data: {
         userid: userid,
         kataid: kataid,