Merge pull request #2390 from sophiemoustard/COM-3716

Com 3716
sophiemoustard · May 27, 2024 · 7568dcf · 7568dcf
2 parents 93e3311 + 9994e79
commit 7568dcf
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/helpers/questionnaires.js b/src/helpers/questionnaires.js
@@ -178,10 +178,11 @@ const getFollowUpForReview = async (questionnaire, courseId) => {
   const followUp = questionnaire.histories.map(h => pick(h, ['user', 'questionnaireAnswersList', 'timeline']));
 
   const course = await Course.findOne({ _id: courseId })
-    .select('subProgram companies misc type holding')
+    .select('subProgram companies misc type holding trainees')
     .populate({ path: 'subProgram', select: 'program', populate: [{ path: 'program', select: 'name' }] })
     .populate({ path: 'companies', select: 'name' })
     .populate({ path: 'holding', select: 'name' })
+    .populate({ path: 'trainees', select: 'identity' })
     .lean();
 
   return { followUp, course };

diff --git a/tests/unit/helpers/questionnaires.test.js b/tests/unit/helpers/questionnaires.test.js
@@ -1324,6 +1324,10 @@ describe('getFollowUp', () => {
         subProgram: { program: { name: 'test' } },
         misc: 'infos',
         type: INTRA,
+        trainees: [
+          { identity: { firstname: 'tomTom', lastname: 'Nana' } },
+          { identity: { firstname: 'eleve', lastname: 'Ducobu' } },
+        ],
       };
       const cardsIds = [new ObjectId(), new ObjectId()];
       const questionnaire = {
@@ -1406,6 +1410,10 @@ describe('getFollowUp', () => {
           companies: [{ name: 'company' }],
           holding: [{ name: 'société mère' }],
           misc: 'infos',
+          trainees: [
+            { identity: { firstname: 'tomTom', lastname: 'Nana' } },
+            { identity: { firstname: 'eleve', lastname: 'Ducobu' } },
+          ],
         },
         followUp: [
           {
@@ -1492,14 +1500,14 @@ describe('getFollowUp', () => {
         courseFindOne,
         [
           { query: 'findOne', args: [{ _id: courseId }] },
-          { query: 'select', args: ['subProgram companies misc type holding'] },
+          { query: 'select', args: ['subProgram companies misc type holding trainees'] },
           {
             query: 'populate',
             args: [{ path: 'subProgram', select: 'program', populate: [{ path: 'program', select: 'name' }] }],
           },
           { query: 'populate', args: [{ path: 'companies', select: 'name' }] },
           { query: 'populate', args: [{ path: 'holding', select: 'name' }] },
-
+          { query: 'populate', args: [{ path: 'trainees', select: 'identity' }] },
           { query: 'lean' },
         ]
       );
@@ -1516,6 +1524,10 @@ describe('getFollowUp', () => {
         subProgram: { program: { name: 'test' } },
         misc: 'infos',
         type: INTRA,
+        trainees: [
+          { identity: { firstname: 'tomTom', lastname: 'Nana' } },
+          { identity: { firstname: 'eleve', lastname: 'Ducobu' } },
+        ],
       };
       const questionnaire = {
         _id: questionnaireId,
@@ -1538,6 +1550,10 @@ describe('getFollowUp', () => {
           companies: [{ name: 'company' }],
           holding: [{ name: 'société mère' }],
           misc: 'infos',
+          trainees: [
+            { identity: { firstname: 'tomTom', lastname: 'Nana' } },
+            { identity: { firstname: 'eleve', lastname: 'Ducobu' } },
+          ],
         },
         followUp: [],
       });
@@ -1571,14 +1587,14 @@ describe('getFollowUp', () => {
         courseFindOne,
         [
           { query: 'findOne', args: [{ _id: courseId }] },
-          { query: 'select', args: ['subProgram companies misc type holding'] },
+          { query: 'select', args: ['subProgram companies misc type holding trainees'] },
           {
             query: 'populate',
             args: [{ path: 'subProgram', select: 'program', populate: [{ path: 'program', select: 'name' }] }],
           },
           { query: 'populate', args: [{ path: 'companies', select: 'name' }] },
           { query: 'populate', args: [{ path: 'holding', select: 'name' }] },
-
+          { query: 'populate', args: [{ path: 'trainees', select: 'identity' }] },
           { query: 'lean' },
         ]
       );