order-management 0.0.26 → 0.0.28

package/.medusa/server/src/api/admin/swaps/route.js

@@ -26,6 +26,14 @@ const GET = async (req, res) => {
             skip: offset,
         });
         const swapArray = Array.isArray(swaps) ? swaps : swaps ? [swaps] : [];
+        // Sort by created_at descending (latest first)
+        swapArray.sort((a, b) => {
+            const aData = a;
+            const bData = b;
+            const aDate = aData.created_at ? new Date(aData.created_at).getTime() : 0;
+            const bDate = bData.created_at ? new Date(bData.created_at).getTime() : 0;
+            return bDate - aDate; // Descending order (newest first)
+        });
         res.json({
             swaps: swapArray,
             count: swapArray.length,
@@ -42,4 +50,4 @@ const GET = async (req, res) => {
     }
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3N3YXBzL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLGdEQUFtRDtBQUc1QyxNQUFNLEdBQUcsR0FBRyxLQUFLLEVBQ3RCLEdBQWtCLEVBQ2xCLEdBQW1CLEVBQ0osRUFBRTtJQUNqQixJQUFJLENBQUM7UUFDSCxNQUFNLFdBQVcsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBYyxrQkFBVyxDQUFDLENBQUE7UUFFL0QsdUJBQXVCO1FBQ3ZCLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsTUFBNEIsQ0FBQTtRQUNyRCxNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLFFBQThCLENBQUE7UUFDeEQsTUFBTSxVQUFVLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxXQUFpQyxDQUFBO1FBQzlELE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxLQUFlLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtRQUM1RSxNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsTUFBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBRTlFLE1BQU0sT0FBTyxHQUE0QixFQUFFLENBQUE7UUFDM0MsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNYLE9BQU8sQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFBO1FBQ3pCLENBQUM7UUFDRCxJQUFJLE9BQU8sRUFBRSxDQUFDO1lBQ1osT0FBTyxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUE7UUFDNUIsQ0FBQztRQUNELElBQUksVUFBVSxFQUFFLENBQUM7WUFDZixPQUFPLENBQUMsV0FBVyxHQUFHLFVBQVUsQ0FBQTtRQUNsQyxDQUFDO1FBRUQsTUFBTSxLQUFLLEdBQUcsTUFBTSxXQUFXLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRTtZQUNqRCxJQUFJLEVBQUUsS0FBSztZQUNYLElBQUksRUFBRSxNQUFNO1NBQ2IsQ0FBQyxDQUFBO1FBRUYsTUFBTSxTQUFTLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtRQUVyRSxHQUFHLENBQUMsSUFBSSxDQUFDO1lBQ1AsS0FBSyxFQUFFLFNBQVM7WUFDaEIsS0FBSyxFQUFFLFNBQVMsQ0FBQyxNQUFNO1lBQ3ZCLEtBQUs7WUFDTCxNQUFNO1NBQ1AsQ0FBQyxDQUFBO0lBQ0osQ0FBQztJQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7UUFDZixNQUFNLFlBQVksR0FBRyxLQUFLLFlBQVksS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxlQUFlLENBQUE7UUFDN0UsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFDbkIsT0FBTyxFQUFFLDBCQUEwQjtZQUNuQyxLQUFLLEVBQUUsWUFBWTtTQUNwQixDQUFDLENBQUE7SUFDSixDQUFDO0FBQ0gsQ0FBQyxDQUFBO0FBN0NZLFFBQUEsR0FBRyxPQTZDZiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3N3YXBzL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLGdEQUFtRDtBQUc1QyxNQUFNLEdBQUcsR0FBRyxLQUFLLEVBQ3RCLEdBQWtCLEVBQ2xCLEdBQW1CLEVBQ0osRUFBRTtJQUNqQixJQUFJLENBQUM7UUFDSCxNQUFNLFdBQVcsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBYyxrQkFBVyxDQUFDLENBQUE7UUFFL0QsdUJBQXVCO1FBQ3ZCLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsTUFBNEIsQ0FBQTtRQUNyRCxNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLFFBQThCLENBQUE7UUFDeEQsTUFBTSxVQUFVLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxXQUFpQyxDQUFBO1FBQzlELE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxLQUFlLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtRQUM1RSxNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsTUFBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBRTlFLE1BQU0sT0FBTyxHQUE0QixFQUFFLENBQUE7UUFDM0MsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNYLE9BQU8sQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFBO1FBQ3pCLENBQUM7UUFDRCxJQUFJLE9BQU8sRUFBRSxDQUFDO1lBQ1osT0FBTyxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUE7UUFDNUIsQ0FBQztRQUNELElBQUksVUFBVSxFQUFFLENBQUM7WUFDZixPQUFPLENBQUMsV0FBVyxHQUFHLFVBQVUsQ0FBQTtRQUNsQyxDQUFDO1FBRUQsTUFBTSxLQUFLLEdBQUcsTUFBTSxXQUFXLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRTtZQUNqRCxJQUFJLEVBQUUsS0FBSztZQUNYLElBQUksRUFBRSxNQUFNO1NBQ2IsQ0FBQyxDQUFBO1FBRUYsTUFBTSxTQUFTLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtRQUVyRSwrQ0FBK0M7UUFDL0MsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQVUsRUFBRSxDQUFVLEVBQUUsRUFBRTtZQUN4QyxNQUFNLEtBQUssR0FBRyxDQUFtQyxDQUFBO1lBQ2pELE1BQU0sS0FBSyxHQUFHLENBQW1DLENBQUE7WUFDakQsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDekUsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDekUsT0FBTyxLQUFLLEdBQUcsS0FBSyxDQUFBLENBQUMsa0NBQWtDO1FBQ3pELENBQUMsQ0FBQyxDQUFBO1FBRUYsR0FBRyxDQUFDLElBQUksQ0FBQztZQUNQLEtBQUssRUFBRSxTQUFTO1lBQ2hCLEtBQUssRUFBRSxTQUFTLENBQUMsTUFBTTtZQUN2QixLQUFLO1lBQ0wsTUFBTTtTQUNQLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1FBQ2YsTUFBTSxZQUFZLEdBQUcsS0FBSyxZQUFZLEtBQUssQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsZUFBZSxDQUFBO1FBQzdFLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQ25CLE9BQU8sRUFBRSwwQkFBMEI7WUFDbkMsS0FBSyxFQUFFLFlBQVk7U0FDcEIsQ0FBQyxDQUFBO0lBQ0osQ0FBQztBQUNILENBQUMsQ0FBQTtBQXREWSxRQUFBLEdBQUcsT0FzRGYifQ==

package/.medusa/server/src/subscribers/exchange-created.js

@@ -7,201 +7,214 @@ const swap_1 = require("../modules/swap");
 /**
  * Subscriber handler for exchange created events
  * Automatically links exchanges created by admin to approved swaps
- *
- * When an exchange is created, this subscriber:
- * 1. Finds the swap with matching order_id and status "approved" without exchange_id
- * 2. Links the exchange to the swap by updating exchange_id field
- * 3. Stores linking timestamp in metadata
  */
-async function exchangeCreatedHandler({ event: { data }, container, }) {
+async function exchangeCreatedHandler({ event, container, }) {
+    const logger = container.resolve("logger");
     const startTime = Date.now();
-    let retryCount = 0;
-    const maxRetries = 3;
-    const retryDelay = 1000; // 1 second base delay
-    // Log event received for verification
-    console.log("[Exchange Created Subscriber] Event received:", {
-        event_name: "exchange.created",
-        exchange_id: data.id,
-        order_id: data.order_id,
-        timestamp: new Date().toISOString(),
-    });
-    const executeWithRetry = async () => {
-        try {
-            const exchangeId = data.id;
-            const orderId = data.order_id;
-            if (!exchangeId) {
-                console.error("[Exchange Created Subscriber] No exchange ID found in event data");
-                return;
-            }
-            if (!orderId) {
-                console.debug("[Exchange Created Subscriber] No order_id in exchange, skipping link");
-                return;
-            }
-            const swapService = container.resolve(swap_1.SWAP_MODULE);
-            const remoteQuery = container.resolve(utils_1.ContainerRegistrationKeys.REMOTE_QUERY);
-            // Validate exchange exists in Medusa before processing
-            try {
-                const exchangeQuery = (0, utils_1.remoteQueryObjectFromString)({
-                    entryPoint: "exchange",
-                    fields: ["id", "order_id"],
-                    filters: {
-                        id: [exchangeId],
-                    },
-                });
-                const exchanges = await remoteQuery(exchangeQuery);
-                const exchangeArray = Array.isArray(exchanges) ? exchanges : exchanges ? [exchanges] : [];
-                const exchange = exchangeArray.find((e) => {
-                    const eData = e;
-                    return eData?.id === exchangeId;
-                });
-                if (!exchange) {
-                    console.warn(`[Exchange Created Subscriber] Exchange ${exchangeId} not found in Medusa, skipping link`);
-                    return;
-                }
-            }
-            catch (validationError) {
-                const validationErrorMessage = validationError instanceof Error ? validationError.message : String(validationError);
-                console.warn(`[Exchange Created Subscriber] Failed to validate exchange ${exchangeId}: ${validationErrorMessage}`);
-                // Continue processing even if validation fails (might be transient)
-            }
-            // Find swap by order_id where:
-            // - status is "approved" OR ("requested" with pending_exchange_creation flag)
-            // - exchange_id is null
-            let swaps;
-            let swap = null;
-            try {
-                // First try to find approved swaps
-                swaps = await swapService.listSwaps({
-                    order_id: orderId,
-                    status: "approved",
-                }, { take: 10 });
-                let swapsArray = Array.isArray(swaps) ? swaps : swaps ? [swaps] : [];
-                // Find swap without exchange_id (not yet linked)
-                swap = swapsArray.find((s) => {
-                    const swapData = s;
-                    return !swapData.exchange_id;
-                }) || null;
-                // If no approved swap found, try to find requested swap with pending_exchange_creation
-                if (!swap) {
-                    swaps = await swapService.listSwaps({
-                        order_id: orderId,
-                        status: "requested",
-                    }, { take: 10 });
-                    swapsArray = Array.isArray(swaps) ? swaps : swaps ? [swaps] : [];
-                    // Find swap with pending_exchange_creation flag and no exchange_id
-                    swap = swapsArray.find((s) => {
-                        const swapData = s;
-                        const metadata = swapData.metadata || {};
-                        const pendingExchangeCreation = metadata.pending_exchange_creation === true;
-                        return !swapData.exchange_id && pendingExchangeCreation;
-                    }) || null;
-                }
-            }
-            catch (filterError) {
-                const errorMessage = filterError instanceof Error ? filterError.message : String(filterError);
-                console.warn(`[Exchange Created Subscriber] Failed to find swap: ${errorMessage}`);
-                return;
-            }
-            if (!swap) {
-                // No unlinked swap found for this order
-                // This is expected if:
-                // - Exchange was created manually without a swap request
-                // - Swap doesn't have pending_exchange_creation flag
-                // - Swap already has an exchange_id
-                console.debug(`[Exchange Created Subscriber] No unlinked swap found for order ${orderId} and exchange ${exchangeId}`);
-                return;
-            }
-            const swapData = swap;
-            if (!swapData.id) {
-                console.error("[Exchange Created Subscriber] Swap found but missing ID");
-                return;
-            }
-            // Check if swap needs to be approved (status is "requested" with pending flag)
-            const swapMetadata = swapData.metadata || {};
-            const pendingExchangeCreation = swapMetadata.pending_exchange_creation === true;
-            const shouldApprove = swapData.status === "requested" && pendingExchangeCreation;
-            // Link exchange to swap and approve if needed
-            const linkingHistory = swapMetadata.exchange_linking_history || [];
-            const statusHistory = swapMetadata.status_history || [];
-            await swapService.updateSwaps({
-                selector: { id: swapData.id },
-                data: {
+    const eventName = event.name || "exchange.created";
+    const data = event.data || {};
+    logger.info(`[Exchange Created Subscriber] ⚡ Event received: ${eventName}`);
+    logger.info(`[Exchange Created Subscriber] Event data: ${JSON.stringify(data, null, 2)}`);
+    // Handle both event data formats:
+    // - Our custom event: { id, order_id, return_id, swap_id }
+    // - Medusa's event: { exchange_id, order_id }
+    const exchangeId = data.id || data.exchange_id;
+    const orderId = data.order_id;
+    if (!exchangeId) {
+        logger.error("[Exchange Created Subscriber] No exchange ID found in event data");
+        return;
+    }
+    if (!orderId) {
+        logger.debug("[Exchange Created Subscriber] No order_id in exchange, skipping link");
+        return;
+    }
+    // Execute with retry logic
+    await executeWithRetry(async () => await processExchangeLinking(exchangeId, orderId, container, logger), logger, exchangeId);
+    const duration = Date.now() - startTime;
+    logger.info(`[Exchange Created Subscriber] Completed in ${duration}ms`);
+}
+/**
+ * Main processing logic with proper error handling
+ */
+async function processExchangeLinking(exchangeId, orderId, container, logger) {
+    const swapService = container.resolve(swap_1.SWAP_MODULE);
+    const remoteQuery = container.resolve(utils_1.ContainerRegistrationKeys.REMOTE_QUERY);
+    // 1. Validate exchange exists in Medusa
+    const exchange = await validateExchangeExists(exchangeId, remoteQuery, logger);
+    if (!exchange) {
+        return;
+    }
+    // 2. Find eligible swap for this order
+    const swap = await findEligibleSwap(orderId, swapService, logger);
+    if (!swap) {
+        logger.debug(`[Exchange Created Subscriber] No unlinked swap found for order ${orderId}`);
+        return;
+    }
+    // 3. Update swap with exchange linkage
+    await linkExchangeToSwap(swap, exchangeId, swapService, logger);
+}
+/**
+ * Validate exchange exists using remote query
+ */
+async function validateExchangeExists(exchangeId, remoteQuery, logger) {
+    try {
+        const exchangeQuery = (0, utils_1.remoteQueryObjectFromString)({
+            entryPoint: "exchange",
+            fields: ["id", "order_id", "status"],
+            filters: { id: exchangeId },
+        });
+        const [exchange] = await remoteQuery(exchangeQuery);
+        if (!exchange) {
+            logger.warn(`[Exchange Created Subscriber] Exchange ${exchangeId} not found`);
+            return null;
+        }
+        return exchange;
+    }
+    catch (error) {
+        logger.warn(`[Exchange Created Subscriber] Exchange validation failed: ${error.message}`);
+        // Continue anyway - exchange might be valid but query failed
+        return { id: exchangeId }; // Return minimal object to continue
+    }
+}
+/**
+ * Find eligible swap for linking
+ */
+async function findEligibleSwap(orderId, swapService, logger) {
+    try {
+        // Get all swaps for this order and filter in memory
+        // This is more reliable than filtering by exchange_id: null in the query
+        const allSwaps = await swapService.listSwaps({ order_id: orderId }, { take: 100 } // Get up to 100 swaps to find unlinked ones
+        );
+        const swapsArray = Array.isArray(allSwaps) ? allSwaps : allSwaps ? [allSwaps] : [];
+        logger.info(`[Exchange Created Subscriber] Found ${swapsArray.length} swap(s) for order ${orderId}`);
+        // Filter for unlinked swaps (exchange_id is null or undefined)
+        const unlinkedSwaps = swapsArray.filter((swap) => {
+            const exchangeId = swap.exchange_id;
+            return !exchangeId || exchangeId === null || exchangeId === "";
+        });
+        logger.info(`[Exchange Created Subscriber] Found ${unlinkedSwaps.length} unlinked swap(s) for order ${orderId}`);
+        if (unlinkedSwaps.length === 0) {
+            return null;
+        }
+        // Priority 1: Approved swaps without exchange_id
+        const approvedSwaps = unlinkedSwaps.filter((swap) => swap.status === "approved");
+        if (approvedSwaps.length > 0) {
+            logger.info(`[Exchange Created Subscriber] Found ${approvedSwaps.length} approved unlinked swap(s), using first one`);
+            return approvedSwaps[0];
+        }
+        // Priority 2: Requested swaps with pending_exchange_creation flag
+        const requestedSwaps = unlinkedSwaps.filter((swap) => {
+            if (swap.status !== "requested")
+                return false;
+            const metadata = swap.metadata || {};
+            return metadata.pending_exchange_creation === true;
+        });
+        if (requestedSwaps.length > 0) {
+            logger.info(`[Exchange Created Subscriber] Found ${requestedSwaps.length} requested swap(s) with pending_exchange_creation flag, using first one`);
+            return requestedSwaps[0];
+        }
+        // Priority 3: Any requested swap (fallback)
+        const anyRequestedSwaps = unlinkedSwaps.filter((swap) => swap.status === "requested");
+        if (anyRequestedSwaps.length > 0) {
+            logger.info(`[Exchange Created Subscriber] Found ${anyRequestedSwaps.length} requested unlinked swap(s), using first one`);
+            return anyRequestedSwaps[0];
+        }
+        logger.debug(`[Exchange Created Subscriber] No eligible unlinked swap found for order ${orderId}`);
+        return null;
+    }
+    catch (error) {
+        logger.error(`[Exchange Created Subscriber] Error finding swap: ${error instanceof Error ? error.message : String(error)}`);
+        throw error; // Re-throw to trigger retry
+    }
+}
+/**
+ * Link exchange to swap with metadata updates
+ */
+async function linkExchangeToSwap(swap, exchangeId, swapService, logger) {
+    const swapId = swap.id;
+    const swapStatus = swap.status;
+    const metadata = swap.metadata || {};
+    logger.info(`[Exchange Created Subscriber] Linking exchange ${exchangeId} to swap ${swapId} (current status: ${swapStatus})`);
+    const pendingExchangeCreation = metadata.pending_exchange_creation === true;
+    const shouldApprove = swapStatus === "requested" && pendingExchangeCreation;
+    logger.info(`[Exchange Created Subscriber] Swap ${swapId} - pending_exchange_creation: ${pendingExchangeCreation}, shouldApprove: ${shouldApprove}`);
+    const linkingHistory = metadata.exchange_linking_history || [];
+    const statusHistory = metadata.status_history || [];
+    const updateData = {
+        exchange_id: exchangeId,
+        metadata: {
+            ...metadata,
+            exchange_linking_history: [
+                ...linkingHistory,
+                {
                     exchange_id: exchangeId,
-                    status: shouldApprove ? "approved" : swapData.status,
-                    metadata: {
-                        ...swapMetadata,
-                        exchange_linking_history: [
-                            ...linkingHistory,
-                            {
-                                exchange_id: exchangeId,
-                                linked_at: new Date().toISOString(),
-                                linked_by: "exchange_created_subscriber",
-                                auto_approved: shouldApprove,
-                            },
-                        ],
-                        exchange_linked_at: new Date().toISOString(),
-                        pending_exchange_creation: false,
-                        ...(shouldApprove ? {
-                            status_history: [
-                                ...statusHistory,
-                                {
-                                    status: "approved",
-                                    timestamp: new Date().toISOString(),
-                                    auto_approved: true,
-                                    approved_via: "exchange_created_subscriber",
-                                },
-                            ],
-                        } : {}),
-                    },
+                    linked_at: new Date().toISOString(),
+                    linked_by: "exchange_created_subscriber",
+                    auto_approved: shouldApprove,
                 },
-            });
-            const duration = Date.now() - startTime;
-            console.log(`[Exchange Created Subscriber] Linked exchange ${exchangeId} to swap ${swapData.id}`, {
-                duration_ms: duration,
-                retry_count: retryCount,
-                order_id: orderId,
-            });
+            ],
+            exchange_linked_at: new Date().toISOString(),
+            pending_exchange_creation: false,
+        },
+    };
+    // Update status if needed
+    if (shouldApprove) {
+        updateData.status = "approved";
+        updateData.metadata.status_history = [
+            ...statusHistory,
+            {
+                status: "approved",
+                timestamp: new Date().toISOString(),
+                auto_approved: true,
+                approved_via: "exchange_created_subscriber",
+            },
+        ];
+        logger.info(`[Exchange Created Subscriber] Will update swap ${swapId} status from "${swapStatus}" to "approved"`);
+    }
+    else {
+        logger.info(`[Exchange Created Subscriber] Swap ${swapId} status will remain "${swapStatus}" (not auto-approving)`);
+    }
+    logger.info(`[Exchange Created Subscriber] Updating swap ${swapId} with exchange_id: ${exchangeId}`);
+    const updatedSwap = await swapService.updateSwaps({
+        selector: { id: swapId },
+        data: updateData,
+    });
+    const finalSwap = Array.isArray(updatedSwap) ? updatedSwap[0] : updatedSwap;
+    const finalStatus = finalSwap?.status || "unknown";
+    logger.info(`[Exchange Created Subscriber] ✅ Successfully linked exchange ${exchangeId} to swap ${swapId}. Final status: ${finalStatus}`);
+}
+/**
+ * Retry execution with exponential backoff
+ */
+async function executeWithRetry(operation, logger, exchangeId, maxRetries = 3, baseDelay = 1000) {
+    let lastError;
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
+        try {
+            return await operation();
         }
         catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            const errorStack = error instanceof Error ? error.stack : undefined;
-            // Retry logic with exponential backoff
-            if (retryCount < maxRetries) {
-                retryCount++;
-                const delay = retryDelay * Math.pow(2, retryCount - 1);
-                console.warn(`[Exchange Created Subscriber] Retry ${retryCount}/${maxRetries} after ${delay}ms:`, errorMessage);
-                await new Promise((resolve) => setTimeout(resolve, delay));
-                return executeWithRetry();
+            lastError = error;
+            if (attempt < maxRetries - 1) {
+                const delay = baseDelay * Math.pow(2, attempt);
+                logger.warn(`[Exchange Created Subscriber] Attempt ${attempt + 1}/${maxRetries} failed for exchange ${exchangeId}, retrying in ${delay}ms:`, error.message);
+                await new Promise(resolve => setTimeout(resolve, delay));
             }
-            console.error("[Exchange Created Subscriber] Error linking exchange to swap (max retries exceeded):", {
-                error: errorMessage,
-                stack: errorStack,
-                retry_count: retryCount,
-                exchange_id: data.id,
-                order_id: data.order_id,
-            });
-            // Don't throw - subscriber errors shouldn't break the exchange flow
         }
-    };
-    await executeWithRetry();
+    }
+    logger.error(`[Exchange Created Subscriber] All ${maxRetries} attempts failed for exchange ${exchangeId}:`, lastError?.message || "Unknown error");
+    throw lastError;
+    // Don't throw - we don't want to break the exchange flow
 }
 /**
  * Subscriber configuration
  *
- * Event Name: "exchange.created"
- *
- * This subscriber listens for exchange creation events in Medusa.
- * When an exchange is created, it automatically links it to an approved swap
- * if one exists for the same order.
- *
- * Event Data Structure Expected:
- * {
- *   id: string (exchange ID)
- *   order_id?: string (order ID)
- *   [key: string]: unknown (other exchange fields)
- * }
+ * Listen to exchange.created event emitted by create-medusa-exchange-step
+ * Also listen to order.exchange_created as fallback in case Medusa emits that instead
  */
 exports.config = {
-    event: "exchange.created",
+    event: [
+        "exchange.created",
+        "order.exchange_created",
+    ],
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhjaGFuZ2UtY3JlYXRlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zdWJzY3JpYmVycy9leGNoYW5nZS1jcmVhdGVkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQXFCQSx5Q0FtT0M7QUF2UEQscURBQWtHO0FBRWxHLDBDQUE2QztBQVM3Qzs7Ozs7Ozs7R0FRRztBQUNZLEtBQUssVUFBVSxzQkFBc0IsQ0FBQyxFQUNuRCxLQUFLLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFDZixTQUFTLEdBQ2dDO0lBQ3pDLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQTtJQUM1QixJQUFJLFVBQVUsR0FBRyxDQUFDLENBQUE7SUFDbEIsTUFBTSxVQUFVLEdBQUcsQ0FBQyxDQUFBO0lBQ3BCLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQSxDQUFDLHNCQUFzQjtJQUU5QyxzQ0FBc0M7SUFDdEMsT0FBTyxDQUFDLEdBQUcsQ0FBQywrQ0FBK0MsRUFBRTtRQUMzRCxVQUFVLEVBQUUsa0JBQWtCO1FBQzlCLFdBQVcsRUFBRSxJQUFJLENBQUMsRUFBRTtRQUNwQixRQUFRLEVBQUUsSUFBSSxDQUFDLFFBQVE7UUFDdkIsU0FBUyxFQUFFLElBQUksSUFBSSxFQUFFLENBQUMsV0FBVyxFQUFFO0tBQ3BDLENBQUMsQ0FBQTtJQUVGLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxJQUFtQixFQUFFO1FBQ2pELElBQUksQ0FBQztZQUNILE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxFQUFFLENBQUE7WUFDMUIsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQTtZQUU3QixJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7Z0JBQ2hCLE9BQU8sQ0FBQyxLQUFLLENBQUMsa0VBQWtFLENBQUMsQ0FBQTtnQkFDakYsT0FBTTtZQUNSLENBQUM7WUFFRCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQ2IsT0FBTyxD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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"exchange-created.js","sourceRoot":"","sources":["../../../../src/subscribers/exchange-created.ts"],"names":[],"mappings":"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"}