@open-mercato/core 0.6.6-develop.6257.1.6d0af84d26 → 0.6.6-develop.6290.1.4bb5a8ba3f

package/src/modules/shipping_carriers/lib/shipping-service.ts

@@ -1,10 +1,19 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import type { CredentialsService } from '../../integrations/lib/credentials-service'
-import { CarrierShipment } from '../data/entities'
+import { CarrierShipment, type CarrierShipmentIdempotencyKey } from '../data/entities'
 import { emitShippingEvent } from '../events'
 import { getShippingAdapter } from './adapter-registry'
 import type { UnifiedShipmentStatus } from './adapter'
+import {
+  claimShipmentIdempotency,
+  computeShipmentRequestHash,
+  findShipmentIdempotencyClaim,
+  isShipmentIdempotencyConflictError,
+  releaseShipmentIdempotency,
+  resolveShipmentIdempotency,
+  ShipmentIdempotencyConflictError,
+} from './shipment-idempotency'
 import {
   getTerminalShippingEvent,
   isValidShippingTransition,
@@ -90,52 +99,87 @@ export function createShippingCarrierService(deps: {
       receiverEmail?: string
       targetPoint?: string
       c2cSendingMethod?: string
+      idempotencyKey?: string
       organizationId: string
       tenantId: string
     }) {
-      const { adapter, credentials } = await resolveAdapter(input.providerKey, {
-        organizationId: input.organizationId,
-        tenantId: input.tenantId,
-      })
-      const mergedCredentials = {
-        ...credentials,
-        ...(input.senderPhone !== undefined ? { senderPhone: input.senderPhone } : {}),
-        ...(input.senderEmail !== undefined ? { senderEmail: input.senderEmail } : {}),
-        ...(input.receiverPhone !== undefined ? { receiverPhone: input.receiverPhone } : {}),
-        ...(input.receiverEmail !== undefined ? { receiverEmail: input.receiverEmail } : {}),
-        ...(input.targetPoint !== undefined ? { targetPoint: input.targetPoint } : {}),
-        ...(input.c2cSendingMethod !== undefined ? { c2cSendingMethod: input.c2cSendingMethod } : {}),
+      const scope = { organizationId: input.organizationId, tenantId: input.tenantId }
+      let claim: CarrierShipmentIdempotencyKey | null = null
+      if (input.idempotencyKey) {
+        const { idempotencyKey: _idempotencyKey, ...fingerprint } = input
+        const requestHash = computeShipmentRequestHash(fingerprint)
+        const existing = await findShipmentIdempotencyClaim(em, input.idempotencyKey, input.providerKey, scope)
+        if (existing) {
+          if (existing.requestHash !== requestHash) {
+            throw new ShipmentIdempotencyConflictError(input.idempotencyKey)
+          }
+          if (existing.shipmentId) {
+            return findShipmentOrThrow(existing.shipmentId, scope)
+          }
+          // Claim exists but the original request has not resolved yet (concurrent in-flight).
+          throw new ShipmentIdempotencyConflictError(input.idempotencyKey)
+        }
+        claim = await claimShipmentIdempotency(em, input.idempotencyKey, input.providerKey, requestHash, scope)
+        if (!claim) {
+          // Lost the claim race with a concurrent request creating the same shipment.
+          throw new ShipmentIdempotencyConflictError(input.idempotencyKey)
+        }
+      }
+      let carrierShipmentCreated = false
+      try {
+        const { adapter, credentials } = await resolveAdapter(input.providerKey, scope)
+        const mergedCredentials = {
+          ...credentials,
+          ...(input.senderPhone !== undefined ? { senderPhone: input.senderPhone } : {}),
+          ...(input.senderEmail !== undefined ? { senderEmail: input.senderEmail } : {}),
+          ...(input.receiverPhone !== undefined ? { receiverPhone: input.receiverPhone } : {}),
+          ...(input.receiverEmail !== undefined ? { receiverEmail: input.receiverEmail } : {}),
+          ...(input.targetPoint !== undefined ? { targetPoint: input.targetPoint } : {}),
+          ...(input.c2cSendingMethod !== undefined ? { c2cSendingMethod: input.c2cSendingMethod } : {}),
+        }
+        const created = await adapter.createShipment({
+          orderId: input.orderId,
+          origin: input.origin,
+          destination: input.destination,
+          packages: input.packages,
+          serviceCode: input.serviceCode,
+          credentials: mergedCredentials,
+          labelFormat: input.labelFormat,
+        })
+        carrierShipmentCreated = true
+        const shipment = em.create(CarrierShipment, {
+          orderId: input.orderId,
+          providerKey: input.providerKey,
+          carrierShipmentId: created.shipmentId,
+          trackingNumber: created.trackingNumber,
+          unifiedStatus: 'label_created',
+          labelUrl: created.labelUrl ?? null,
+          labelData: created.labelData ?? null,
+          organizationId: input.organizationId,
+          tenantId: input.tenantId,
+        })
+        await em.persist(shipment).flush()
+        if (claim) {
+          await resolveShipmentIdempotency(em, claim, shipment.id)
+        }
+        await emitShippingEvent('shipping_carriers.shipment.created', {
+          shipmentId: shipment.id,
+          orderId: input.orderId,
+          providerKey: input.providerKey,
+          trackingNumber: created.trackingNumber,
+          organizationId: input.organizationId,
+          tenantId: input.tenantId,
+        })
+        return shipment
+      } catch (error: unknown) {
+        // Release the claim only when the carrier was NOT successfully called, so a retry can
+        // proceed. If the carrier already created the shipment, keep the claim so a retry does
+        // not produce a duplicate upstream shipment.
+        if (claim && !carrierShipmentCreated && input.idempotencyKey && !isShipmentIdempotencyConflictError(error)) {
+          await releaseShipmentIdempotency(em, input.idempotencyKey, input.providerKey, scope).catch(() => {})
+        }
+        throw error
       }
-      const created = await adapter.createShipment({
-        orderId: input.orderId,
-        origin: input.origin,
-        destination: input.destination,
-        packages: input.packages,
-        serviceCode: input.serviceCode,
-        credentials: mergedCredentials,
-        labelFormat: input.labelFormat,
-      })
-      const shipment = em.create(CarrierShipment, {
-        orderId: input.orderId,
-        providerKey: input.providerKey,
-        carrierShipmentId: created.shipmentId,
-        trackingNumber: created.trackingNumber,
-        unifiedStatus: 'label_created',
-        labelUrl: created.labelUrl ?? null,
-        labelData: created.labelData ?? null,
-        organizationId: input.organizationId,
-        tenantId: input.tenantId,
-      })
-      await em.persist(shipment).flush()
-      await emitShippingEvent('shipping_carriers.shipment.created', {
-        shipmentId: shipment.id,
-        orderId: input.orderId,
-        providerKey: input.providerKey,
-        trackingNumber: created.trackingNumber,
-        organizationId: input.organizationId,
-        tenantId: input.tenantId,
-      })
-      return shipment
     },
 
     async getTracking(input: {

package/src/modules/shipping_carriers/migrations/.snapshot-open-mercato.json

@@ -4,6 +4,177 @@
     "public"
   ],
   "tables": [
+    {
+      "name": "carrier_shipment_idempotency_keys",
+      "schema": "public",
+      "columns": {
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamptz(6)",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": 6,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "datetime"
+        },
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": true,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": "gen_random_uuid()",
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "uuid"
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": true,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "text"
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "uuid"
+        },
+        "provider_key": {
+          "name": "provider_key",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "text"
+        },
+        "request_hash": {
+          "name": "request_hash",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "text"
+        },
+        "shipment_id": {
+          "name": "shipment_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "uuid"
+        },
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "collation": null,
+          "enumItems": [],
+          "mappedType": "uuid"
+        }
+      },
+      "indexes": [
+        {
+          "columnNames": [
+            "id"
+          ],
+          "composite": false,
+          "constraint": true,
+          "keyName": "carrier_shipment_idempotency_keys_pkey",
+          "primary": true,
+          "unique": true
+        },
+        {
+          "columnNames": [
+            "idempotency_key",
+            "provider_key",
+            "organization_id",
+            "tenant_id"
+          ],
+          "composite": true,
+          "constraint": true,
+          "keyName": "carrier_shipment_idempotency_keys_unique",
+          "primary": false,
+          "unique": true
+        }
+      ],
+      "checks": [],
+      "triggers": [],
+      "foreignKeys": {},
+      "comment": null
+    },
     {
       "name": "carrier_shipments",
       "schema": "public",
@@ -21,6 +192,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -37,6 +209,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -53,6 +226,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -69,6 +243,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -85,6 +260,7 @@
           "scale": null,
           "default": "gen_random_uuid()",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -101,6 +277,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -117,6 +294,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -133,6 +311,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -149,6 +328,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -165,6 +345,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -181,6 +362,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -197,6 +379,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -213,6 +396,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -229,6 +413,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "json"
         },
@@ -245,6 +430,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -261,6 +447,7 @@
           "scale": null,
           "default": "'label_created'",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -277,6 +464,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         }
@@ -330,6 +518,7 @@
         }
       ],
       "checks": [],
+      "triggers": [],
       "foreignKeys": {},
       "comment": null
     },
@@ -350,6 +539,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -366,6 +556,7 @@
           "scale": null,
           "default": "gen_random_uuid()",
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -382,6 +573,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -398,6 +590,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         },
@@ -414,6 +607,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "datetime"
         },
@@ -430,6 +624,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "text"
         },
@@ -446,6 +641,7 @@
           "scale": null,
           "default": null,
           "comment": null,
+          "collation": null,
           "enumItems": [],
           "mappedType": "uuid"
         }
@@ -476,6 +672,7 @@
         }
       ],
       "checks": [],
+      "triggers": [],
       "foreignKeys": {},
       "comment": null
     }

package/src/modules/shipping_carriers/migrations/Migration20260618173616_shipping_carriers.ts

@@ -0,0 +1,14 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260618173616_shipping_carriers extends Migration {
+
+  override up(): void | Promise<void> {
+    this.addSql(`create table "carrier_shipment_idempotency_keys" ("id" uuid not null default gen_random_uuid(), "provider_key" text not null, "idempotency_key" text not null, "request_hash" text not null, "shipment_id" uuid null, "organization_id" uuid not null, "tenant_id" uuid not null, "created_at" timestamptz not null, primary key ("id"));`);
+    this.addSql(`alter table "carrier_shipment_idempotency_keys" add constraint "carrier_shipment_idempotency_keys_unique" unique ("idempotency_key", "provider_key", "organization_id", "tenant_id");`);
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`drop table if exists "carrier_shipment_idempotency_keys";`);
+  }
+
+}

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

@@ -977,6 +977,7 @@
   "staff.timesheets.my.errors.updateAssignment": "Failed to update projects.",
   "staff.timesheets.my.list.addDescription": "Add description",
   "staff.timesheets.my.list.noEntries": "No entries for this period.",
+  "staff.timesheets.my.list.saveError": "Beschreibung konnte nicht gespeichert werden. Bitte versuchen Sie es erneut.",
   "staff.timesheets.my.list.today": "Today",
   "staff.timesheets.my.list.yesterday": "Yesterday",
   "staff.timesheets.my.loading": "Loading timesheets...",

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

@@ -977,6 +977,7 @@
   "staff.timesheets.my.errors.updateAssignment": "Failed to update projects.",
   "staff.timesheets.my.list.addDescription": "Add description",
   "staff.timesheets.my.list.noEntries": "No entries for this period.",
+  "staff.timesheets.my.list.saveError": "Failed to save description. Please try again.",
   "staff.timesheets.my.list.today": "Today",
   "staff.timesheets.my.list.yesterday": "Yesterday",
   "staff.timesheets.my.loading": "Loading timesheets...",

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

@@ -977,6 +977,7 @@
   "staff.timesheets.my.errors.updateAssignment": "Failed to update projects.",
   "staff.timesheets.my.list.addDescription": "Add description",
   "staff.timesheets.my.list.noEntries": "No entries for this period.",
+  "staff.timesheets.my.list.saveError": "No se pudo guardar la descripción. Inténtalo de nuevo.",
   "staff.timesheets.my.list.today": "Today",
   "staff.timesheets.my.list.yesterday": "Yesterday",
   "staff.timesheets.my.loading": "Loading timesheets...",

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

@@ -977,6 +977,7 @@
   "staff.timesheets.my.errors.updateAssignment": "Failed to update projects.",
   "staff.timesheets.my.list.addDescription": "Add description",
   "staff.timesheets.my.list.noEntries": "No entries for this period.",
+  "staff.timesheets.my.list.saveError": "Nie udało się zapisać opisu. Spróbuj ponownie.",
   "staff.timesheets.my.list.today": "Today",
   "staff.timesheets.my.list.yesterday": "Yesterday",
   "staff.timesheets.my.loading": "Loading timesheets...",

package/src/modules/staff/lib/timesheets-ui/ListView.tsx

@@ -3,7 +3,9 @@
 import * as React from 'react'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import type { TranslateFn } from '@open-mercato/shared/lib/i18n/context'
-import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCallOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
+import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { ProjectColorDot } from './ProjectColorDot'
 
 type TimeEntry = {
@@ -86,6 +88,7 @@ function InlineDescription({
   placeholder: string
   onSaved?: () => void
 }) {
+  const t = useT()
   const [editing, setEditing] = React.useState(false)
   const [value, setValue] = React.useState(initialValue ?? '')
   const [saving, setSaving] = React.useState(false)
@@ -103,19 +106,24 @@ function InlineDescription({
     }
     setSaving(true)
     try {
-      await apiCall(`/api/staff/timesheets/time-entries`, {
+      await apiCallOrThrow(`/api/staff/timesheets/time-entries`, {
         method: 'PUT',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ id: entryId, notes: trimmed || null }),
       })
-      onSaved?.()
-    } catch {
-      // silent
-    } finally {
       setSaving(false)
       setEditing(false)
+      onSaved?.()
+    } catch (err) {
+      setSaving(false)
+      if (!surfaceRecordConflict(err, t)) {
+        flash(
+          t('staff.timesheets.my.list.saveError', 'Failed to save description. Please try again.'),
+          'error',
+        )
+      }
     }
-  }, [entryId, value, initialValue, onSaved])
+  }, [entryId, value, initialValue, onSaved, t])
 
   if (!editing) {
     return (