@open-mercato/core 0.6.8-develop.7013.1.48f7adca80 → 0.6.8-develop.7015.1.af90a2ddc7

package/dist/modules/customers/api/companies/[id]/people/route.js

@@ -5,17 +5,10 @@ import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
 import { getAuthFromRequest } from "@open-mercato/shared/lib/auth/server";
 import { resolveOrganizationScopeForRequest } from "@open-mercato/core/modules/directory/utils/organizationScope";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
-import { findOneWithDecryption, findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
+import { findOneWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import { isOrganizationReadAccessAllowed } from "@open-mercato/core/modules/directory/utils/organizationScopeGuard";
-import {
-  CustomerEntity,
-  CustomerPersonCompanyLink,
-  CustomerPersonProfile
-} from "../../../../data/entities.js";
-import {
-  filterActivePersonCompanyLinks,
-  withActiveCustomerPersonCompanyLinkFilter
-} from "../../../../lib/personCompanyLinkTable.js";
+import { CustomerEntity } from "../../../../data/entities.js";
+import { loadCompanyPeopleUnion } from "../../../../lib/personCompanies.js";
 import { createLogger } from "@open-mercato/shared/lib/logger";
 const logger = createLogger("customers");
 const paramsSchema = z.object({
@@ -91,59 +84,22 @@ async function GET(req, ctx) {
       throw new CrudHttpError(403, { error: translate("customers.errors.access_denied", "Access denied") });
     }
     const entityScope = { tenantId: auth.tenantId, organizationId: company.organizationId };
-    const linkWhere = await withActiveCustomerPersonCompanyLinkFilter(
-      em,
-      {
-        company: company.id,
-        tenantId: company.tenantId,
-        organizationId: company.organizationId
-      },
-      "customers.companies.people.GET"
-    );
-    const links = filterActivePersonCompanyLinks(
-      await findWithDecryption(
-        em,
-        CustomerPersonCompanyLink,
-        linkWhere,
-        { populate: ["person"] },
-        entityScope
-      )
-    );
-    const personIds = links.map((link) => link.person?.id).filter((personId) => typeof personId === "string" && personId.length > 0);
-    const profiles = personIds.length > 0 ? await findWithDecryption(
-      em,
-      CustomerPersonProfile,
-      {
-        entity: { $in: personIds },
-        tenantId: company.tenantId,
-        organizationId: company.organizationId
-      },
-      {},
-      entityScope
-    ) : [];
-    const profileByPersonId = new Map(
-      profiles.map((profile) => [profile.entity.id, profile])
-    );
-    const items = links.map((link) => {
-      const person = link.person;
-      if (!person?.id) return null;
-      const profile = profileByPersonId.get(person.id) ?? null;
-      return {
-        id: person.id,
-        displayName: person.displayName ?? person.primaryEmail ?? person.id,
-        primaryEmail: person.primaryEmail ?? null,
-        primaryPhone: person.primaryPhone ?? null,
-        status: person.status ?? null,
-        lifecycleStage: person.lifecycleStage ?? null,
-        jobTitle: profile?.jobTitle ?? null,
-        department: profile?.department ?? null,
-        createdAt: person.createdAt.toISOString(),
-        organizationId: person.organizationId,
-        temperature: person.temperature ?? null,
-        source: person.source ?? null,
-        linkedAt: link.createdAt ? link.createdAt.toISOString() : null
-      };
-    }).filter((item) => item !== null);
+    const union = await loadCompanyPeopleUnion(em, company, entityScope);
+    const items = union.map(({ entity: person, profile, linkedAt }) => ({
+      id: person.id,
+      displayName: person.displayName ?? person.primaryEmail ?? person.id,
+      primaryEmail: person.primaryEmail ?? null,
+      primaryPhone: person.primaryPhone ?? null,
+      status: person.status ?? null,
+      lifecycleStage: person.lifecycleStage ?? null,
+      jobTitle: profile?.jobTitle ?? null,
+      department: profile?.department ?? null,
+      createdAt: person.createdAt.toISOString(),
+      organizationId: person.organizationId,
+      temperature: person.temperature ?? null,
+      source: person.source ?? null,
+      linkedAt
+    }));
     const filtered = query.search?.trim().length ? items.filter((item) => matchesSearch(item, query.search ?? "")) : items;
     const sorted = sortItems(filtered, query.sort);
     const total = sorted.length;

package/dist/modules/customers/api/companies/[id]/people/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/modules/customers/api/companies/%5Bid%5D/people/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { CrudHttpError, isCrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { isOrganizationReadAccessAllowed } from '@open-mercato/core/modules/directory/utils/organizationScopeGuard'\nimport {\n  CustomerEntity,\n  CustomerPersonCompanyLink,\n  CustomerPersonProfile,\n} from '../../../../data/entities'\nimport {\n  filterActivePersonCompanyLinks,\n  withActiveCustomerPersonCompanyLinkFilter,\n} from '../../../../lib/personCompanyLinkTable'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('customers')\n\nconst paramsSchema = z.object({\n  id: z.string().uuid(),\n})\n\nconst querySchema = z.object({\n  page: z.coerce.number().min(1).default(1),\n  pageSize: z.coerce.number().min(1).max(100).default(20),\n  search: z.string().optional(),\n  sort: z.enum(['name-asc', 'name-desc', 'recent']).default('name-asc'),\n})\n\ntype CompanyPersonItem = {\n  id: string\n  displayName: string\n  primaryEmail: string | null\n  primaryPhone: string | null\n  status: string | null\n  lifecycleStage: string | null\n  jobTitle: string | null\n  department: string | null\n  createdAt: string\n  organizationId: string\n  temperature: string | null\n  source: string | null\n  linkedAt: string | null\n}\n\nfunction matchesSearch(item: CompanyPersonItem, query: string): boolean {\n  const normalized = query.trim().toLowerCase()\n  if (!normalized.length) return true\n  return [\n    item.displayName,\n    item.primaryEmail,\n    item.primaryPhone,\n    item.jobTitle,\n    item.department,\n    item.status,\n    item.lifecycleStage,\n    item.source,\n  ]\n    .filter((value): value is string => typeof value === 'string' && value.length > 0)\n    .some((value) => value.toLowerCase().includes(normalized))\n}\n\nfunction sortItems(items: CompanyPersonItem[], sort: 'name-asc' | 'name-desc' | 'recent'): CompanyPersonItem[] {\n  if (sort === 'recent') {\n    return [...items].sort((left, right) => {\n      const leftTimestamp = left.linkedAt ? new Date(left.linkedAt).getTime() : new Date(left.createdAt).getTime()\n      const rightTimestamp = right.linkedAt ? new Date(right.linkedAt).getTime() : new Date(right.createdAt).getTime()\n      if (leftTimestamp === rightTimestamp) return left.displayName.localeCompare(right.displayName)\n      return rightTimestamp - leftTimestamp\n    })\n  }\n\n  return [...items].sort((left, right) => {\n    const compare = left.displayName.localeCompare(right.displayName, undefined, { sensitivity: 'base' })\n    return sort === 'name-asc' ? compare : -compare\n  })\n}\n\nexport const metadata = {\n  GET: { requireAuth: true, requireFeatures: ['customers.companies.view'] },\n}\n\nexport async function GET(req: Request, ctx: { params?: { id?: string } }) {\n  const { translate } = await resolveTranslations()\n  try {\n    const { id } = paramsSchema.parse({ id: ctx.params?.id })\n    const auth = await getAuthFromRequest(req)\n    if (!auth?.tenantId) throw new CrudHttpError(401, { error: 'Unauthorized' })\n\n    const query = querySchema.parse({\n      page: new URL(req.url).searchParams.get('page') ?? undefined,\n      pageSize: new URL(req.url).searchParams.get('pageSize') ?? undefined,\n      search: new URL(req.url).searchParams.get('search') ?? undefined,\n      sort: new URL(req.url).searchParams.get('sort') ?? undefined,\n    })\n\n    const container = await createRequestContainer()\n    const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })\n    const em = (container.resolve('em') as EntityManager).fork()\n    const decryptionScope = {\n      tenantId: auth.tenantId,\n      organizationId: scope?.selectedId ?? auth.orgId ?? null,\n    }\n\n    const company = await findOneWithDecryption(\n      em,\n      CustomerEntity,\n      { id, kind: 'company', tenantId: auth.tenantId, deletedAt: null },\n      {},\n      decryptionScope,\n    )\n    if (!company) {\n      throw notFound(translate('customers.errors.company_not_found', 'Company not found'))\n    }\n\n    if (!isOrganizationReadAccessAllowed({ scope, auth, organizationId: company.organizationId })) {\n      throw new CrudHttpError(403, { error: translate('customers.errors.access_denied', 'Access denied') })\n    }\n\n    const entityScope = { tenantId: auth.tenantId, organizationId: company.organizationId }\n    const linkWhere = await withActiveCustomerPersonCompanyLinkFilter(\n      em,\n      {\n        company: company.id,\n        tenantId: company.tenantId,\n        organizationId: company.organizationId,\n      },\n      'customers.companies.people.GET',\n    )\n    const links = filterActivePersonCompanyLinks(\n      await findWithDecryption(\n        em,\n        CustomerPersonCompanyLink,\n        linkWhere,\n        { populate: ['person'] },\n        entityScope,\n      ),\n    )\n\n    const personIds = links\n      .map((link) => link.person?.id)\n      .filter((personId): personId is string => typeof personId === 'string' && personId.length > 0)\n\n    const profiles = personIds.length > 0\n      ? await findWithDecryption(\n          em,\n          CustomerPersonProfile,\n          {\n            entity: { $in: personIds },\n            tenantId: company.tenantId,\n            organizationId: company.organizationId,\n          },\n          {},\n          entityScope,\n        )\n      : []\n    const profileByPersonId = new Map(\n      profiles.map((profile) => [(profile.entity as { id: string }).id, profile]),\n    )\n\n    const items = links\n      .map((link) => {\n        const person = link.person\n        if (!person?.id) return null\n        const profile = profileByPersonId.get(person.id) ?? null\n        return {\n          id: person.id,\n          displayName: person.displayName ?? person.primaryEmail ?? person.id,\n          primaryEmail: person.primaryEmail ?? null,\n          primaryPhone: person.primaryPhone ?? null,\n          status: person.status ?? null,\n          lifecycleStage: person.lifecycleStage ?? null,\n          jobTitle: profile?.jobTitle ?? null,\n          department: profile?.department ?? null,\n          createdAt: person.createdAt.toISOString(),\n          organizationId: person.organizationId,\n          temperature: person.temperature ?? null,\n          source: person.source ?? null,\n          linkedAt: link.createdAt ? link.createdAt.toISOString() : null,\n        } satisfies CompanyPersonItem\n      })\n      .filter((item): item is CompanyPersonItem => item !== null)\n\n    const filtered = query.search?.trim().length ? items.filter((item) => matchesSearch(item, query.search ?? '')) : items\n    const sorted = sortItems(filtered, query.sort)\n    const total = sorted.length\n    const totalPages = Math.max(1, Math.ceil(total / query.pageSize))\n    const page = Math.min(query.page, totalPages)\n    const start = (page - 1) * query.pageSize\n\n    return NextResponse.json({\n      items: sorted.slice(start, start + query.pageSize),\n      total,\n      page,\n      pageSize: query.pageSize,\n      totalPages,\n    })\n  } catch (error) {\n    if (isCrudHttpError(error)) {\n      return NextResponse.json(error.body, { status: error.status })\n    }\n    logger.error('customers.companies.people.GET', { err: error })\n    return NextResponse.json({ error: translate('customers.errors.company_people_load_failed', 'Failed to load linked people') }, { status: 500 })\n  }\n}\n\nconst companyPeopleItemSchema = z.object({\n  id: z.string().uuid(),\n  displayName: z.string(),\n  primaryEmail: z.string().nullable(),\n  primaryPhone: z.string().nullable(),\n  status: z.string().nullable(),\n  lifecycleStage: z.string().nullable(),\n  jobTitle: z.string().nullable(),\n  department: z.string().nullable(),\n  createdAt: z.string(),\n  organizationId: z.string().uuid().nullable(),\n  temperature: z.string().nullable(),\n  source: z.string().nullable(),\n  linkedAt: z.string().nullable(),\n})\n\nexport const openApi: OpenApiRouteDoc = {\n  tag: 'Customers',\n  methods: {\n    GET: {\n      summary: 'List linked people for a company',\n      query: querySchema,\n      responses: [\n        {\n          status: 200,\n          description: 'Paginated linked people',\n          schema: z.object({\n            items: z.array(companyPeopleItemSchema),\n            total: z.number().int().nonnegative(),\n            page: z.number().int().min(1),\n            pageSize: z.number().int().min(1),\n            totalPages: z.number().int().min(1),\n          }),\n        },\n      ],\n    },\n  },\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { CrudHttpError, isCrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { isOrganizationReadAccessAllowed } from '@open-mercato/core/modules/directory/utils/organizationScopeGuard'\nimport { CustomerEntity } from '../../../../data/entities'\nimport { loadCompanyPeopleUnion } from '../../../../lib/personCompanies'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('customers')\n\nconst paramsSchema = z.object({\n  id: z.string().uuid(),\n})\n\nconst querySchema = z.object({\n  page: z.coerce.number().min(1).default(1),\n  pageSize: z.coerce.number().min(1).max(100).default(20),\n  search: z.string().optional(),\n  sort: z.enum(['name-asc', 'name-desc', 'recent']).default('name-asc'),\n})\n\ntype CompanyPersonItem = {\n  id: string\n  displayName: string\n  primaryEmail: string | null\n  primaryPhone: string | null\n  status: string | null\n  lifecycleStage: string | null\n  jobTitle: string | null\n  department: string | null\n  createdAt: string\n  organizationId: string\n  temperature: string | null\n  source: string | null\n  linkedAt: string | null\n}\n\nfunction matchesSearch(item: CompanyPersonItem, query: string): boolean {\n  const normalized = query.trim().toLowerCase()\n  if (!normalized.length) return true\n  return [\n    item.displayName,\n    item.primaryEmail,\n    item.primaryPhone,\n    item.jobTitle,\n    item.department,\n    item.status,\n    item.lifecycleStage,\n    item.source,\n  ]\n    .filter((value): value is string => typeof value === 'string' && value.length > 0)\n    .some((value) => value.toLowerCase().includes(normalized))\n}\n\nfunction sortItems(items: CompanyPersonItem[], sort: 'name-asc' | 'name-desc' | 'recent'): CompanyPersonItem[] {\n  if (sort === 'recent') {\n    return [...items].sort((left, right) => {\n      const leftTimestamp = left.linkedAt ? new Date(left.linkedAt).getTime() : new Date(left.createdAt).getTime()\n      const rightTimestamp = right.linkedAt ? new Date(right.linkedAt).getTime() : new Date(right.createdAt).getTime()\n      if (leftTimestamp === rightTimestamp) return left.displayName.localeCompare(right.displayName)\n      return rightTimestamp - leftTimestamp\n    })\n  }\n\n  return [...items].sort((left, right) => {\n    const compare = left.displayName.localeCompare(right.displayName, undefined, { sensitivity: 'base' })\n    return sort === 'name-asc' ? compare : -compare\n  })\n}\n\nexport const metadata = {\n  GET: { requireAuth: true, requireFeatures: ['customers.companies.view'] },\n}\n\nexport async function GET(req: Request, ctx: { params?: { id?: string } }) {\n  const { translate } = await resolveTranslations()\n  try {\n    const { id } = paramsSchema.parse({ id: ctx.params?.id })\n    const auth = await getAuthFromRequest(req)\n    if (!auth?.tenantId) throw new CrudHttpError(401, { error: 'Unauthorized' })\n\n    const query = querySchema.parse({\n      page: new URL(req.url).searchParams.get('page') ?? undefined,\n      pageSize: new URL(req.url).searchParams.get('pageSize') ?? undefined,\n      search: new URL(req.url).searchParams.get('search') ?? undefined,\n      sort: new URL(req.url).searchParams.get('sort') ?? undefined,\n    })\n\n    const container = await createRequestContainer()\n    const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })\n    const em = (container.resolve('em') as EntityManager).fork()\n    const decryptionScope = {\n      tenantId: auth.tenantId,\n      organizationId: scope?.selectedId ?? auth.orgId ?? null,\n    }\n\n    const company = await findOneWithDecryption(\n      em,\n      CustomerEntity,\n      { id, kind: 'company', tenantId: auth.tenantId, deletedAt: null },\n      {},\n      decryptionScope,\n    )\n    if (!company) {\n      throw notFound(translate('customers.errors.company_not_found', 'Company not found'))\n    }\n\n    if (!isOrganizationReadAccessAllowed({ scope, auth, organizationId: company.organizationId })) {\n      throw new CrudHttpError(403, { error: translate('customers.errors.access_denied', 'Access denied') })\n    }\n\n    const entityScope = { tenantId: auth.tenantId, organizationId: company.organizationId }\n    const union = await loadCompanyPeopleUnion(em, company, entityScope)\n\n    const items = union.map(({ entity: person, profile, linkedAt }) => ({\n      id: person.id,\n      displayName: person.displayName ?? person.primaryEmail ?? person.id,\n      primaryEmail: person.primaryEmail ?? null,\n      primaryPhone: person.primaryPhone ?? null,\n      status: person.status ?? null,\n      lifecycleStage: person.lifecycleStage ?? null,\n      jobTitle: profile?.jobTitle ?? null,\n      department: profile?.department ?? null,\n      createdAt: person.createdAt.toISOString(),\n      organizationId: person.organizationId,\n      temperature: person.temperature ?? null,\n      source: person.source ?? null,\n      linkedAt,\n    } satisfies CompanyPersonItem))\n\n    const filtered = query.search?.trim().length ? items.filter((item) => matchesSearch(item, query.search ?? '')) : items\n    const sorted = sortItems(filtered, query.sort)\n    const total = sorted.length\n    const totalPages = Math.max(1, Math.ceil(total / query.pageSize))\n    const page = Math.min(query.page, totalPages)\n    const start = (page - 1) * query.pageSize\n\n    return NextResponse.json({\n      items: sorted.slice(start, start + query.pageSize),\n      total,\n      page,\n      pageSize: query.pageSize,\n      totalPages,\n    })\n  } catch (error) {\n    if (isCrudHttpError(error)) {\n      return NextResponse.json(error.body, { status: error.status })\n    }\n    logger.error('customers.companies.people.GET', { err: error })\n    return NextResponse.json({ error: translate('customers.errors.company_people_load_failed', 'Failed to load linked people') }, { status: 500 })\n  }\n}\n\nconst companyPeopleItemSchema = z.object({\n  id: z.string().uuid(),\n  displayName: z.string(),\n  primaryEmail: z.string().nullable(),\n  primaryPhone: z.string().nullable(),\n  status: z.string().nullable(),\n  lifecycleStage: z.string().nullable(),\n  jobTitle: z.string().nullable(),\n  department: z.string().nullable(),\n  createdAt: z.string(),\n  organizationId: z.string().uuid().nullable(),\n  temperature: z.string().nullable(),\n  source: z.string().nullable(),\n  linkedAt: z.string().nullable(),\n})\n\nexport const openApi: OpenApiRouteDoc = {\n  tag: 'Customers',\n  methods: {\n    GET: {\n      summary: 'List linked people for a company',\n      query: querySchema,\n      responses: [\n        {\n          status: 200,\n          description: 'Paginated linked people',\n          schema: z.object({\n            items: z.array(companyPeopleItemSchema),\n            total: z.number().int().nonnegative(),\n            page: z.number().int().min(1),\n            pageSize: z.number().int().min(1),\n            totalPages: z.number().int().min(1),\n          }),\n        },\n      ],\n    },\n  },\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/customers/api/companies/[id]/route.js

@@ -13,8 +13,6 @@ import {
   CustomerLabelAssignment,
   CustomerDealCompanyLink,
   CustomerTodoLink,
-  CustomerPersonCompanyLink,
-  CustomerPersonProfile,
   CustomerInteraction
 } from "../../../data/entities.js";
 import { User } from "@open-mercato/core/modules/auth/data/entities";
@@ -40,9 +38,9 @@ import { resolveCustomerDetailTenantScope } from "../../../lib/detailTenantScope
 import { findOneWithDecryption, findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import { parseBooleanFromUnknown } from "@open-mercato/shared/lib/boolean";
 import {
-  filterActivePersonCompanyLinks,
-  withActiveCustomerPersonCompanyLinkFilter
-} from "../../../lib/personCompanyLinkTable.js";
+  countCompanyPeopleUnion,
+  loadCompanyPeopleUnion
+} from "../../../lib/personCompanies.js";
 import { normalizeCustomerDetailCustomFields } from "../../detailCustomFields.js";
 import { isOrganizationReadAccessAllowed } from "@open-mercato/core/modules/directory/utils/organizationScopeGuard";
 import { runWithCacheTenant } from "@open-mercato/cache";
@@ -631,68 +629,13 @@ async function GET(_req, ctx) {
   )).map((link) => link.deal ?? null).filter(
     (deal) => !!deal && typeof deal !== "string" && deal.tenantId === company.tenantId && deal.organizationId === company.organizationId
   );
+  const peopleUnionScope = {
+    tenantId: company.tenantId ?? auth.tenantId ?? null,
+    organizationId: company.organizationId ?? scope?.selectedId ?? auth.orgId ?? null
+  };
   let relatedPeople = [];
   if (includePeople) {
-    const peopleDecryptionScope = {
-      tenantId: company.tenantId ?? auth.tenantId ?? null,
-      organizationId: company.organizationId ?? scope?.selectedId ?? auth.orgId ?? null
-    };
-    const relatedPeopleById = /* @__PURE__ */ new Map();
-    const companyLinkWhere = await withActiveCustomerPersonCompanyLinkFilter(
-      em,
-      {
-        company: company.id,
-        organizationId: company.organizationId,
-        tenantId: company.tenantId
-      },
-      "customers.companies.GET"
-    );
-    const companyLinks = filterActivePersonCompanyLinks(
-      await findWithDecryption(
-        em,
-        CustomerPersonCompanyLink,
-        companyLinkWhere,
-        {
-          populate: ["person", "person.personProfile"],
-          orderBy: { isPrimary: "desc", createdAt: "asc" }
-        },
-        peopleDecryptionScope
-      )
-    );
-    companyLinks.forEach((link) => {
-      const entity = typeof link.person === "string" ? null : link.person;
-      if (!entity || entity.kind !== "person" || entity.deletedAt) return;
-      const personProfile = entity.personProfile && typeof entity.personProfile !== "string" ? entity.personProfile : null;
-      relatedPeopleById.set(entity.id, {
-        entity,
-        profile: personProfile,
-        linkedAt: link.createdAt instanceof Date ? link.createdAt.toISOString() : null
-      });
-    });
-    const profiles = await findWithDecryption(
-      em,
-      CustomerPersonProfile,
-      {
-        company: company.id,
-        tenantId: company.tenantId,
-        organizationId: company.organizationId,
-        entity: { deletedAt: null }
-      },
-      { populate: ["entity"] },
-      peopleDecryptionScope
-    );
-    profiles.forEach((entry) => {
-      const entity = entry.entity;
-      if (!entity || entity.kind !== "person" || entity.deletedAt) return;
-      if (!relatedPeopleById.has(entity.id)) {
-        relatedPeopleById.set(entity.id, {
-          entity,
-          profile: entry ?? null,
-          linkedAt: entry.createdAt instanceof Date ? entry.createdAt.toISOString() : null
-        });
-      }
-    });
-    relatedPeople = Array.from(relatedPeopleById.values());
+    relatedPeople = await loadCompanyPeopleUnion(em, company, peopleUnionScope);
   }
   const profileId = profile?.id ?? null;
   const [entityCustomFieldValues, profileCustomFieldValues, routing] = await Promise.all([
@@ -725,26 +668,7 @@ async function GET(_req, ctx) {
       profileId ? profileCustomFieldValues?.[profileId] ?? {} : {}
     )
   );
-  const peopleCountQuery = includePeople ? Promise.resolve(relatedPeople.length) : (async () => {
-    const peopleLinkWhere = await withActiveCustomerPersonCompanyLinkFilter(
-      em,
-      {
-        company: company.id,
-        organizationId: company.organizationId,
-        tenantId: company.tenantId
-      },
-      "customers.companies.GET"
-    );
-    return filterActivePersonCompanyLinks(
-      await findWithDecryption(
-        em,
-        CustomerPersonCompanyLink,
-        peopleLinkWhere,
-        {},
-        { tenantId: company.tenantId, organizationId: company.organizationId }
-      )
-    ).length;
-  })();
+  const peopleCountQuery = includePeople ? Promise.resolve(relatedPeople.length) : countCompanyPeopleUnion(em, company);
   const [
     activityCount,
     interactionCount,