@open-mercato/core 0.6.7-develop.6552.1.5208a19369 → 0.6.7-develop.6565.1.1026d85fff

package/src/modules/sales/api/notes/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { makeCrudRoute, type CrudCtx } from '@open-mercato/shared/lib/crud/factory'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
@@ -97,9 +97,7 @@ async function loadNoteForPermission(
   })
 
   if (!note) {
-    throw new CrudHttpError(404, {
-      error: translate('sales.documents.detail.error', 'Document not found or inaccessible.'),
-    })
+    throw notFound(translate('sales.documents.detail.error', 'Document not found or inaccessible.'))
   }
 
   return note

package/src/modules/sales/api/quotes/accept/route.ts

@@ -3,7 +3,7 @@ import { z } from 'zod'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { LockMode } from '@mikro-orm/core'
@@ -93,7 +93,7 @@ export async function POST(req: Request) {
         )
       const quote = (await findQuoteByToken(hashedToken)) ?? (await findQuoteByToken(token))
       if (!quote) {
-        throw new CrudHttpError(404, { error: translate('sales.quotes.accept.notFound', 'Quote not found.') })
+        throw notFound(translate('sales.quotes.accept.notFound', 'Quote not found.'))
       }
 
       const now = new Date()

package/src/modules/sales/api/quotes/public/[token]/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
 import { z } from "zod";
 import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
-import { CrudHttpError, isCrudHttpError } from "@open-mercato/shared/lib/crud/errors";
+import { isCrudHttpError, notFound } from "@open-mercato/shared/lib/crud/errors";
 import type { OpenApiRouteDoc } from "@open-mercato/shared/lib/openapi";
 import type { EntityManager } from "@mikro-orm/postgresql";
 import { findOneWithDecryption, findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
@@ -43,16 +43,12 @@ export async function GET(req: Request, ctx: { params: { token: string } }) {
       }));
     const { translate } = await resolveTranslations();
     if (!quote) {
-      throw new CrudHttpError(404, {
-        error: translate("sales.quotes.public.notFound", "Quote not found."),
-      });
+      throw notFound(translate("sales.quotes.public.notFound", "Quote not found."));
     }
 
     const auth = await getAuthFromRequest(req);
     if (auth?.tenantId && quote.tenantId !== auth.tenantId) {
-      throw new CrudHttpError(404, {
-        error: translate("sales.quotes.public.notFound", "Quote not found."),
-      });
+      throw notFound(translate("sales.quotes.public.notFound", "Quote not found."));
     }
 
     const now = new Date();

package/src/modules/sales/api/quotes/send/route.ts

@@ -5,7 +5,7 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { resolveTranslations, detectLocale } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import {
   bridgeLegacyGuard,
@@ -151,7 +151,7 @@ export async function POST(req: Request) {
     const tenantScope = ctx.auth?.tenantId ? { tenantId: ctx.auth.tenantId } : undefined
     const quote = await findOneWithDecryption(em, SalesQuote, { id: input.quoteId, deletedAt: null }, {}, tenantScope)
     if (!quote) {
-      throw new CrudHttpError(404, { error: translate('sales.documents.detail.error', 'Document not found or inaccessible.') })
+      throw notFound(translate('sales.documents.detail.error', 'Document not found or inaccessible.'))
     }
     if (quote.tenantId !== ctx.auth?.tenantId || quote.organizationId !== ctx.selectedOrganizationId) {
       throw new CrudHttpError(403, { error: translate('sales.documents.errors.forbidden', 'Forbidden') })

package/src/modules/sales/api/returns/[id]/route.ts

@@ -6,7 +6,7 @@ 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 { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { SalesReturn, SalesReturnLine } from '../../../data/entities'
 import { createLogger } from '@open-mercato/shared/lib/logger'
@@ -56,7 +56,7 @@ export async function GET(req: Request, ctx: { params: { id: string } }) {
       { tenantId: auth.tenantId, organizationId },
     )
     if (!header || !header.order) {
-      throw new CrudHttpError(404, { error: translate('sales.returns.notFound', 'Return not found.') })
+      throw notFound(translate('sales.returns.notFound', 'Return not found.'))
     }
 
     const lines = await findWithDecryption(

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

@@ -9,7 +9,7 @@ import {
   emitCrudUndoSideEffects,
 } from '@open-mercato/shared/lib/commands/helpers'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { notFound } from '@open-mercato/shared/lib/crud/errors'
 import { loadCustomFieldSnapshot, buildCustomFieldResetMap } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
 import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
@@ -751,7 +751,7 @@ const updateChannelCommand: CommandHandler<ChannelUpdateInput, { channelId: stri
     const { parsed, custom } = parseWithCustomFields(channelUpdateSchema, rawInput)
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const record = await findOneWithDecryption(em, SalesChannel, { id: parsed.id, deletedAt: null }, {}, { tenantId: parsed.tenantId, organizationId: parsed.organizationId })
-    if (!record) throw new CrudHttpError(404, { error: 'Channel not found' })
+    if (!record) throw notFound('Channel not found')
     const dataEngine = ctx.container.resolve('dataEngine') as DataEngine
     const scope = resolveScopeFromUpdate(record, parsed, ctx)
 
@@ -899,7 +899,7 @@ const deleteChannelCommand: CommandHandler<
     const id = requireId(input, 'Channel id is required')
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const record = await findOneWithDecryption(em, SalesChannel, { id }, {})
-    if (!record) throw new CrudHttpError(404, { error: 'Channel not found' })
+    if (!record) throw notFound('Channel not found')
     ensureTenantScope(ctx, record.tenantId)
     ensureOrganizationScope(ctx, record.organizationId)
     em.remove(record)
@@ -1097,7 +1097,7 @@ const updateDeliveryWindowCommand: CommandHandler<
     const { parsed, custom } = parseWithCustomFields(deliveryWindowUpdateSchema, rawInput)
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const record = await em.findOne(SalesDeliveryWindow, { id: parsed.id, deletedAt: null })
-    if (!record) throw new CrudHttpError(404, { error: 'Delivery window not found' })
+    if (!record) throw notFound('Delivery window not found')
     const scope = resolveScopeFromUpdate(record, parsed, ctx)
     record.organizationId = scope.organizationId
     record.tenantId = scope.tenantId
@@ -1201,7 +1201,7 @@ const deleteDeliveryWindowCommand: CommandHandler<
     const id = requireId(input, 'Delivery window id is required')
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const record = await em.findOne(SalesDeliveryWindow, { id })
-    if (!record) throw new CrudHttpError(404, { error: 'Delivery window not found' })
+    if (!record) throw notFound('Delivery window not found')
     ensureTenantScope(ctx, record.tenantId)
     ensureOrganizationScope(ctx, record.organizationId)
     em.remove(record)
@@ -1377,7 +1377,7 @@ const updateShippingMethodCommand: CommandHandler<
     const { parsed, custom } = parseWithCustomFields(shippingMethodUpdateSchema, rawInput)
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const record = await em.findOne(SalesShippingMethod, { id: parsed.id, deletedAt: null })
-    if (!record) throw new CrudHttpError(404, { error: 'Shipping method not found' })
+    if (!record) throw notFound('Shipping method not found')
     const scope = resolveScopeFromUpdate(record, parsed, ctx)
     record.organizationId = scope.organizationId
     record.tenantId = scope.tenantId
@@ -1501,7 +1501,7 @@ const deleteShippingMethodCommand: CommandHandler<
     const id = requireId(input, 'Shipping method id is required')
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const record = await em.findOne(SalesShippingMethod, { id })
-    if (!record) throw new CrudHttpError(404, { error: 'Shipping method not found' })
+    if (!record) throw notFound('Shipping method not found')
     ensureTenantScope(ctx, record.tenantId)
     ensureOrganizationScope(ctx, record.organizationId)
     em.remove(record)
@@ -1672,7 +1672,7 @@ const updatePaymentMethodCommand: CommandHandler<
     const { parsed, custom } = parseWithCustomFields(paymentMethodUpdateSchema, rawInput)
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const record = await em.findOne(SalesPaymentMethod, { id: parsed.id, deletedAt: null })
-    if (!record) throw new CrudHttpError(404, { error: 'Payment method not found' })
+    if (!record) throw notFound('Payment method not found')
     const scope = resolveScopeFromUpdate(record, parsed, ctx)
     record.organizationId = scope.organizationId
     record.tenantId = scope.tenantId
@@ -1785,7 +1785,7 @@ const deletePaymentMethodCommand: CommandHandler<
     const id = requireId(input, 'Payment method id is required')
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const record = await em.findOne(SalesPaymentMethod, { id })
-    if (!record) throw new CrudHttpError(404, { error: 'Payment method not found' })
+    if (!record) throw notFound('Payment method not found')
     ensureTenantScope(ctx, record.tenantId)
     ensureOrganizationScope(ctx, record.organizationId)
     em.remove(record)
@@ -1971,7 +1971,7 @@ const updateTaxRateCommand: CommandHandler<TaxRateUpdateInput, { taxRateId: stri
     const { parsed, custom } = parseWithCustomFields(taxRateUpdateSchema, rawInput)
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const record = await em.findOne(SalesTaxRate, { id: parsed.id, deletedAt: null })
-    if (!record) throw new CrudHttpError(404, { error: 'Tax rate not found' })
+    if (!record) throw notFound('Tax rate not found')
     const scope = resolveScopeFromUpdate(record, parsed, ctx)
     record.organizationId = scope.organizationId
     record.tenantId = scope.tenantId
@@ -2102,7 +2102,7 @@ const deleteTaxRateCommand: CommandHandler<
     const id = requireId(input, 'Tax rate id is required')
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const record = await em.findOne(SalesTaxRate, { id })
-    if (!record) throw new CrudHttpError(404, { error: 'Tax rate not found' })
+    if (!record) throw notFound('Tax rate not found')
     ensureTenantScope(ctx, record.tenantId)
     ensureOrganizationScope(ctx, record.organizationId)
     const snapshot = await loadTaxRateSnapshot((ctx.container.resolve('em') as EntityManager), id)

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

@@ -4,7 +4,7 @@ import { registerCommand, type CommandHandler } from '@open-mercato/shared/lib/c
 import { emitCrudSideEffects } from '@open-mercato/shared/lib/commands/helpers'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
 import {
   documentAddressCreateSchema,
   documentAddressDeleteSchema,
@@ -106,7 +106,7 @@ function applyDocumentAddressSnapshot(em: EntityManager, entity: SalesDocumentAd
 
 function assertDocumentAddressParent(entity: SalesDocumentAddress, input: { documentId: string; documentKind: 'order' | 'quote' }): void {
   if (entity.documentId !== input.documentId || entity.documentKind !== input.documentKind) {
-    throw new CrudHttpError(404, { error: 'sales.document.address.not_found' })
+    throw notFound('sales.document.address.not_found')
   }
 }
 
@@ -145,7 +145,7 @@ async function requireDocument(
   const repo = kind === 'order' ? SalesOrder : SalesQuote
   const doc = await findOneWithDecryption(em, repo, { id, organizationId, tenantId }, {}, { tenantId, organizationId })
   if (!doc) {
-    throw new CrudHttpError(404, { error: 'sales.document.not_found' })
+    throw notFound('sales.document.not_found')
   }
   return doc
 }

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

@@ -15,7 +15,7 @@ import { LockMode } from "@mikro-orm/core";
 import type { EntityManager } from "@mikro-orm/postgresql";
 import type { EventBus } from "@open-mercato/events";
 import type { DataEngine } from "@open-mercato/shared/lib/data/engine";
-import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
+import { CrudHttpError, notFound } from "@open-mercato/shared/lib/crud/errors";
 import {
   deriveResourceFromCommandId,
   invalidateCrudCache,
@@ -4854,7 +4854,7 @@ const deleteQuoteCommand: CommandHandler<
     const em = (ctx.container.resolve("em") as EntityManager).fork();
     const quote = await findOneWithDecryption(em, SalesQuote, { id });
     if (!quote)
-      throw new CrudHttpError(404, { error: "Sales quote not found" });
+      throw notFound("Sales quote not found");
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     const [addresses, notes, tags, adjustments, lines] = await Promise.all([
       findWithDecryption(
@@ -4984,7 +4984,7 @@ const updateQuoteCommand: CommandHandler<
       deletedAt: null,
     });
     if (!quote)
-      throw new CrudHttpError(404, { error: "Sales quote not found" });
+      throw notFound("Sales quote not found");
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
     const shouldInvalidateSentToken = (quote.status ?? null) === "sent";
@@ -5216,7 +5216,7 @@ const updateOrderCommand: CommandHandler<
       deletedAt: null,
     });
     if (!order)
-      throw new CrudHttpError(404, { error: "Sales order not found" });
+      throw notFound("Sales order not found");
     ensureOrderScope(ctx, order.organizationId, order.tenantId);
     await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER);
     const previousStatus = normalizeStatusValue(order.status);
@@ -5861,7 +5861,7 @@ const deleteOrderCommand: CommandHandler<
     const em = (ctx.container.resolve("em") as EntityManager).fork();
     const order = await findOneWithDecryption(em, SalesOrder, { id });
     if (!order)
-      throw new CrudHttpError(404, { error: "Sales order not found" });
+      throw notFound("Sales order not found");
     ensureOrderScope(ctx, order.organizationId, order.tenantId);
     const shipments = await em.find(SalesShipment, { order: order.id });
     const shipmentIds = shipments.map((entry) => entry.id);
@@ -6055,22 +6055,18 @@ const convertQuoteToOrderCommand: CommandHandler<
       );
       const { translate } = await resolveTranslations();
       if (!quote)
-        throw new CrudHttpError(404, {
-          error: translate(
+        throw notFound(translate(
             "sales.documents.detail.error",
             "Document not found or inaccessible.",
-          ),
-        });
+          ));
       ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
       await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
       const snapshot = await loadQuoteSnapshot(em, payload.quoteId);
       if (!snapshot)
-        throw new CrudHttpError(404, {
-          error: translate(
+        throw notFound(translate(
             "sales.documents.detail.error",
             "Document not found or inaccessible.",
-          ),
-        });
+          ));
       const orderId = payload.orderId ?? quote.id;
       const existingOrder = await findOneWithDecryption(em, SalesOrder, {
         id: orderId,
@@ -6613,7 +6609,7 @@ const orderLineUpsertCommand: CommandHandler<
       deletedAt: null,
     });
     if (!order)
-      throw new CrudHttpError(404, { error: "Sales order not found" });
+      throw notFound("Sales order not found");
     ensureOrderScope(ctx, order.organizationId, order.tenantId);
     await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER);
 
@@ -6930,12 +6926,10 @@ const orderLineDeleteCommand: CommandHandler<
       deletedAt: null,
     });
     if (!order)
-      throw new CrudHttpError(404, {
-        error: translate(
+      throw notFound(translate(
           "sales.documents.detail.error",
           "Document not found or inaccessible.",
-        ),
-      });
+        ));
     ensureOrderScope(ctx, order.organizationId, order.tenantId);
     await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER);
     const shipmentCount = await em.count(SalesShipmentItem, {
@@ -6962,12 +6956,10 @@ const orderLineDeleteCommand: CommandHandler<
     );
     const filtered = existingLines.filter((line) => line.id !== parsed.id);
     if (filtered.length === existingLines.length) {
-      throw new CrudHttpError(404, {
-        error: translate(
+      throw notFound(translate(
           "sales.documents.detail.error",
           "Document not found or inaccessible.",
-        ),
-      });
+        ));
     }
     const sourceInputs = filtered.map((line, index) => ({
       ...mapOrderLineEntityToSnapshot(line),
@@ -7106,7 +7098,7 @@ const quoteLineUpsertCommand: CommandHandler<
       deletedAt: null,
     });
     if (!quote)
-      throw new CrudHttpError(404, { error: "Sales quote not found" });
+      throw notFound("Sales quote not found");
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
     const [existingLines, adjustments] = await Promise.all([
@@ -7418,7 +7410,7 @@ const quoteLineDeleteCommand: CommandHandler<
       deletedAt: null,
     });
     if (!quote)
-      throw new CrudHttpError(404, { error: "Sales quote not found" });
+      throw notFound("Sales quote not found");
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
     const existingLines = await em.find(
@@ -7433,7 +7425,7 @@ const quoteLineDeleteCommand: CommandHandler<
     );
     const filtered = existingLines.filter((line) => line.id !== parsed.id);
     if (filtered.length === existingLines.length) {
-      throw new CrudHttpError(404, { error: "Quote line not found" });
+      throw notFound("Quote line not found");
     }
     const sourceInputs = filtered.map((line, index) => ({
       ...mapQuoteLineEntityToSnapshot(line),
@@ -7572,7 +7564,7 @@ const orderAdjustmentUpsertCommand: CommandHandler<
       deletedAt: null,
     });
     if (!order)
-      throw new CrudHttpError(404, { error: "Sales order not found" });
+      throw notFound("Sales order not found");
     ensureOrderScope(ctx, order.organizationId, order.tenantId);
     await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER);
     if (parsed.scope === "line") {
@@ -7866,7 +7858,7 @@ const orderAdjustmentDeleteCommand: CommandHandler<
       deletedAt: null,
     });
     if (!order)
-      throw new CrudHttpError(404, { error: "Sales order not found" });
+      throw notFound("Sales order not found");
     ensureOrderScope(ctx, order.organizationId, order.tenantId);
     await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER);
 
@@ -7880,7 +7872,7 @@ const orderAdjustmentDeleteCommand: CommandHandler<
     ]);
     const filtered = adjustments.filter((adj) => adj.id !== parsed.id);
     if (filtered.length === adjustments.length) {
-      throw new CrudHttpError(404, { error: "Adjustment not found" });
+      throw notFound("Adjustment not found");
     }
     const lineSnapshots = existingLines.map(mapOrderLineEntityToSnapshot);
     const calcLines = lineSnapshots.map((line, index) =>
@@ -8031,7 +8023,7 @@ const quoteAdjustmentUpsertCommand: CommandHandler<
       deletedAt: null,
     });
     if (!quote)
-      throw new CrudHttpError(404, { error: "Sales quote not found" });
+      throw notFound("Sales quote not found");
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
     if (parsed.scope === "line") {
@@ -8323,7 +8315,7 @@ const quoteAdjustmentDeleteCommand: CommandHandler<
       deletedAt: null,
     });
     if (!quote)
-      throw new CrudHttpError(404, { error: "Sales quote not found" });
+      throw notFound("Sales quote not found");
     ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
     await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
 
@@ -8337,7 +8329,7 @@ const quoteAdjustmentDeleteCommand: CommandHandler<
     ]);
     const filtered = adjustments.filter((adj) => adj.id !== parsed.id);
     if (filtered.length === adjustments.length) {
-      throw new CrudHttpError(404, { error: "Adjustment not found" });
+      throw notFound("Adjustment not found");
     }
     const lineSnapshots = existingLines.map(mapQuoteLineEntityToSnapshot);
     const calcLines = lineSnapshots.map((line, index) =>

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

@@ -7,7 +7,7 @@ import {
 } from '@open-mercato/shared/lib/commands/helpers'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { notFound } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import type { CrudEventsConfig } from '@open-mercato/shared/lib/crud/types'
 import { E } from '#generated/entities.ids.generated'
@@ -96,7 +96,7 @@ async function requireContext(
   if (contextType === 'order') {
     const order = await findOneWithDecryption(em, SalesOrder, { id: contextId }, {}, { tenantId, organizationId })
     if (!order) {
-      throw new CrudHttpError(404, { error: 'sales.notes.context_not_found' })
+      throw notFound('sales.notes.context_not_found')
     }
     if (organizationId && tenantId) {
       ensureSameScope(order, organizationId, tenantId)
@@ -111,7 +111,7 @@ async function requireContext(
   if (contextType === 'quote') {
     const quote = await findOneWithDecryption(em, SalesQuote, { id: contextId }, {}, { tenantId, organizationId })
     if (!quote) {
-      throw new CrudHttpError(404, { error: 'sales.notes.context_not_found' })
+      throw notFound('sales.notes.context_not_found')
     }
     if (organizationId && tenantId) {
       ensureSameScope(quote, organizationId, tenantId)
@@ -132,7 +132,7 @@ async function requireContext(
     { tenantId, organizationId },
   ) as (SalesInvoice | SalesCreditMemo) | null
   if (!entity) {
-    throw new CrudHttpError(404, { error: 'sales.notes.context_not_found' })
+    throw notFound('sales.notes.context_not_found')
   }
   if (organizationId && tenantId) {
     ensureSameScope(entity, organizationId, tenantId)
@@ -256,7 +256,7 @@ const createNoteCommand: CommandHandler<NoteCreateInput, { noteId: string; autho
     beforeRestore: async ({ em, snapshot }) => {
       const context = await requireContext(em, snapshot.contextType, snapshot.contextId).catch(() => null)
       if (!context) {
-        throw new CrudHttpError(404, { error: 'sales.notes.context_not_found' })
+        throw notFound('sales.notes.context_not_found')
       }
       return {
         order: snapshot.orderId ? context.order ?? null : null,
@@ -279,7 +279,7 @@ const updateNoteCommand: CommandHandler<NoteUpdateInput, { noteId: string }> = {
     const parsed = noteUpdateSchema.parse(rawInput ?? {})
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const note = await findOneWithDecryption(em, SalesNote, { id: parsed.id }, {})
-    if (!note) throw new CrudHttpError(404, { error: 'sales.notes.not_found' })
+    if (!note) throw notFound('sales.notes.not_found')
     ensureTenantScope(ctx, note.tenantId)
     ensureOrganizationScope(ctx, note.organizationId)
 
@@ -413,7 +413,7 @@ const deleteNoteCommand: CommandHandler<{ body?: Record<string, unknown>; query?
       const id = requireId(input, 'Note id required')
       const em = (ctx.container.resolve('em') as EntityManager).fork()
       const note = await findOneWithDecryption(em, SalesNote, { id }, {})
-      if (!note) throw new CrudHttpError(404, { error: 'sales.notes.not_found' })
+      if (!note) throw notFound('sales.notes.not_found')
       ensureTenantScope(ctx, note.tenantId)
       ensureOrganizationScope(ctx, note.organizationId)
       em.remove(note)

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

@@ -3,7 +3,7 @@
 import { registerCommand, type CommandHandler } from '@open-mercato/shared/lib/commands'
 import { LockMode } from '@mikro-orm/core'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { loadCustomFieldValues } from '@open-mercato/shared/lib/crud/custom-fields'
 import { setRecordCustomFields } from '@open-mercato/core/modules/entities/lib/helpers'
@@ -346,7 +346,7 @@ const createPaymentCommand: CommandHandler<
       )
       ensureSameScope(order, input.organizationId, input.tenantId)
       if (order.deletedAt) {
-        throw new CrudHttpError(404, { error: 'sales.payments.order_not_found' })
+        throw notFound('sales.payments.order_not_found')
       }
       // Guard the parent order's aggregate version (Gap A): a payment mutation
       // recalculates the order totals, so a stale parent must 409 before we touch it.

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

@@ -3,7 +3,7 @@ import { registerCommand, type CommandHandler } from '@open-mercato/shared/lib/c
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import { LockMode } from '@mikro-orm/core'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
 import { invalidateCrudCache } from '@open-mercato/shared/lib/crud/cache'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { emitCrudSideEffects } from '@open-mercato/shared/lib/commands/helpers'
@@ -456,7 +456,7 @@ async function restoreReturnEffects(
           { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId },
         )
         if (!order) {
-          throw new CrudHttpError(404, { error: 'sales.returns.orderMissing' })
+          throw notFound('sales.returns.orderMissing')
         }
         ensureSameScope(order, snapshot.organizationId, snapshot.tenantId)
 
@@ -620,7 +620,7 @@ const createReturnCommand: CommandHandler<ReturnCreateInput, { returnId: string
         { tenantId: input.tenantId, organizationId: input.organizationId },
       )
       if (!order) {
-        throw new CrudHttpError(404, { error: translate('sales.returns.orderMissing', 'Order not found.') })
+        throw notFound(translate('sales.returns.orderMissing', 'Order not found.'))
       }
       ensureSameScope(order, input.organizationId, input.tenantId)
       await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER)
@@ -642,7 +642,7 @@ const createReturnCommand: CommandHandler<ReturnCreateInput, { returnId: string
       requested.forEach(({ orderLineId, quantity }) => {
         const line = lineMap.get(orderLineId)
         if (!line) {
-          throw new CrudHttpError(404, { error: translate('sales.returns.lineMissing', 'Order line not found.') })
+          throw notFound(translate('sales.returns.lineMissing', 'Order line not found.'))
         }
         const available = computeAvailableReturnQuantity({
           quantity: toNumeric(line.quantity),
@@ -846,7 +846,7 @@ const createReturnCommand: CommandHandler<ReturnCreateInput, { returnId: string
       { tenantId: after.tenantId, organizationId: after.organizationId },
     )
     if (!header) {
-      throw new CrudHttpError(404, { error: 'sales.returns.orderMissing' })
+      throw notFound('sales.returns.orderMissing')
     }
 
     await invalidateOrderCache(ctx.container, {
@@ -911,7 +911,7 @@ const updateReturnCommand: CommandHandler<ReturnUpdateInput, { returnId: string
         { tenantId: input.tenantId, organizationId: input.organizationId },
       )
       if (!entity || !entity.order) {
-        throw new CrudHttpError(404, { error: translate('sales.returns.notFound', 'Return not found.') })
+        throw notFound(translate('sales.returns.notFound', 'Return not found.'))
       }
       ensureSameScope(entity, input.organizationId, input.tenantId)
       const orderId = typeof entity.order === 'string' ? entity.order : entity.order.id
@@ -1031,7 +1031,7 @@ const deleteReturnCommand: CommandHandler<ReturnDeleteInput, { returnId: string
 
     const snapshot = await loadReturnSnapshot(em, input.id)
     if (!snapshot) {
-      throw new CrudHttpError(404, { error: translate('sales.returns.notFound', 'Return not found.') })
+      throw notFound(translate('sales.returns.notFound', 'Return not found.'))
     }
     ensureSameScope(snapshot, input.organizationId, input.tenantId)
     if (input.orderId !== snapshot.orderId) {
@@ -1046,7 +1046,7 @@ const deleteReturnCommand: CommandHandler<ReturnDeleteInput, { returnId: string
       { tenantId: input.tenantId, organizationId: input.organizationId },
     )
     if (!header) {
-      throw new CrudHttpError(404, { error: translate('sales.returns.notFound', 'Return not found.') })
+      throw notFound(translate('sales.returns.notFound', 'Return not found.'))
     }
     ensureSameScope(header, input.organizationId, input.tenantId)
     // Lock on the return's own version, captured before any mutation.

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

@@ -1,5 +1,5 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { notFound } from '@open-mercato/shared/lib/crud/errors'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { enforceCommandOptimisticLockWithGuards } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
@@ -138,6 +138,6 @@ export async function requireScopedEntity<T extends { id: string; deletedAt?: Da
   if (scope.organizationId) where.organizationId = scope.organizationId
   if (scope.tenantId) where.tenantId = scope.tenantId
   const entity = await findOneWithDecryption(em, entityClass, where, {}, scope)
-  if (!entity) throw new CrudHttpError(404, { error: message })
+  if (!entity) throw notFound(message)
   return entity
 }

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

@@ -4,7 +4,7 @@ import { randomUUID } from 'crypto'
 import { registerCommand, type CommandHandler } from '@open-mercato/shared/lib/commands'
 import { LockMode } from '@mikro-orm/core'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, notFound } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { loadCustomFieldValues } from '@open-mercato/shared/lib/crud/custom-fields'
 import { setRecordCustomFields } from '@open-mercato/core/modules/entities/lib/helpers'
@@ -340,7 +340,7 @@ async function loadOrder(
   scope?: { tenantId: string; organizationId: string }
 ): Promise<SalesOrder> {
   const order = await findOneWithDecryption(em, SalesOrder, { id, deletedAt: null }, {}, scope)
-  if (!order) throw new CrudHttpError(404, { error: 'sales.shipments.not_found' })
+  if (!order) throw notFound('sales.shipments.not_found')
   return order
 }
 
@@ -403,7 +403,7 @@ async function validateShipmentItems(params: {
     }
     const line = lineMap.get(lineId)
     if (!line) {
-      throw new CrudHttpError(404, { error: translate('sales.shipments.line_missing', 'Order line not found.') })
+      throw notFound(translate('sales.shipments.line_missing', 'Order line not found.'))
     }
     const lineTotal = toNumber(line.quantity)
     const alreadyShipped = shippedTotals.get(lineId) ?? 0
@@ -675,7 +675,7 @@ const updateShipmentCommand: CommandHandler<ShipmentUpdateInput, { shipmentId: s
         { tenantId: input.tenantId, organizationId: input.organizationId },
       )
       if (!shipmentEntity || !shipmentEntity.order) {
-        throw new CrudHttpError(404, { error: 'sales.shipments.not_found' })
+        throw notFound('sales.shipments.not_found')
       }
       ensureSameScope(shipmentEntity, input.organizationId, input.tenantId)
       const order = shipmentEntity.order as SalesOrder
@@ -970,7 +970,7 @@ const deleteShipmentCommand: CommandHandler<
         { tenantId: payload.tenantId, organizationId: payload.organizationId },
       )
       if (!shipmentEntity || !shipmentEntity.order) {
-        throw new CrudHttpError(404, { error: translate('sales.shipments.not_found', 'Shipment not found') })
+        throw notFound(translate('sales.shipments.not_found', 'Shipment not found'))
       }
       try {
         ensureSameScope(shipmentEntity, payload.organizationId, payload.tenantId)