Merge pull request #1820 from CVEProject/af-1819

Resolves issue #1819: Return object for GET requests of non existent reviews

Author: david-rocca

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

@@ -37,7 +37,7 @@ async function getReviewObjectByOrgIdentifier (req, res, next) {
     value = await repo.getOrgReviewObjectByOrgShortname(identifier, isSecretariat, {})
   }
   if (!value) {
-    return res.status(404).json({ message: 'No pending review object exists for this organization' })
+    return res.status(200).json({ pendingReview: null })
   }
   return res.status(200).json(value)
 }

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

@@ -585,18 +585,18 @@ describe('Review Object Controller Integration Tests', () => {
         .send({})
       expect(rejectRes).to.have.status(200)
     })
-  })
 
-  context('Negative Tests', () => {
-    it('Returns 404 for non-existent review object GET', async () => {
+    it('Returns 200 with pendingReview set to null for non-existent review object GET', async () => {
       const res = await chai
         .request(app)
         .get('/api/review/org/nonexistent-org')
         .set({ ...constants.headers })
-      expect(res).to.have.status(404)
-      expect(res.body.message).to.contain('No pending review object exists for this organization')
+      expect(res).to.have.status(200)
+      expect(res.body).to.have.property('pendingReview', null)
     })
+  })
 
+  context('Negative Tests', () => {
     it('Returns 404 when approving non-existent review object', async () => {
       const fakeUUID = '00000000-0000-0000-0000-000000000000'
       const res = await chai

test/unit-tests/review-object/review-object.controller.test.js

@@ -77,22 +77,22 @@ describe('Review Object Controller', function () {
       expect(res.json.calledWith({ name: short })).to.be.true
     })
 
-    it('should return 404 if no pending review object exists for UUID', async () => {
+    it('should return 200 with pendingReview set to null if no pending review object exists for UUID', async () => {
       const uuid = '123e4567-e89b-12d3-a456-426614174000'
       req.params.identifier = uuid
       repoStub.getOrgReviewObjectByOrgUUID = sinon.stub().resolves(null)
       await controller.getReviewObjectByOrgIdentifier(req, res, next)
-      expect(res.status.calledWith(404)).to.be.true
-      expect(res.json.calledWith({ message: 'No pending review object exists for this organization' })).to.be.true
+      expect(res.status.calledWith(200)).to.be.true
+      expect(res.json.calledWith({ pendingReview: null })).to.be.true
     })
 
-    it('should return 404 if no pending review object exists for short_name', async () => {
+    it('should return 200 with pendingReview set to null if no pending review object exists for short_name', async () => {
       const short = 'myorg'
       req.params.identifier = short
       repoStub.getOrgReviewObjectByOrgShortname = sinon.stub().resolves(null)
       await controller.getReviewObjectByOrgIdentifier(req, res, next)
-      expect(res.status.calledWith(404)).to.be.true
-      expect(res.json.calledWith({ message: 'No pending review object exists for this organization' })).to.be.true
+      expect(res.status.calledWith(200)).to.be.true
+      expect(res.json.calledWith({ pendingReview: null })).to.be.true
     })
   })