@open-mercato/core 0.6.3-develop.3651.1.d3a548a5f1 → 0.6.3-develop.3660.1.53b73d5aa4

package/dist/modules/customers/api/deals/route.js

@@ -5,6 +5,7 @@ import { CustomerDeal, CustomerDealPersonLink, CustomerDealCompanyLink } from ".
 import { dealCreateSchema, dealUpdateSchema } from "../../data/validators.js";
 import { E } from "../../../../generated/entities.ids.generated.js";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
+import { parseBooleanFromUnknown } from "@open-mercato/shared/lib/boolean";
 import {
   applyEntityIdRestriction,
   findMatchingEntityIdsWithQueryEngine,
@@ -17,21 +18,44 @@ import {
   defaultOkResponseSchema
 } from "../openapi.js";
 import { findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
+import { isTenantDataEncryptionEnabled } from "@open-mercato/shared/lib/encryption/toggles";
 import { escapeLikePattern } from "@open-mercato/shared/lib/db/escapeLikePattern";
 import { consumeAdvancedFilterState, mergeAdvancedFilterTree } from "@open-mercato/shared/lib/crud/advanced-filter-integration";
+import { fetchStuckDealIds } from "../../lib/stuckDeals.js";
 const rawBodySchema = z.object({}).passthrough();
-const listSchema = z.object({
+const stringOrStringArray = z.union([z.string(), z.array(z.string())]);
+const booleanQueryParam = z.preprocess((value) => {
+  const parsed = parseBooleanFromUnknown(value);
+  return parsed === null ? value : parsed;
+}, z.boolean()).optional();
+const dealListQuerySchema = z.object({
   page: z.coerce.number().min(1).default(1),
   pageSize: z.coerce.number().min(1).max(100).default(50),
   search: z.string().optional(),
-  status: z.string().optional(),
+  status: stringOrStringArray.optional(),
   pipelineStage: z.string().optional(),
-  pipelineId: z.string().uuid().optional(),
-  pipelineStageId: z.string().uuid().optional(),
+  pipelineId: stringOrStringArray.optional(),
+  pipelineStageId: z.union([z.string().uuid(), z.literal("__unassigned")]).optional(),
+  ownerUserId: stringOrStringArray.optional(),
+  expectedCloseAtFrom: z.string().optional(),
+  expectedCloseAtTo: z.string().optional(),
+  isStuck: booleanQueryParam,
+  isOverdue: booleanQueryParam,
+  valueCurrency: stringOrStringArray.optional(),
   sortField: z.string().optional(),
   sortDir: z.enum(["asc", "desc"]).optional(),
-  personEntityId: z.string().uuid().optional(),
-  companyEntityId: z.string().uuid().optional()
+  /**
+   * @deprecated Use `personId` instead. The `personEntityId` alias is kept for backward
+   * compatibility with older clients and will be removed in a future minor release.
+   */
+  personEntityId: z.string().uuid().optional().describe("Deprecated; use personId"),
+  /**
+   * @deprecated Use `companyId` instead. The `companyEntityId` alias is kept for backward
+   * compatibility with older clients and will be removed in a future minor release.
+   */
+  companyEntityId: z.string().uuid().optional().describe("Deprecated; use companyId"),
+  personId: stringOrStringArray.optional(),
+  companyId: stringOrStringArray.optional()
 }).passthrough();
 const routeMetadata = {
   GET: { requireAuth: true, requireFeatures: ["customers.deals.view"] },
@@ -47,6 +71,67 @@ function parseUuid(value) {
   const result = z.string().uuid().safeParse(trimmed);
   return result.success ? trimmed : null;
 }
+function normalizeStringList(value) {
+  const set = /* @__PURE__ */ new Set();
+  const visit = (entry) => {
+    if (entry == null) return;
+    if (Array.isArray(entry)) {
+      entry.forEach(visit);
+      return;
+    }
+    if (typeof entry !== "string") return;
+    entry.split(",").map((token) => token.trim()).filter((token) => token.length > 0).forEach((token) => set.add(token));
+  };
+  visit(value);
+  return Array.from(set);
+}
+function parseDateInput(value) {
+  if (!(typeof value === "string") || value.trim().length === 0) return null;
+  const date = new Date(value);
+  return Number.isNaN(date.getTime()) ? null : date;
+}
+async function fetchDealIdsMatchingAssociations(em, organizationId, tenantId, personIds, companyIds) {
+  if (!personIds.length && !companyIds.length) return [];
+  const where = [
+    "organization_id = ?",
+    "tenant_id = ?",
+    "deleted_at IS NULL"
+  ];
+  const values = [organizationId, tenantId];
+  if (personIds.length) {
+    const placeholders = personIds.map(() => "?").join(",");
+    where.push(
+      `EXISTS (SELECT 1 FROM customer_deal_people dp WHERE dp.deal_id = customer_deals.id AND dp.person_entity_id IN (${placeholders}))`
+    );
+    values.push(...personIds);
+  }
+  if (companyIds.length) {
+    const placeholders = companyIds.map(() => "?").join(",");
+    where.push(
+      `EXISTS (SELECT 1 FROM customer_deal_companies dc WHERE dc.deal_id = customer_deals.id AND dc.company_entity_id IN (${placeholders}))`
+    );
+    values.push(...companyIds);
+  }
+  const rows = await em.getConnection().execute(
+    `SELECT id FROM customer_deals WHERE ${where.join(" AND ")}`,
+    values
+  );
+  return rows.map((row) => row.id);
+}
+function normalizeCurrencyList(value) {
+  const set = /* @__PURE__ */ new Set();
+  const visit = (entry) => {
+    if (entry == null) return;
+    if (Array.isArray(entry)) {
+      entry.forEach(visit);
+      return;
+    }
+    if (typeof entry !== "string") return;
+    entry.split(",").map((token) => token.trim().toUpperCase()).filter((token) => /^[A-Z]{3}$/.test(token)).forEach((token) => set.add(token));
+  };
+  visit(value);
+  return Array.from(set);
+}
 function normalizeUuidList(values) {
   const set = /* @__PURE__ */ new Set();
   values.forEach((candidate) => {
@@ -69,6 +154,144 @@ function normalizeUuidList(values) {
   });
   return Array.from(set);
 }
+async function buildDealListFilters(query, ctx) {
+  const advancedFilterTree = consumeAdvancedFilterState(query);
+  const filters = {};
+  let restrictedIds = null;
+  const intersectIds = (ids) => {
+    if (restrictedIds === null) {
+      restrictedIds = ids;
+      return;
+    }
+    const lookup = new Set(ids);
+    restrictedIds = restrictedIds.filter((id) => lookup.has(id));
+  };
+  if (query.search) {
+    const matchingIds = ctx ? await findMatchingEntityIdsBySearchTokensAcrossSources({
+      ctx,
+      query: query.search,
+      sources: [
+        {
+          entityType: E.customers.customer_deal,
+          fields: [
+            "title",
+            "description",
+            "status",
+            "pipeline_stage",
+            "source",
+            "value_amount",
+            "value_currency",
+            "cf:competitive_risk",
+            "cf:implementation_complexity"
+          ]
+        }
+      ]
+    }) : null;
+    if (matchingIds !== null && matchingIds.length > 0) {
+      intersectIds(matchingIds);
+    } else if (isTenantDataEncryptionEnabled()) {
+      intersectIds([]);
+    } else {
+      const searchPattern = `%${escapeLikePattern(query.search)}%`;
+      filters.$or = [
+        { title: { $ilike: searchPattern } },
+        { description: { $ilike: searchPattern } }
+      ];
+    }
+  }
+  const statusList = query.status ? normalizeStringList(query.status) : [];
+  if (statusList.length > 0) {
+    filters.status = statusList.length === 1 ? { $eq: statusList[0] } : { $in: statusList };
+  }
+  if (query.pipelineStage) {
+    filters.pipeline_stage = { $eq: query.pipelineStage };
+  }
+  const pipelineIds = query.pipelineId ? normalizeUuidList([query.pipelineId]) : [];
+  if (pipelineIds.length > 0) {
+    filters.pipeline_id = pipelineIds.length === 1 ? { $eq: pipelineIds[0] } : { $in: pipelineIds };
+  }
+  if (query.pipelineStageId === "__unassigned") {
+    filters.pipeline_stage_id = { $eq: null };
+  } else if (query.pipelineStageId) {
+    filters.pipeline_stage_id = { $eq: query.pipelineStageId };
+  }
+  const ownerUserIds = query.ownerUserId ? normalizeUuidList([query.ownerUserId]) : [];
+  if (ownerUserIds.length > 0) {
+    filters.owner_user_id = ownerUserIds.length === 1 ? { $eq: ownerUserIds[0] } : { $in: ownerUserIds };
+  }
+  const currencyCodes = query.valueCurrency ? normalizeCurrencyList(query.valueCurrency) : [];
+  if (currencyCodes.length > 0) {
+    filters.value_currency = currencyCodes.length === 1 ? { $eq: currencyCodes[0] } : { $in: currencyCodes };
+  }
+  const expectedCloseFrom = parseDateInput(query.expectedCloseAtFrom);
+  const expectedCloseTo = parseDateInput(query.expectedCloseAtTo);
+  if (expectedCloseFrom || expectedCloseTo) {
+    const range = {};
+    if (expectedCloseFrom) range.$gte = expectedCloseFrom;
+    if (expectedCloseTo) range.$lte = expectedCloseTo;
+    filters.expected_close_at = range;
+  }
+  if (query.isOverdue) {
+    const today = /* @__PURE__ */ new Date();
+    today.setHours(0, 0, 0, 0);
+    if (statusList.length === 0) {
+      filters.status = { $eq: "open" };
+    }
+    const existingRange = filters.expected_close_at && typeof filters.expected_close_at === "object" ? filters.expected_close_at : {};
+    existingRange.$lt = today;
+    filters.expected_close_at = existingRange;
+  }
+  if (query.isStuck && ctx) {
+    const tenantId = ctx.auth?.tenantId;
+    const organizationId = ctx.auth?.orgId;
+    if (typeof tenantId === "string" && typeof organizationId === "string") {
+      const em = ctx.container.resolve("em");
+      const stuckIds = await fetchStuckDealIds(em, organizationId, tenantId);
+      intersectIds(stuckIds);
+    }
+  }
+  const url = ctx?.request ? new URL(ctx.request.url) : null;
+  const personCandidates = [query.personId, query.personEntityId];
+  const companyCandidates = [query.companyId, query.companyEntityId];
+  if (url) {
+    personCandidates.push(url.searchParams.getAll("personId"));
+    personCandidates.push(url.searchParams.getAll("personEntityId"));
+    companyCandidates.push(url.searchParams.getAll("companyId"));
+    companyCandidates.push(url.searchParams.getAll("companyEntityId"));
+  }
+  const selectedPersonIds = normalizeUuidList(personCandidates);
+  const selectedCompanyIds = normalizeUuidList(companyCandidates);
+  if ((selectedPersonIds.length > 0 || selectedCompanyIds.length > 0) && ctx) {
+    const tenantId = ctx.auth?.tenantId;
+    const organizationId = ctx.auth?.orgId;
+    if (typeof tenantId === "string" && typeof organizationId === "string") {
+      const em = ctx.container.resolve("em");
+      const matchedIds = await fetchDealIdsMatchingAssociations(
+        em,
+        organizationId,
+        tenantId,
+        selectedPersonIds,
+        selectedCompanyIds
+      );
+      intersectIds(matchedIds);
+    }
+  }
+  if (ctx && advancedFilterTree) {
+    const advancedFilters = mergeAdvancedFilterTree({ ...filters }, advancedFilterTree);
+    const matchedIds = await findMatchingEntityIdsWithQueryEngine({
+      ctx,
+      entityId: E.customers.customer_deal,
+      filters: advancedFilters
+    });
+    if (matchedIds !== null) {
+      intersectIds(matchedIds);
+    }
+  }
+  if (restrictedIds !== null) {
+    applyEntityIdRestriction(filters, restrictedIds);
+  }
+  return filters;
+}
 const crud = makeCrudRoute({
   metadata: routeMetadata,
   orm: {
@@ -81,8 +304,9 @@ const crud = makeCrudRoute({
   indexer: {
     entityType: E.customers.customer_deal
   },
+  enrichers: { entityId: "customers.deal" },
   list: {
-    schema: listSchema,
+    schema: dealListQuerySchema,
     entityId: E.customers.customer_deal,
     fields: [
       "id",
@@ -113,66 +337,11 @@ const crud = makeCrudRoute({
       createdAt: "created_at",
       updatedAt: "updated_at",
       title: "title",
-      value: "value_amount"
+      value: "value_amount",
+      probability: "probability",
+      expectedCloseAt: "expected_close_at"
     },
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    buildFilters: async (query, ctx) => {
-      const advancedFilterTree = consumeAdvancedFilterState(query);
-      const filters = {};
-      if (query.search) {
-        const matchingIds = ctx ? await findMatchingEntityIdsBySearchTokensAcrossSources({
-          ctx,
-          query: query.search,
-          sources: [
-            {
-              entityType: E.customers.customer_deal,
-              fields: [
-                "title",
-                "description",
-                "status",
-                "pipeline_stage",
-                "source",
-                "value_amount",
-                "value_currency",
-                "cf:competitive_risk",
-                "cf:implementation_complexity"
-              ]
-            }
-          ]
-        }) : null;
-        if (matchingIds !== null && matchingIds.length > 0) {
-          applyEntityIdRestriction(filters, matchingIds);
-        } else {
-          const searchPattern = `%${escapeLikePattern(query.search)}%`;
-          filters.$or = [
-            { title: { $ilike: searchPattern } },
-            { description: { $ilike: searchPattern } }
-          ];
-        }
-      }
-      if (query.status) {
-        filters.status = { $eq: query.status };
-      }
-      if (query.pipelineStage) {
-        filters.pipeline_stage = { $eq: query.pipelineStage };
-      }
-      if (query.pipelineId) {
-        filters.pipeline_id = { $eq: query.pipelineId };
-      }
-      if (query.pipelineStageId) {
-        filters.pipeline_stage_id = { $eq: query.pipelineStageId };
-      }
-      if (ctx && advancedFilterTree) {
-        const advancedFilters = mergeAdvancedFilterTree({ ...filters }, advancedFilterTree);
-        const matchedIds = await findMatchingEntityIdsWithQueryEngine({
-          ctx,
-          entityId: E.customers.customer_deal,
-          filters: advancedFilters
-        });
-        applyEntityIdRestriction(filters, matchedIds);
-      }
-      return filters;
-    }
+    buildFilters: buildDealListFilters
   },
   actions: {
     create: {
@@ -207,42 +376,18 @@ const crud = makeCrudRoute({
     }
   },
   hooks: {
-    beforeList: (query, ctx) => {
-      const url = ctx.request ? new URL(ctx.request.url) : null;
-      const legacyPersonId = query.personEntityId ?? null;
-      const legacyCompanyId = query.companyEntityId ?? null;
-      const allPersonCandidates = [];
-      const allCompanyCandidates = [];
-      if (legacyPersonId) allPersonCandidates.push(legacyPersonId);
-      if (legacyCompanyId) allCompanyCandidates.push(legacyCompanyId);
-      if (url) {
-        const personParams = url.searchParams.getAll("personId");
-        const companyParams = url.searchParams.getAll("companyId");
-        if (personParams.length) allPersonCandidates.push(...personParams);
-        if (companyParams.length) allCompanyCandidates.push(...companyParams);
-        const legacyRepeatPerson = url.searchParams.getAll("personEntityId");
-        const legacyRepeatCompany = url.searchParams.getAll("companyEntityId");
-        if (legacyRepeatPerson.length) allPersonCandidates.push(...legacyRepeatPerson);
-        if (legacyRepeatCompany.length) allCompanyCandidates.push(...legacyRepeatCompany);
-      }
-      const personIds = normalizeUuidList(allPersonCandidates);
-      const companyIds = normalizeUuidList(allCompanyCandidates);
-      ctx.__dealsFilters = {
-        personIds,
-        companyIds
-      };
-    },
+    // afterList only DECORATES results with `people`/`companies` arrays — it must not filter,
+    // because filtering after pagination would drop deals on later pages and rewrite `total`
+    // to a misleading value. Association filtering happens pre-pagination in `buildFilters`
+    // via `fetchDealIdsMatchingAssociations`.
     afterList: async (payload, ctx) => {
-      const filters = ctx.__dealsFilters || {};
-      const selectedPersonIds = Array.isArray(filters.personIds) ? filters.personIds : [];
-      const selectedCompanyIds = Array.isArray(filters.companyIds) ? filters.companyIds : [];
       const items = Array.isArray(payload.items) ? payload.items : [];
       if (!items.length) return;
       const scopeSource = items[0] ?? {};
       const tenantIdRaw = scopeSource.tenantId ?? scopeSource.tenant_id;
-      const fallbackTenantId = (typeof tenantIdRaw === "string" && tenantIdRaw.trim().length ? tenantIdRaw : null) ?? ctx?.auth?.tenantId ?? null;
+      const fallbackTenantId = (typeof tenantIdRaw === "string" && tenantIdRaw.trim().length ? tenantIdRaw : null) ?? ctx.auth?.tenantId ?? null;
       const orgIdRaw = scopeSource.organizationId ?? scopeSource.organization_id;
-      const fallbackOrganizationId = (typeof orgIdRaw === "string" && orgIdRaw.trim().length ? orgIdRaw : null) ?? ctx?.auth?.orgId ?? null;
+      const fallbackOrganizationId = (typeof orgIdRaw === "string" && orgIdRaw.trim().length ? orgIdRaw : null) ?? ctx.auth?.orgId ?? null;
       const ids = items.map((item) => {
         if (!item || typeof item !== "object") return null;
         const candidate = item.id;
@@ -272,7 +417,6 @@ const crud = makeCrudRoute({
           )
         ]);
         const personAssignments = /* @__PURE__ */ new Map();
-        const personMemberships = /* @__PURE__ */ new Map();
         allPersonLinks.forEach((link) => {
           const deal = link.deal;
           const dealRecord = deal && typeof deal === "object" ? deal : null;
@@ -288,12 +432,8 @@ const crud = makeCrudRoute({
             bucket.push({ id: personId, label });
             personAssignments.set(dealId, bucket);
           }
-          const membership = personMemberships.get(dealId) ?? /* @__PURE__ */ new Set();
-          membership.add(personId);
-          personMemberships.set(dealId, membership);
         });
         const companyAssignments = /* @__PURE__ */ new Map();
-        const companyMemberships = /* @__PURE__ */ new Map();
         allCompanyLinks.forEach((link) => {
           const deal = link.deal;
           const dealRecord = deal && typeof deal === "object" ? deal : null;
@@ -309,18 +449,7 @@ const crud = makeCrudRoute({
             bucket.push({ id: companyId, label });
             companyAssignments.set(dealId, bucket);
           }
-          const membership = companyMemberships.get(dealId) ?? /* @__PURE__ */ new Set();
-          membership.add(companyId);
-          companyMemberships.set(dealId, membership);
         });
-        const hasPersonFilter = selectedPersonIds.length > 0;
-        const hasCompanyFilter = selectedCompanyIds.length > 0;
-        const matchesAll = (selected, memberships, dealId) => {
-          if (!selected.length) return true;
-          const membership = memberships.get(dealId);
-          if (!membership || membership.size === 0) return false;
-          return selected.every((id) => membership.has(id));
-        };
         const enhancedItems = items.map((item) => {
           if (!item || typeof item !== "object") return null;
           const data = item;
@@ -328,9 +457,6 @@ const crud = makeCrudRoute({
           if (!candidate || !candidate.trim().length) return null;
           const people = personAssignments.get(candidate) ?? [];
           const companies = companyAssignments.get(candidate) ?? [];
-          const matchesPerson = matchesAll(selectedPersonIds, personMemberships, candidate);
-          const matchesCompany = matchesAll(selectedCompanyIds, companyMemberships, candidate);
-          if (!matchesPerson || !matchesCompany) return null;
           const tenantIdRaw2 = typeof data.tenantId === "string" ? data.tenantId : typeof data.tenant_id === "string" ? data.tenant_id : null;
           const organizationIdRaw = typeof data.organizationId === "string" ? data.organizationId : typeof data.organization_id === "string" ? data.organization_id : null;
           const tenantId = tenantIdRaw2 && tenantIdRaw2.trim().length ? tenantIdRaw2.trim() : null;
@@ -348,13 +474,18 @@ const crud = makeCrudRoute({
           (item) => item !== null
         );
         payload.items = enhancedItems;
-        if (hasPersonFilter || hasCompanyFilter) {
-          payload.total = enhancedItems.length;
-          payload.totalPages = 1;
-          payload.page = 1;
-        }
       } catch (err) {
-        console.warn("[customers.deals] failed to filter by person/company link", err);
+        console.warn("[customers.deals] failed to decorate items with person/company links", err);
+        payload.items = items.map((item) => {
+          if (!item || typeof item !== "object") return item;
+          return {
+            ...item,
+            _associations: {
+              ok: false,
+              reason: err instanceof Error ? err.message : "unknown"
+            }
+          };
+        });
       }
     }
   }
@@ -395,7 +526,7 @@ const dealCreateResponseSchema = z.object({
 });
 const openApi = createCustomersCrudOpenApi({
   resourceName: "Deal",
-  querySchema: listSchema,
+  querySchema: dealListQuerySchema,
   listResponseSchema: createPagedListResponseSchema(dealListItemSchema),
   create: {
     schema: dealCreateSchema,
@@ -418,6 +549,8 @@ export {
   GET,
   POST,
   PUT,
+  buildDealListFilters,
+  dealListQuerySchema,
   metadata,
   openApi
 };