Merge pull request #356 from 1024pix/pf-495-save-pix-value-for-each-skills

[FEATURE] Sauvegarder la valeur des Pix quand on répond à une question (PF-495).

Author: MelanieMEB

api/db/migrations/20190205153549_update_pix-score_column_in_knowledge_element_table.js

@@ -68,7 +68,7 @@ module.exports = {
 
     const updatedAnswer = answerSerializer.deserializeToBookshelfAnswer(request.payload);
     return answerRepository
-      .findByChallengeAndAssessment(updatedAnswer.get('challengeId'), updatedAnswer.get('assessmentId'))
+      .findByChallengeAndAssessment({ challengeId: updatedAnswer.get('challengeId'), assessmentId: updatedAnswer.get('assessmentId') })
       .then((existingAnswer) => {
 
         if (!existingAnswer) {
@@ -92,7 +92,7 @@ module.exports = {
 
   findByChallengeAndAssessment(request) {
     return answerRepository
-      .findByChallengeAndAssessment(request.url.query.challenge, request.url.query.assessment)
+      .findByChallengeAndAssessment({ challengeId: request.url.query.challenge, assessmentId: request.url.query.assessment })
       .then(answerSerializer.serializeFromBookshelfAnswer)
       .catch((err) => {
         logger.error(err);

api/lib/application/answers/answer-controller.js

@@ -5,12 +5,14 @@ class Skill {
     id,
     // attributes
     name,
+    pixValue,
     // includes
     // references
   } = {}) {
     this.id = id;
     // attributes
     this.name = name;
+    this.pixValue = pixValue;
     // includes
     // references
   }

api/lib/domain/models/Skill.js

@@ -29,7 +29,7 @@ class SmartPlacementKnowledgeElement {
     createdAt,
     source,
     status,
-    pixScore,
+    earnedPix,
     // includes
     // references
     answerId,
@@ -41,7 +41,7 @@ class SmartPlacementKnowledgeElement {
     this.createdAt = createdAt;
     this.source = source;
     this.status = status;
-    this.pixScore = pixScore;
+    this.earnedPix = earnedPix;
     // includes
     // references
     this.answerId = answerId;
@@ -59,14 +59,14 @@ class SmartPlacementKnowledgeElement {
 
   static createKnowledgeElementsForAnswer({
     answer,
-    associatedChallenge,
+    challenge,
     previouslyFailedSkills,
     previouslyValidatedSkills,
     targetSkills,
   }) {
 
     const directKnowledgeElements = _createDirectKnowledgeElements({
-      answer, associatedChallenge, previouslyFailedSkills, previouslyValidatedSkills, targetSkills,
+      answer, challenge, previouslyFailedSkills, previouslyValidatedSkills, targetSkills,
     });
 
     return _enrichDirectKnowledgeElementsWithInferredKnowledgeElements({
@@ -84,15 +84,15 @@ SmartPlacementKnowledgeElement.StatusType = SmartPlacementKnowledgeElementStatus
 
 function _createDirectKnowledgeElements({
   answer,
-  associatedChallenge,
+  challenge,
   previouslyFailedSkills,
   previouslyValidatedSkills,
   targetSkills,
 }) {
 
   const status = answer.isOk() ? VALIDATED_STATUS : INVALIDATED_STATUS;
 
-  return associatedChallenge.skills
+  return challenge.skills
     .filter(_skillIsInTargetedSkills({ targetSkills }))
     .filter(_skillIsNotAlreadyAssessed({ previouslyFailedSkills, previouslyValidatedSkills }))
     .map((skill) => {
@@ -195,10 +195,12 @@ function _createInferredInvalidatedKnowledgeElement({ answer, skillToInfer }) {
 }
 
 function _createKnowledgeElementsForSkill({ skill, source, status, answer }) {
+  const pixValue = (status === VALIDATED_STATUS) ? skill.pixValue : 0;
+
   return new SmartPlacementKnowledgeElement({
     answerId: answer.id,
     assessmentId: answer.assessmentId,
-    pixScore: 0,
+    earnedPix: pixValue,
     skillId: skill.id,
     source,
     status,