Merge pull request #6 from codeMonkeyMasters/darian-One-join

Scaled down to one join table, to make things easier and more logical.
codeMonkeyMasters · Aug 26, 2020 · e44939c · e44939c
2 parents 449805b + d6ffff9
commit e44939c
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 127 deletions.
diff --git a/migrations/3-create-quiz-question.js → migrations/2-create-quiz-question.js b/migrations/3-create-quiz-question.js → migrations/2-create-quiz-question.js
diff --git a/migrations/2-create-completed-exercise.js → migrations/3-create-completed-exercise.js b/migrations/2-create-completed-exercise.js → migrations/3-create-completed-exercise.js
@@ -20,17 +20,24 @@ module.exports = {
       },
       exerciseId: {
         type: Sequelize.INTEGER,
-        allowNull: false,
+        references: {
+          model: "exercises",
+          key: "id",
+      },
+        onUpdate: "CASCADE",
+        onDelete: "CASCADE",
+      },
+      quizQuestionId: {
+      type: Sequelize.INTEGER,
       references: {
-        model: "exercises",
+        model: "quizQuestions",
         key: "id",
-      },
+        },
       onUpdate: "CASCADE",
       onDelete: "CASCADE",
       },
       timeTaken: {
         type: Sequelize.TIME,
-        allowNull: false,
       },
       exp: {
         type: Sequelize.INTEGER,

diff --git a/migrations/4-create-completed-quiz.js b/migrations/4-create-completed-quiz.js
diff --git a/models/completedexercise.js b/models/completedexercise.js
@@ -26,17 +26,24 @@ module.exports = (sequelize, DataTypes) => {
     },
     exerciseId: {
       type: DataTypes.INTEGER,
-      allowNull: false,
       references: {
         model: "exercises",
         key: "id",
       },
       onUpdate: "CASCADE",
       onDelete: "CASCADE",
     },
+    quizQuestionId: {
+      type: DataTypes.INTEGER,
+      references: {
+        model: "quizQuestions",
+        key: "id",
+      },
+      onUpdate: "CASCADE",
+      onDelete: "CASCADE",
+    },
     timeTaken: {
       type: DataTypes.TIME,
-      allowNull: false,
     },
     exp: {
       type: DataTypes.INTEGER,

diff --git a/models/completedquiz.js b/models/completedquiz.js
diff --git a/models/quizquestion.js b/models/quizquestion.js
@@ -11,9 +11,10 @@ module.exports = (sequelize, DataTypes) => {
      */
     static associate(models) {
       quizQuestion.belongsToMany(models.user, {
-        through: "completedQuizzes",
+        through: "completedExercises",
         key: "quizQuestionId",
       })
+      quizQuestion.hasOne(models.exercise)
     }
   };
   quizQuestion.init({

diff --git a/models/user.js b/models/user.js
@@ -14,8 +14,8 @@ module.exports = (sequelize, DataTypes) => {
         key: "userId",
       })
       user.belongsToMany(models.quizQuestion, {
-        through: "completedQuizzes",
-        key: "userId",
+        through: "completedExercises",
+        key: "quizQuestionId",
       })
     }
   }

diff --git a/routers/exercisesRouter.js b/routers/exercisesRouter.js
@@ -71,7 +71,7 @@ router.patch(
         }
 
         try{
-            const quizComplete = await CompletedQuizzes.create({
+            const quizComplete = await CompletedExercises.create({
                 userId: userIdNeeded,
                 quizQuestionId: quizIdNeeded,
                 exp: 10,
@@ -106,7 +106,7 @@ router.patch(
 )
 
 router.patch(
-    "/:id/completed",
+    "/:id/completed/:qId",
     authMiddleware,
     async(req, res, next) => {
         const userIdNeeded = req.user.id
@@ -121,6 +121,12 @@ router.patch(
             res.status(400).send("The Url malfunctioned please refresh and try again.")
         }
 
+        const quizIdNeeded = parseInt(req.params.qId)
+        console.log("quiz id test", quizIdNeeded)
+        if(!quizIdNeeded){
+            res.status(400).send("The Url malfunctioned please refresh and try again.")
+        }
+
         const time = req.body.timeTaken
         const expInt = parseInt(req.body.exp)
         // console.log(`time test: ${time}
@@ -134,16 +140,17 @@ router.patch(
                 where: {
                     userId: userIdNeeded,
                     exerciseId: exerciseIdNeeded,
+                    quizQuestionId: quizIdNeeded,
                 }
             })
             ?
             await CompletedExercises.update({
                 timeTaken: time,
-                exp: expInt,
             },{
                 where: {
                     userId: userIdNeeded,
-                    exerciseId: exerciseIdNeeded
+                    exerciseId: exerciseIdNeeded,
+                    quizQuestionId: quizIdNeeded,
                 }
             })
             : 
@@ -161,6 +168,7 @@ router.patch(
                 where: {
                     userId: userIdNeeded,
                     exerciseId: exerciseIdNeeded,
+                    quizQuestionId: quizIdNeeded,
                     exp: expInt,
                     timeTaken: time,
                 }

diff --git a/seeders/3-some-quizQuestions.js → seeders/2-some-quizQuestions.js b/seeders/3-some-quizQuestions.js → seeders/2-some-quizQuestions.js
diff --git a/seeders/2-some-completedExercises.js → seeders/3-some-completedExercises.js b/seeders/2-some-completedExercises.js → seeders/3-some-completedExercises.js
@@ -7,6 +7,7 @@ module.exports = {
       {
         userId: 1,
         exerciseId: 3,
+        quizQuestionId: 23,
         timeTaken: "00:05:00",
         exp: 40,
         createdAt: new Date(),
@@ -15,6 +16,7 @@ module.exports = {
       {
         userId: 1,
         exerciseId: 2,
+        quizQuestionId: 22,
         timeTaken: "00:15:00",
         exp: 20,
         createdAt: new Date(),
@@ -23,6 +25,7 @@ module.exports = {
       {
         userId: 2,
         exerciseId: 1,
+        quizQuestionId: 21,
         timeTaken: "00:02:35",
         exp: 50,
         createdAt: new Date(),

diff --git a/seeders/4-some-completedQuiz.js b/seeders/4-some-completedQuiz.js