feat: expose org domains via work-history and org name search (CM-1266)

joanagmaia · claude · joanagmaia · commit dd4cdaf04a93 · 2026-07-03T11:24:55.000+01:00
- Add domains[] to work-experience responses via bulk primary-domain lookup
- Extend GET /organizations to accept ?name= with fuzzy, paginated search
- Add searchOrganizationsByName DAL fn with ILIKE + window-count
- Update openapi.yaml with new fields, params, and OrganizationSearchResponse schema
- Add Vitest unit tests for searchOrganizationsByName

Co-Authored-By: Claude Opus 4.7 &lt;noreply@anthropic.com&gt;
Signed-off-by: Joana Maia &lt;jmaia@contractor.linuxfoundation.org&gt;
diff --git a/backend/src/api/public/openapi.yaml b/backend/src/api/public/openapi.yaml
@@ -779,8 +779,14 @@ paths:
   /organizations:
     get:
       operationId: getOrganization
-      summary: Look up an organization by domain
-      description: Find a verified organization by its primary domain.
+      summary: Look up or search organizations
+      description: >
+        Look up a single verified organization by its primary domain (`domain`),
+        or search organizations by display name (`name`). Exactly one of the two
+        query parameters must be provided.
+
+        When `name` is provided the response is a paginated list; when `domain`
+        is provided the response is a single organization object.
       tags:
         - Organizations
       security:
@@ -789,23 +795,70 @@ paths:
       parameters:
         - name: domain
           in: query
-          required: true
-          description: Primary domain of the organization.
+          required: false
+          description: Primary domain of the organization. Mutually exclusive with `name`.
           schema:
             type: string
             minLength: 1
           example: linuxfoundation.org
+        - name: name
+          in: query
+          required: false
+          description: >
+            Display name to search for (case-insensitive substring match).
+            Mutually exclusive with `domain`.
+          schema:
+            type: string
+            minLength: 1
+          example: Linux Foundation
+        - name: page
+          in: query
+          required: false
+          description: Page number (1-based). Only used when `name` is provided.
+          schema:
+            type: integer
+            minimum: 1
+            default: 1
+        - name: pageSize
+          in: query
+          required: false
+          description: Number of results per page (max 100). Only used when `name` is provided.
+          schema:
+            type: integer
+            minimum: 1
+            maximum: 100
+            default: 20
       responses:
         '200':
-          description: Organization found.
+          description: >
+            Organization found (domain lookup) or search results returned (name search).
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Organization'
-              example:
-                id: 550e8400-e29b-41d4-a716-446655440000
-                name: Linux Foundation
-                logo: https://example.com/logo.png
+                oneOf:
+                  - $ref: '#/components/schemas/Organization'
+                  - $ref: '#/components/schemas/OrganizationSearchResponse'
+              examples:
+                domainLookup:
+                  summary: Single organization by domain
+                  value:
+                    id: 550e8400-e29b-41d4-a716-446655440000
+                    name: Linux Foundation
+                    logo: https://example.com/logo.png
+                nameSearch:
+                  summary: Paginated name search results
+                  value:
+                    organizations:
+                      - id: 550e8400-e29b-41d4-a716-446655440000
+                        name: Linux Foundation
+                        domains:
+                          - linuxfoundation.org
+                        logo: https://example.com/logo.png
+                    page: 1
+                    pageSize: 20
+                    total: 1
+        '400':
+          $ref: '#/components/responses/BadRequest'
         '401':
           $ref: '#/components/responses/Unauthorized'
         '403':
@@ -1243,6 +1296,11 @@ components:
             - string
             - 'null'
           description: URL of the organization logo.
+        domains:
+          type: array
+          items:
+            type: string
+          description: Verified primary domains for the organization. Empty when none are on record.
         jobTitle:
           type:
             - string
@@ -1542,6 +1600,50 @@ components:
           type: string
           description: URL of the organization logo. Only present if available.
 
+    OrganizationWithDomains:
+      type: object
+      required:
+        - id
+        - name
+        - domains
+      properties:
+        id:
+          type: string
+          format: uuid
+        name:
+          type: string
+          description: Display name of the organization.
+        domains:
+          type: array
+          items:
+            type: string
+          description: Verified primary domains for the organization.
+        logo:
+          type: string
+          description: URL of the organization logo. Only present if available.
+
+    OrganizationSearchResponse:
+      type: object
+      required:
+        - organizations
+        - page
+        - pageSize
+        - total
+      properties:
+        organizations:
+          type: array
+          items:
+            $ref: '#/components/schemas/OrganizationWithDomains'
+        page:
+          type: integer
+          description: Current page number (1-based).
+        pageSize:
+          type: integer
+          description: Number of results per page.
+        total:
+          type: integer
+          description: Total number of matching organizations.
+
     HttpError:
       type: object
       required:
diff --git a/backend/src/api/public/v1/members/work-experiences/getMemberWorkExperiences.ts b/backend/src/api/public/v1/members/work-experiences/getMemberWorkExperiences.ts
@@ -5,6 +5,7 @@ import { NotFoundError } from '@crowd/common'
 import {
   MemberField,
   fetchManyMemberOrgsWithOrgData,
+  fetchManyOrganizationVerifiedPrimaryDomains,
   findMemberById,
   optionsQx,
 } from '@crowd/data-access-layer'
@@ -28,8 +29,14 @@ export async function getMemberWorkExperiences(req: Request, res: Response): Pro
   }
 
   const orgsMap = await fetchManyMemberOrgsWithOrgData(qx, [memberId])
-  const workExperiences = groupMemberOrganizations(orgsMap.get(memberId) ?? []).map(
-    toMemberWorkExperience,
+  const grouped = groupMemberOrganizations(orgsMap.get(memberId) ?? [])
+
+  const orgIds = [...new Set(grouped.map((r) => r.organizationId).filter(Boolean))]
+  const primaryDomains = await fetchManyOrganizationVerifiedPrimaryDomains(qx, orgIds)
+  const domainsMap = new Map(primaryDomains.map((d) => [d.orgId, d.domains]))
+
+  const workExperiences = grouped.map((role) =>
+    toMemberWorkExperience(role, domainsMap.get(role.organizationId) ?? []),
   )
 
   ok(res, { memberId, workExperiences })
diff --git a/backend/src/api/public/v1/organizations/getOrganization.ts b/backend/src/api/public/v1/organizations/getOrganization.ts
@@ -5,53 +5,88 @@ import { NotFoundError, normalizeHostname } from '@crowd/common'
 import {
   OrgIdentityField,
   OrganizationField,
+  fetchManyOrganizationVerifiedPrimaryDomains,
   findOrgAttributes,
   findOrgById,
   optionsQx,
   queryOrgIdentities,
+  searchOrganizationsByName,
 } from '@crowd/data-access-layer'
 import { OrganizationIdentityType } from '@crowd/types'
 
 import { ok } from '@/utils/api'
 import { validateOrThrow } from '@/utils/validation'
 
-const querySchema = z.object({
-  domain: z.string().trim().min(1),
-})
+const DEFAULT_PAGE_SIZE = 20
+const MAX_PAGE_SIZE = 100
+
+const querySchema = z
+  .object({
+    domain: z.string().trim().min(1).optional(),
+    name: z.string().trim().min(1).optional(),
+    page: z.coerce.number().int().min(1).default(1),
+    pageSize: z.coerce.number().int().min(1).max(MAX_PAGE_SIZE).default(DEFAULT_PAGE_SIZE),
+  })
+  .refine((d) => !!(d.domain ?? d.name), {
+    message: 'Either domain or name is required',
+  })
+  .refine((d) => !(d.domain && d.name), {
+    message: 'Only one of domain or name may be provided',
+  })
 
 export async function getOrganization(req: Request, res: Response): Promise<void> {
-  const { domain } = validateOrThrow(querySchema, req.query)
+  const { domain, name, page, pageSize } = validateOrThrow(querySchema, req.query)
 
   const qx = optionsQx(req)
 
-  const results = await queryOrgIdentities(qx, {
-    fields: [OrgIdentityField.ORGANIZATION_ID],
-    filter: {
-      and: [
-        { value: { eq: normalizeHostname(domain, false) } },
-        { type: { eq: OrganizationIdentityType.PRIMARY_DOMAIN } },
-        { verified: { eq: true } },
-      ],
-    },
-  })
+  if (domain) {
+    const results = await queryOrgIdentities(qx, {
+      fields: [OrgIdentityField.ORGANIZATION_ID],
+      filter: {
+        and: [
+          { value: { eq: normalizeHostname(domain, false) } },
+          { type: { eq: OrganizationIdentityType.PRIMARY_DOMAIN } },
+          { verified: { eq: true } },
+        ],
+      },
+    })
 
-  const organizationId = results[0]?.organizationId
+    const organizationId = results[0]?.organizationId
 
-  if (!organizationId) {
-    throw new NotFoundError('Organization not found')
+    if (!organizationId) {
+      throw new NotFoundError('Organization not found')
+    }
+
+    const org = await findOrgById(qx, organizationId, [
+      OrganizationField.ID,
+      OrganizationField.DISPLAY_NAME,
+    ])
+
+    const attributes = await findOrgAttributes(qx, organizationId)
+    const logo = attributes.find((a) => a.name === 'logo')?.value
+
+    ok(res, {
+      id: org.id,
+      name: org.displayName,
+      ...(logo ? { logo } : {}),
+    })
+    return
   }
 
-  const org = await findOrgById(qx, organizationId, [
-    OrganizationField.ID,
-    OrganizationField.DISPLAY_NAME,
-  ])
+  // name search — fuzzy, paginated
+  const offset = (page - 1) * pageSize
+  const { rows, total } = await searchOrganizationsByName(qx, name, { limit: pageSize, offset })
 
-  const attributes = await findOrgAttributes(qx, organizationId)
-  const logo = attributes.find((a) => a.name === 'logo')?.value
+  const orgIds = rows.map((r) => r.id)
+  const primaryDomains = await fetchManyOrganizationVerifiedPrimaryDomains(qx, orgIds)
+  const domainsMap = new Map(primaryDomains.map((d) => [d.orgId, d.domains]))
 
-  ok(res, {
-    id: org.id,
-    name: org.displayName,
-    ...(logo ? { logo } : {}),
-  })
+  const organizations = rows.map((r) => ({
+    id: r.id,
+    name: r.displayName,
+    domains: domainsMap.get(r.id) ?? [],
+    ...(r.logo ? { logo: r.logo } : {}),
+  }))
+
+  ok(res, { organizations, page, pageSize, total })
 }
diff --git a/backend/src/utils/mapper.ts b/backend/src/utils/mapper.ts
@@ -123,12 +123,13 @@ export function groupMemberOrganizations<T extends IMemberOrganization>(rows: T[
     })
 }
 
-export function toMemberWorkExperience(mo: IMemberRoleWithOrganization) {
+export function toMemberWorkExperience(mo: IMemberRoleWithOrganization, domains: string[] = []) {
   return {
     id: mo.id,
     organizationId: mo.organizationId,
     organizationName: mo.organizationName,
     organizationLogo: mo.organizationLogo,
+    domains,
     jobTitle: mo.title ?? null,
     verified: mo.verified ?? false,
     verifiedBy: mo.verifiedBy ?? null,
diff --git a/services/libs/data-access-layer/src/organizations/__tests__/searchOrganizationsByName.test.ts b/services/libs/data-access-layer/src/organizations/__tests__/searchOrganizationsByName.test.ts
diff --git a/services/libs/data-access-layer/src/organizations/base.ts b/services/libs/data-access-layer/src/organizations/base.ts
