fixed problems with acceptChallenge and removed dummy data for the ro…

…utes Relates #19 #5
fac-14 · Sep 15, 2018 · 3b94b92 · 3b94b92
1 parent 4ed0114
commit 3b94b92
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 202 deletions.
diff --git a/src/controllers/get-accepted-challenges.js b/src/controllers/get-accepted-challenges.js
@@ -2,7 +2,6 @@ const queries = require("../model/index");
 
 exports.get = (req, res) => {
     queries.getAcceptedChallenges(1, 1).then(acceptedChallenges => {
-        console.log("HELLO");
         res.render("dashboard", { acceptedChallenges });
     });
 };
diff --git a/src/controllers/get-completed-challenges.js b/src/controllers/get-completed-challenges.js
@@ -1,7 +1,7 @@
 const queries = require("../model/index");
 
 exports.get = (req, res) => {
-    queries.getCompletedChallenges().then(completedChallenges => {
-        res.render("dashboard", { completedChallenges: completedChallenges });
+    queries.getCompletedChallenges(1, 2).then(completedChallenges => {
+        res.render("dashboard", { completedChallenges });
     });
 };
diff --git a/src/controllers/index.js b/src/controllers/index.js
@@ -30,20 +30,24 @@ router.get("/learn", learn.get);
 router.get("/stats", userStats.get);
 router.get("/inventory-item", itemSelect.get);
 router.get("/my-challenge/", acceptedChallSelect.get);
+
 // accepting and completing challenges
 router.post("/challenge/accepted", (req, res) => {
   // insert query here to add accepted challenge to database
-  queries.acceptChallenge(0, 1);
+  queries.acceptChallenge(1, 1);
   console.log("Challenge accepted!");
   res.redirect(302, "/dashboard");
   res.end();
 });
+
 router.post("/challenge/completed", (req, res) => {
   // insert query here to add completed challenge to database
+  queries.completeChallenge(1, 1);
   console.log("Challenge completed!");
   res.redirect(302, "/dashboard");
   res.end();
 });
+
 if (process.env.NODE_ENV === "test") {
   router.get("/make-error", errorRoute);
 }

diff --git a/src/model/acceptChallenge.js b/src/model/acceptChallenge.js
@@ -5,14 +5,8 @@ const db = require('../../db/db_connection');
 
 const acceptChallenge = (challengeId, userId) => new Promise((resolve, reject) => {
     db.query(`INSERT INTO challenge_status (challenge_id, user_id, status) VALUES ($1, $2, $3);`, [challengeId, userId, 1])
-        .then(res => {
-            // console.log("hi" + res);
-            resolve(res)
-        })
-        .catch(err => {
-            // console.log("h");
-            reject(err)
-        })
+        .then(res => resolve(res))
+        .catch(err => reject(err))
 })
 
 module.exports = acceptChallenge;
diff --git a/src/model/completeChallenge.js b/src/model/completeChallenge.js
@@ -7,4 +7,6 @@ const completeChallenge = (challengeId, userId) => new Promise((resolve, reject)
     .catch(err => reject(err))
 })
 
+// add a query to take reward_points from the challenge and add them to the users points
+
 module.exports = completeChallenge;
diff --git a/src/model/getAcceptedChallenges.js b/src/model/getAcceptedChallenges.js
@@ -12,53 +12,3 @@ const getAccepetedChallenges = (userId, challengeStatus) => new Promise((resolve
 // should work for accepted and completed challenges just change challengeStatus
 
 module.exports = getAccepetedChallenges;
-
-// DUMMY CODE!!!!!!
-// const getAcceptedChallenges = () => {
-//     return new Promise((resolve, reject) => {
-//         const result = [
-//             {
-//                 id: 1,
-//                 inventory_id: 2,
-//                 title: "Go to a farmers market",
-//                 what: "Go to a farmers market",
-//                 why: "you can find organic produces and save packaging waste",
-//                 ext_link: "https://www.lfm.org.uk/",
-//                 img_link:
-//                     "https://s3.eu-central-1.amazonaws.com/lfm-web-prod/images/2016_May_Balham_Herbal_Haven_herbs.0f37de8c.fill-360x360.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Expires=3600&X-Amz-Credential=AKIAJXL7S33WNUYF726A%2F20180912%2Feu-central-1%2Fs3%2Faws4_request&X-Amz-SignedHeaders=host&X-Amz-Date=20180912T140221Z&X-Amz-Signature=3683277a9cc390d6d2d38d8bbad863a38bf16da79f3049a897ac8dad46078746",
-//                 reward_points: 10,
-//                 repeatable: false
-//             },
-//             {
-//                 id: 2,
-//                 inventory_id: null,
-//                 title: "Dont buy plastic water bottles for a week",
-//                 what: "maybe buy refillable bottle",
-//                 why: "saving lots of plastic",
-//                 ext_link:
-//                     "https://www.independent.co.uk/environment/plastic-bottles-waste-recycling-pollution-single-use-keep-britain-tidy-water-a8307591.html",
-//                 img_link:
-//                     "https://www.banthebottle.net/wp-content/uploads/2009/06/ban-all-bottles-300x225.jpg",
-//                 reward_points: 10,
-//                 repeatable: true
-//             },
-//             {
-//                 id: 3,
-//                 inventory_id: null,
-//                 title: "Stop trashing you dick",
-//                 what: "maybe buy refillable bottle",
-//                 why: "saving lots of plastic",
-//                 ext_link:
-//                     "https://www.independent.co.uk/environment/plastic-bottles-waste-recycling-pollution-single-use-keep-britain-tidy-water-a8307591.html",
-//                 img_link:
-//                     "https://www.banthebottle.net/wp-content/uploads/2009/06/ban-all-bottles-300x225.jpg",
-//                 reward_points: 10,
-//                 repeatable: true
-//             }
-//         ];
-
-//         resolve(result);
-//     });
-// };
-
-// module.exports = getAcceptedChallenges;
diff --git a/src/model/getChallenges.js b/src/model/getChallenges.js
@@ -10,79 +10,3 @@ const getChallenges = () => new Promise((resolve, reject) => {
 })
 
 module.exports = getChallenges;
-
-// DUMMY CODE!!!!!!
-// const getChallenges = () => {
-//   return new Promise((resolve, reject) => {
-//     const result = [
-//       {
-//         id: 1,
-//         inventory_id: 2,
-//         title: "Go to a farmers market",
-//         what: "Go to a farmers market",
-//         why: "you can find organic produces and save packaging waste",
-//         ext_link: "https://www.lfm.org.uk/",
-//         img_link:
-//           "https://s3.eu-central-1.amazonaws.com/lfm-web-prod/images/2016_May_Balham_Herbal_Haven_herbs.0f37de8c.fill-360x360.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Expires=3600&X-Amz-Credential=AKIAJXL7S33WNUYF726A%2F20180912%2Feu-central-1%2Fs3%2Faws4_request&X-Amz-SignedHeaders=host&X-Amz-Date=20180912T140221Z&X-Amz-Signature=3683277a9cc390d6d2d38d8bbad863a38bf16da79f3049a897ac8dad46078746",
-//         reward_points: 10,
-//         repeatable: false
-//       },
-//       {
-//         id: 2,
-//         inventory_id: null,
-//         title: "Dont buy plastic water bottles for a week",
-//         what: "maybe buy refillable bottle",
-//         why: "saving lots of plastic",
-//         ext_link:
-//           "https://www.independent.co.uk/environment/plastic-bottles-waste-recycling-pollution-single-use-keep-britain-tidy-water-a8307591.html",
-//         img_link:
-//           "https://www.banthebottle.net/wp-content/uploads/2009/06/ban-all-bottles-300x225.jpg",
-//         reward_points: 10,
-//         repeatable: true
-//       },
-//       {
-//         id: 3,
-//         inventory_id: null,
-//         title: "Stop trashing you dick",
-//         what: "maybe buy refillable bottle",
-//         why: "saving lots of plastic",
-//         ext_link:
-//           "https://www.independent.co.uk/environment/plastic-bottles-waste-recycling-pollution-single-use-keep-britain-tidy-water-a8307591.html",
-//         img_link:
-//           "https://www.banthebottle.net/wp-content/uploads/2009/06/ban-all-bottles-300x225.jpg",
-//         reward_points: 10,
-//         repeatable: true
-//       },
-//       {
-//         id: 4,
-//         inventory_id: null,
-//         title: "Get a reusable coffee cup",
-//         what: "maybe buy refillable bottle",
-//         why: "saving lots of plastic",
-//         ext_link:
-//           "https://www.independent.co.uk/environment/plastic-bottles-waste-recycling-pollution-single-use-keep-britain-tidy-water-a8307591.html",
-//         img_link:
-//           "https://www.banthebottle.net/wp-content/uploads/2009/06/ban-all-bottles-300x225.jpg",
-//         reward_points: 10,
-//         repeatable: true
-//       },
-//       {
-//         id: 5,
-//         inventory_id: null,
-//         title: "Something else importat",
-//         what: "maybe buy refillable bottle",
-//         why: "saving lots of plastic",
-//         ext_link:
-//           "https://www.independent.co.uk/environment/plastic-bottles-waste-recycling-pollution-single-use-keep-britain-tidy-water-a8307591.html",
-//         img_link:
-//           "https://www.banthebottle.net/wp-content/uploads/2009/06/ban-all-bottles-300x225.jpg",
-//         reward_points: 10,
-//         repeatable: true
-//       }
-//     ];
-
-//     resolve(result);
-//   });
-// };
-
-// module.exports = getChallenges;
diff --git a/src/model/getCompletedChallenges.js b/src/model/getCompletedChallenges.js
diff --git a/src/model/getSingleChallenge.js b/src/model/getSingleChallenge.js
@@ -10,29 +10,3 @@ const getSingleChallenge = (challenge_id) => new Promise((resolve, reject) => {
 })
 
 module.exports = getSingleChallenge;
-
-// DUMMY CODE!!!!!!
-
-// const getSingleChallenge = () => {
-//   return new Promise((resolve, reject) => {
-//     const result = [
-//       {
-//         id: 5,
-//         inventory_id: null,
-//         title: "Something else importat",
-//         what: "maybe buy refillable bottle",
-//         why: "saving lots of plastic",
-//         ext_link:
-//           "https://www.independent.co.uk/environment/plastic-bottles-waste-recycling-pollution-single-use-keep-britain-tidy-water-a8307591.html",
-//         img_link:
-//           "https://www.banthebottle.net/wp-content/uploads/2009/06/ban-all-bottles-300x225.jpg",
-//         reward_points: 10,
-//         repeatable: true
-//       }
-//     ];
-
-//     resolve(result);
-//   });
-// };
-
-// module.exports = getSingleChallenge;
diff --git a/src/model/index.js b/src/model/index.js
@@ -3,14 +3,14 @@ const acceptChallenge = require('./acceptChallenge')
 const completeChallenge = require('./completeChallenge')
 const getAcceptedChallenges = require('./getAcceptedChallenges')
 const getChallenges = require('./getChallenges')
-const getCompletedChallenges = require('./getCompletedChallenges')
+// const getCompletedChallenges = require('./getCompletedChallenges')
 const getSingleChallenge = require('./getSingleChallenge')
 
 module.exports = {
     acceptChallenge,
     completeChallenge,
     getAcceptedChallenges,
     getChallenges,
-    getCompletedChallenges,
+    // getCompletedChallenges,
     getSingleChallenge
 }