@open-mercato/core 0.6.4-develop.4217.1.c9aa050183 → 0.6.4-develop.4239.1.4a264a5828

package/src/modules/resources/commands/resources.ts

@@ -4,6 +4,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { buildChanges, emitCrudSideEffects, emitCrudUndoSideEffects, parseWithCustomFields, setCustomFieldsIfAny } from '@open-mercato/shared/lib/commands/helpers'
+import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import { buildCustomFieldResetMap, diffCustomFieldChanges, loadCustomFieldSnapshot, type CustomFieldSnapshot } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
@@ -236,8 +237,18 @@ const createResourceCommand: CommandHandler<ResourcesResourceCreateInput, { reso
       createdAt: now,
       updatedAt: now,
     })
-    em.persist(record)
-    await em.flush()
+    await withAtomicFlush(em, [
+      async () => {
+        em.persist(record)
+        await em.flush()
+      },
+      () => syncResourcesResourceTags(em, {
+        resourceId: record.id,
+        organizationId: record.organizationId,
+        tenantId: record.tenantId,
+        tagIds: parsed.tags,
+      }),
+    ], { transaction: true })
     const dataEngine = (ctx.container.resolve('dataEngine') as DataEngine)
     await setCustomFieldsIfAny({
       dataEngine,
@@ -247,13 +258,6 @@ const createResourceCommand: CommandHandler<ResourcesResourceCreateInput, { reso
       organizationId: record.organizationId,
       values: custom,
     })
-    await syncResourcesResourceTags(em, {
-      resourceId: record.id,
-      organizationId: record.organizationId,
-      tenantId: record.tenantId,
-      tagIds: parsed.tags,
-    })
-    await em.flush()
     await emitCrudSideEffects({
       dataEngine,
       action: 'created',
@@ -351,43 +355,43 @@ const updateResourceCommand: CommandHandler<ResourcesResourceUpdateInput, { reso
     ensureTenantScope(ctx, record.tenantId)
     ensureOrganizationScope(ctx, record.organizationId)
 
+    let capacityUnit: CapacityUnitSnapshot | null | undefined
     if (parsed.capacityUnitValue !== undefined) {
       const unitValue =
         typeof parsed.capacityUnitValue === 'string' ? parsed.capacityUnitValue.trim() : ''
-      if (!unitValue) {
-        record.capacityUnitValue = null
-        record.capacityUnitName = null
-        record.capacityUnitColor = null
-        record.capacityUnitIcon = null
-      } else {
-        const unitSnapshot = await resolveCapacityUnit(
-          em,
-          { tenantId: record.tenantId, organizationId: record.organizationId },
-          unitValue,
-        )
-        record.capacityUnitValue = unitSnapshot.value
-        record.capacityUnitName = unitSnapshot.name
-        record.capacityUnitColor = unitSnapshot.color
-        record.capacityUnitIcon = unitSnapshot.icon
-      }
+      capacityUnit = unitValue
+        ? await resolveCapacityUnit(
+            em,
+            { tenantId: record.tenantId, organizationId: record.organizationId },
+            unitValue,
+          )
+        : null
     }
-    if (parsed.name !== undefined) record.name = parsed.name
-    if (parsed.description !== undefined) record.description = parsed.description ?? null
-    if (parsed.resourceTypeId !== undefined) record.resourceTypeId = parsed.resourceTypeId ?? null
-    if (parsed.capacity !== undefined) record.capacity = parsed.capacity ?? null
-    if (parsed.appearanceIcon !== undefined) record.appearanceIcon = parsed.appearanceIcon ?? null
-    if (parsed.appearanceColor !== undefined) record.appearanceColor = parsed.appearanceColor ?? null
-    if (parsed.availabilityRuleSetId !== undefined) record.availabilityRuleSetId = parsed.availabilityRuleSetId ?? null
-    record.updatedAt = new Date()
-    if (parsed.isActive !== undefined) record.isActive = parsed.isActive
-    await em.flush()
-    await syncResourcesResourceTags(em, {
-      resourceId: record.id,
-      organizationId: record.organizationId,
-      tenantId: record.tenantId,
-      tagIds: parsed.tags,
-    })
-    await em.flush()
+    await withAtomicFlush(em, [
+      () => {
+        if (parsed.capacityUnitValue !== undefined) {
+          record.capacityUnitValue = capacityUnit?.value ?? null
+          record.capacityUnitName = capacityUnit?.name ?? null
+          record.capacityUnitColor = capacityUnit?.color ?? null
+          record.capacityUnitIcon = capacityUnit?.icon ?? null
+        }
+        if (parsed.name !== undefined) record.name = parsed.name
+        if (parsed.description !== undefined) record.description = parsed.description ?? null
+        if (parsed.resourceTypeId !== undefined) record.resourceTypeId = parsed.resourceTypeId ?? null
+        if (parsed.capacity !== undefined) record.capacity = parsed.capacity ?? null
+        if (parsed.appearanceIcon !== undefined) record.appearanceIcon = parsed.appearanceIcon ?? null
+        if (parsed.appearanceColor !== undefined) record.appearanceColor = parsed.appearanceColor ?? null
+        if (parsed.availabilityRuleSetId !== undefined) record.availabilityRuleSetId = parsed.availabilityRuleSetId ?? null
+        record.updatedAt = new Date()
+        if (parsed.isActive !== undefined) record.isActive = parsed.isActive
+      },
+      () => syncResourcesResourceTags(em, {
+        resourceId: record.id,
+        organizationId: record.organizationId,
+        tenantId: record.tenantId,
+        tagIds: parsed.tags,
+      }),
+    ], { transaction: true })
     const dataEngine = (ctx.container.resolve('dataEngine') as DataEngine)
     await setCustomFieldsIfAny({
       dataEngine,
@@ -476,28 +480,30 @@ const updateResourceCommand: CommandHandler<ResourcesResourceUpdateInput, { reso
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const record = await em.findOne(ResourcesResource, { id: before.id })
     if (!record) return
-    record.name = before.name
-    record.description = before.description ?? null
-    record.resourceTypeId = before.resourceTypeId ?? null
-    record.capacity = before.capacity ?? null
-    record.capacityUnitValue = before.capacityUnitValue ?? null
-    record.capacityUnitName = before.capacityUnitName ?? null
-    record.capacityUnitColor = before.capacityUnitColor ?? null
-    record.capacityUnitIcon = before.capacityUnitIcon ?? null
-    record.appearanceIcon = before.appearanceIcon ?? null
-    record.appearanceColor = before.appearanceColor ?? null
-    record.isActive = before.isActive
-    record.availabilityRuleSetId = before.availabilityRuleSetId ?? null
-    record.deletedAt = before.deletedAt ? new Date(before.deletedAt) : null
-    record.updatedAt = new Date()
-    await em.flush()
-    await syncResourcesResourceTags(em, {
-      resourceId: record.id,
-      organizationId: record.organizationId,
-      tenantId: record.tenantId,
-      tagIds: before.tags,
-    })
-    await em.flush()
+    await withAtomicFlush(em, [
+      () => {
+        record.name = before.name
+        record.description = before.description ?? null
+        record.resourceTypeId = before.resourceTypeId ?? null
+        record.capacity = before.capacity ?? null
+        record.capacityUnitValue = before.capacityUnitValue ?? null
+        record.capacityUnitName = before.capacityUnitName ?? null
+        record.capacityUnitColor = before.capacityUnitColor ?? null
+        record.capacityUnitIcon = before.capacityUnitIcon ?? null
+        record.appearanceIcon = before.appearanceIcon ?? null
+        record.appearanceColor = before.appearanceColor ?? null
+        record.isActive = before.isActive
+        record.availabilityRuleSetId = before.availabilityRuleSetId ?? null
+        record.deletedAt = before.deletedAt ? new Date(before.deletedAt) : null
+        record.updatedAt = new Date()
+      },
+      () => syncResourcesResourceTags(em, {
+        resourceId: record.id,
+        organizationId: record.organizationId,
+        tenantId: record.tenantId,
+        tagIds: before.tags,
+      }),
+    ], { transaction: true })
 
     const dataEngine = (ctx.container.resolve('dataEngine') as DataEngine)
     const customBefore = payload.customBefore ?? fallbackCustomBefore ?? undefined
@@ -602,52 +608,56 @@ const deleteResourceCommand: CommandHandler<{ id?: string }, { resourceId: strin
     const fallbackCustomBefore = (before as ResourceSnapshot).customFields ?? null
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     let record = await em.findOne(ResourcesResource, { id: before.id })
-    if (!record) {
-      record = em.create(ResourcesResource, {
-        id: before.id,
-        tenantId: before.tenantId,
-        organizationId: before.organizationId,
-        name: before.name,
-        description: before.description ?? null,
-        resourceTypeId: before.resourceTypeId ?? null,
-        capacity: before.capacity ?? null,
-        capacityUnitValue: before.capacityUnitValue ?? null,
-        capacityUnitName: before.capacityUnitName ?? null,
-        capacityUnitColor: before.capacityUnitColor ?? null,
-        capacityUnitIcon: before.capacityUnitIcon ?? null,
-        appearanceIcon: before.appearanceIcon ?? null,
-        appearanceColor: before.appearanceColor ?? null,
-        isActive: before.isActive,
-        availabilityRuleSetId: before.availabilityRuleSetId ?? null,
-        deletedAt: null,
-        createdAt: new Date(),
-        updatedAt: new Date(),
-      })
-      em.persist(record)
-    } else {
-      record.name = before.name
-      record.description = before.description ?? null
-      record.resourceTypeId = before.resourceTypeId ?? null
-      record.capacity = before.capacity ?? null
-      record.capacityUnitValue = before.capacityUnitValue ?? null
-      record.capacityUnitName = before.capacityUnitName ?? null
-      record.capacityUnitColor = before.capacityUnitColor ?? null
-      record.capacityUnitIcon = before.capacityUnitIcon ?? null
-      record.appearanceIcon = before.appearanceIcon ?? null
-      record.appearanceColor = before.appearanceColor ?? null
-      record.isActive = before.isActive
-      record.availabilityRuleSetId = before.availabilityRuleSetId ?? null
-      record.deletedAt = null
-      record.updatedAt = new Date()
-    }
-    await em.flush()
-    await syncResourcesResourceTags(em, {
-      resourceId: record.id,
-      organizationId: record.organizationId,
-      tenantId: record.tenantId,
-      tagIds: before.tags,
-    })
-    await em.flush()
+    await withAtomicFlush(em, [
+      async () => {
+        if (!record) {
+          record = em.create(ResourcesResource, {
+            id: before.id,
+            tenantId: before.tenantId,
+            organizationId: before.organizationId,
+            name: before.name,
+            description: before.description ?? null,
+            resourceTypeId: before.resourceTypeId ?? null,
+            capacity: before.capacity ?? null,
+            capacityUnitValue: before.capacityUnitValue ?? null,
+            capacityUnitName: before.capacityUnitName ?? null,
+            capacityUnitColor: before.capacityUnitColor ?? null,
+            capacityUnitIcon: before.capacityUnitIcon ?? null,
+            appearanceIcon: before.appearanceIcon ?? null,
+            appearanceColor: before.appearanceColor ?? null,
+            isActive: before.isActive,
+            availabilityRuleSetId: before.availabilityRuleSetId ?? null,
+            deletedAt: null,
+            createdAt: new Date(),
+            updatedAt: new Date(),
+          })
+          em.persist(record)
+        } else {
+          record.name = before.name
+          record.description = before.description ?? null
+          record.resourceTypeId = before.resourceTypeId ?? null
+          record.capacity = before.capacity ?? null
+          record.capacityUnitValue = before.capacityUnitValue ?? null
+          record.capacityUnitName = before.capacityUnitName ?? null
+          record.capacityUnitColor = before.capacityUnitColor ?? null
+          record.capacityUnitIcon = before.capacityUnitIcon ?? null
+          record.appearanceIcon = before.appearanceIcon ?? null
+          record.appearanceColor = before.appearanceColor ?? null
+          record.isActive = before.isActive
+          record.availabilityRuleSetId = before.availabilityRuleSetId ?? null
+          record.deletedAt = null
+          record.updatedAt = new Date()
+        }
+        await em.flush()
+      },
+      () => syncResourcesResourceTags(em, {
+        resourceId: (record as ResourcesResource).id,
+        organizationId: (record as ResourcesResource).organizationId,
+        tenantId: (record as ResourcesResource).tenantId,
+        tagIds: before.tags,
+      }),
+    ], { transaction: true })
+    const resolvedRecord = record as ResourcesResource
 
     const dataEngine = (ctx.container.resolve('dataEngine') as DataEngine)
     const customBefore = payload.customBefore ?? fallbackCustomBefore ?? undefined
@@ -656,9 +666,9 @@ const deleteResourceCommand: CommandHandler<{ id?: string }, { resourceId: strin
       await setCustomFieldsIfAny({
         dataEngine,
         entityId: E.resources.resources_resource,
-        recordId: record.id,
-        tenantId: record.tenantId,
-        organizationId: record.organizationId,
+        recordId: resolvedRecord.id,
+        tenantId: resolvedRecord.tenantId,
+        organizationId: resolvedRecord.organizationId,
         values: reset,
       })
     }
@@ -666,11 +676,11 @@ const deleteResourceCommand: CommandHandler<{ id?: string }, { resourceId: strin
     await emitCrudUndoSideEffects({
       dataEngine,
       action: 'created',
-      entity: record,
+      entity: resolvedRecord,
       identifiers: {
-        id: record.id,
-        organizationId: record.organizationId,
-        tenantId: record.tenantId,
+        id: resolvedRecord.id,
+        organizationId: resolvedRecord.organizationId,
+        tenantId: resolvedRecord.tenantId,
       },
       events: resourcesResourceCrudEvents,
       indexer: resourceCrudIndexer,

package/src/modules/resources/commands/tags.ts

@@ -2,6 +2,7 @@ import type { CommandHandler } from '@open-mercato/shared/lib/commands'
 import { registerCommand } from '@open-mercato/shared/lib/commands'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { slugifyTagLabel } from '@open-mercato/shared/lib/utils'
 import { ResourcesResourceTag, ResourcesResourceTagAssignment } from '../data/entities'
@@ -105,9 +106,12 @@ const deleteTagCommand: CommandHandler<{ id?: string }, { tagId: string }> = {
     if (!tag) throw new CrudHttpError(404, { error: 'Tag not found' })
     ensureTenantScope(ctx, tag.tenantId)
     ensureOrganizationScope(ctx, tag.organizationId)
-    await em.nativeDelete(ResourcesResourceTagAssignment, { tag: tag.id })
-    em.remove(tag)
-    await em.flush()
+    await withAtomicFlush(em, [
+      async () => {
+        await em.nativeDelete(ResourcesResourceTagAssignment, { tag: tag.id })
+        em.remove(tag)
+      },
+    ], { transaction: true })
     return { tagId: id }
   },
   buildLog: async ({ input, result, ctx }) => {

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

@@ -168,17 +168,23 @@ export async function POST(req: Request) {
     validUntil.setUTCDate(validUntil.getUTCDate() + input.validForDays)
 
     const rawAcceptanceToken = crypto.randomUUID()
-    quote.validUntil = validUntil
-    quote.acceptanceToken = hashAuthToken(rawAcceptanceToken)
-    quote.sentAt = now
-    quote.status = 'sent'
-    quote.statusEntryId = await resolveStatusEntryIdByValue(em, {
-      tenantId: quote.tenantId,
-      organizationId: quote.organizationId,
-      value: 'sent',
+
+    // Persist the send state (status/token/sentAt) atomically and commit it
+    // BEFORE the email goes out, so a customer never receives a link whose
+    // acceptance token was not durably stored.
+    await em.transactional(async (tx) => {
+      quote.validUntil = validUntil
+      quote.acceptanceToken = hashAuthToken(rawAcceptanceToken)
+      quote.sentAt = now
+      quote.status = 'sent'
+      quote.statusEntryId = await resolveStatusEntryIdByValue(tx, {
+        tenantId: quote.tenantId,
+        organizationId: quote.organizationId,
+        value: 'sent',
+      })
+      quote.updatedAt = now
+      tx.persist(quote)
     })
-    quote.updatedAt = now
-    em.persist(quote)
 
     const appUrl = process.env.APP_URL || ''
     const url = appUrl ? `${appUrl.replace(/\/$/, '')}/quote/${rawAcceptanceToken}` : `/quote/${rawAcceptanceToken}`
@@ -202,14 +208,13 @@ export async function POST(req: Request) {
       footer: translate('sales.quotes.email.footer', 'Open Mercato'),
     }
 
+    // Side effect after commit: an email failure must not roll back the send state.
     await sendEmail({
       to: email,
       subject: translate('sales.quotes.email.subject', 'Quote {quoteNumber}', { quoteNumber: quote.quoteNumber }),
       react: QuoteSentEmail({ url, copy }),
     })
 
-    await em.flush()
-
     if (guardResult.afterSuccessCallbacks.length) {
       await runGuardAfterSuccessCallbacks(guardResult.afterSuccessCallbacks, {
         tenantId: ctx.auth?.tenantId ?? '',