@open-mercato/core 0.6.8-develop.7072.1.19c2a8bbe0 → 0.6.8-develop.7077.1.94f1126c13

package/src/modules/customers/commands/deals.ts

@@ -45,6 +45,13 @@ import type { CrudIndexerConfig, CrudEventsConfig } from '@open-mercato/shared/l
 import { E } from '#generated/entities.ids.generated'
 import { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { isMissingDealStageTransitionTable, warnMissingDealStageTransitionTable } from '../lib/dealStageTransitionTable'
+import {
+  dealClosureOutcomeFromStatus,
+  loadClosurePipelineStageSnapshot,
+  type DealClosureOutcome,
+  type PipelineStageSnapshot,
+} from '../lib/closureStage'
+import { canonicalDealStatus, isClosedDealStatus } from '../lib/dealStatus'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('customers')
@@ -65,20 +72,6 @@ const dealCrudEvents: CrudEventsConfig = {
   }),
 }
 
-type PipelineStageSnapshot = {
-  id: string
-  pipelineId: string
-  label: string
-  order: number
-}
-
-type DealClosureOutcome = 'won' | 'lost'
-
-const TERMINAL_PIPELINE_STAGE_LABELS: Record<DealClosureOutcome, ReadonlySet<string>> = {
-  won: new Set(['won', 'win', 'closed won', 'closed win']),
-  lost: new Set(['lost', 'loose', 'closed lost', 'closed loose']),
-}
-
 type DealStageTransitionSnapshot = {
   id: string
   pipelineId: string
@@ -123,54 +116,14 @@ async function loadPipelineStageSnapshot(
   }
 }
 
-function normalizePipelineStageLabel(value: string): string {
-  return value
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, ' ')
-    .trim()
-}
-
 function resolveRequestedClosureOutcome(input: DealUpdateInput): DealClosureOutcome | null {
   if (input.closureOutcome === 'won' || input.closureOutcome === 'lost') {
     return input.closureOutcome
   }
-  if (input.status === 'win') return 'won'
-  if (input.status === 'loose') return 'lost'
-  return null
-}
-
-async function loadClosurePipelineStageSnapshot(
-  em: EntityManager,
-  input: {
-    pipelineId: string | null
-    closureOutcome: DealClosureOutcome
-    tenantId: string
-    organizationId: string
-  },
-): Promise<PipelineStageSnapshot | null> {
-  if (!input.pipelineId) return null
-
-  const stages = await findWithDecryption(
-    em,
-    CustomerPipelineStage,
-    {
-      pipelineId: input.pipelineId,
-      tenantId: input.tenantId,
-      organizationId: input.organizationId,
-    },
-    { orderBy: { order: 'ASC' } },
-    { tenantId: input.tenantId, organizationId: input.organizationId },
-  )
-  const aliases = TERMINAL_PIPELINE_STAGE_LABELS[input.closureOutcome]
-  const stage = stages.find((candidate) => aliases.has(normalizePipelineStageLabel(candidate.label)))
-  if (!stage) return null
-  return {
-    id: stage.id,
-    pipelineId: stage.pipelineId,
-    label: stage.label,
-    order: stage.order,
-  }
+  // `win` / `loose` are what the UI closure flows persist; `won` / `lost` are the
+  // spellings the AI stage tool persists. Both must derive the same closure outcome so
+  // every closed deal lands in the pipeline's terminal stage (#5107).
+  return dealClosureOutcomeFromStatus(input.status)
 }
 
 async function resolvePipelineStageValue(
@@ -739,6 +692,7 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
     let nextPipelineStageLabel: string | null = null
     let resolvedCurrentPipelineStageLabel: string | null = null
     let pipelineStageAssignmentChanged = false
+    let requestedClosureOutcome: DealClosureOutcome | null = null
 
     await runCrudCommandWrite({
       ctx,
@@ -759,7 +713,7 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
       }),
       phases: [
         async () => {
-          const requestedClosureOutcome = resolveRequestedClosureOutcome(parsed)
+          requestedClosureOutcome = resolveRequestedClosureOutcome(parsed)
           const requestedPipelineId =
             parsed.pipelineId !== undefined ? parsed.pipelineId ?? null : record.pipelineId ?? null
           const closureStageSnapshot =
@@ -828,6 +782,27 @@ const updateDealCommand: CommandHandler<DealUpdateInput, { dealId: string }> = {
           if (parsed.ownerUserId !== undefined) record.ownerUserId = parsed.ownerUserId ?? null
           if (parsed.source !== undefined) record.source = parsed.source ?? null
           if (parsed.closureOutcome !== undefined) record.closureOutcome = parsed.closureOutcome ?? null
+          // Derive the outcome only when the status spelling alone drives the closure —
+          // the same condition that triggers the terminal-stage move below — so an
+          // explicit non-terminal pipelineStageId never produces a half-closed state.
+          else if (requestedClosureOutcome && parsed.pipelineStageId === undefined) {
+            record.closureOutcome = requestedClosureOutcome
+          } else if (
+            parsed.status !== undefined &&
+            !requestedClosureOutcome &&
+            // `closed` is a seeded dictionary status: saving it is not a reopen, so only
+            // a genuinely non-closed status clears stored closure state — and only when
+            // the deal actually carries any (a no-op status echo must not wipe loss data).
+            // Canonicalize first: `dealClosureOutcomeFromStatus` above already matches
+            // case-insensitively, so matching `closed` exactly would let `Closed` through
+            // this guard and null the operator's loss notes.
+            !isClosedDealStatus(canonicalDealStatus(parsed.status)) &&
+            record.closureOutcome !== null
+          ) {
+            record.closureOutcome = null
+            if (parsed.lossReasonId === undefined) record.lossReasonId = null
+            if (parsed.lossNotes === undefined) record.lossNotes = null
+          }
           if (parsed.lossReasonId !== undefined) record.lossReasonId = parsed.lossReasonId ?? null
           if (parsed.lossNotes !== undefined) record.lossNotes = parsed.lossNotes ?? null
         },

package/src/modules/customers/i18n/de.json

@@ -1323,6 +1323,9 @@
   "customers.deals.kanban.filter.searchPlaceholder": "Search…",
   "customers.deals.kanban.filter.selected": "selected",
   "customers.deals.kanban.filter.status": "Status",
+  "customers.deals.kanban.filter.status.closed": "Geschlossen",
+  "customers.deals.kanban.filter.status.inProgress": "In Bearbeitung",
+  "customers.deals.kanban.filter.status.loading": "Status werden geladen…",
   "customers.deals.kanban.filter.status.lost": "Lost",
   "customers.deals.kanban.filter.status.open": "Open",
   "customers.deals.kanban.filter.status.title": "Filter · Status",

package/src/modules/customers/i18n/en.json

@@ -1323,6 +1323,9 @@
   "customers.deals.kanban.filter.searchPlaceholder": "Search…",
   "customers.deals.kanban.filter.selected": "selected",
   "customers.deals.kanban.filter.status": "Status",
+  "customers.deals.kanban.filter.status.closed": "Closed",
+  "customers.deals.kanban.filter.status.inProgress": "In progress",
+  "customers.deals.kanban.filter.status.loading": "Loading statuses…",
   "customers.deals.kanban.filter.status.lost": "Lost",
   "customers.deals.kanban.filter.status.open": "Open",
   "customers.deals.kanban.filter.status.title": "Filter · Status",

package/src/modules/customers/i18n/es.json

@@ -1323,6 +1323,9 @@
   "customers.deals.kanban.filter.searchPlaceholder": "Search…",
   "customers.deals.kanban.filter.selected": "selected",
   "customers.deals.kanban.filter.status": "Status",
+  "customers.deals.kanban.filter.status.closed": "Cerrado",
+  "customers.deals.kanban.filter.status.inProgress": "En curso",
+  "customers.deals.kanban.filter.status.loading": "Cargando estados…",
   "customers.deals.kanban.filter.status.lost": "Lost",
   "customers.deals.kanban.filter.status.open": "Open",
   "customers.deals.kanban.filter.status.title": "Filter · Status",

package/src/modules/customers/i18n/ko.json

@@ -1323,6 +1323,9 @@
   "customers.deals.kanban.filter.searchPlaceholder": "검색…",
   "customers.deals.kanban.filter.selected": "선택됨",
   "customers.deals.kanban.filter.status": "상태",
+  "customers.deals.kanban.filter.status.closed": "마감",
+  "customers.deals.kanban.filter.status.inProgress": "진행 중",
+  "customers.deals.kanban.filter.status.loading": "상태 로드 중…",
   "customers.deals.kanban.filter.status.lost": "실패",
   "customers.deals.kanban.filter.status.open": "열림",
   "customers.deals.kanban.filter.status.title": "필터 · 상태",

package/src/modules/customers/i18n/pl.json

@@ -1323,6 +1323,9 @@
   "customers.deals.kanban.filter.searchPlaceholder": "Szukaj…",
   "customers.deals.kanban.filter.selected": "zaznaczono",
   "customers.deals.kanban.filter.status": "Status",
+  "customers.deals.kanban.filter.status.closed": "Zamknięta",
+  "customers.deals.kanban.filter.status.inProgress": "W toku",
+  "customers.deals.kanban.filter.status.loading": "Ładowanie statusów…",
   "customers.deals.kanban.filter.status.lost": "Przegrana",
   "customers.deals.kanban.filter.status.open": "Otwarta",
   "customers.deals.kanban.filter.status.title": "Filtr · Status",

package/src/modules/customers/lib/closureStage.ts

@@ -0,0 +1,76 @@
+import type { EntityManager } from '@mikro-orm/postgresql'
+import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { CustomerPipelineStage } from '../data/entities'
+
+export type DealClosureOutcome = 'won' | 'lost'
+
+export type PipelineStageSnapshot = {
+  id: string
+  pipelineId: string
+  label: string
+  order: number
+}
+
+// Stage labels that mark a pipeline as terminal for a given closure outcome. Matching is
+// label-based because stages are tenant-configurable rows; see #5107.
+export const TERMINAL_PIPELINE_STAGE_LABELS: Record<DealClosureOutcome, ReadonlySet<string>> = {
+  won: new Set(['won', 'win', 'closed won', 'closed win']),
+  lost: new Set(['lost', 'loose', 'closed lost', 'closed loose']),
+}
+
+/**
+ * Map a deal status spelling (UI `win`/`loose` or AI `won`/`lost`) to its closure
+ * outcome. Case-insensitive because callers such as the AI tool pass free-form model
+ * text through, while every persisted status is lower-case.
+ */
+export function dealClosureOutcomeFromStatus(status: string | null | undefined): DealClosureOutcome | null {
+  const normalized = typeof status === 'string' ? status.trim().toLowerCase() : status
+  if (normalized === 'win' || normalized === 'won') return 'won'
+  if (normalized === 'loose' || normalized === 'lost') return 'lost'
+  return null
+}
+
+export function normalizePipelineStageLabel(value: string): string {
+  return value
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, ' ')
+    .trim()
+}
+
+/**
+ * Resolve the terminal stage of the deal's pipeline for a closure outcome, so every
+ * writer (command, AI tool preview) agrees on where a closed deal lands (#5107).
+ */
+export async function loadClosurePipelineStageSnapshot(
+  em: EntityManager,
+  input: {
+    pipelineId: string | null
+    closureOutcome: DealClosureOutcome
+    tenantId: string
+    organizationId: string
+  },
+): Promise<PipelineStageSnapshot | null> {
+  if (!input.pipelineId) return null
+
+  const stages = await findWithDecryption(
+    em,
+    CustomerPipelineStage,
+    {
+      pipelineId: input.pipelineId,
+      tenantId: input.tenantId,
+      organizationId: input.organizationId,
+    },
+    { orderBy: { order: 'ASC' } },
+    { tenantId: input.tenantId, organizationId: input.organizationId },
+  )
+  const aliases = TERMINAL_PIPELINE_STAGE_LABELS[input.closureOutcome]
+  const stage = stages.find((candidate) => aliases.has(normalizePipelineStageLabel(candidate.label)))
+  if (!stage) return null
+  return {
+    id: stage.id,
+    pipelineId: stage.pipelineId,
+    label: stage.label,
+    order: stage.order,
+  }
+}

package/src/modules/customers/lib/dealStatus.ts

@@ -46,3 +46,45 @@ export function isClosedDealStatus(value: string | null | undefined): boolean {
 export function isOpenDealStatus(value: string | null | undefined): boolean {
   return !isClosedDealStatus(value)
 }
+
+export function canonicalDealStatus(value: string): string {
+  const lower = value.toLowerCase()
+  if (lower === 'won') return DEAL_STATUS_WIN
+  if (lower === 'lost') return DEAL_STATUS_LOSE
+  // Canonical spellings normalize to lower-case too, so an upper-case selection still
+  // matches the lower-case persisted values and dictionary options.
+  if (lower === 'win' || lower === 'loose' || lower === 'open' || lower === 'closed') return lower
+  return value
+}
+
+/**
+ * Expand operator-selected status filter values into the canonical vocabulary so a
+ * single selection matches every spelling the supported writers persist (#5107).
+ *
+ * Alias groups (`win`/`won`, `loose`/`lost`, `closed`) are matched case-insensitively,
+ * expanded to their canonical spellings, and also keep the caller's original token so
+ * the result is always a strict superset of a verbatim match. Unknown values emit both
+ * the trimmed original and its lower-case form — mixed-case tenant dictionary statuses
+ * match exactly while `?status=Open` still hits lower-case stored rows.
+ */
+export function expandDealStatusAliases(values: string[]): string[] {
+  const out = new Set<string>()
+  for (const value of values) {
+    const trimmed = value.trim()
+    const lower = trimmed.toLowerCase()
+    if (lower === 'win' || lower === 'won') {
+      WON_DEAL_STATUS_LIST.forEach((entry) => out.add(entry))
+      out.add(trimmed)
+    } else if (lower === 'loose' || lower === 'lost') {
+      LOST_DEAL_STATUS_LIST.forEach((entry) => out.add(entry))
+      out.add(trimmed)
+    } else if (lower === 'closed') {
+      CLOSED_DEAL_STATUS_LIST.forEach((entry) => out.add(entry))
+      out.add(trimmed)
+    } else {
+      out.add(trimmed)
+      out.add(lower)
+    }
+  }
+  return Array.from(out)
+}

package/src/modules/query_index/lib/search-entity-policy.ts

@@ -0,0 +1,46 @@
+import { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'
+
+/**
+ * The canonical customer record. Every customer also has a person or company profile indexed under
+ * its own entity type, and it is the profile — not the base row — that carries the detail-page
+ * navigation.
+ */
+export const CUSTOMERS_BASE_ENTITY_TYPE = 'customers:customer_entity'
+
+/**
+ * Whether base customer rows are offered as search results.
+ *
+ * Why the knob exists: `search_tokens` is written by the query index for **every** entity a CRUD
+ * route indexes, independently of any module's `search.ts` config. `customers:customer_entity` is
+ * indexed but no module registers it for search, so its rows only ever surface a second,
+ * navigation-less copy of a customer who is already represented by their person or company
+ * profile — the duplicate reported in #5046. Worse, the duplicate was visible to superadmins only:
+ * `resolveReadableEntityTypes` narrows every other caller to entity types a module registered for
+ * search, so the same query returned different shapes for different users.
+ *
+ * Default `false`: the token strategy never returns base customer rows, so a customer appears
+ * exactly once, as their profile. `OM_SEARCH_CUSTOMERS_INDEX_BASE_ENTITY=true` restores the
+ * previous behavior, where both rows are returned and the presenter enricher's linked-result merge
+ * collapses the pair into the canonical entity result.
+ *
+ * Deliberately a **read-side** filter. `search_tokens` is not only the token-search index: the
+ * People and Companies list routes resolve their search box through
+ * `findEntityIdsBySearchTokens` on this exact entity type, and both query engines rewrite
+ * `like`/`ilike` on encrypted customer columns into the same table. Dropping the rows would
+ * silently break list search on `display_name`, `primary_email`, `description` and friends, so the
+ * rows stay and only the search strategy stops offering them.
+ */
+export function indexesCustomerBaseEntity(): boolean {
+  return parseBooleanWithDefault(process.env.OM_SEARCH_CUSTOMERS_INDEX_BASE_ENTITY, false)
+}
+
+/**
+ * Entity types the token search strategy must not return.
+ *
+ * Exposed as a list so the strategy can express the exclusion as a single `NOT IN` predicate
+ * instead of post-filtering rows it already paid to fetch — a post-filter would silently shrink
+ * the caller's `limit`.
+ */
+export function listSearchTokenExcludedEntityTypes(): string[] {
+  return indexesCustomerBaseEntity() ? [] : [CUSTOMERS_BASE_ENTITY_TYPE]
+}