Merge pull request CodewarsClone#82 from CodewarsClone/monBranch

Mon branch

Author: Jon Myrick

db/start/tables.sql

@@ -1,4 +1,4 @@
-DROP TABLE IF EXISTS ratings, rating,  solutions, katas, kata, users;
+DROP TABLE IF EXISTS kata_ratings, sol_ratings, ratings, rating, solutions, katas, kata, users;
 
 CREATE TABLE users (
   id serial primary key,
@@ -29,14 +29,20 @@ CREATE TABLE solutions (
   script text not null
 );
 
-CREATE TABLE ratings (
+CREATE TABLE sol_ratings (
   id serial primary key,
   user_id integer references users(id),
-  kata_id integer references katas(id),
   solution_id integer references solutions(id),
   liked boolean not null
 );
 
+CREATE TABLE kata_ratings (
+  id serial primary key,
+  user_id integer references users(id),
+  kata_id integer references katas(id),
+  liked boolean not null
+)
+
 INSERT INTO users (github_id, name, email, username, picture_url, points)
 VALUES ('12', 'Bob Smith', 'bob@smith.com', 'bobIScool', null, 25);
 

db/update/kata_likes.sql

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

db/update/solution_likes.sql

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

server.js

@@ -106,8 +106,8 @@ app.post('/api/submit-answer/:kataid', kataCtrl.sumbitAnswer);
 app.post('/api/kata-by-name', kataCtrl.searchByKatasName);
 
 app.put('/api/points', kataCtrl.addPointsToUser);
-app.put('/api/kata-votes', kataCtrl.upVoteKata);
-app.put('/api/solution-votes', kataCtrl.upVoteSolution);
+app.put('/api/kata-votes/:kataid', kataCtrl.upVoteKata);
+app.put('/api/solution-votes/:kataid', kataCtrl.upVoteSolution);
 
 
 app.listen(config.port, function () {

src/components/mainService.js

@@ -70,7 +70,7 @@ angular.module('app').service('mainService', function($http, $q, $sce) {
     });
   };
 
-  // homeCtrl - displaying one kata withing range
+  // homeCtrl - displaying one kata within range
   this.getRandomKata = (userkyu) => {
     return $http({
       method: 'GET',
@@ -122,17 +122,25 @@ angular.module('app').service('mainService', function($http, $q, $sce) {
     })
   };
 
-  this.upVoteKata = () => {
+  this.upVoteKata = (userid, kataid) => {
     return $http({
       method: 'PUT',
-      url: `/api/kata-votes`
+      url: `/api/kata-votes/` + kataid,
+      data: {
+        userid: userid,
+        kataid: kataid
+      }
     })
   }
 
-  this.upVoteSolution = () => {
+  this.upVoteSolution = (kataid, userid, solutionid) => {
     return $http({
       method: 'PUT',
-      url: `/api/solution-votes`
+      url: `/api/solution-votes/` + kataid,
+      data: {
+        userid: userid,
+        solutionid: solutionid
+      }
     })
   }