From 86481ae84e5c4cc665bbc7053da47292f76e3570 Mon Sep 17 00:00:00 2001
From: David T Rocca <drocca@mitre.org>
Date: Mon, 21 Sep 2026 10:05:06 -0400
Subject: [PATCH] Removed the hydration from the legacy endpoints

---
 src/repositories/baseOrgRepository.js         | 26 -------------------
 .../registry-org/rootOrgTest.js               | 26 +++++++++++++++++++
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/repositories/baseOrgRepository.js b/src/repositories/baseOrgRepository.js
index fcdf0b837..9bcc5ecf1 100644
--- a/src/repositories/baseOrgRepository.js
+++ b/src/repositories/baseOrgRepository.js
@@ -924,32 +924,6 @@ class BaseOrgRepository extends BaseRepository {
       ? applyLeanLegacyOrgDefaults(data)
       : applyLeanRegistryOrgDefaults(data)
 
-    if (returnLegacyFormat) {
-      const parentOrg = await BaseOrgModel.findOne({ oversees: result.UUID }).select('UUID').lean()
-      if (parentOrg) {
-        result.reports_to = parentOrg.UUID
-      }
-
-      const relatedOrgUUIDs = new Set()
-      if (Array.isArray(result.oversees)) {
-        result.oversees.forEach(uuid => relatedOrgUUIDs.add(uuid))
-      }
-      if (result.reports_to) {
-        relatedOrgUUIDs.add(result.reports_to)
-      }
-
-      if (relatedOrgUUIDs.size > 0) {
-        const relatedOrgs = await BaseOrgModel.find({ UUID: { $in: Array.from(relatedOrgUUIDs) } }).select('short_name long_name UUID').lean()
-        if (relatedOrgs.length > 0) {
-          result._relatedOrganizations = relatedOrgs.map(org => ({
-            short_name: org.short_name,
-            long_name: org.long_name,
-            UUID: org.UUID
-          }))
-        }
-      }
-    }
-
     if (result.reports_to === null) delete result.reports_to
     if (result.top_level_root === null) delete result.top_level_root
 
diff --git a/test/integration-tests/registry-org/rootOrgTest.js b/test/integration-tests/registry-org/rootOrgTest.js
index 54d062833..80c61e7ae 100644
--- a/test/integration-tests/registry-org/rootOrgTest.js
+++ b/test/integration-tests/registry-org/rootOrgTest.js
@@ -248,6 +248,32 @@ describe('Testing ROOT Organization Type', () => {
         })
     })
 
+    for (const identifierField of ['short_name', 'UUID']) {
+      it(`Omits registry relationships from legacy organization details retrieved by ${identifierField}`, async () => {
+        const legacyResponse = await chai.request(app)
+          .get(`/api/org/${reportingOrg[identifierField]}`)
+          .set(secretariatHeaders)
+
+        expect(legacyResponse).to.have.status(200)
+        expect(legacyResponse.body.UUID).to.equal(reportingOrg.UUID)
+        expect(legacyResponse.body.short_name).to.equal(reportingOrg.short_name)
+        expect(legacyResponse.body.name).to.equal(reportingOrg.long_name)
+        expect(legacyResponse.body.authority).to.deep.equal({ active_roles: ['CNA'] })
+        expect(legacyResponse.body.policies.id_quota).to.equal(100)
+        expect(legacyResponse.body).to.not.have.any.keys('reports_to', '_relatedOrganizations', '_hierarchy')
+
+        const registryResponse = await chai.request(app)
+          .get(`/api/registry/org/${reportingOrg[identifierField]}`)
+          .set(secretariatHeaders)
+
+        expect(registryResponse).to.have.status(200)
+        expect(registryResponse.body.reports_to).to.equal(secondRootOrg.short_name)
+        expect(registryResponse.body.top_level_root).to.equal(topLevelRootOrg.short_name)
+        expect(registryResponse.body._hierarchy).to.be.an('array').that.is.not.empty
+        expect(registryResponse.body).to.not.have.property('_relatedOrganizations')
+      })
+    }
+
     it('Preserves overseen organizations when updating a ROOT that reports to another ROOT', async () => {
       await chai.request(app)
         .put(`/api/registry/org/${secondRootOrg.short_name}`)