@open-mercato/core 0.10.1-develop.7787.1.96c7cfc66f → 0.10.1-develop.7793.1.9e0c43fdde

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

@@ -9,6 +9,8 @@ import { invalidateCrudCache } from "@open-mercato/shared/lib/crud/cache";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
 import { findOneWithDecryption, findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import { readSafeDecryptedString } from "../lib/decryptionSafety.js";
+import { isInitialReplacementOrderApproval } from "../lib/replacementOrderUndo.js";
+import { OPTIMISTIC_LOCK_HEADER_NAME } from "@open-mercato/shared/lib/crud/optimistic-lock-headers";
 import { E } from "../../../generated/entities.ids.generated.js";
 import {
   WarrantyClaim,
@@ -2298,19 +2300,26 @@ const SALES_ORDER_LINE_KINDS = /* @__PURE__ */ new Set(["product", "service", "s
 function readSalesOrderLineKind(value) {
   return typeof value === "string" && SALES_ORDER_LINE_KINDS.has(value) ? value : null;
 }
-async function dispatchSalesOrderDelete(ctx, scope, replacementOrderId) {
+async function dispatchSalesOrderDelete(ctx, scope, replacementOrderId, expectedUpdatedAt) {
   const commandBus = ctx.container.resolve("commandBus");
+  const dispatchContext = scrubbedDispatchContext(ctx);
+  if (expectedUpdatedAt) {
+    dispatchContext.request = new Request(ctx.request?.url ?? "http://localhost", {
+      headers: { [OPTIMISTIC_LOCK_HEADER_NAME]: expectedUpdatedAt }
+    });
+  }
   await commandBus.execute(
     "sales.orders.delete",
     {
       input: { id: replacementOrderId, tenantId: scope.tenantId, organizationId: scope.organizationId },
-      ctx: scrubbedDispatchContext(ctx)
+      ctx: dispatchContext
     }
   );
 }
 const createReplacementOrderCommand = {
   id: "warranty_claims.claim.create_replacement_order",
   isUndoable: true,
+  redo: ({ input, ctx }) => createReplacementOrderCommand.execute({ ...input, updatedAt: void 0 }, ctx),
   prepare: async (rawInput, ctx) => {
     const input = parseCommandInput(claimCreateReplacementOrderSchema, rawInput);
     const scope = resolveScope(ctx, input);
@@ -2548,10 +2557,10 @@ const createReplacementOrderCommand = {
       }
       if (currentRow) {
         const currentUpdatedAt = currentRow.updated_at ? new Date(currentRow.updated_at).toISOString() : null;
-        if (!replacementOrder.updatedAt || !currentUpdatedAt || currentUpdatedAt !== replacementOrder.updatedAt) {
+        if (!replacementOrder.updatedAt || !currentUpdatedAt || currentUpdatedAt !== replacementOrder.updatedAt && !await isInitialReplacementOrderApproval(ctx, scope, replacementOrder.id, replacementOrder.updatedAt, currentUpdatedAt)) {
           throw new CrudHttpError(409, { error: "warranty_claims.errors.replacementOrderChangedUndoAborted" });
         }
-        await dispatchSalesOrderDelete(ctx, scope, replacementOrder.id);
+        await dispatchSalesOrderDelete(ctx, scope, replacementOrder.id, currentUpdatedAt);
       } else {
         replacementOrderBridgeLogger.info("warranty_claims.claim.create_replacement_order undo found replacement order already absent", {
           claimId: before.id,