Merge pull request CodewarsClone#107 from CodewarsClone/fixBranch

Fix branch

Author: Jon Myrick

controllers/kataCtrl.js

@@ -68,6 +68,32 @@ module.exports = {
         })
     },
 
+    getKataVotes: (req, res, next) => {
+        db.read.all_kata_likes([], (err, likes) => {
+            if (err) return next(err);
+            db.read.all_kata_dislikes([], (err, dislikes) => {
+                if (err) return next(err);
+                db.read.all_kata_votes([], (err, votes) => {
+                    if (err) return next(err);
+                    return res.status(200).json([likes, dislikes, votes]);
+                })
+            })
+        })
+    },
+
+    getSolutionVotes: (req, res, next) => {
+        db.read.all_solution_likes([], (err, likes) => {
+            if (err) return next(err);
+            db.read.all_solution_dislikes([], (err, dislikes) => {
+                if (err) return next(err);
+                db.read.all_solution_votes([], (err, votes) => {
+                    if (err) return next(err);
+                    return res.status(200).json([likes, dislikes, votes]);
+                })
+            })
+        })
+    },
+
     voteKata: (req, res, next) => {
         db.read.check_kata_vote([req.body.userid, req.body.kataid], (err, data) => {
             if (err) return next(err);

db/read/all_kata_dislikes.sql

@@ -0,0 +1,2 @@
+SELECT COUNT(*) AS dislikes, kata_id FROM kata_ratings WHERE liked = false
+GROUP BY kata_id;

db/read/all_kata_likes.sql

@@ -0,0 +1,2 @@
+SELECT COUNT(*) AS likes, kata_id FROM kata_ratings WHERE liked = true
+GROUP BY kata_id;

db/read/all_kata_votes.sql

@@ -0,0 +1,2 @@
+SELECT COUNT(*) AS votes, kata_id FROM kata_ratings
+GROUP BY kata_id;

db/read/all_solution_dislikes.sql

@@ -0,0 +1,2 @@
+SELECT COUNT(*) AS dislikes, solution_id FROM sol_ratings WHERE liked = false
+GROUP BY solution_id;

db/read/all_solution_likes.sql

@@ -0,0 +1,2 @@
+SELECT COUNT(*) AS dislikes, solution_id FROM sol_ratings WHERE liked = true
+GROUP BY solution_id;

db/read/all_solution_votes.sql

@@ -0,0 +1 @@
+SELECT COUNT(*) AS dislikes, solution_id FROM sol_ratings GROUP BY solution_id;

server.js

@@ -100,6 +100,8 @@ app.get('/api/random-kata-list/:userkyu', kataCtrl.getRandomKataList);
 app.get('/api/katas-by-kyu/:kyu', kataCtrl.getKatasByKyu);
 app.get('/api/solutions/:kataid', kataCtrl.getKataSolutions);
 app.get('/api/get-user-katas/:userid', kataCtrl.getUserKatas);
+app.get('/api/kata-votes', kataCtrl.getKataVotes);
+app.get('/api/solution-votes/', kataCtrl.getSolutionVotes);
 
 app.post('/api/test/suite/:kataid', testCtrl.testKata);
 app.post('/api/test/examples', testCtrl.testExamplesKata);

src/components/home/homeCtrl.js

@@ -1,6 +1,6 @@
 /***********HOME CONTROLLER***********/
 
-angular.module('app').controller('homeCtrl', function($scope, $state, mainService) {
+angular.module('app').controller('homeCtrl', function($scope, $state, mainService, $stateParams) {
 
     mainService.checkAuth();
     $scope.languageOptions = ["JavaScript", "Ruby", "C++"];
@@ -13,6 +13,7 @@ angular.module('app').controller('homeCtrl', function($scope, $state, mainServic
             mainService.user = response.data;
             mainService.user.kyu_level = mainService.rankCalculator(mainService.user);
             $scope.getUserKatas(mainService.user.id);
+            $scope.getKataVotes();
             $scope.getRandomKata();
         })
     };
@@ -48,6 +49,13 @@ angular.module('app').controller('homeCtrl', function($scope, $state, mainServic
         })
     }
 
+    $scope.getKataVotes = () => {
+        mainService.getKataVotes().then(response => {
+            $scope.allKataVotes = response.data
+            console.log($scope.allKataVotes);
+        })
+    }
+
     $scope.getUser();
 
 

src/components/kata_list/kata_listCtrl.js

@@ -41,6 +41,7 @@ angular.module('app').controller('kata_listCtrl', function($scope, $state, mainS
             $scope.randomKataList = response.data;
             $scope.displayKataList = $scope.randomKataList;
             $scope.totalKata = $scope.displayKataList.length;
+            $scope.getKataVotes();
         })
     }
 
@@ -96,4 +97,11 @@ angular.module('app').controller('kata_listCtrl', function($scope, $state, mainS
       $scope.totalKata = $scope.displayKataList.length;
     }
 
+    $scope.getKataVotes = () => {
+        mainService.getKataVotes().then(response => {
+            $scope.allKataVotes = response.data
+            console.log($scope.allKataVotes);
+        })
+    }
+
 });