Aftral[premieroctet#90]: fixed trainee resources

Wappizy · Aug 12, 2024 · 2f2a00b · 2f2a00b
1 parent 626c581
commit 2f2a00b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 11 deletions.
diff --git a/backend/web/server/plugins/aftral-lms/block.js b/backend/web/server/plugins/aftral-lms/block.js
@@ -167,7 +167,6 @@ const getAttribute = attName => async (userId, params, data) => {
       }
       return !lodash.isNil(block[attName])
     })
-    console.log(block)
     res=block[attName]
     ATTRIBUTES_CACHE.set(key, res)
   }

diff --git a/backend/web/server/plugins/aftral-lms/user.js b/backend/web/server/plugins/aftral-lms/user.js
@@ -1,15 +1,40 @@
-const Session = require('../../models/Session')
-const { getSessionBlocks } = require('./block')
 const { loadFromDb } = require('../../utils/database')
 
 const getTraineeResources = async (userId, params, data) => {
-  const sessions = await Session.find({ trainees: data._id }).populate('children')
-  const blocks = await Promise.all(
-    sessions.map(s =>   getSessionBlocks(s))
+  let sessions = await loadFromDb({model: 'session', fields:[
+    'trainees',
+    'children.children.children.children.spent_time_str',
+    'children.children.children.children.name',
+    'children.children.children.children.resource_type',
+    'children.children.children.children.achievement_status',
+    'children.children.children.children.children.spent_time_str',
+    'children.children.children.children.children.name',
+    'children.children.children.children.children.resource_type',
+    'children.children.children.children.children.achievement_status',
+  ], user:data})
+
+  sessions = sessions.filter(s => s.trainees.some(t => t._id.toString() === data._id.toString()))
+
+  const resources = sessions.flatMap(session =>
+    session.children.flatMap(program =>
+      program.children.flatMap(child => {
+        if (child.type === 'chapter') {
+          return child.children.flatMap(modulee =>
+            modulee.children.flatMap(sequence =>
+              sequence.children
+            )
+          )
+        } else {
+          return child.children.flatMap(sequence =>
+            sequence.children
+          )
+        }
+      })
+    )
   )
-  const resources = blocks.flat().filter(b => b.type == 'resource')
-  const res = await Promise.all(resources.map(b => loadFromDb({id:b._id, fields:['spent_time_str','name','resource_type','achievement_rule'], model:'resource',  user:data})))
-  return res
+
+  console.log(resources)
+  return resources
 }
 
 

diff --git a/backend/web/tests/aftral-lms/user.test.js b/backend/web/tests/aftral-lms/user.test.js
@@ -138,8 +138,8 @@ describe('User', () => {
     await addChildAction({parent: modulee1._id, child: sequence1._id}, conceptor)
     await addChildAction({parent: modulee1._id, child: sequence2._id}, conceptor)
     await addChildAction({parent: modulee2._id, child: sequence3._id}, conceptor)
-    await addChildAction({parent: sequence1._id, child: resource1._id}, conceptor)
-    await addChildAction({parent: sequence1._id, child: resource2._id}, conceptor)
+    //await addChildAction({parent: sequence1._id, child: resource1._id}, conceptor)
+    //await addChildAction({parent: sequence1._id, child: resource2._id}, conceptor)
     await addChildAction({parent: sequence2._id, child: resource3._id}, conceptor)
     await addChildAction({parent: sequence3._id, child: resource4._id}, conceptor)