@open-mercato/core 0.9.1-develop.7513.1.ae2715553f → 0.9.1-develop.7515.1.e2712c8b00

package/dist/modules/warranty_claims/commands/claims.js

@@ -43,7 +43,8 @@ import {
   ensureOrganizationScope,
   ensureTenantScope,
   extractUndoPayload,
-  requireScopedClaim
+  requireScopedClaim,
+  throwUndoRefusal
 } from "./shared.js";
 const claimCrudEvents = {
   module: "warranty_claims",
@@ -404,7 +405,7 @@ function restoreLineDelta(line, before, after) {
   line.updatedAt = /* @__PURE__ */ new Date();
 }
 function throwClaimUndoConflict() {
-  throw new CrudHttpError(409, { error: "warranty_claims.errors.conflict" });
+  return throwUndoRefusal("warranty_claims.errors.conflict", "This claim changed while you were editing it.");
 }
 async function requireCurrentUndoSnapshot(em, after) {
   const scope = { tenantId: after.tenantId, organizationId: after.organizationId };
@@ -416,7 +417,7 @@ async function requireCurrentUndoSnapshot(em, after) {
     scope
   );
   const expectedClaimUpdatedAt = toIso(after.updatedAt);
-  if (!claim || !expectedClaimUpdatedAt || toIso(claim.updatedAt) !== expectedClaimUpdatedAt) throwClaimUndoConflict();
+  if (!claim || !expectedClaimUpdatedAt || toIso(claim.updatedAt) !== expectedClaimUpdatedAt) return throwClaimUndoConflict();
   const lines = await findWithDecryption(
     em,
     WarrantyClaimLine,
@@ -425,12 +426,12 @@ async function requireCurrentUndoSnapshot(em, after) {
     scope
   );
   const afterLines = Array.isArray(after.lines) ? after.lines : [];
-  if (lines.length !== afterLines.length) throwClaimUndoConflict();
+  if (lines.length !== afterLines.length) return throwClaimUndoConflict();
   const afterLinesById = new Map(afterLines.map((line) => [line.id, line]));
   for (const line of lines) {
     const expected = afterLinesById.get(line.id);
     const expectedLineUpdatedAt = toIso(expected?.updatedAt);
-    if (!expectedLineUpdatedAt || toIso(line.updatedAt) !== expectedLineUpdatedAt) throwClaimUndoConflict();
+    if (!expectedLineUpdatedAt || toIso(line.updatedAt) !== expectedLineUpdatedAt) return throwClaimUndoConflict();
   }
   return { claim, lines };
 }
@@ -448,7 +449,7 @@ async function restoreSnapshot(em, before, after) {
   for (const line of lines) {
     const beforeLine = beforeLinesById.get(line.id);
     const afterLine = afterLinesById.get(line.id);
-    if (!beforeLine || !afterLine) throwClaimUndoConflict();
+    if (!beforeLine || !afterLine) return throwClaimUndoConflict();
     if (snapshotValueChanged(beforeLine, afterLine)) restoreLineDelta(line, beforeLine, afterLine);
   }
   return claim;
@@ -1121,7 +1122,7 @@ const updateClaimCommand = {
     const before = payload?.before;
     if (!before) return;
     const after = payload?.after;
-    if (!after) throwClaimUndoConflict();
+    if (!after) return throwClaimUndoConflict();
     const em = ctx.container.resolve("em").fork();
     let claim;
     await withAtomicFlush(em, [
@@ -1184,7 +1185,7 @@ const deleteClaimCommand = {
     const before = payload?.before;
     if (!before) return;
     const after = payload?.after;
-    if (!after) throwClaimUndoConflict();
+    if (!after) return throwClaimUndoConflict();
     const em = ctx.container.resolve("em").fork();
     let claim;
     await withAtomicFlush(em, [
@@ -1365,7 +1366,7 @@ const transitionClaimCommand = {
     const before = payload?.before;
     if (!before) return;
     const after = payload?.after;
-    if (!after) throwClaimUndoConflict();
+    if (!after) return throwClaimUndoConflict();
     const em = ctx.container.resolve("em").fork();
     let claim;
     await withAtomicFlush(em, [
@@ -1464,7 +1465,7 @@ const setReturnLabelCommand = {
     const before = payload?.before;
     if (!before) return;
     const after = payload?.after;
-    if (!after) throwClaimUndoConflict();
+    if (!after) return throwClaimUndoConflict();
     const em = ctx.container.resolve("em").fork();
     let claim;
     await withAtomicFlush(em, [
@@ -1901,7 +1902,7 @@ const createSalesReturnCommand = {
     const before = payload?.before;
     if (!before) return;
     const after = payload?.after;
-    if (!after) throwClaimUndoConflict();
+    if (!after) return throwClaimUndoConflict();
     await assertUndoSnapshotCurrent(ctx, after);
     const scope = { tenantId: before.tenantId, organizationId: before.organizationId };
     const salesReturn = payload?.salesReturn ?? null;
@@ -2199,7 +2200,7 @@ const createCreditMemoCommand = {
     const before = payload?.before;
     if (!before) return;
     const after = payload?.after;
-    if (!after) throwClaimUndoConflict();
+    if (!after) return throwClaimUndoConflict();
     await assertUndoSnapshotCurrent(ctx, after);
     const scope = { tenantId: before.tenantId, organizationId: before.organizationId };
     const creditMemo = payload?.creditMemo ?? null;
@@ -2489,7 +2490,7 @@ const createReplacementOrderCommand = {
     const before = payload?.before;
     if (!before) return;
     const after = payload?.after;
-    if (!after) throwClaimUndoConflict();
+    if (!after) return throwClaimUndoConflict();
     await assertUndoSnapshotCurrent(ctx, after);
     const scope = { tenantId: before.tenantId, organizationId: before.organizationId };
     const replacementOrder = payload?.replacementOrder ?? null;