Merge pull request #1691 from CVEProject/dr_1683

#1683 hard_quota is now a Joint Approval

Author: jdaigneau5

src/constants/index.js

@@ -44,8 +44,8 @@ function getConstants () {
     USER_ROLES: [
       'ADMIN'
     ],
-    JOINT_APPROVAL_FIELDS: ['short_name', 'long_name', 'authority', 'aliases', 'oversees', 'root_or_tlr', 'charter_or', 'product_list', 'disclosure_policy', 'contact_info.poc', 'contact_info.poc_email', 'contact_info.poc_phone', 'contact_info.org_email', 'cna_role_type', 'cna_country', 'vulnerability_advisory_locations', 'advisory_location_require_credentials', 'industry', 'tl_root_start_date', 'is_cna_discussion_list'],
-    JOINT_APPROVAL_FIELDS_LEGACY: ['short_name', 'name', 'authority.active_roles'],
+    JOINT_APPROVAL_FIELDS: ['short_name', 'long_name', 'authority', 'aliases', 'oversees', 'root_or_tlr', 'charter_or', 'product_list', 'disclosure_policy', 'contact_info.poc', 'contact_info.poc_email', 'contact_info.poc_phone', 'contact_info.org_email', 'cna_role_type', 'cna_country', 'vulnerability_advisory_locations', 'advisory_location_require_credentials', 'industry', 'tl_root_start_date', 'is_cna_discussion_list', 'hard_quota'],
+    JOINT_APPROVAL_FIELDS_LEGACY: ['short_name', 'name', 'authority.active_roles', 'policies.id_quota'],
     USER_ROLE_ENUM: {
       ADMIN: 'ADMIN'
     },

test/integration-tests/registry-org/registryOrgWithJointReviewTest.js

@@ -116,7 +116,7 @@ describe('Testing Joint approval', () => {
       await chai.request(app)
         .put('/api/registry/org/non_secretariat_org')
         .set(nonAdminHeaders)
-        .send({ ...testRegistryOrgForReview, short_name: 'new_non_secretariat_org', hard_quota: 10000 })
+        .send({ ...testRegistryOrgForReview, short_name: 'new_non_secretariat_org', contact_info: { website: 'https://www.example.com' } })
         .then((res) => {
           expect(res).to.have.status(200)
           expect(res.body.message).to.contain('organization was successfully updated, but joint approval is required for some fields.')
@@ -144,11 +144,11 @@ describe('Testing Joint approval', () => {
           expect(err).to.be.undefined
           expect(res).to.have.status(200)
           expect(res.body.short_name).to.equal('non_secretariat_org')
-          expect(res.body.hard_quota).to.equal(10000)
+          expect(res.body.contact_info.website).to.equal('https://www.example.com')
         })
     })
     it('Secretariat can approve the ORG review with body parameter', async function () {
-      const newBody = { short_name: 'final_non_secretariat_org', authority: ['SECRETARIAT'], hard_quota: 20000, long_name: 'Final Non Secretariat Organization' }
+      const newBody = { short_name: 'final_non_secretariat_org', contact_info: { website: 'https://final.example.com' }, hard_quota: 1000, authority: ['CNA'], long_name: 'Final Non Secretariat Organization' }
       await chai.request(app)
         .put(`/api/review/${reviewUUID}/approve`)
         .set(secretariatHeaders)
@@ -164,7 +164,7 @@ describe('Testing Joint approval', () => {
           expect(err).to.be.undefined
           expect(res).to.have.status(200)
           expect(res.body.short_name).to.equal('final_non_secretariat_org')
-          expect(res.body.hard_quota).to.equal(20000)
+          expect(res.body.contact_info.website).to.equal('https://final.example.com')
         })
     })
   })
@@ -219,7 +219,7 @@ describe('Testing Joint approval', () => {
       await chai.request(app)
         .put('/api/registry/org/non_with_comments')
         .set(nonAdminHeaders2)
-        .send({ ...testRegistryOrgForReviewWithComments, short_name: 'new_non_with_comments', hard_quota: 10000 })
+        .send({ ...testRegistryOrgForReviewWithComments, short_name: 'new_non_with_comments', contact_info: { website: 'https://www.example.com' } })
         .then((res) => {
           expect(res).to.have.status(200)
           expect(res.body.message).to.contain('organization was successfully updated, but joint approval is required for some fields.')
@@ -247,7 +247,7 @@ describe('Testing Joint approval', () => {
           expect(err).to.be.undefined
           expect(res).to.have.status(200)
           expect(res.body.short_name).to.equal('non_with_comments')
-          expect(res.body.hard_quota).to.equal(10000)
+          expect(res.body.contact_info.website).to.equal('https://www.example.com')
         })
     })
     it('Secretariat leaves a public comment on the org review', async () => {
@@ -320,7 +320,7 @@ describe('Testing Joint approval', () => {
           expect(err).to.be.undefined
           expect(res).to.have.status(200)
           expect(res.body.short_name).to.equal('new_non_with_comments')
-          expect(res.body.hard_quota).to.equal(10000)
+          expect(res.body.hard_quota).to.equal(1000)
         })
     })
   })

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

@@ -187,15 +187,16 @@ describe('Review Object Controller Integration Tests', () => {
       const updateData = {}
       updateData.short_name = constants.existingOrg.short_name
       updateData.long_name = 'Approve Test Organization'
-      updateData.hard_quota = 123
       updateData.authority = ['CNA']
+      updateData.hard_quota = 1000
+      updateData.contact_info = { website: 'https://www.example.com' }
       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)
-      expect(res.body.updated.hard_quota).to.equal(123)
+      expect(res.body.updated.contact_info.website).to.equal('https://www.example.com')
 
       const reviewRes = await chai
         .request(app)
@@ -205,7 +206,7 @@ describe('Review Object Controller Integration Tests', () => {
       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', 'Approve Test Organization')
-      expect(reviewRes.body).to.have.nested.property('new_review_data.hard_quota', 123)
+      expect(reviewRes.body).to.have.nested.property('new_review_data.contact_info.website', 'https://www.example.com')
       approveTestReviewUUID = reviewRes.body.uuid
     })