Aftral[premieroctet#108]: fixed ae finish mission, allowed trainer to…

… finish mission
Wappizy · Sep 5, 2024 · 5184aaa · 5184aaa
1 parent 81cc872
commit 5184aaa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/backend/web/server/plugins/aftral-lms/actions.js b/backend/web/server/plugins/aftral-lms/actions.js
@@ -124,6 +124,9 @@ addAction('session', getSessionAction)
 // TODO dev only
 if (!isProduction()) {
   const forceFinishResource = async ({value, dataId}, user) => {
+    if([ROLE_HELPDESK, ROLE_FORMATEUR].includes(user.role) && dataId) {
+      user = await User.findById(dataId)
+    }
     await Progress.findOneAndUpdate(
       {user, block: value._id},
       {user, block: value._id, achievement_status: BLOCK_STATUS_FINISHED},

diff --git a/backend/web/tests/aftral-lms/block.test.js b/backend/web/tests/aftral-lms/block.test.js
@@ -294,7 +294,7 @@ describe('User', () => {
     //Had to copy paste from aftral-lms/actions.js
 
     const forceFinishResource = async ({value, dataId}, user) => {
-      if(user.role == ROLE_HELPDESK && dataId) {
+      if([ROLE_HELPDESK, ROLE_FORMATEUR].includes(user.role) && dataId) {
         user = await User.findById(dataId)
       }
       await Progress.findOneAndUpdate(
@@ -317,5 +317,14 @@ describe('User', () => {
     await forceFinishResource({value:resource, dataId:trainee2._id}, helpdesk)
     prog = await Progress.findOne({user:trainee2._id})
     expect(prog.achievement_status == BLOCK_STATUS_FINISHED).toBeTruthy()
+
+    await Progress.findOneAndUpdate(
+      {user: trainee2, block: resource._id},
+      {user: trainee2, block: resource._id, achievement_status: BLOCK_STATUS_CURRENT},
+    )
+
+    await forceFinishResource({value:resource, dataId:trainee2._id}, trainer)
+    prog = await Progress.findOne({user:trainee2._id})
+    expect(prog.achievement_status == BLOCK_STATUS_FINISHED).toBeTruthy()
   })
 })