Merge pull request #1815 from CVEProject/dr_1663

Resolves issue #1663, Resolve inconsistent parameters and query target UUID when fetching review history conversations.

Author: david-rocca

src/repositories/conversationRepository.js

@@ -36,8 +36,12 @@ class ConversationRepository extends BaseRepository {
   }
 
   async getAllByTargetUUID (targetUUID, isSecretariat, options = {}) {
+    const findOptions = {}
+    if (options.session) {
+      findOptions.session = options.session
+    }
     const conversations = await ConversationModel.find({ target_uuid: targetUUID }, null, {
-      ...options,
+      ...findOptions,
       sort: {
         posted_at: 1,
         UUID: 1

src/repositories/reviewObjectRepository.js

@@ -245,7 +245,7 @@ class ReviewObjectRepository extends BaseRepository {
       const conversationRepository = new ConversationRepository()
 
       for (const review of data.reviewObjects) {
-        let conversations = await conversationRepository.getAllByTargetUUID(review.uuid, isSecretariat, options)
+        let conversations = await conversationRepository.getAllByTargetUUID(review.target_object_uuid, isSecretariat)
 
         // Filter conversations based on user role
         if (conversations && conversations.length) {

test/integration-tests/review-object/reviewObjectTest.js

@@ -184,15 +184,27 @@ describe('Review Object Controller Integration Tests', () => {
     })
 
     it('Retrieves review history with conversations included', async () => {
+      // 1. Post a conversation message to the organization target UUID
+      const msgRes = await chai
+        .request(app)
+        .post(`/api/conversation/target/${orgUUID}`)
+        .set({ ...constants.headers })
+        .send({ body: 'Test comment on org history', visibility: 'public' })
+      expect(msgRes).to.have.status(200)
+
+      // 2. Fetch the review history with conversations included
       const res = await chai
         .request(app)
         .get(`/api/review/org/${constants.testRegistryOrg2.short_name}/reviews?include_conversations=true`)
         .set({ ...constants.headers })
       expect(res).to.have.status(200)
       expect(res.body).to.have.property('reviewObjects')
-      if (res.body.reviewObjects.length > 0) {
-        expect(res.body.reviewObjects[0]).to.have.property('conversation')
-      }
+      expect(res.body.reviewObjects).to.be.an('array')
+      expect(res.body.reviewObjects.length).to.be.greaterThan(0)
+      expect(res.body.reviewObjects[0]).to.have.property('conversation')
+      expect(res.body.reviewObjects[0].conversation).to.be.an('array')
+      expect(res.body.reviewObjects[0].conversation.length).to.be.greaterThan(0)
+      expect(res.body.reviewObjects[0].conversation[0]).to.have.property('body', 'Test comment on org history')
     })
 
     it('Nonsecretariat user can update an organization, review object gets created', async () => {