questions now contains positive and negative marks

coding-blocks · Apr 22, 2020 · b49f633 · b49f633
1 parent 0ca5241
commit b49f633
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 20 deletions.
diff --git a/framework/serializers/choices.js b/framework/serializers/choices.js
@@ -17,7 +17,7 @@ module.exports = function (included = [], type, config) {
   }
 
   const options = {
-    attributes: ['title', 'description', 'positiveWeight' ,'negativeWeight', 'question'],
+    attributes: ['title', 'description', 'question'],
     meta: {
       pagination: function (record) {
         return record.pagination

diff --git a/framework/serializers/questions.js b/framework/serializers/questions.js
@@ -24,7 +24,18 @@ module.exports = function (included = [], type, config) {
   }
 
   const options = {
-    attributes: ['title', 'description', 'explanation','difficulty' ,'user', 'choices', 'tags','createdBy'],
+    attributes: [
+      'title', 
+      'description', 
+      'explanation',
+      'difficulty',
+      'positiveScore',
+      'negativeScore',
+      'user', 
+      'choices', 
+      'tags',
+      'createdBy'
+    ],
     meta: {
       pagination: function (record) {
         return record.pagination
@@ -37,7 +48,7 @@ module.exports = function (included = [], type, config) {
     },
     choices: {
       ref: 'id',
-      attributes: ['title', 'description', 'positiveWeight' ,'negativeWeight', 'question'],
+      attributes: ['title', 'description', 'question'],
       included: included.includes('choices')
     },
     tags: {

diff --git a/migrations/20200422121249-addScoresInQuestion.js b/migrations/20200422121249-addScoresInQuestion.js
@@ -0,0 +1,25 @@
+'use strict';
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return Promise.all([
+      queryInterface.addColumn('questions', 'positiveScore', {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        defaultValue: 10
+      }),
+      queryInterface.addColumn('questions', 'negativeScore', {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        defaultValue: 0
+      })
+    ])
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return Promise.all([
+      queryInterface.removeColumn('questions', 'positiveScore'),
+      queryInterface.removeColumn('questions', 'negativeScore')
+    ])
+  }
+};
diff --git a/models/choices.js b/models/choices.js
@@ -8,16 +8,6 @@ module.exports = (sequelize, DataTypes) => {
     description: {
       type: DataTypes.STRING,
       allowNull: true
-    },
-    positiveWeight: {
-      type: DataTypes.INTEGER,
-      allowNull: true,
-      defaultValue: 1,
-    },
-    negativeWeight: {
-      type: DataTypes.INTEGER,
-      allowNull: true,
-      defaultValue: 0,
     }
   }, {});
   choices.associate = function(models) {

diff --git a/models/questions.js b/models/questions.js
@@ -22,6 +22,16 @@ module.exports = (sequelize, DataTypes) => {
       type: DataTypes.ARRAY(DataTypes.BIGINT),
       allowNull: false,
       defaultValue: []
+    },
+    positiveScore: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      defaultValue: 10
+    },
+    negativeScore: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      defaultValue: 0
     }
   }, {
     paranoid: true

diff --git a/routes/api/quiz/controller.js b/routes/api/quiz/controller.js
@@ -105,7 +105,7 @@ class QuizController extends BaseController {
         return ;
       }
 
-      const { score, correctlyAnswered, incorrectlyAnswered } = U.getScore(markedChoices, U.parseIntArray(question.correctAnswers), question.choices)
+      const { score, correctlyAnswered, incorrectlyAnswered } = U.getScore(markedChoices, U.parseIntArray(question.correctAnswers), question)
 
       return {
         id: markedQuestion.id,

diff --git a/utils/index.js b/utils/index.js
@@ -23,7 +23,8 @@ const isContainedIn = (a, b) => R.intersection(a, b).length === a.length
   markedChoices = Array of ids
   correctChoices = Array of Sequelize model instances of correctChoices
 */
-const getScore = (markedChoices, correctChoiceIds, possibleChoices) => {
+const getScore = (markedChoices, correctChoiceIds, question) => {
+  const possibleChoices = question.choices
   // const correctChoiceIds = correctChoices.map(_ => _.id)
 
   // is the id in the correctChoiceIds
@@ -35,11 +36,7 @@ const getScore = (markedChoices, correctChoiceIds, possibleChoices) => {
   const correctlyAnswered = possibleChoices.filter(choice => R.contains(choice.id, correctlyAnsweredIds))
   const incorrectlyAnswered = possibleChoices.filter(choice => R.contains(choice.id, incorrectlyAnsweredIds))
 
-  let score = correctlyAnswered.reduce((acc, c) => acc + c.positiveWeight, 0)
-  score -= incorrectlyAnswered.reduce((acc, c) => acc + c.negativeWeight, 0)
-
-  // scale score out of 10
-  score *= 10
+  const score = R.equals(new Set(correctChoiceIds), new Set(correctlyAnsweredIds)) ? question.positiveScore : -question.negativeScore
 
   return {
     score,