Aftral[premieroctet#111]: fixed permissions to be computed on user, n…

…ow only depends of permission group

backend/web/server/plugins/aftral-lms/functions.js

@@ -42,6 +42,7 @@ const { setBlockLiked } = require('./block')
 const { setBlockDisliked } = require('./block')
 const Permission = require('../../models/Permission')
 const Group = require('../../models/Group')
+const { getUserPermissions } = require('./user')
 
 const GENERAL_FEED_ID='FFFFFFFFFFFFFFFFFFFFFFFF'
 
@@ -141,6 +142,7 @@ USER_MODELS.forEach(model => {
       instance: 'ObjectID',
       options: {ref: 'ticket'}},
   })
+  declareComputedField({model, field: `permissions`, requires:`permission_groups.permissions`, getterFn: getUserPermissions})
 })
 
 // search start

backend/web/server/plugins/aftral-lms/schemas/PermissionGroupSchema.js

@@ -8,7 +8,11 @@ const PermissionGroupSchema = new Schema({
   permissions: [{
     type: Schema.Types.ObjectId,
     ref: 'permission',
-  }]
+  }],
+  label: {
+    type: String,
+    required: false,
+  }
 }, schemaOptions)
 
 /* eslint-disable prefer-arrow-callback */

backend/web/server/plugins/aftral-lms/schemas/UserSchema.js

@@ -52,10 +52,10 @@ const UserSchema = new Schema({
     type: Schema.Types.ObjectId,
     ref: 'permission'
   }],
-  permission_group: {
+  permission_groups: [{
     type: Schema.Types.ObjectId,
     ref: 'permissionGroup'
-  }
+  }],
 }, schemaOptions)
 
 UserSchema.virtual('fullname', DUMMY_REF).get(function() {

backend/web/server/plugins/aftral-lms/user.js

@@ -1,3 +1,4 @@
+const PermissionGroup = require('../../models/PermissionGroup')
 const Progress = require('../../models/Progress')
 const Resource = require('../../models/Resource')
 const { loadFromDb } = require('../../utils/database')
@@ -13,7 +14,10 @@ const getTraineeCurrentResources = async (userId, params, data, fields) => {
   return resources.map(r => new Resource(r))
 }
 
+const getUserPermissions = async (userId, params, data) => {
+  return data.permission_groups.flatMap(group => group.permissions)
+}
 
 module.exports = {
-  getTraineeCurrentResources,getTraineeCurrentResources
+  getTraineeCurrentResources,getTraineeCurrentResources, getUserPermissions
 }

backend/web/tests/aftral-lms/user.test.js

@@ -12,6 +12,10 @@ const ProductCode = require('../../server/models/ProductCode')
 const { addChildAction } = require('../../server/plugins/aftral-lms/actions')
 const { getBlockResources, getRessourceSession } = require('../../server/plugins/aftral-lms/resources')
 const Block = require('../../server/models/Block')
+const Permission = require('../../server/models/Permission')
+const PermissionGroup = require('../../server/models/PermissionGroup')
+require('../../server/models/Certification')
+require('../../server/models/Feed')
 
 jest.setTimeout(60000)
 
@@ -28,12 +32,18 @@ describe('User', () => {
       lastname: `Doe`,
     })
 
+    const permission = await Permission.findOne({})
+    const permissionGroup = await PermissionGroup.create({
+      permissions: [permission._id]
+    })
+
     trainer = await User.create({
       role: ROLE_FORMATEUR,
       email: `b@b.com`,
       password: `J'enseigne le Python`,
       firstname: `Jeanette`,
       lastname: `Doe`,
+      permission_groups: [permissionGroup._id]
     })
 
     conceptor = await User.create({
@@ -162,4 +172,9 @@ describe('User', () => {
     const [u] = await loadFromDb({model:'user', fields:['resources'], id:trainee._id})
     expect(u.resources.length).toEqual(2)
   })
+
+  it.only('must return user permissions', async () => {
+    const [data] = await loadFromDb({model:`user`, id:trainer._id, fields:[`permissions`,`fullname`,`permission_groups`]})
+    expect(data.permissions.length).toEqual(1)
+  })
 })