feat(api): make CappedTubeRequirement work

frinyvonnick · frinyvonnick · commit 7da4c0d639fb · 2025-03-17T16:36:29.000+01:00
diff --git a/api/src/quest/domain/models/Success.js b/api/src/quest/domain/models/Success.js
@@ -1,3 +1,5 @@
+import uniqBy from 'lodash/uniqBy.js';
+
 import { KnowledgeElement } from '../../../shared/domain/models/index.js';
 
 export class Success {
@@ -28,26 +30,28 @@ export class Success {
    * @param {Array<{tubeId: string, level: number}>} cappedTubes
    * @returns {number}
    */
-  // Pour cette implémentation, ne tient pas compte des versions d'acquis obtenus dans les campagnes
-  // potentiellement effectuées dans le cadre de la quête, mais seulement du profil de l'utilisateur
-  // pour que ça marche efficacement, ajouter une condition d'éligibilité qui impose d'être allé au bout
-  // de la participation, on s'assure ainsi qu'il a bien un KE pour chaque acquis des campagnes et qu'il
-  // n'obtienne pas l'attestation sans avoir effectivement participé
-
-  // L'autre solution serait de baser les cappedTubes sur l'ensemble des lots d'acquis des campagnes
-  // concernées peut-être ?
-  /*getMasteryPercentageForCappedTubes(cappedTubes) {
-    if (!cappedTubes?.length) {
-      return 0;
+  getMasteryPercentageForCappedTubes(cappedTubes) {
+    const uniqCampaignSkills = uniqBy(this.campaignSkills, 'id');
+    const sortedKEByDateDesc = this.knowledgeElements.sort((keA, keB) => keB.createdAt - keA.createdAt);
+    let total = 0;
+    let validated = 0;
+    for (const cappedTube of cappedTubes) {
+      const skillsInTubeWithinMaxDifficulty = uniqCampaignSkills.filter(
+        ({ tubeId, difficulty }) => tubeId === cappedTube.tubeId && difficulty <= cappedTube.level,
+      );
+      const skillsByDifficulty = Object.groupBy(skillsInTubeWithinMaxDifficulty, ({ difficulty }) => difficulty);
+      for (const skills of Object.values(skillsByDifficulty)) {
+        ++total;
+        const skillIds = skills.map(({ id }) => id);
+        const ke = sortedKEByDateDesc.find(({ skillId }) => skillIds.includes(skillId));
+        if (ke?.status === KnowledgeElement.StatusType.VALIDATED) {
+          ++validated;
+        }
+      }
     }
 
-    let sumTotal = 0;
-    let sumValidated = 0;
-    for (const { tubeId, level } of cappedTubes) {
-      sumTotal += level; // ceci est très cavalier, je présuppose que le référentiel n'a aucun trou \o/
-      const dataForTubeId = this.#dataByTubeId[tubeId] ?? [];
-      sumValidated += dataForTubeId.filter(({ isValidated, difficulty }) => isValidated && difficulty <= level).length;
-    }
-    return Math.round((sumValidated * 100) / sumTotal);
-  }*/
+    if (total === 0) return 0;
+
+    return (validated / total) * 100;
+  }
 }
diff --git a/api/tests/quest/unit/domain/models/Requirement_test.js b/api/tests/quest/unit/domain/models/Requirement_test.js
@@ -13,7 +13,7 @@ import { Success } from '../../../../../src/quest/domain/models/Success.js';
 import { KnowledgeElement } from '../../../../../src/shared/domain/models/index.js';
 import { expect } from '../../../../test-helper.js';
 
-describe('Quest | Unit | Domain | Models | Requirement ', function () {
+describe.only('Quest | Unit | Domain | Models | Requirement ', function () {
   describe('Factory - buildRequirement', function () {
     context('when requirement_type is compose', function () {
       it('should build a ComposedRequirement', function () {
@@ -664,18 +664,46 @@ describe('Quest | Unit | Domain | Models | Requirement ', function () {
       beforeEach(function () {
         successWith60MasteryPercentage = new Success({
           knowledgeElements: [
-            { status: KnowledgeElement.StatusType.VALIDATED, skillId: 'skill1tubeA' },
-            { status: KnowledgeElement.StatusType.INVALIDATED, skillId: 'skill2tubeA' },
-            { status: KnowledgeElement.StatusType.VALIDATED, skillId: 'skill3tubeA' },
-            { status: KnowledgeElement.StatusType.VALIDATED, skillId: 'skill4tubeA' },
-            { status: KnowledgeElement.StatusType.VALIDATED, skillId: 'skill1tubeB' },
-            { status: KnowledgeElement.StatusType.VALIDATED, skillId: 'skill2tubeB' },
-            { status: KnowledgeElement.StatusType.INVALIDATED, skillId: 'skill3tubeB' },
-            { status: KnowledgeElement.StatusType.VALIDATED, skillId: 'skillTubeC' },
-            { status: KnowledgeElement.StatusType.VALIDATED, skillId: 'skillTubeD' },
+            {
+              status: KnowledgeElement.StatusType.VALIDATED,
+              skillId: 'skill1tubeA_V1',
+              createdAt: new Date('2025-03-17'),
+            },
+            {
+              status: KnowledgeElement.StatusType.INVALIDATED,
+              skillId: 'skill2tubeA',
+              createdAt: new Date('2025-03-17'),
+            },
+            {
+              status: KnowledgeElement.StatusType.VALIDATED,
+              skillId: 'skill3tubeA',
+              createdAt: new Date('2025-03-17'),
+            },
+            {
+              status: KnowledgeElement.StatusType.VALIDATED,
+              skillId: 'skill4tubeA',
+              createdAt: new Date('2025-03-17'),
+            },
+            {
+              status: KnowledgeElement.StatusType.VALIDATED,
+              skillId: 'skill1tubeB',
+              createdAt: new Date('2025-03-17'),
+            },
+            {
+              status: KnowledgeElement.StatusType.VALIDATED,
+              skillId: 'skill2tubeB',
+              createdAt: new Date('2025-03-17'),
+            },
+            {
+              status: KnowledgeElement.StatusType.INVALIDATED,
+              skillId: 'skill3tubeB',
+              createdAt: new Date('2025-03-17'),
+            },
+            { status: KnowledgeElement.StatusType.VALIDATED, skillId: 'skillTubeC', createdAt: new Date('2025-03-17') },
+            { status: KnowledgeElement.StatusType.VALIDATED, skillId: 'skillTubeD', createdAt: new Date('2025-03-17') },
           ],
-          skills: [
-            { id: 'skill1tubeA', tubeId: 'tubeA', difficulty: 1 },
+          campaignSkills: [
+            { id: 'skill1tubeA_V1', tubeId: 'tubeA', difficulty: 1 },
             { id: 'skill2tubeA', tubeId: 'tubeA', difficulty: 2 },
             { id: 'skill3tubeA', tubeId: 'tubeA', difficulty: 3 },
             { id: 'skill4tubeA', tubeId: 'tubeA', difficulty: 4 },
@@ -687,6 +715,71 @@ describe('Quest | Unit | Domain | Models | Requirement ', function () {
           ],
         });
       });
+      context(
+        'when two skills exist for a tube and a difficulty compute fulfillement taking in account only most recent knowledge element',
+        function () {
+          it('return true', function () {
+            // given
+            const success = new Success({
+              knowledgeElements: [
+                ...successWith60MasteryPercentage.knowledgeElements,
+                {
+                  status: KnowledgeElement.StatusType.INVALIDATED,
+                  skillId: 'skill1tubeA_V2',
+                  createdAt: new Date('2024-06-10'),
+                },
+              ],
+              campaignSkills: [
+                ...successWith60MasteryPercentage.campaignSkills,
+                { id: 'skill1tubeA_V2', tubeId: 'tubeA', difficulty: 1 },
+              ],
+            });
+            const requirement = new CappedTubesProfileRequirement({
+              data: {
+                cappedTubes,
+                threshold: 60,
+              },
+            });
+
+            // when
+            const isFulfilled = requirement.isFulfilled(success);
+
+            // then
+            expect(isFulfilled).to.be.true;
+          });
+
+          it('return false', function () {
+            // given
+            const success = new Success({
+              knowledgeElements: [
+                ...successWith60MasteryPercentage.knowledgeElements,
+                {
+                  status: KnowledgeElement.StatusType.INVALIDATED,
+                  skillId: 'skill1tubeA_V2',
+                  createdAt: new Date('2025-12-24'),
+                },
+              ],
+              campaignSkills: [
+                ...successWith60MasteryPercentage.campaignSkills,
+                { id: 'skill1tubeA_V2', tubeId: 'tubeA', difficulty: 1 },
+              ],
+            });
+            const requirement = new CappedTubesProfileRequirement({
+              data: {
+                cappedTubes,
+                threshold: 60,
+              },
+            });
+
+            // when
+            const isFulfilled = requirement.isFulfilled(success);
+
+            // then
+            expect(isFulfilled).to.be.false;
+          });
+        },
+      );
+
       context("when dataInput's masteryPercentage is below threshold", function () {
         it('should return false', function () {
           // given
@@ -711,7 +804,7 @@ describe('Quest | Unit | Domain | Models | Requirement ', function () {
           const requirement = new CappedTubesProfileRequirement({
             data: {
               cappedTubes,
-              threshold: 50,
+              threshold: 60,
             },
           });
 
