Merge pull request #1812 from CVEProject/dr_1771

Resolves issue #1771, Fixes the review object history to correctly reflect modified data when an approver modifies the request during approval.

Author: david-rocca

src/controller/review-object.controller/review-object.controller.js

@@ -117,7 +117,7 @@ async function approveReviewObject (req, res, next) {
 
     const requestingUserUUID = await userRepo.getUserUUID(req.ctx.user, req.ctx.org, { session })
 
-    const reviewObj = await reviewRepo.approveReviewOrgObject(UUID, req.ctx.user, { session })
+    const reviewObj = await reviewRepo.approveReviewOrgObject(UUID, req.ctx.user, { session }, body)
     if (!reviewObj) {
       await session.abortTransaction()
       return res.status(404).json({ message: `Review object not approved with UUID ${UUID}` })

src/repositories/reviewObjectRepository.js

@@ -183,13 +183,17 @@ class ReviewObjectRepository extends BaseRepository {
     return _.omit(result.toObject(), ['_id', '__v'])
   }
 
-  async approveReviewOrgObject (UUID, approverUsername, options = {}) {
+  async approveReviewOrgObject (UUID, approverUsername, options = {}, modifiedBody = null) {
     console.log('Approving review object with UUID:', UUID)
     const reviewObject = await ReviewObjectModel.findOne({ uuid: UUID }, null, options)
     if (!reviewObject) {
       return null
     }
 
+    if (modifiedBody && Object.keys(modifiedBody).length) {
+      reviewObject.new_review_data = modifiedBody
+    }
+
     reviewObject.status = 'approved'
     if (approverUsername) {
       reviewObject.approver = {

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

@@ -14,6 +14,7 @@ describe('Review Object Controller Integration Tests', () => {
   let autoApproveReviewUUID
   let autoRejectReviewUUID
   let adminRetrievalTestReviewUUID
+  let modifyApproveTestReviewUUID
 
   context('Positive Tests', () => {
     it('Creates an organization to use for review object tests', async () => {
@@ -240,6 +241,58 @@ describe('Review Object Controller Integration Tests', () => {
       expect(res.body).to.have.property('status', 'approved')
     })
 
+    it('Nonsecretariat user can update an organization, creates review object for modify-on-approve test', async () => {
+      const updateData = {}
+      updateData.short_name = constants.existingOrg.short_name
+      updateData.long_name = 'Original Pending Organization'
+      updateData.authority = ['CNA']
+      updateData.hard_quota = 1000
+      const res = await chai
+        .request(app)
+        .put(`/api/registry/org/${constants.existingOrg.short_name}`)
+        .set({ ...constants.nonSecretariatUserHeaders2 })
+        .send(updateData)
+      expect(res).to.have.status(200)
+
+      const reviewRes = await chai
+        .request(app)
+        .get(`/api/review/org/${constants.existingOrg.short_name}`)
+        .set({ ...constants.headers })
+      expect(reviewRes).to.have.status(200)
+      expect(reviewRes.body).to.have.property('uuid')
+      expect(reviewRes.body.status).to.equal('pending')
+      expect(reviewRes.body).to.have.nested.property('new_review_data.long_name', 'Original Pending Organization')
+      modifyApproveTestReviewUUID = reviewRes.body.uuid
+    })
+
+    it('Approves a review object with modifications and updates the organization and review object history', async () => {
+      const modifiedData = {
+        short_name: constants.existingOrg.short_name,
+        long_name: 'Modified Approved Organization',
+        authority: ['CNA'],
+        hard_quota: 2000
+      }
+      const res = await chai
+        .request(app)
+        .put(`/api/review/${modifyApproveTestReviewUUID}/approve`)
+        .set({ ...constants.headers })
+        .send(modifiedData)
+      expect(res).to.have.status(200)
+      expect(res.body).to.have.property('long_name', 'Modified Approved Organization')
+      expect(res.body).to.have.property('hard_quota', 2000)
+    })
+
+    it('Verifies the review object status is now approved and new_review_data reflects the modifications', async () => {
+      const res = await chai
+        .request(app)
+        .get(`/api/review/byUUID/${modifyApproveTestReviewUUID}`)
+        .set({ ...constants.headers })
+      expect(res).to.have.status(200)
+      expect(res.body).to.have.property('status', 'approved')
+      expect(res.body).to.have.nested.property('new_review_data.long_name', 'Modified Approved Organization')
+      expect(res.body).to.have.nested.property('new_review_data.hard_quota', 2000)
+    })
+
     it('Create new review object for rejection testing', async () => {
       const updateData = {}
       updateData.short_name = constants.existingOrg.short_name