Aftral[premieroctet#111]: added evaluation_resources under statistics

Wappizy · Sep 5, 2024 · b9e9d1e · b9e9d1e
1 parent b552f98
commit b9e9d1e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/backend/web/server/plugins/aftral-lms/functions.js b/backend/web/server/plugins/aftral-lms/functions.js
@@ -105,6 +105,7 @@ BLOCK_MODELS.forEach(model => {
   declareComputedField({model, field: 'tickets_count', getterFn: getBlockTicketsCount})
   declareEnumField({model, field: 'scale', enumValues: SCALE})
   declareComputedField({model, field: 'note', getterFn: getBlockNote})
+  declareComputedField({model, field: 'evaluation_resources', getterFn: getEvalResources})
 })
 
 //Program start
@@ -116,7 +117,6 @@ declareComputedField({
   requires:PROGRAM_CERTIFICATE_ATTRIBUTES.join(','),
   getterFn: getCertificate, 
 })
-declareComputedField({model: 'program', field: 'evaluation_resources', getterFn: getEvalResources})
 //Program end
 
 declareComputedField({model: 'resource', field: 'mine', getterFn: isResourceMine})

diff --git a/backend/web/server/plugins/aftral-lms/schemas/BlockSchema.js b/backend/web/server/plugins/aftral-lms/schemas/BlockSchema.js
@@ -271,6 +271,15 @@ const BlockSchema = new Schema({
     type: String,
     required: false,
   },
+  // Computed
+  evaluation_resources: {
+    type: [{
+      type: Schema.Types.ObjectId,
+      ref: `block`,
+    }],
+    required: true,
+    default: []
+  }
 }, {...schemaOptions, ...BLOCK_DISCRIMINATOR})
 
 BlockSchema.virtual('is_template', DUMMY_REF).get(function() {

diff --git a/backend/web/server/plugins/aftral-lms/schemas/ProgramSchema.js b/backend/web/server/plugins/aftral-lms/schemas/ProgramSchema.js
@@ -33,15 +33,6 @@ const ProgramSchema = new Schema({
     type: String,
     required: false,
   },
-  // Computed
-  evaluation_resources: {
-    type: [{
-      type: Schema.Types.ObjectId,
-      ref: `block`,
-    }],
-    required: true,
-    default: []
-  }
 }, {...schemaOptions, ...BLOCK_DISCRIMINATOR})
 
 /* eslint-disable prefer-arrow-callback */

diff --git a/backend/web/tests/aftral-lms/statistics.test.js b/backend/web/tests/aftral-lms/statistics.test.js
@@ -112,6 +112,7 @@ describe('Test models computations', () => {
       `sessions.trainees.statistics.children.children.name`,
       `sessions.trainees.statistics.evaluation_resources`,
       `sessions.trainees`,
+      `sessions.children.evaluation_resources`
     ]
   })
 
@@ -138,14 +139,7 @@ describe('Test models computations', () => {
       fields,
     })
     expect(data[0].sessions[0].trainees.length).toEqual(2)
-  })
-
-  it('`must return all trainees statistics including evaluation_resources', async () => {
-    const data = await loadFromDb({
-      model: `statistics`,
-      user: trainer,
-      fields,
-    })
     expect(data[0].sessions[0].trainees[0].statistics.evaluation_resources.length).toEqual(1)
+    expect(data[0].sessions[0].children[0].evaluation_resources.length).toEqual(1)
   })
 })