@open-mercato/core 0.6.7-develop.6766.1.40c9011995 → 0.6.7-develop.6770.1.b52298cf20

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

@@ -0,0 +1,211 @@
+import type { EntityManager as CoreEntityManager } from '@mikro-orm/core'
+import type { EntityManager as PgEntityManager } from '@mikro-orm/postgresql'
+import { fetchStuckDealIds } from './stuckDeals'
+
+type DateWindow = {
+  start: Date
+  end: Date
+}
+
+export type OpenPipelineRow = {
+  stage: string | null
+  currency: string | null
+  total: string | number | null
+  count: string | number
+  owner_user_id: string | null
+}
+
+export type WindowSumRow = {
+  currency: string | null
+  current_total: string | number | null
+  current_count: string | number
+  previous_total: string | number | null
+  previous_count: string | number
+}
+
+export type WinLossRow = {
+  current_won: string | number
+  current_lost: string | number
+  previous_won: string | number
+  previous_lost: string | number
+}
+
+export type WinRateMonthRow = {
+  period: string
+  won: string | number
+  lost: string | number
+}
+
+export type DealsSummaryQueryRows = {
+  openRows: OpenPipelineRow[]
+  inflowRows: WindowSumRow[]
+  wonRows: WindowSumRow[]
+  winLossRows: WinLossRow[]
+  seriesRows: WinRateMonthRow[]
+  overdueRows: Array<{ id: string }>
+  openStuckIds: string[]
+}
+
+export type DealsSummaryQueryInput = {
+  em: CoreEntityManager
+  tenantId: string
+  organizationIds: string[]
+  currentQuarter: DateWindow
+  previousQuarter: DateWindow
+  seriesStart: Date
+}
+
+type SqlPredicate = {
+  clause: string
+  values: string[]
+}
+
+export function buildOpenDealPredicate(statuses: readonly string[]): SqlPredicate {
+  if (statuses.length === 0) {
+    throw new Error('[internal] Open-deal predicate requires at least one status')
+  }
+
+  const placeholders = statuses.map(() => '?').join(',')
+  return {
+    clause: `status IN (${placeholders}) AND closure_outcome IS NULL`,
+    values: [...statuses],
+  }
+}
+
+export async function loadDealsSummaryQueryRows(input: DealsSummaryQueryInput): Promise<DealsSummaryQueryRows> {
+  if (input.organizationIds.length === 0) {
+    throw new Error('[internal] Deals summary query requires an organization scope')
+  }
+
+  const connection = input.em.getConnection()
+  const organizationPlaceholders = input.organizationIds.map(() => '?').join(',')
+  const scopeWhere = `tenant_id = ? AND organization_id IN (${organizationPlaceholders}) AND deleted_at IS NULL`
+  const scopeValues: Array<string | number | null> = [input.tenantId, ...input.organizationIds]
+  const openDealsPredicate = buildOpenDealPredicate(['open', 'in_progress'])
+
+  const openRows = await connection.execute<OpenPipelineRow[]>(
+    `SELECT
+        pipeline_stage AS stage,
+        UPPER(COALESCE(value_currency, '')) AS currency,
+        COALESCE(SUM(value_amount), 0) AS total,
+        COUNT(*) AS count,
+        owner_user_id
+      FROM customer_deals
+      WHERE ${scopeWhere} AND ${openDealsPredicate.clause}
+      GROUP BY pipeline_stage, UPPER(COALESCE(value_currency, '')), owner_user_id`,
+    [...scopeValues, ...openDealsPredicate.values],
+  )
+
+  const inflowRows = await connection.execute<WindowSumRow[]>(
+    `SELECT
+        UPPER(COALESCE(value_currency, '')) AS currency,
+        COALESCE(SUM(value_amount) FILTER (WHERE created_at >= ? AND created_at < ?), 0) AS current_total,
+        COUNT(*) FILTER (WHERE created_at >= ? AND created_at < ?) AS current_count,
+        COALESCE(SUM(value_amount) FILTER (WHERE created_at >= ? AND created_at < ?), 0) AS previous_total,
+        COUNT(*) FILTER (WHERE created_at >= ? AND created_at < ?) AS previous_count
+      FROM customer_deals
+      WHERE ${scopeWhere} AND ${openDealsPredicate.clause}
+      GROUP BY UPPER(COALESCE(value_currency, ''))`,
+    [
+      input.currentQuarter.start.toISOString(),
+      input.currentQuarter.end.toISOString(),
+      input.currentQuarter.start.toISOString(),
+      input.currentQuarter.end.toISOString(),
+      input.previousQuarter.start.toISOString(),
+      input.previousQuarter.end.toISOString(),
+      input.previousQuarter.start.toISOString(),
+      input.previousQuarter.end.toISOString(),
+      ...scopeValues,
+      ...openDealsPredicate.values,
+    ],
+  )
+
+  const wonRows = await connection.execute<WindowSumRow[]>(
+    `SELECT
+        UPPER(COALESCE(value_currency, '')) AS currency,
+        COALESCE(SUM(value_amount) FILTER (WHERE updated_at >= ? AND updated_at < ?), 0) AS current_total,
+        COUNT(*) FILTER (WHERE updated_at >= ? AND updated_at < ?) AS current_count,
+        COALESCE(SUM(value_amount) FILTER (WHERE updated_at >= ? AND updated_at < ?), 0) AS previous_total,
+        COUNT(*) FILTER (WHERE updated_at >= ? AND updated_at < ?) AS previous_count
+      FROM customer_deals
+      WHERE ${scopeWhere} AND (status = 'win' OR closure_outcome = 'won')
+      GROUP BY UPPER(COALESCE(value_currency, ''))`,
+    [
+      input.currentQuarter.start.toISOString(),
+      input.currentQuarter.end.toISOString(),
+      input.currentQuarter.start.toISOString(),
+      input.currentQuarter.end.toISOString(),
+      input.previousQuarter.start.toISOString(),
+      input.previousQuarter.end.toISOString(),
+      input.previousQuarter.start.toISOString(),
+      input.previousQuarter.end.toISOString(),
+      ...scopeValues,
+    ],
+  )
+
+  const winLossRows = await connection.execute<WinLossRow[]>(
+    `SELECT
+        COUNT(*) FILTER (WHERE (status = 'win' OR closure_outcome = 'won') AND updated_at >= ? AND updated_at < ?) AS current_won,
+        COUNT(*) FILTER (WHERE (status = 'loose' OR closure_outcome = 'lost') AND updated_at >= ? AND updated_at < ?) AS current_lost,
+        COUNT(*) FILTER (WHERE (status = 'win' OR closure_outcome = 'won') AND updated_at >= ? AND updated_at < ?) AS previous_won,
+        COUNT(*) FILTER (WHERE (status = 'loose' OR closure_outcome = 'lost') AND updated_at >= ? AND updated_at < ?) AS previous_lost
+      FROM customer_deals
+      WHERE ${scopeWhere}`,
+    [
+      input.currentQuarter.start.toISOString(),
+      input.currentQuarter.end.toISOString(),
+      input.currentQuarter.start.toISOString(),
+      input.currentQuarter.end.toISOString(),
+      input.previousQuarter.start.toISOString(),
+      input.previousQuarter.end.toISOString(),
+      input.previousQuarter.start.toISOString(),
+      input.previousQuarter.end.toISOString(),
+      ...scopeValues,
+    ],
+  )
+
+  const seriesRows = await connection.execute<WinRateMonthRow[]>(
+    `SELECT
+        to_char(date_trunc('month', updated_at AT TIME ZONE 'UTC'), 'YYYY-MM') AS period,
+        COUNT(*) FILTER (WHERE status = 'win' OR closure_outcome = 'won') AS won,
+        COUNT(*) FILTER (WHERE status = 'loose' OR closure_outcome = 'lost') AS lost
+      FROM customer_deals
+      WHERE ${scopeWhere} AND updated_at >= ?
+      GROUP BY 1`,
+    [...scopeValues, input.seriesStart.toISOString()],
+  )
+
+  const overdueDealsPredicate = buildOpenDealPredicate(['open'])
+  const overdueRows = await connection.execute<Array<{ id: string }>>(
+    `SELECT id FROM customer_deals
+      WHERE ${scopeWhere} AND ${overdueDealsPredicate.clause} AND expected_close_at IS NOT NULL AND expected_close_at < CURRENT_DATE`,
+    [...scopeValues, ...overdueDealsPredicate.values],
+  )
+
+  const stuckIdLists = await Promise.all(
+    input.organizationIds.map((organizationId) =>
+      fetchStuckDealIds(input.em as unknown as PgEntityManager, organizationId, input.tenantId),
+    ),
+  )
+  const stuckIdValues = Array.from(new Set(stuckIdLists.flat()))
+  let openStuckIds: string[] = []
+  if (stuckIdValues.length > 0) {
+    const stuckPlaceholders = stuckIdValues.map(() => '?').join(',')
+    const openStuckRows: Array<{ id: string }> = await connection.execute<Array<{ id: string }>>(
+      `SELECT id FROM customer_deals
+        WHERE ${scopeWhere} AND ${openDealsPredicate.clause} AND id IN (${stuckPlaceholders})`,
+      [...scopeValues, ...openDealsPredicate.values, ...stuckIdValues],
+    )
+    openStuckIds = openStuckRows.map((row) => row.id)
+  }
+
+  return {
+    openRows,
+    inflowRows,
+    wonRows,
+    winLossRows,
+    seriesRows,
+    overdueRows,
+    openStuckIds,
+  }
+}

package/src/modules/directory/backend/directory/organizations/[id]/edit/page.tsx

@@ -5,7 +5,6 @@ import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 import { E } from '#generated/entities.ids.generated'
 import { OrganizationSelect } from '@open-mercato/core/modules/directory/components/OrganizationSelect'
-import { TenantSelect } from '@open-mercato/core/modules/directory/components/TenantSelect'
 import {
   buildOrganizationTreeOptions,
   type OrganizationTreeNode,
@@ -52,6 +51,7 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
   const [initialValues, setInitialValues] = React.useState<Record<string, unknown> | null>(null)
   const [pathLabel, setPathLabel] = React.useState<string>('')
   const [tenantId, setTenantId] = React.useState<string | null>(null)
+  const [tenantName, setTenantName] = React.useState<string | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
   const [isNotFound, setIsNotFound] = React.useState(false)
@@ -133,6 +133,7 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
         }
         const resolvedTenantId = record.tenantId || null
         setTenantId(resolvedTenantId)
+        setTenantName(record.tenantName ?? null)
         const baseTree = await loadParentTree(resolvedTenantId, record.descendantIds ?? [])
         const fullTree = buildOrganizationTreeOptions(baseTree)
         const nodeMap = new Map(fullTree.map((opt) => [opt.value, opt]))
@@ -199,18 +200,13 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
         id: 'tenantId',
         label: t('directory.organizations.form.field.tenant', 'Tenant'),
         type: 'custom',
-        component: ({ value, setValue }) => (
-          <TenantSelect
-            id="tenantId"
-            value={typeof value === 'string' ? value : tenantId}
-            onChange={(next) => {
-              const normalized = next ?? null
-              setTenantId(normalized)
-              setValue(normalized)
-            }}
-            includeEmptyOption={false}
-            className="w-full h-9 rounded border px-2 text-sm"
-          />
+        component: () => (
+          <div>
+            <p className="text-sm">{tenantName ?? '—'}</p>
+            <p className="mt-1 text-xs text-muted-foreground">
+              {t('directory.organizations.form.field.tenantReadonlyDescription', 'Tenant cannot be changed for an existing organization.')}
+            </p>
+          </div>
         ),
       } as CrudField,
     ] : []),
@@ -260,7 +256,7 @@ export default function EditOrganizationPage({ params }: { params?: { id?: strin
       },
     },
     { id: 'isActive', label: t('directory.organizations.form.field.isActive', 'Active'), type: 'checkbox' },
-  ], [actorIsSuperAdmin, childSummary, parentTree, t, tenantId])
+  ], [actorIsSuperAdmin, childSummary, parentTree, t, tenantId, tenantName])
 
   const detailFields = React.useMemo(() => (
     actorIsSuperAdmin

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

@@ -52,6 +52,7 @@
   "directory.organizations.form.field.slug": "Slug",
   "directory.organizations.form.field.slug.description": "URL-sicherer Bezeichner für das Kundenportal (Kleinbuchstaben, Zahlen, Bindestriche, Unterstriche).",
   "directory.organizations.form.field.tenant": "Mandant",
+  "directory.organizations.form.field.tenantReadonlyDescription": "Der Mandant kann für eine bestehende Organisation nicht geändert werden.",
   "directory.organizations.form.group.customFields": "Benutzerdefinierte Daten",
   "directory.organizations.form.group.details": "Details",
   "directory.organizations.form.loading": "Organisation wird geladen...",

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

@@ -52,6 +52,7 @@
   "directory.organizations.form.field.slug": "Slug",
   "directory.organizations.form.field.slug.description": "URL-safe identifier used for the customer portal (lowercase letters, numbers, hyphens, underscores).",
   "directory.organizations.form.field.tenant": "Tenant",
+  "directory.organizations.form.field.tenantReadonlyDescription": "Tenant cannot be changed for an existing organization.",
   "directory.organizations.form.group.customFields": "Custom Data",
   "directory.organizations.form.group.details": "Details",
   "directory.organizations.form.loading": "Loading organization...",

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

@@ -52,6 +52,7 @@
   "directory.organizations.form.field.slug": "Slug",
   "directory.organizations.form.field.slug.description": "Identificador seguro para URL usado en el portal de clientes (minúsculas, números, guiones, guiones bajos).",
   "directory.organizations.form.field.tenant": "Inquilino",
+  "directory.organizations.form.field.tenantReadonlyDescription": "El inquilino no se puede cambiar para una organización existente.",
   "directory.organizations.form.group.customFields": "Datos personalizados",
   "directory.organizations.form.group.details": "Detalles",
   "directory.organizations.form.loading": "Cargando organización...",

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

@@ -52,6 +52,7 @@
   "directory.organizations.form.field.slug": "Identyfikator URL",
   "directory.organizations.form.field.slug.description": "Identyfikator używany w adresie portalu klienta (małe litery, cyfry, myślniki, podkreślenia).",
   "directory.organizations.form.field.tenant": "Najemca",
+  "directory.organizations.form.field.tenantReadonlyDescription": "Najemcy nie można zmienić dla istniejącej organizacji.",
   "directory.organizations.form.group.customFields": "Dane niestandardowe",
   "directory.organizations.form.group.details": "Szczegóły",
   "directory.organizations.form.loading": "Ładowanie organizacji...",