Retrieve org attributes when finding org by id

backend/src/database/repositories/organizationRepository.ts

@@ -12,6 +12,7 @@ import {
   fetchManyOrgIdentities,
   updateOrgIdentity,
 } from '@crowd/data-access-layer/src/org_identities'
+import { findOrgAttributes } from '@crowd/data-access-layer/src/org_attributes'
 import { FieldTranslatorFactory, OpensearchQueryParser } from '@crowd/opensearch'
 import {
   FeatureFlag,
@@ -1250,7 +1251,26 @@ class OrganizationRepository {
       throw new Error404()
     }
 
-    return rows[0]
+    const organization = rows[0]
+
+    const qx = SequelizeRepository.getQueryExecutor(options)
+    const attributes = await findOrgAttributes(qx, id)
+    organization.attributes = attributes.reduce((acc, a) => {
+      if (!acc[a.name]) {
+        acc[a.name] = {}
+      }
+      if (!acc[a.name][a.source]) {
+        acc[a.name][a.source] = []
+      }
+
+      acc[a.name][a.source].push(a.value)
+      if (a.default) {
+        acc[a.name].default = a.value
+      }
+      return acc
+    }, {})
+
+    return organization
   }
 
   static async filterIdsInTenant(ids, options: IRepositoryOptions) {

services/libs/data-access-layer/src/org_attributes/index.ts

@@ -0,0 +1,27 @@
+import { QueryExecutor } from '../queryExecutor'
+
+export interface IOrgAttribute {
+  id?: string
+  createdAt: string
+  updatedAt: string
+  organizationId: string
+  type: string
+  name: string
+  source: string
+  default: boolean
+  value?: string
+}
+
+export async function findOrgAttributes(qx: QueryExecutor, organizationId: string) {
+  return qx.select(
+    `
+    SELECT
+      *
+    FROM "orgAttributes"
+    WHERE "organizationId" = $(organizationId)
+  `,
+    {
+      organizationId,
+    },
+  )
+}