tech(orga): campaign assessment participation repository

Author: alicegoarnisson

api/src/prescription/campaign-participation/infrastructure/repositories/campaign-assessment-participation-repository.js

@@ -80,13 +80,13 @@ async function _setSkillsCount(result) {
   if (result.assessmentState !== Assessment.states.COMPLETED) {
     const operativeSkillIds = await campaignRepository.findSkillIds({ campaignId: result.campaignId });
 
-    const knowledgeElementsByUser = await knowledgeElementRepository.findSnapshotForUsers({
-      [result.userId]: result.sharedAt,
+    const knowledgeElementsByUser = await knowledgeElementRepository.findAssessedByUserIdAndLimitDateQuery({
+      userId: result.userId,
+      limitDate: result.sharedAt,
     });
-    const knowledgeElements = knowledgeElementsByUser[result.userId];
 
     targetedSkillsCount = operativeSkillIds.length;
-    testedSkillsCount = _getTestedSkillsCount(operativeSkillIds, knowledgeElements);
+    testedSkillsCount = _getTestedSkillsCount(operativeSkillIds, knowledgeElementsByUser);
   }
 
   return { targetedSkillsCount, testedSkillsCount };

api/tests/prescription/campaign-participation/integration/infrastructure/repositories/campaign-assessment-participation-repository_test.js

@@ -6,7 +6,7 @@ import { Assessment } from '../../../../../../src/shared/domain/models/Assessmen
 import { KnowledgeElement } from '../../../../../../src/shared/domain/models/KnowledgeElement.js';
 import { catchErr, databaseBuilder, expect, mockLearningContent } from '../../../../../test-helper.js';
 
-const { STARTED } = CampaignParticipationStatuses;
+const { STARTED, SHARED } = CampaignParticipationStatuses;
 
 describe('Integration | Repository | Campaign Assessment Participation', function () {
   describe('#getByCampaignIdAndCampaignParticipationId', function () {
@@ -128,20 +128,31 @@ describe('Integration | Repository | Campaign Assessment Participation', functio
     });
 
     context('When campaign participation is not shared', function () {
+      let campaignParticipation, skill1;
       beforeEach(async function () {
-        const skill1 = { id: 'skill1', status: 'actif' };
-        await mockLearningContent({ skills: [skill1] });
-        campaignId = databaseBuilder.factory.buildAssessmentCampaign({}, [skill1]).id;
-        campaignParticipationId = databaseBuilder.factory.buildAssessmentFromParticipation({
+        skill1 = { id: 'skill1', status: 'actif' };
+        const skill2 = { id: 'skill2', status: 'actif' };
+        await mockLearningContent({ skills: [skill1, skill2] });
+        campaignId = databaseBuilder.factory.buildAssessmentCampaign({}, [skill1, skill2]).id;
+
+        campaignParticipation = databaseBuilder.factory.buildCampaignParticipation({
           status: STARTED,
           sharedAt: null,
           campaignId,
-        }).campaignParticipationId;
-
+        });
+        campaignParticipationId = campaignParticipation.id;
         await databaseBuilder.commit();
       });
 
       it('create CampaignAssessmentParticipation with empty results', async function () {
+        //given
+        databaseBuilder.factory.buildAssessment({
+          userId: campaignParticipation.userId,
+          campaignParticipationId,
+          state: Assessment.states.COMPLETED,
+        });
+        await databaseBuilder.commit();
+
         const campaignAssessmentParticipation =
           await campaignAssessmentParticipationRepository.getByCampaignIdAndCampaignParticipationId({
             campaignId,
@@ -151,6 +162,32 @@ describe('Integration | Repository | Campaign Assessment Participation', functio
         expect(campaignAssessmentParticipation.masteryRate).to.equal(null);
         expect(campaignAssessmentParticipation.progression).to.equal(1);
       });
+
+      context('when assessment is started', function () {
+        it('computes the progression', async function () {
+          //given
+          databaseBuilder.factory.buildAssessment({
+            userId: campaignParticipation.userId,
+            campaignParticipationId,
+            state: Assessment.states.STARTED,
+          });
+          databaseBuilder.factory.buildKnowledgeElement({
+            status: KnowledgeElement.StatusType.VALIDATED,
+            userId: campaignParticipation.userId,
+            skillId: skill1.id,
+            createdAt: new Date('2020-01-01'),
+          });
+          await databaseBuilder.commit();
+          // then
+          const campaignAssessmentParticipation =
+            await campaignAssessmentParticipationRepository.getByCampaignIdAndCampaignParticipationId({
+              campaignId,
+              campaignParticipationId,
+            });
+
+          expect(campaignAssessmentParticipation.progression).to.equal(0.5);
+        });
+      });
     });
 
     context('When campaign participation is shared', function () {
@@ -168,8 +205,8 @@ describe('Integration | Repository | Campaign Assessment Participation', functio
           campaignParticipationId = databaseBuilder.factory.buildCampaignParticipation({
             campaignId,
             userId,
-            status: STARTED,
-            sharedAt: null,
+            status: SHARED,
+            sharedAt: new Date('2020-01-02'),
           }).id;
 
           databaseBuilder.factory.buildKnowledgeElement({
@@ -184,6 +221,12 @@ describe('Integration | Repository | Campaign Assessment Participation', functio
             skillId: skill2.id,
             createdAt: new Date('2020-01-01'),
           });
+          databaseBuilder.factory.buildKnowledgeElement({
+            status: KnowledgeElement.StatusType.INVALIDATED,
+            userId,
+            skillId: skill3.id,
+            createdAt: new Date('2020-01-04'),
+          });
           await databaseBuilder.commit();
         });
 
@@ -205,25 +248,6 @@ describe('Integration | Repository | Campaign Assessment Participation', functio
             expect(campaignAssessmentParticipation.progression).to.equal(1);
           });
         });
-
-        context('when assessment is started', function () {
-          it('computes the progression', async function () {
-            databaseBuilder.factory.buildAssessment({
-              campaignParticipationId,
-              userId,
-              state: Assessment.states.STARTED,
-            });
-            await databaseBuilder.commit();
-
-            const campaignAssessmentParticipation =
-              await campaignAssessmentParticipationRepository.getByCampaignIdAndCampaignParticipationId({
-                campaignId,
-                campaignParticipationId,
-              });
-
-            expect(campaignAssessmentParticipation.progression).to.equal(0.5);
-          });
-        });
       });
     });