Added hydration to GETs

Author: david-rocca

schemas/registry-user/get-registry-user-response.json

@@ -38,6 +38,11 @@
         "last"
       ]
     },
+    "role": {
+      "type": "string",
+      "enum": ["ADMIN"],
+      "description": "The role of the user in the organization. Currently only 'ADMIN' is supported."
+    },
     "org_affiliations": {
       "type": "array",
       "items": {

schemas/registry-user/list-registry-users-response.json

@@ -66,7 +66,8 @@
           },
           "role": {
             "type": "string",
-            "description": "Unique identifier for the user"
+            "enum": ["ADMIN"],
+            "description": "The role of the user in the organization. Currently only 'ADMIN' is supported."
           },
           "secret": {
             "type": "string",

src/controller/registry-org.controller/registry-org.controller.js

@@ -470,6 +470,12 @@ async function getUsers (req, res, next) {
     // This should always return Registry typed
     const payload = await userRepo.getAllUsersByOrgShortname(orgShortName, options, true)
 
+    // Hydrate the role field
+    const org = await orgRepo.findOneByShortName(orgShortName)
+    payload.users.forEach(user => {
+      user.role = org.admins.includes(user.UUID) ? 'ADMIN' : user.role // Default to existing role if not admin
+    })
+
     logger.info({ uuid: req.ctx.uuid, message: `The users of ${orgShortName} organization were sent to the user.` })
     return res.status(200).json(payload)
   } catch (err) {

src/controller/registry-user.controller/registry-user.controller.js

@@ -25,6 +25,30 @@ async function getAllUsers (req, res, next) {
 
     try {
       returnValue = await repo.getAllUsers(options)
+      // Hydrate roles
+      const orgRepo = req.ctx.repositories.getBaseOrgRepository()
+      const distinctOrgUUIDs = [...new Set(returnValue.users.map(u => u.org_UUID))]
+
+      // Fetch all relevant orgs in one go (or in parallel) if possible, but map is easy for now
+      // Since we don't have a "getManyOrgsByUUID", we might need to do it one by one or improve repository
+      // For now, let's iterate and fetch. It's not optimal but safe given repo limitations.
+      // Optimization: We can build a map of orgUUID -> orgObject
+      const orgMap = {}
+      for (const uuid of distinctOrgUUIDs) {
+        // We need the org content to get admins
+        const org = await orgRepo.findOneByUUID(uuid)
+        if (org) {
+          orgMap[uuid] = org
+        }
+      }
+
+      returnValue.users.forEach(user => {
+        const org = orgMap[user.org_UUID]
+        if (org && org.admins && org.admins.includes(user.UUID)) {
+          user.role = 'ADMIN'
+        }
+        // If not admin, leave as is (undefined or empty or whatever it was)
+      })
     } finally {
       await session.endSession()
     }
@@ -85,6 +109,7 @@ async function getUser (req, res, next) {
 
     const user = result.toObject ? result.toObject() : result
     const userPayload = _.omit(user, ['secret', '_id', '__v'])
+    userPayload.role = org.admins.includes(userPayload.UUID) ? 'ADMIN' : userPayload.role
     return res.status(200).json(userPayload)
   } catch (err) {
     next(err)