Updating to partner_role, country, and type

david-rocca · david-rocca · commit e5cb8665ec73 · 2026-04-07T13:26:51.000-04:00
diff --git a/api-docs/openapi.json b/api-docs/openapi.json
@@ -2605,7 +2605,7 @@
           "Registry Organization"
         ],
         "summary": "Updates information about the organization specified by short name (accessible Temporarily to Secretariat only)",
-        "description": "  <h2>Access Control</h2>  <p>User must belong to an organization with the <b>Secretariat</b> role temporarily.</p>  <p>In the future, only the organization's admin will be able to request changes to its information.</p>  <p>With Joint Approval required for the following fields:</p>  <h2>Expected Behavior</h2>  <b>This endpoint expects a full organization object in the request body.</b>  <p><b>Secretariat:</b> Updates any organization's information</p>  <p><b>Organization Admin:</b> Requests changes to its organization's information</p>  <ul>  <li>short_name</li>  <li>long_name</li>  <li>authority</li>  <li>aliases</li>  <li>oversees</li>  <li>root_or_tlr</li>  <li>charter_or_scope</li>  <li>product_list</li>  <li>disclosure_policy</li>  <li>contact_info.poc</li>  <li>contact_info.poc_email</li>  <li>contact_info.poc_phone</li>  <li>contact_info.org_email</li>  <li>cna_role_type</li>  <li>cna_country</li>  <li>vulnerability_advisory_locations</li>  <li>advisory_location_require_credentials</li>  <li>industry</li>  <li>tl_root_start_date</li>  <li>is_cna_discussion_list</li>  </ul>",
+        "description": "  <h2>Access Control</h2>  <p>User must belong to an organization with the <b>Secretariat</b> role temporarily.</p>  <p>In the future, only the organization's admin will be able to request changes to its information.</p>  <p>With Joint Approval required for the following fields:</p>  <h2>Expected Behavior</h2>  <b>This endpoint expects a full organization object in the request body.</b>  <p><b>Secretariat:</b> Updates any organization's information</p>  <p><b>Organization Admin:</b> Requests changes to its organization's information</p>  <ul>  <li>short_name</li>  <li>long_name</li>  <li>authority</li>  <li>aliases</li>  <li>oversees</li>  <li>root_or_tlr</li>  <li>charter_or_scope</li>  <li>product_list</li>  <li>disclosure_policy</li>  <li>contact_info.poc</li>  <li>contact_info.poc_email</li>  <li>contact_info.poc_phone</li>  <li>contact_info.org_email</li>  <li>partner_role</li>  <li>partner_type</li>  <li>partner_country</li>  <li>vulnerability_advisory_locations</li>  <li>advisory_location_require_credentials</li>  <li>industry</li>  <li>tl_root_start_date</li>  <li>is_cna_discussion_list</li>  </ul>",
         "operationId": "orgUpdateSingle",
         "parameters": [
           {
diff --git a/schemas/registry-org/get-registry-org-response.json b/schemas/registry-org/get-registry-org-response.json
@@ -105,13 +105,17 @@
         "org_email"
       ]
     },
-    "cna_role_type": {
+    "partner_role": {
         "type": "string",
-        "description": "Type of CNA role"
+        "description": "Role of the partner"
     },
-    "cna_country": {
+    "partner_type": {
         "type": "string",
-        "description": "Country of the CNA"
+        "description": "Type of the partner"
+    },
+    "partner_country": {
+        "type": "string",
+        "description": "Country of the partner"
     },
     "vulnerability_advisory_locations": {
         "type": "array",
diff --git a/schemas/registry-org/list-registry-orgs-response.json b/schemas/registry-org/list-registry-orgs-response.json
@@ -134,13 +134,17 @@
               "org_email"
             ]
           },
-          "cna_role_type": {
+          "partner_role": {
             "type": "string",
-            "description": "Type of CNA role"
+            "description": "Role of the partner"
           },
-          "cna_country": {
+          "partner_type": {
             "type": "string",
-            "description": "Country of the CNA"
+            "description": "Type of the partner"
+          },
+          "partner_country": {
+            "type": "string",
+            "description": "Country of the partner"
           },
           "vulnerability_advisory_locations": {
             "type": "array",
diff --git a/src/constants/index.js b/src/constants/index.js
@@ -44,7 +44,7 @@ function getConstants () {
     USER_ROLES: [
       'ADMIN'
     ],
-    JOINT_APPROVAL_FIELDS: ['short_name', 'long_name', 'authority', 'aliases', 'oversees', 'root_or_tlr', 'charter_or_scope', '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: ['short_name', 'long_name', 'authority', 'aliases', 'oversees', 'root_or_tlr', 'charter_or_scope', 'product_list', 'disclosure_policy', 'contact_info.poc', 'contact_info.poc_email', 'contact_info.poc_phone', 'contact_info.org_email', 'partner_role', 'partner_type', 'partner_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'
diff --git a/src/controller/org.controller/index.js b/src/controller/org.controller/index.js
@@ -556,8 +556,9 @@ router.put('/registry/org/:shortname',
           <li>contact_info.poc_email</li>
           <li>contact_info.poc_phone</li>
           <li>contact_info.org_email</li>
-          <li>cna_role_type</li>
-          <li>cna_country</li>
+          <li>partner_role</li>
+          <li>partner_type</li>
+          <li>partner_country</li>
           <li>vulnerability_advisory_locations</li>
           <li>advisory_location_require_credentials</li>
           <li>industry</li>
diff --git a/src/controller/org.controller/org.middleware.js b/src/controller/org.controller/org.middleware.js
@@ -70,8 +70,9 @@ function validateCreateOrgParameters () {
             'contact_info.poc_phone',
             'contact_info.org_email',
             'contact_info.website',
-            'cna_role_type',
-            'cna_country',
+            'partner_role',
+            'partner_type',
+            'partner_country',
             'industry'
           ])
           .default('')
@@ -133,8 +134,9 @@ function validateCreateOrgParameters () {
           'contact_info.org_email',
           'contact_info.additional_contact_users',
           'contact_info.website',
-          'cna_role_type',
-          'cna_country',
+          'partner_role',
+          'partner_type',
+          'partner_country',
           'vulnerability_advisory_locations',
           'advisory_location_require_credentials',
           'industry',
@@ -217,8 +219,9 @@ function validateUpdateOrgParameters () {
           'contact_info.poc_phone',
           'contact_info.org_email',
           'contact_info.website',
-          'cna_role_type',
-          'cna_country',
+          'partner_role',
+          'partner_type',
+          'partner_country',
           'vulnerability_advisory_locations',
           'advisory_location_require_credentials',
           'industry',
@@ -305,8 +308,9 @@ const QUERY_PARAMETERS = {
     'contact_info.poc_phone',
     'contact_info.org_email',
     'contact_info.website',
-    'cna_role_type',
-    'cna_country',
+    'partner_role',
+    'partner_type',
+    'partner_country',
     'vulnerability_advisory_locations',
     'advisory_location_require_credentials',
     'industry',
diff --git a/src/controller/registry-org.controller/registry-org.middleware.js b/src/controller/registry-org.controller/registry-org.middleware.js
@@ -17,8 +17,9 @@ function parsePostParams (req, res, next) {
     'soft_quota', 'hard_quota',
     'contact_info.additional_contact_users', 'contact_info.poc', 'contact_info.poc_email', 'contact_info.poc_phone',
     'contact_info.admins', 'contact_info.org_email', 'contact_info.website',
-    'cna_role_type',
-    'cna_country',
+    'partner_role',
+    'partner_type',
+    'partner_country',
     'vulnerability_advisory_locations',
     'advisory_location_require_credentials',
     'industry',
diff --git a/src/middleware/schemas/BaseOrg.json b/src/middleware/schemas/BaseOrg.json
@@ -121,10 +121,13 @@
       },
       "additionalProperties": false
     },
-    "cna_role_type": {
+    "partner_role": {
       "type": "string"
     },
-    "cna_country": {
+    "partner_type": {
+      "type": "string"
+    },
+    "partner_country": {
       "type": "string"
     },
     "vulnerability_advisory_locations": {
diff --git a/src/model/baseorg.js b/src/model/baseorg.js
@@ -22,8 +22,9 @@ const schema = {
     org_email: String,
     website: String
   },
-  cna_role_type: String,
-  cna_country: String,
+  partner_role: String,
+  partner_type: String,
+  partner_country: String,
   vulnerability_advisory_locations: [String],
   advisory_location_require_credentials: Boolean,
   industry: String,
diff --git a/src/repositories/baseOrgRepository.js b/src/repositories/baseOrgRepository.js
@@ -644,8 +644,9 @@ class BaseOrgRepository extends BaseRepository {
       'oversees',
       'reports_to',
       'contact_info', // Handles all nested contact_info fields automatically
-      'cna_role_type',
-      'cna_country',
+      'partner_role',
+      'partner_type',
+      'partner_country',
       'vulnerability_advisory_locations',
       'advisory_location_require_credentials',
       'industry',
diff --git a/test/integration-tests/registry-org/registryOrgCRUDTest.js b/test/integration-tests/registry-org/registryOrgCRUDTest.js
@@ -12,7 +12,10 @@ const testRegistryOrg = {
   short_name: 'registry_org_test',
   long_name: 'Registry Org Test',
   authority: ['CNA'],
-  hard_quota: 1000
+  hard_quota: 1000,
+  partner_role: 'Initial Partner Role',
+  partner_type: 'Initial Partner Type',
+  partner_country: 'US'
 }
 let createdOrg
 
@@ -47,6 +50,15 @@ describe('Testing /registryOrg endpoints', () => {
             expect(res.body.created).to.haveOwnProperty('hard_quota')
             expect(res.body.created.hard_quota).to.equal(testRegistryOrg.hard_quota)
 
+            expect(res.body.created).to.haveOwnProperty('partner_role')
+            expect(res.body.created.partner_role).to.equal(testRegistryOrg.partner_role)
+
+            expect(res.body.created).to.haveOwnProperty('partner_type')
+            expect(res.body.created.partner_type).to.equal(testRegistryOrg.partner_type)
+
+            expect(res.body.created).to.haveOwnProperty('partner_country')
+            expect(res.body.created.partner_country).to.equal(testRegistryOrg.partner_country)
+
             createdOrg = res.body.created
           })
       })
@@ -112,6 +124,9 @@ describe('Testing /registryOrg endpoints', () => {
             expect(res.body).to.have.property('long_name', createdOrg.long_name)
             expect(res.body).to.have.property('short_name', createdOrg.short_name)
             expect(res.body.authority).to.be.an('array').that.includes('CNA')
+            expect(res.body).to.have.property('partner_role', createdOrg.partner_role)
+            expect(res.body).to.have.property('partner_type', createdOrg.partner_type)
+            expect(res.body).to.have.property('partner_country', createdOrg.partner_country)
           })
       })
     })
@@ -135,7 +150,10 @@ describe('Testing /registryOrg endpoints', () => {
           .set(secretariatHeaders)
           .send({
             ...createdOrg,
-            long_name: 'Registry Org Test Updated'
+            long_name: 'Registry Org Test Updated',
+            partner_role: 'Updated Partner Role',
+            partner_type: 'Updated Partner Type',
+            partner_country: 'UK'
           })
           .then((res, err) => {
             expect(err).to.be.undefined
@@ -160,6 +178,15 @@ describe('Testing /registryOrg endpoints', () => {
 
             expect(res.body.updated).to.haveOwnProperty('hard_quota')
             expect(res.body.updated.hard_quota).to.equal(createdOrg.hard_quota)
+
+            expect(res.body.updated).to.haveOwnProperty('partner_role')
+            expect(res.body.updated.partner_role).to.equal('Updated Partner Role')
+
+            expect(res.body.updated).to.haveOwnProperty('partner_type')
+            expect(res.body.updated.partner_type).to.equal('Updated Partner Type')
+
+            expect(res.body.updated).to.haveOwnProperty('partner_country')
+            expect(res.body.updated.partner_country).to.equal('UK')
           })
       })
       it('Updates a registry organization\'s short name and role simultaneously to verify read-after-write audit logic', async () => {

Original file line number	Diff line number	Diff line change
`@@ -2605,7 +2605,7 @@`
`2605`	`2605`	`"Registry Organization"`
`2606`	`2606`	`],`
`2607`	`2607`	`"summary": "Updates information about the organization specified by short name (accessible Temporarily to Secretariat only)",`
`2608`		- "description": " <h2>Access Control</h2> <p>User must belong to an organization with the <b>Secretariat</b> role temporarily.</p> <p>In the future, only the organization's admin will be able to request changes to its information.</p> <p>With Joint Approval required for the following fields:</p> <h2>Expected Behavior</h2> <b>This endpoint expects a full organization object in the request body.</b> <p><b>Secretariat:</b> Updates any organization's information</p> <p><b>Organization Admin:</b> Requests changes to its organization's information</p> <ul> <li>short_name</li> <li>long_name</li> <li>authority</li> <li>aliases</li> <li>oversees</li> <li>root_or_tlr</li> <li>charter_or_scope</li> <li>product_list</li> <li>disclosure_policy</li> <li>contact_info.poc</li> <li>contact_info.poc_email</li> <li>contact_info.poc_phone</li> <li>contact_info.org_email</li> <li>cna_role_type</li> <li>cna_country</li> <li>vulnerability_advisory_locations</li> <li>advisory_location_require_credentials</li> <li>industry</li> <li>tl_root_start_date</li> <li>is_cna_discussion_list</li> </ul>",
	`2608`	+ "description": " <h2>Access Control</h2> <p>User must belong to an organization with the <b>Secretariat</b> role temporarily.</p> <p>In the future, only the organization's admin will be able to request changes to its information.</p> <p>With Joint Approval required for the following fields:</p> <h2>Expected Behavior</h2> <b>This endpoint expects a full organization object in the request body.</b> <p><b>Secretariat:</b> Updates any organization's information</p> <p><b>Organization Admin:</b> Requests changes to its organization's information</p> <ul> <li>short_name</li> <li>long_name</li> <li>authority</li> <li>aliases</li> <li>oversees</li> <li>root_or_tlr</li> <li>charter_or_scope</li> <li>product_list</li> <li>disclosure_policy</li> <li>contact_info.poc</li> <li>contact_info.poc_email</li> <li>contact_info.poc_phone</li> <li>contact_info.org_email</li> <li>partner_role</li> <li>partner_type</li> <li>partner_country</li> <li>vulnerability_advisory_locations</li> <li>advisory_location_require_credentials</li> <li>industry</li> <li>tl_root_start_date</li> <li>is_cna_discussion_list</li> </ul>",
`2609`	`2609`	`"operationId": "orgUpdateSingle",`
`2610`	`2610`	`"parameters": [`
`2611`	`2611`	`{`