@open-mercato/core 0.6.7-develop.6775.1.c2313bb8a3 → 0.6.7-develop.6784.1.f80b9afce5

package/src/modules/query_index/subscribers/delete_one.ts

@@ -1,4 +1,5 @@
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
+import { isReadProjectionAlwaysConsistent } from '@open-mercato/shared/lib/data/consistency'
 import { sql } from 'kysely'
 import { markDeleted } from '../lib/indexer'
 import { applyCoverageAdjustments, createCoverageAdjustments } from '../lib/coverage'
@@ -39,7 +40,9 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
   if (!entityType || !recordId) return
   let organizationId: string | null = payload?.organizationId ?? null
   let tenantId: string | null = payload?.tenantId ?? null
+  const suppressCoverage = payload?.suppressCoverage === true
   const coverageDelayMs = typeof payload?.coverageDelayMs === 'number' ? payload.coverageDelayMs : undefined
+  const alwaysConsistent = isReadProjectionAlwaysConsistent()
   try {
     const hasPayloadOrganizationId = Object.prototype.hasOwnProperty.call(payload ?? {}, 'organizationId')
     const hasPayloadTenantId = Object.prototype.hasOwnProperty.call(payload ?? {}, 'tenantId')
@@ -55,6 +58,68 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
     organizationId = resolvedScope.organizationId
     tenantId = resolvedScope.tenantId
 
+    if (alwaysConsistent) {
+      const db = (em as any).getKysely()
+      await db.transaction().execute(async (trx: any) => {
+        const { wasActive } = await markDeleted(em, { entityType, recordId, organizationId, tenantId, trx })
+
+        let baseQuery = trx
+          .selectFrom(source.table as any)
+          .select(['deleted_at' as any])
+          .where('id' as any, '=', recordId)
+        if (source.organizationColumn) {
+          baseQuery = baseQuery.where(
+            source.organizationColumn as any,
+            organizationId === null ? 'is' : '=',
+            organizationId as any,
+          )
+        }
+        if (source.tenantColumn) {
+          baseQuery = baseQuery.where(sql`${sql.ref(source.tenantColumn)} is not distinct from ${tenantId}`)
+        }
+        const row = await baseQuery.executeTakeFirst() as { deleted_at: Date | null } | undefined
+        const baseDelta = !row || row.deleted_at != null ? -1 : 0
+
+        const baseDeltaOverride =
+          typeof payload?.coverageBaseDelta === 'number' ? payload.coverageBaseDelta : undefined
+        const indexDeltaOverride =
+          typeof payload?.coverageIndexDelta === 'number' ? payload.coverageIndexDelta : undefined
+        let effectiveBaseDelta = baseDeltaOverride ?? baseDelta
+        let effectiveIndexDelta = indexDeltaOverride ?? (wasActive ? -1 : 0)
+
+        if (!Number.isFinite(effectiveBaseDelta)) effectiveBaseDelta = 0
+        if (!Number.isFinite(effectiveIndexDelta)) effectiveIndexDelta = 0
+
+        if (effectiveBaseDelta !== 0 || effectiveIndexDelta !== 0) {
+          const adjustments = createCoverageAdjustments({
+            entityType,
+            tenantId: tenantId ?? null,
+            organizationId: organizationId ?? null,
+            baseDelta: effectiveBaseDelta,
+            indexDelta: effectiveIndexDelta,
+          })
+          if (adjustments.length) {
+            await applyCoverageAdjustments(em, adjustments, { trx })
+          }
+        }
+      })
+
+      const bus = ctx.resolve<any>('eventBus')
+      const shouldRefreshCoverage =
+        !suppressCoverage && (coverageDelayMs === undefined || coverageDelayMs >= 0)
+      const coverageRefreshDelay = coverageDelayMs ?? 0
+      if (shouldRefreshCoverage) {
+        await bus.emitEvent('query_index.coverage.refresh', {
+          entityType,
+          tenantId: tenantId ?? null,
+          organizationId: organizationId ?? null,
+          delayMs: coverageRefreshDelay,
+        }, { rethrowHandlerErrors: true })
+      }
+      await bus.emitEvent('search.delete_record', { entityId: entityType, recordId, organizationId, tenantId }, { rethrowHandlerErrors: true })
+      return
+    }
+
     const { wasActive } = await markDeleted(em, { entityType, recordId, organizationId, tenantId })
 
     let baseDelta = 0
@@ -110,7 +175,6 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
     // awaits this subscriber) so list reads are consistent immediately. The coverage
     // recompute (a COUNT, run inline when delayMs is 0) and the fulltext delete are
     // secondary, so defer them fire-and-forget to keep write/bulk-delete latency bounded.
-    const suppressCoverage = payload?.suppressCoverage === true
     const explicitDelayRequested = typeof payload?.coverageDelayMs === 'number'
     const shouldRefreshCoverage =
       !suppressCoverage &&

package/src/modules/query_index/subscribers/upsert_one.ts

@@ -1,5 +1,6 @@
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
-import { upsertIndexRow, reindexSearchTokensForRecord } from '../lib/indexer'
+import { isReadProjectionAlwaysConsistent } from '@open-mercato/shared/lib/data/consistency'
+import { upsertIndexRow, reindexSearchTokensForRecord, type UpsertIndexResult } from '../lib/indexer'
 import { applyCoverageAdjustments, createCoverageAdjustments } from '../lib/coverage'
 import {
   loadQueryIndexRowScope,
@@ -26,6 +27,7 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
   let tenantId: string | null = payload?.tenantId ?? null
   const suppressCoverage = payload?.suppressCoverage === true
   const coverageDelayMs = typeof payload?.coverageDelayMs === 'number' ? payload.coverageDelayMs : undefined
+  const alwaysConsistent = isReadProjectionAlwaysConsistent()
   try {
     const hasPayloadOrganizationId = Object.prototype.hasOwnProperty.call(payload ?? {}, 'organizationId')
     const hasPayloadTenantId = Object.prototype.hasOwnProperty.call(payload ?? {}, 'tenantId')
@@ -44,6 +46,71 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
     const searchTokenDoc = typeof payload?.searchTokenDoc === 'object' && payload.searchTokenDoc && !Array.isArray(payload.searchTokenDoc)
       ? (payload.searchTokenDoc as Record<string, unknown>)
       : null
+    if (alwaysConsistent) {
+      const db = (em as any).getKysely()
+      let result: UpsertIndexResult | null = null
+      await db.transaction().execute(async (trx: any) => {
+        result = await upsertIndexRow(em, {
+          entityType,
+          recordId,
+          organizationId,
+          tenantId,
+          searchTokenDoc,
+          deferSearchTokens: false,
+          trx,
+        })
+        if (!suppressCoverage) {
+          const doc = result.doc
+          const isActive = !!doc && (doc.deleted_at == null || doc.deleted_at === null)
+          let baseDelta: number | undefined =
+            typeof payload?.coverageBaseDelta === 'number' ? payload.coverageBaseDelta : undefined
+          let indexDelta: number | undefined =
+            typeof payload?.coverageIndexDelta === 'number' ? payload.coverageIndexDelta : undefined
+          const crudAction = typeof payload?.crudAction === 'string' ? payload.crudAction : undefined
+
+          if (baseDelta === undefined) {
+            if (result.revived) baseDelta = 1
+            else if (crudAction === 'created') baseDelta = 1
+            else baseDelta = 0
+          }
+
+          if (indexDelta === undefined) {
+            if (isActive && (result.created || result.revived)) indexDelta = 1
+            else indexDelta = 0
+          }
+
+          if (!isActive && baseDelta > 0) baseDelta = 0
+          if (!isActive && indexDelta > 0) indexDelta = 0
+          if (!Number.isFinite(baseDelta)) baseDelta = 0
+          if (!Number.isFinite(indexDelta)) indexDelta = 0
+
+          const adjustments = createCoverageAdjustments({
+            entityType,
+            tenantId: tenantId ?? null,
+            organizationId: organizationId ?? null,
+            baseDelta,
+            indexDelta,
+          })
+          if (adjustments.length) {
+            await applyCoverageAdjustments(em, adjustments, { trx })
+          }
+        }
+      })
+
+      const bus = ctx.resolve<any>('eventBus')
+      const eventScope = { entityType, recordId, organizationId, tenantId }
+      await bus.emitEvent('query_index.vectorize_one', eventScope, { rethrowHandlerErrors: true })
+      await bus.emitEvent('search.index_record', { entityId: entityType, recordId, organizationId, tenantId }, { rethrowHandlerErrors: true })
+      if (!suppressCoverage && coverageDelayMs !== undefined && coverageDelayMs >= 0) {
+        await bus.emitEvent('query_index.coverage.refresh', {
+          entityType,
+          tenantId: tenantId ?? null,
+          organizationId: organizationId ?? null,
+          delayMs: coverageDelayMs,
+        }, { rethrowHandlerErrors: true })
+      }
+      return
+    }
     // Update the projection row synchronously so list reads (`customValues`) are
     // consistent the moment the write returns; defer the heavy search-token rebuild.
     const result = await upsertIndexRow(em, {

package/src/modules/sales/commands/documents.ts

@@ -6686,6 +6686,32 @@ async function assertShippedOrderLineEditable(
   }
 }
 
+const FULFILLED_ORDER_STATUS = "fulfilled";
+
+const isFulfilledOrder = (order: SalesOrder): boolean => {
+  const normalize = (value: string | null | undefined): string =>
+    (value ?? "").trim().toLowerCase();
+  return (
+    normalize(order.status) === FULFILLED_ORDER_STATUS ||
+    normalize(order.fulfillmentStatus) === FULFILLED_ORDER_STATUS
+  );
+};
+
+async function assertOrderAcceptsNewLine(
+  order: SalesOrder,
+  existingSnapshot: SalesLineSnapshot | null,
+): Promise<void> {
+  if (existingSnapshot) return;
+  if (!isFulfilledOrder(order)) return;
+  const { translate } = await resolveTranslations();
+  throw new CrudHttpError(409, {
+    error: translate(
+      "sales.documents.items.errorAddToFulfilled",
+      "You cannot add a new item to a fulfilled order. Change the order status first.",
+    ),
+  });
+}
+
 const orderLineUpsertCommand: CommandHandler<
   { body?: Record<string, unknown>; query?: Record<string, unknown> },
   { orderId: string; lineId: string }
@@ -6730,6 +6756,7 @@ const orderLineUpsertCommand: CommandHandler<
     const existingSnapshot = parsed.id
       ? (lineSnapshots.find((line) => line.id === parsed.id) ?? null)
       : null;
+    await assertOrderAcceptsNewLine(order, existingSnapshot);
     await assertShippedOrderLineEditable(em, order, existingSnapshot, parsed);
     const priceMode =
       parsed.priceMode === "gross"

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

@@ -967,6 +967,7 @@
   "sales.documents.items.deletedCatalogReference.title": "Dieses Katalogprodukt wurde gelöscht",
   "sales.documents.items.editTitle": "Position bearbeiten",
   "sales.documents.items.empty": "Noch keine Positionen.",
+  "sales.documents.items.errorAddToFulfilled": "Zu einem erfüllten Auftrag kann keine neue Position hinzugefügt werden. Ändere zuerst den Auftragsstatus.",
   "sales.documents.items.errorCurrency": "Währung ist erforderlich.",
   "sales.documents.items.errorDelete": "Position konnte nicht gelöscht werden.",
   "sales.documents.items.errorDeleteLast": "Eine Bestellung muss mindestens eine Position enthalten.",

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

@@ -967,6 +967,7 @@
   "sales.documents.items.deletedCatalogReference.title": "This catalog item was deleted",
   "sales.documents.items.editTitle": "Edit line",
   "sales.documents.items.empty": "No items yet.",
+  "sales.documents.items.errorAddToFulfilled": "You cannot add a new item to a fulfilled order. Change the order status first.",
   "sales.documents.items.errorCurrency": "Currency is required.",
   "sales.documents.items.errorDelete": "Failed to delete line.",
   "sales.documents.items.errorDeleteLast": "An order must contain at least one line item.",

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

@@ -967,6 +967,7 @@
   "sales.documents.items.deletedCatalogReference.title": "Este artículo del catálogo fue eliminado",
   "sales.documents.items.editTitle": "Editar línea",
   "sales.documents.items.empty": "Aún no hay artículos.",
+  "sales.documents.items.errorAddToFulfilled": "No puedes añadir un nuevo artículo a un pedido ya completado. Cambia primero el estado del pedido.",
   "sales.documents.items.errorCurrency": "La moneda es obligatoria.",
   "sales.documents.items.errorDelete": "No se pudo eliminar la línea.",
   "sales.documents.items.errorDeleteLast": "Un pedido debe contener al menos una línea.",

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

@@ -967,6 +967,7 @@
   "sales.documents.items.deletedCatalogReference.title": "Ten produkt katalogowy został usunięty",
   "sales.documents.items.editTitle": "Edytuj pozycję",
   "sales.documents.items.empty": "Brak pozycji.",
+  "sales.documents.items.errorAddToFulfilled": "Nie można dodać nowej pozycji do zrealizowanego zamówienia. Najpierw zmień status zamówienia.",
   "sales.documents.items.errorCurrency": "Waluta jest wymagana.",
   "sales.documents.items.errorDelete": "Nie udało się usunąć pozycji.",
   "sales.documents.items.errorDeleteLast": "Zamówienie musi zawierać co najmniej jedną pozycję.",

package/src/modules/staff/api/interceptors.ts

@@ -1,5 +1,5 @@
 import type { ApiInterceptor, InterceptorContext } from '@open-mercato/shared/lib/crud/api-interceptor'
-import { hasFeature } from '@open-mercato/shared/security/features'
+import { authorizeFeatures } from '@open-mercato/shared/security/featurePolicy'
 import { getStaffMemberByUserId } from '../lib/staffMemberResolver'
 
 type RbacServiceLike = {
@@ -21,7 +21,6 @@ type RbacServiceLike = {
  * from `rbacService.userHasAllFeatures`, which is cached and wildcard-aware.
  */
 async function hasManageAllFeature(context: InterceptorContext): Promise<boolean> {
-  if (hasFeature(context.userFeatures, 'staff.timesheets.manage_all')) return true
   try {
     const rbac = context.container.resolve('rbacService') as RbacServiceLike | undefined
     if (rbac?.userHasAllFeatures) {
@@ -32,9 +31,12 @@ async function hasManageAllFeature(context: InterceptorContext): Promise<boolean
       )
     }
   } catch {
-    // rbacService not available — fall through to deny
+    // Fall back to the already-loaded snapshot below.
   }
-  return false
+  return authorizeFeatures(
+    ['staff.timesheets.manage_all'],
+    { grantedFeatures: context.userFeatures ?? [] },
+  )
 }
 
 export const interceptors: ApiInterceptor[] = [

package/src/modules/sync_excel/api/upload/route.ts

@@ -10,7 +10,12 @@ import { buildSuggestedMapping } from '../../lib/mapping'
 import { parseCsvPreview } from '../../lib/parser'
 import { createSyncExcelUploadAttachment } from '../../lib/upload-storage'
 import { resolveSyncExcelConcreteScope } from '../../lib/scope'
-import { isMultipartRequestWithinUploadLimit, resolveDefaultAttachmentMaxUploadBytes } from '../../../attachments/lib/upload-limits'
+import {
+  isMultipartRequestWithinUploadLimit,
+  isMultipartUploadLimitError,
+  parseMultipartFormDataWithinUploadLimit,
+  resolveDefaultAttachmentMaxUploadBytes,
+} from '../../../attachments/lib/upload-limits'
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['sync_excel.run'] },
@@ -67,7 +72,15 @@ export async function POST(request: Request) {
     return NextResponse.json({ error: 'CSV upload exceeds the maximum upload size.' }, { status: 413 })
   }
 
-  const formData = await request.formData()
+  let formData: FormData
+  try {
+    formData = await parseMultipartFormDataWithinUploadLimit(request)
+  } catch (error) {
+    if (isMultipartUploadLimitError(error)) {
+      return NextResponse.json({ error: 'CSV upload exceeds the maximum upload size.' }, { status: 413 })
+    }
+    throw error
+  }
   const parsedPayload = multipartSchema.safeParse({
     entityType: typeof formData.get('entityType') === 'string' ? formData.get('entityType') : undefined,
   })

package/src/modules/workflows/lib/activity-executor.ts

@@ -22,7 +22,6 @@ import {
   type HostLookup,
 } from '@open-mercato/shared/lib/url-safety'
 import { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'
-import { hasAllFeatures } from '@open-mercato/shared/security/features'
 import { callWebhookConfigSchema } from '../data/validators'
 import { WorkflowActivityJob, WORKFLOW_ACTIVITIES_QUEUE_NAME } from './activity-queue-types'
 import { logWorkflowEvent } from './event-logger'
@@ -163,27 +162,29 @@ export interface ActivityContext {
 }
 
 type RbacFeatureResolver = {
-  getGrantedFeatures: (
+  userHasAllFeatures: (
     userId: string,
+    required: string[],
     opts: { tenantId: string | null; organizationId: string | null }
-  ) => Promise<string[]>
+  ) => Promise<boolean>
 }
 
-async function resolveWorkflowUserFeatures(
+async function workflowUserHasAllFeatures(
   container: AwilixContainer,
   userId: string,
+  required: readonly string[],
   tenantId: string | null,
   organizationId: string | null
-): Promise<string[]> {
+): Promise<boolean> {
   try {
     const rbac = container.resolve('rbacService') as RbacFeatureResolver | undefined
-    if (rbac?.getGrantedFeatures) {
-      return await rbac.getGrantedFeatures(userId, { tenantId, organizationId })
+    if (rbac?.userHasAllFeatures) {
+      return await rbac.userHasAllFeatures(userId, [...required], { tenantId, organizationId })
     }
   } catch {
     // Fail closed below when the workflow executor cannot prove the actor's grants.
   }
-  return []
+  return false
 }
 
 export interface ActivityExecutionResult {
@@ -681,13 +682,14 @@ export async function executeUpdateEntity(
     throw new Error('UPDATE_ENTITY requires an authenticated workflow user')
   }
 
-  const userFeatures = await resolveWorkflowUserFeatures(
+  const authorized = await workflowUserHasAllFeatures(
     container,
     actorUserId,
+    workflowSafeCommand.requiredFeatures,
     context.workflowInstance.tenantId,
     context.workflowInstance.organizationId
   )
-  if (!hasAllFeatures(userFeatures, workflowSafeCommand.requiredFeatures)) {
+  if (!authorized) {
     throw new Error('UPDATE_ENTITY command is not authorized')
   }