@open-mercato/core 0.6.4-develop.4382.1.6b4f656b77 → 0.6.4

package/src/modules/business_rules/api/sets/route.ts

@@ -3,6 +3,8 @@ import { z } from 'zod'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
+import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { enforceCommandOptimisticLock } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import { RuleSet } from '../../data/entities'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
@@ -221,6 +223,20 @@ export async function PUT(req: Request) {
     return NextResponse.json({ error: 'Rule set not found' }, { status: 404 })
   }
 
+  try {
+    enforceCommandOptimisticLock({
+      resourceKind: 'business_rules.ruleSet',
+      resourceId: ruleSet.id,
+      current: ruleSet.updatedAt ?? null,
+      request: req,
+    })
+  } catch (err) {
+    if (isCrudHttpError(err)) {
+      return NextResponse.json(err.body, { status: err.status })
+    }
+    throw err
+  }
+
   em.assign(ruleSet, parsed.data)
   await em.persist(ruleSet).flush()
 
@@ -254,6 +270,20 @@ export async function DELETE(req: Request) {
     return NextResponse.json({ error: 'Rule set not found' }, { status: 404 })
   }
 
+  try {
+    enforceCommandOptimisticLock({
+      resourceKind: 'business_rules.ruleSet',
+      resourceId: ruleSet.id,
+      current: ruleSet.updatedAt ?? null,
+      request: req,
+    })
+  } catch (err) {
+    if (isCrudHttpError(err)) {
+      return NextResponse.json(err.body, { status: err.status })
+    }
+    throw err
+  }
+
   ruleSet.deletedAt = new Date()
   await em.persist(ruleSet).flush()
 

package/src/modules/business_rules/backend/rules/[id]/page.tsx

@@ -8,7 +8,10 @@ import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { CrudForm } from '@open-mercato/ui/backend/CrudForm'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { apiFetch } from '@open-mercato/ui/backend/utils/api'
+import { apiFetch, withScopedApiHeaders } from '@open-mercato/ui/backend/utils/api'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { readJsonSafe } from '@open-mercato/ui/backend/utils/serverErrors'
+import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import {
@@ -67,7 +70,7 @@ export default function EditBusinessRulePage() {
 
     const payload = buildRulePayload(values, effectiveTenantId, effectiveOrgId, undefined)
 
-    const response = await apiFetch('/api/business_rules/rules', {
+    const updateRule = () => apiFetch('/api/business_rules/rules', {
       method: 'PUT',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
@@ -75,10 +78,18 @@ export default function EditBusinessRulePage() {
         id: ruleId,
       }),
     })
+    const headers = buildOptimisticLockHeader(rule?.updatedAt ?? rule?.updated_at ?? null)
+    const response = Object.keys(headers).length
+      ? await withScopedApiHeaders(headers, updateRule)
+      : await updateRule()
 
     if (!response.ok) {
-      const error = await response.json()
-      throw new Error(error.error || error.message || t('business_rules.errors.updateFailed'))
+      const body = (await readJsonSafe<Record<string, unknown>>(response)) ?? {}
+      const message =
+        (typeof body.error === 'string' && body.error) ||
+        (typeof body.message === 'string' && body.message) ||
+        t('business_rules.errors.updateFailed')
+      throw new CrudHttpError(response.status, { ...body, error: message })
     }
 
     router.push('/backend/rules')
@@ -134,6 +145,7 @@ export default function EditBusinessRulePage() {
           schema={businessRuleFormSchema}
           fields={fields}
           initialValues={initialValues}
+          optimisticLockUpdatedAt={rule?.updatedAt ?? rule?.updated_at ?? null}
           onSubmit={handleSubmit}
           cancelHref="/backend/rules"
           groups={formGroups}

package/src/modules/business_rules/backend/rules/page.tsx

@@ -8,12 +8,14 @@ import { DataTable } from '@open-mercato/ui/backend/DataTable'
 import type { ColumnDef } from '@tanstack/react-table'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
-import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import type { FilterDef, FilterValues } from '@open-mercato/ui/backend/FilterBar'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
+import { ListEmptyState } from '@open-mercato/ui/backend/filters/ListEmptyState'
 
 type Rule = {
   id: string
@@ -92,9 +94,13 @@ export default function RulesListPage() {
     })
     if (!confirmed) return
 
-    const result = await apiCall(`/api/business_rules/rules?id=${id}`, {
-      method: 'DELETE',
-    })
+    const record = (data || []).find((item) => item.id === id)
+    const result = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(record?.updatedAt),
+      () => apiCall(`/api/business_rules/rules?id=${id}`, {
+        method: 'DELETE',
+      }),
+    )
 
     if (result.ok) {
       flash(t('business_rules.messages.deleted'), 'success')
@@ -105,14 +111,18 @@ export default function RulesListPage() {
   }
 
   const handleToggleEnabled = async (id: string, currentEnabled: boolean) => {
-    const result = await apiCall('/api/business_rules/rules', {
-      method: 'PUT',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        id,
-        enabled: !currentEnabled,
+    const record = (data || []).find((item) => item.id === id)
+    const result = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(record?.updatedAt),
+      () => apiCall('/api/business_rules/rules', {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          id,
+          enabled: !currentEnabled,
+        }),
       }),
-    })
+    )
 
     if (result.ok) {
       flash(t('business_rules.messages.updated'), 'success')
@@ -214,7 +224,7 @@ export default function RulesListPage() {
           VALIDATION: 'bg-status-warning-bg text-status-warning-text',
           CALCULATION: 'bg-status-info-bg text-status-info-text',
           ACTION: 'bg-status-success-bg text-status-success-text',
-          ASSIGNMENT: 'bg-purple-100 text-purple-800',
+          ASSIGNMENT: 'bg-brand-violet/10 text-brand-violet',
         }
         const color = typeColors[row.original.ruleType] || 'bg-muted text-foreground'
         return (
@@ -334,6 +344,13 @@ export default function RulesListPage() {
           perspective={{
             tableId: 'business-rules.rules.list',
           }}
+          emptyState={(
+            <ListEmptyState
+              entityName={t('business_rules.list.title')}
+              createHref="/backend/rules/create"
+              createLabel={t('business_rules.actions.create')}
+            />
+          )}
           pagination={{ page, pageSize, total, totalPages, onPageChange: setPage }}
         />
       </PageBody>

package/src/modules/business_rules/backend/sets/[id]/page.tsx

@@ -9,8 +9,11 @@ import { CrudForm } from '@open-mercato/ui/backend/CrudForm'
 import type { CrudField } from '@open-mercato/ui/backend/CrudForm'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { apiFetch } from '@open-mercato/ui/backend/utils/api'
+import { apiFetch, withScopedApiHeaders } from '@open-mercato/ui/backend/utils/api'
 import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { readJsonSafe } from '@open-mercato/ui/backend/utils/serverErrors'
+import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
@@ -85,15 +88,23 @@ export default function EditRuleSetPage() {
       ...values,
     }
 
-    const response = await apiFetch('/api/business_rules/sets', {
+    const updateSet = () => apiFetch('/api/business_rules/sets', {
       method: 'PUT',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify(payload),
     })
+    const headers = buildOptimisticLockHeader(ruleSet?.updatedAt ?? null)
+    const response = Object.keys(headers).length
+      ? await withScopedApiHeaders(headers, updateSet)
+      : await updateSet()
 
     if (!response.ok) {
-      const error = await response.json()
-      throw new Error(error.error || error.message || t('business_rules.sets.errors.updateFailed'))
+      const body = (await readJsonSafe<Record<string, unknown>>(response)) ?? {}
+      const message =
+        (typeof body.error === 'string' && body.error) ||
+        (typeof body.message === 'string' && body.message) ||
+        t('business_rules.sets.errors.updateFailed')
+      throw new CrudHttpError(response.status, { ...body, error: message })
     }
 
     flash(t('business_rules.sets.messages.updated'), 'success')
@@ -265,6 +276,7 @@ export default function EditRuleSetPage() {
           schema={ruleSetFormSchema}
           fields={fields}
           initialValues={initialValues}
+          optimisticLockUpdatedAt={ruleSet.updatedAt}
           onSubmit={handleSubmit}
           cancelHref="/backend/sets"
           submitLabel={t('business_rules.sets.form.update')}

package/src/modules/business_rules/backend/sets/page.tsx

@@ -8,12 +8,14 @@ import { DataTable } from '@open-mercato/ui/backend/DataTable'
 import type { ColumnDef } from '@tanstack/react-table'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
-import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import type { FilterDef, FilterValues } from '@open-mercato/ui/backend/FilterBar'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
+import { ListEmptyState } from '@open-mercato/ui/backend/filters/ListEmptyState'
 
 type RuleSet = {
   id: string
@@ -83,9 +85,13 @@ export default function RuleSetsListPage() {
     })
     if (!confirmed) return
 
-    const result = await apiCall(`/api/business_rules/sets?id=${id}`, {
-      method: 'DELETE',
-    })
+    const record = (data || []).find((item) => item.id === id)
+    const result = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(record?.updatedAt),
+      () => apiCall(`/api/business_rules/sets?id=${id}`, {
+        method: 'DELETE',
+      }),
+    )
 
     if (result.ok) {
       flash(t('business_rules.sets.messages.deleted'), 'success')
@@ -96,14 +102,18 @@ export default function RuleSetsListPage() {
   }
 
   const handleToggleEnabled = async (id: string, currentEnabled: boolean) => {
-    const result = await apiCall('/api/business_rules/sets', {
-      method: 'PUT',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        id,
-        enabled: !currentEnabled,
+    const record = (data || []).find((item) => item.id === id)
+    const result = await withScopedApiRequestHeaders(
+      buildOptimisticLockHeader(record?.updatedAt),
+      () => apiCall('/api/business_rules/sets', {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          id,
+          enabled: !currentEnabled,
+        }),
       }),
-    })
+    )
 
     if (result.ok) {
       flash(t('business_rules.sets.messages.updated'), 'success')
@@ -241,6 +251,13 @@ export default function RuleSetsListPage() {
           onFiltersClear={handleFiltersClear}
           isLoading={isLoading}
           error={error ? t('business_rules.sets.messages.loadFailed') : undefined}
+          emptyState={(
+            <ListEmptyState
+              entityName={t('business_rules.sets.list.title')}
+              createHref="/backend/sets/create"
+              createLabel={t('business_rules.sets.actions.create')}
+            />
+          )}
           pagination={{ page, pageSize, total, totalPages, onPageChange: setPage }}
         />
       </PageBody>

package/src/modules/catalog/AGENTS.md

@@ -45,6 +45,16 @@ registerCatalogPricingResolver(myResolver, { priority: 10 })
 
 The default pipeline emits `catalog.pricing.resolve.before|after` events.
 
+### Price selection order
+
+When multiple price rows match the same context, `selectBestPrice` resolves ties in this order:
+
+1. **Score** (descending) — `custom` > `promotion` > `tier` > `regular`, plus additional points for variant, offer, channel, user, group, and customer scoping. See `scorePrice` for the full rubric.
+2. **`startsAt`** (descending) — when scores tie, the row with the more recent `startsAt` wins.
+3. **`minQuantity`** — direction depends on whether the tied rows share the same resolved kind:
+    - **Same kind** (e.g. tier vs tier): **descending** — the row with the larger `minQuantity` wins. This implements the standard volume-discount semantic: for `qty=50` with tiers `minQty=10` ($9) and `minQty=50` ($8), the `minQty=50` row applies (issue #1706).
+    - **Different kinds** (e.g. promotion vs tier): **ascending** — the row with the smaller `minQuantity` wins. The `+1 for minQuantity > 1` bonus in `scorePrice` can pull a lower-base kind up to the same total as a higher-base kind (e.g. tier `minQty=3` = 3+1 vs promotion `minQty=1` = 4). Ascending across kinds preserves the kind precedence in those collisions.
+
 ## Data Model Constraints
 
 - **Products** — core entities with media and descriptions. MUST have at least a name

package/src/modules/catalog/api/categories/route.ts

@@ -99,6 +99,7 @@ type ManageCategoryRow = {
   childCount: number
   descendantCount: number
   isActive: boolean
+  updatedAt: string | null
   organizationId: string
   tenantId: string
 }
@@ -262,6 +263,7 @@ export async function GET(req: Request) {
       childCount: node.childIds.length,
       descendantCount: node.descendantIds.length,
       isActive: node.isActive,
+      updatedAt: category?.updatedAt ? new Date(category.updatedAt).toISOString() : null,
       organizationId,
       tenantId,
       ...(cfValues[recordId] ?? {}),
@@ -297,6 +299,7 @@ const categoryListItemSchema = z.object({
   childCount: z.number(),
   descendantCount: z.number(),
   isActive: z.boolean(),
+  updatedAt: z.string().nullable().optional(),
   organizationId: z.string().uuid(),
   tenantId: z.string().uuid(),
 })

package/src/modules/catalog/api/products/route.ts

@@ -425,6 +425,10 @@ async function decorateProductsAfterList(
         defaultMediaId: offer.defaultMediaId ?? null,
         defaultMediaUrl: offer.defaultMediaUrl ?? null,
         metadata: offer.metadata ?? null,
+        updatedAt:
+          offer.updatedAt instanceof Date
+            ? offer.updatedAt.toISOString()
+            : (typeof offer.updatedAt === "string" ? offer.updatedAt : null),
       });
       offersByProduct.set(productId, entry);
     }

package/src/modules/catalog/backend/catalog/categories/[id]/edit/page.tsx

@@ -22,6 +22,8 @@ type CategoryRow = {
   description: string | null
   parentId: string | null
   isActive: boolean
+  updatedAt?: string | null
+  updated_at?: string | null
   pathLabel?: string
 }
 
@@ -36,6 +38,7 @@ type CategoryFormValues = {
   description?: string
   parentId?: string | null
   isActive?: boolean
+  updatedAt?: string | null
 }
 
 async function submitCategoryUpdate(
@@ -116,6 +119,7 @@ export default function EditCatalogCategoryPage({ params }: { params?: { id?: st
           description: record.description ?? '',
           parentId: record.parentId ?? '',
           isActive: record.isActive,
+          updatedAt: record.updatedAt ?? record.updated_at ?? null,
           ...customValues,
         })
         setPathLabel(record.pathLabel ?? '')
@@ -238,6 +242,7 @@ export default function EditCatalogCategoryPage({ params }: { params?: { id?: st
           groups={groups}
           entityId={E.catalog.catalog_product_category}
           initialValues={initialValues ?? { id: categoryId, name: '', slug: '', description: '', parentId: '', isActive: true }}
+          optimisticLockUpdatedAt={initialValues?.updatedAt}
           isLoading={loading}
           loadingMessage={t('catalog.categories.form.loading', 'Loading category...')}
           submitLabel={t('catalog.categories.form.action.save', 'Save')}