Merge branch 'aftral-lms-post' into aftral-lms-validation

Wappizy · Aug 14, 2024 · e978c12 · e978c12
2 parents 36507c1 + d97ea8c
commit e978c12
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/backend/web/server/plugins/aftral-lms/functions.js b/backend/web/server/plugins/aftral-lms/functions.js
@@ -115,7 +115,8 @@ declareComputedField({model: 'message', field: 'mine', getterFn:isMine})
 // Message end
 
 // Post start
-declareVirtualField({model:'post', field: 'comments', instance: 'Array', multiple: true,
+declareVirtualField({model:'post', field: 'comments', instance: 'Array',
+  multiple: true,
   caster: {
     instance: 'ObjectID',
     options: {ref: 'comment'}},
@@ -127,7 +128,7 @@ declareVirtualField({model:'post', field: 'comments_count', instance: 'Number',
     options: {ref: 'comment'}},
 })
 declareVirtualField({model:'post', field: 'likes_count', instance: 'Number', requires:'likes'})
-declareComputedField({model: 'post', field: 'liked', getterFn: isLiked})
+declareComputedField({model: 'post', field: 'liked', getterFn: isLiked, requires:'likes'})
 
 // Resource start
 declareVirtualField({model:'resource', field: 'likes_count', instance: 'Number', requires:'likes'})

diff --git a/backend/web/server/plugins/aftral-lms/schemas/PostSchema.js b/backend/web/server/plugins/aftral-lms/schemas/PostSchema.js
@@ -43,7 +43,7 @@ const PostSchema = new Schema({
 }, schemaOptions)
 
 PostSchema.virtual('likes_count', DUMMY_REF).get(function(){
-  return this.liked.length || 0
+  return this.likes.length || 0
 })
 
 PostSchema.virtual('comments', {

diff --git a/backend/web/tests/aftral-lms/db.test.js b/backend/web/tests/aftral-lms/db.test.js
@@ -31,4 +31,12 @@ describe('User', () => {
     console.log(resources[0].likes[0]._id, resources)
     console.log(user._id)
   })
+  it.only('must return comments on post', async() => {
+    const id='66b0f1cc3356935c1fdaa148'
+    const user = await User.find({role: ROLE_APPRENANT})
+    const feed = await loadFromDb({model:'feed', id, user, fields:['posts.comments', 'posts.likes', 'posts.liked']})
+    const post = await loadFromDb({model:'post', id:'66bc866949ffa43e7b746755', user, fields:['comments']})
+    console.log(JSON.stringify(feed, null, 2))
+    console.log(JSON.stringify(post, null, 2))
+  })
 })