order-management 0.0.23 → 0.0.25

package/.medusa/server/src/workflows/steps/swap/update-swap-exchange-details-step.js

@@ -5,11 +5,15 @@ const utils_1 = require("@medusajs/framework/utils");
 const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
 const swap_1 = require("../../../modules/swap");
 exports.updateSwapExchangeDetailsStep = (0, workflows_sdk_1.createStep)("update-swap-exchange-details", async (input, { container }) => {
-    const { swap_id, return_location_id, return_shipping_method_id, outbound_shipping_method_id, send_notification, } = input;
+    const { swap_id, return_location_id, return_shipping_method_id, outbound_shipping_method_id, send_notification, metadata, } = input;
     if (!swap_id) {
         throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "swap_id is required");
     }
     const swapService = container.resolve(swap_1.SWAP_MODULE);
+    // Retrieve current swap to preserve existing metadata
+    const currentSwap = await swapService.retrieveSwap(swap_id);
+    const currentSwapData = currentSwap;
+    const currentMetadata = currentSwapData.metadata || {};
     await swapService.updateSwaps({
         selector: { id: swap_id },
         data: {
@@ -17,6 +21,12 @@ exports.updateSwapExchangeDetailsStep = (0, workflows_sdk_1.createStep)("update-
             return_shipping_method_id: return_shipping_method_id || null,
             outbound_shipping_method_id: outbound_shipping_method_id || null,
             send_notification: send_notification || false,
+            ...(metadata && {
+                metadata: {
+                    ...currentMetadata,
+                    ...metadata,
+                },
+            }),
         },
     });
     const swap = await swapService.retrieveSwap(swap_id);
@@ -24,4 +34,4 @@ exports.updateSwapExchangeDetailsStep = (0, workflows_sdk_1.createStep)("update-
         swap,
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLXN3YXAtZXhjaGFuZ2UtZGV0YWlscy1zdGVwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3dvcmtmbG93cy9zdGVwcy9zd2FwL3VwZGF0ZS1zd2FwLWV4Y2hhbmdlLWRldGFpbHMtc3RlcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxxREFBdUQ7QUFDdkQscUVBQTRFO0FBQzVFLGdEQUFtRDtBQWV0QyxRQUFBLDZCQUE2QixHQUFHLElBQUEsMEJBQVUsRUFDckQsOEJBQThCLEVBQzlCLEtBQUssRUFDSCxLQUF5QyxFQUN6QyxFQUFFLFNBQVMsRUFBRSxFQUMrQyxFQUFFO0lBQzlELE1BQU0sRUFDSixPQUFPLEVBQ1Asa0JBQWtCLEVBQ2xCLHlCQUF5QixFQUN6QiwyQkFBMkIsRUFDM0IsaUJBQWlCLEdBQ2xCLEdBQUcsS0FBSyxDQUFBO0lBRVQsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2IsTUFBTSxJQUFJLG1CQUFXLENBQ25CLG1CQUFXLENBQUMsS0FBSyxDQUFDLFlBQVksRUFDOUIscUJBQXFCLENBQ3RCLENBQUE7SUFDSCxDQUFDO0lBRUQsTUFBTSxXQUFXLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBYyxrQkFBVyxDQUFDLENBQUE7SUFFL0QsTUFBTSxXQUFXLENBQUMsV0FBVyxDQUFDO1FBQzVCLFFBQVEsRUFBRSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUU7UUFDekIsSUFBSSxFQUFFO1lBQ0osa0JBQWtCLEVBQUUsa0JBQWtCLElBQUksSUFBSTtZQUM5Qyx5QkFBeUIsRUFBRSx5QkFBeUIsSUFBSSxJQUFJO1lBQzVELDJCQUEyQixFQUFFLDJCQUEyQixJQUFJLElBQUk7WUFDaEUsaUJBQWlCLEVBQUUsaUJBQWlCLElBQUksS0FBSztTQUM5QztLQUNGLENBQUMsQ0FBQTtJQUVGLE1BQU0sSUFBSSxHQUFHLE1BQU0sV0FBVyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUVwRCxPQUFPLElBQUksNEJBQVksQ0FBc0M7UUFDM0QsSUFBSTtLQUNMLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FDRixDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLXN3YXAtZXhjaGFuZ2UtZGV0YWlscy1zdGVwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3dvcmtmbG93cy9zdGVwcy9zd2FwL3VwZGF0ZS1zd2FwLWV4Y2hhbmdlLWRldGFpbHMtc3RlcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxxREFBdUQ7QUFDdkQscUVBQTRFO0FBQzVFLGdEQUFtRDtBQWdCdEMsUUFBQSw2QkFBNkIsR0FBRyxJQUFBLDBCQUFVLEVBQ3JELDhCQUE4QixFQUM5QixLQUFLLEVBQ0gsS0FBeUMsRUFDekMsRUFBRSxTQUFTLEVBQUUsRUFDK0MsRUFBRTtJQUM5RCxNQUFNLEVBQ0osT0FBTyxFQUNQLGtCQUFrQixFQUNsQix5QkFBeUIsRUFDekIsMkJBQTJCLEVBQzNCLGlCQUFpQixFQUNqQixRQUFRLEdBQ1QsR0FBRyxLQUFLLENBQUE7SUFFVCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDYixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsWUFBWSxFQUM5QixxQkFBcUIsQ0FDdEIsQ0FBQTtJQUNILENBQUM7SUFFRCxNQUFNLFdBQVcsR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFjLGtCQUFXLENBQUMsQ0FBQTtJQUUvRCxzREFBc0Q7SUFDdEQsTUFBTSxXQUFXLEdBQUcsTUFBTSxXQUFXLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQzNELE1BQU0sZUFBZSxHQUFHLFdBQXFELENBQUE7SUFDN0UsTUFBTSxlQUFlLEdBQUcsZUFBZSxDQUFDLFFBQVEsSUFBSSxFQUFFLENBQUE7SUFFdEQsTUFBTSxXQUFXLENBQUMsV0FBVyxDQUFDO1FBQzVCLFFBQVEsRUFBRSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUU7UUFDekIsSUFBSSxFQUFFO1lBQ0osa0JBQWtCLEVBQUUsa0JBQWtCLElBQUksSUFBSTtZQUM5Qyx5QkFBeUIsRUFBRSx5QkFBeUIsSUFBSSxJQUFJO1lBQzVELDJCQUEyQixFQUFFLDJCQUEyQixJQUFJLElBQUk7WUFDaEUsaUJBQWlCLEVBQUUsaUJBQWlCLElBQUksS0FBSztZQUM3QyxHQUFHLENBQUMsUUFBUSxJQUFJO2dCQUNkLFFBQVEsRUFBRTtvQkFDUixHQUFHLGVBQWU7b0JBQ2xCLEdBQUcsUUFBUTtpQkFDWjthQUNGLENBQUM7U0FDSDtLQUNGLENBQUMsQ0FBQTtJQUVGLE1BQU0sSUFBSSxHQUFHLE1BQU0sV0FBVyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUVwRCxPQUFPLElBQUksNEJBQVksQ0FBc0M7UUFDM0QsSUFBSTtLQUNMLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FDRixDQUFBIn0=

package/.medusa/server/src/workflows/steps/swap/validate-swap-items-step.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateSwapItemsStep = void 0;
 const utils_1 = require("@medusajs/framework/utils");
 const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
+const utils_2 = require("@medusajs/framework/utils");
 exports.validateSwapItemsStep = (0, workflows_sdk_1.createStep)("validate-swap-items", async (input, { container }) => {
     const { order, return_items, new_items } = input;
     if (!return_items || return_items.length === 0) {
@@ -12,8 +13,60 @@ exports.validateSwapItemsStep = (0, workflows_sdk_1.createStep)("validate-swap-i
         throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "New items are required");
     }
     const orderItems = order.items || [];
-    // Validate return items exist in order
-    for (const returnItem of return_items) {
+    // Check for existing returns/exchanges that might conflict with swap items
+    try {
+        const remoteQuery = container.resolve(utils_2.ContainerRegistrationKeys.REMOTE_QUERY);
+        // Query for existing returns on this order
+        const existingReturnsQuery = (0, utils_2.remoteQueryObjectFromString)({
+            entryPoint: "return",
+            fields: ["id", "order_id", "items.id", "items.variant_id"],
+            filters: {
+                order_id: [order.id],
+            },
+        });
+        const existingReturns = await remoteQuery(existingReturnsQuery);
+        const returnsArray = Array.isArray(existingReturns) ? existingReturns : existingReturns ? [existingReturns] : [];
+        // Check if any return items overlap with swap return items
+        if (returnsArray.length > 0) {
+            const returnedItemIds = new Set();
+            const returnedVariantIds = new Set();
+            returnsArray.forEach((ret) => {
+                const retData = ret;
+                retData.items?.forEach((item) => {
+                    if (item.id)
+                        returnedItemIds.add(item.id);
+                    if (item.variant_id)
+                        returnedVariantIds.add(item.variant_id);
+                });
+            });
+            // Check for ID overlap
+            for (const returnItem of return_items) {
+                if (returnedItemIds.has(returnItem.id)) {
+                    throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Cannot create swap: Order item "${returnItem.id}" is already part of an existing return for this order. Please use a different item or cancel the existing return first.`);
+                }
+            }
+            // Check for variant_id overlap (catch cases where item was replaced)
+            for (const returnItem of return_items) {
+                const orderItem = orderItems.find((item) => item.id === returnItem.id);
+                const orderItemVariantId = orderItem?.variant_id;
+                const itemVariantId = returnItem.variant_id || orderItemVariantId;
+                if (itemVariantId && returnedVariantIds.has(itemVariantId)) {
+                    throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Cannot create swap: The product variant "${itemVariantId}" for order item "${returnItem.id}" has already been returned. This item may have been replaced in the order.`);
+                }
+            }
+        }
+    }
+    catch (queryError) {
+        // If it's a validation error we threw, re-throw it
+        if (queryError instanceof utils_1.MedusaError) {
+            throw queryError;
+        }
+        // Otherwise, log warning but continue - this is just a safety check
+        console.warn("[Validate Swap Items] Failed to check existing returns/exchanges:", queryError);
+    }
+    // Validate return items exist in order and enrich with variant_id
+    // This enables safe ID mapping if order items change later
+    const enrichedReturnItems = return_items.map((returnItem) => {
         const orderItem = orderItems.find((item) => item.id === returnItem.id);
         if (!orderItem) {
             throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Return item with id ${returnItem.id} not found in order`);
@@ -23,6 +76,39 @@ exports.validateSwapItemsStep = (0, workflows_sdk_1.createStep)("validate-swap-i
         if (returnItem.quantity > orderQuantity) {
             throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Return quantity ${returnItem.quantity} exceeds order quantity ${orderQuantity} for item ${returnItem.id}`);
         }
+        // CRITICAL VALIDATION: Check if variant_id matches
+        // If a variant_id was provided, it must match the order item's variant_id
+        // This catches cases where the order item was replaced before swap creation
+        const orderVariantId = orderItemData.variant_id;
+        const providedVariantId = returnItem.variant_id;
+        if (providedVariantId && orderVariantId && providedVariantId !== orderVariantId) {
+            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Cannot create swap: Order item "${returnItem.id}" has been replaced with a different product variant. ` +
+                `Expected variant: "${providedVariantId}", but order has variant: "${orderVariantId}". ` +
+                `The order item may have been modified. Please refresh and try again with the current order items.`);
+        }
+        // Enrich return item with variant_id from order item for safe ID mapping
+        // Use existing variant_id if provided, otherwise get from order item
+        return {
+            ...returnItem,
+            variant_id: returnItem.variant_id || orderItemData.variant_id, // Store variant_id for future ID mapping
+        };
+    });
+    // Explicit validation: Ensure return item variant_id matches order item variant_id
+    // This allows returning the same variant and catches mismatches
+    for (const returnItem of enrichedReturnItems) {
+        const orderItem = orderItems.find((item) => item.id === returnItem.id);
+        if (orderItem) {
+            const orderItemVariantId = orderItem?.variant_id;
+            const returnItemVariantId = returnItem.variant_id;
+            // If both have variant_id, they should match (allowing same variant returns)
+            if (orderItemVariantId && returnItemVariantId && orderItemVariantId !== returnItemVariantId) {
+                throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Variant mismatch: Return item "${returnItem.id}" has variant "${returnItemVariantId}" but order item has variant "${orderItemVariantId}"`);
+            }
+            // Log when customer is returning the same variant (this is allowed)
+            if (orderItemVariantId && returnItemVariantId && orderItemVariantId === returnItemVariantId) {
+                console.log(`[Validate Swap Items] Customer returning same variant "${returnItemVariantId}" for order item "${returnItem.id}" in order ${order.id}`);
+            }
+        }
     }
     // Validate new items have variant_id and quantity
     for (const newItem of new_items) {
@@ -33,9 +119,21 @@ exports.validateSwapItemsStep = (0, workflows_sdk_1.createStep)("validate-swap-i
             throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `New item quantity must be greater than 0 for variant ${newItem.variant_id}`);
         }
     }
+    // Check if new items match variants already in order (allow same variant requests)
+    const orderVariantIds = new Set(orderItems
+        .map((item) => item.variant_id)
+        .filter((variantId) => Boolean(variantId)));
+    for (const newItem of new_items) {
+        if (orderVariantIds.has(newItem.variant_id)) {
+            // Same variant requested - this is allowed, but log for awareness
+            console.log(`[Validate Swap Items] Customer requesting same variant "${newItem.variant_id}" that's already in order ${order.id} (quantity: ${newItem.quantity})`);
+            // Optional: Add validation that quantity is reasonable
+            // For now, allow any quantity as long as variant exists
+        }
+    }
     return new workflows_sdk_1.StepResponse({
-        return_items,
+        return_items: enrichedReturnItems, // Return enriched items with variant_id
         new_items,
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGUtc3dhcC1pdGVtcy1zdGVwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3dvcmtmbG93cy9zdGVwcy9zd2FwL3ZhbGlkYXRlLXN3YXAtaXRlbXMtc3RlcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxxREFBdUQ7QUFDdkQscUVBQTRFO0FBeUIvRCxRQUFBLHFCQUFxQixHQUFHLElBQUEsMEJBQVUsRUFDN0MscUJBQXFCLEVBQ3JCLEtBQUssRUFDSCxLQUFpQyxFQUNqQyxFQUFFLFNBQVMsRUFBRSxFQUN1QyxFQUFFO0lBQ3RELE1BQU0sRUFBRSxLQUFLLEVBQUUsWUFBWSxFQUFFLFNBQVMsRUFBRSxHQUFHLEtBQUssQ0FBQTtJQUVoRCxJQUFJLENBQUMsWUFBWSxJQUFJLFlBQVksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDL0MsTUFBTSxJQUFJLG1CQUFXLENBQ25CLG1CQUFXLENBQUMsS0FBSyxDQUFDLFlBQVksRUFDOUIsMkJBQTJCLENBQzVCLENBQUE7SUFDSCxDQUFDO0lBRUQsSUFBSSxDQUFDLFNBQVMsSUFBSSxTQUFTLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ3pDLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQzlCLHdCQUF3QixDQUN6QixDQUFBO0lBQ0gsQ0FBQztJQUVELE1BQU0sVUFBVSxHQUFHLEtBQUssQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFBO0lBRXBDLHVDQUF1QztJQUN2QyxLQUFLLE1BQU0sVUFBVSxJQUFJLFlBQVksRUFBRSxDQUFDO1FBQ3RDLE1BQU0sU0FBUyxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQy9CLENBQUMsSUFBcUIsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxVQUFVLENBQUMsRUFBRSxDQUNyRCxDQUFBO1FBRUQsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ2YsTUFBTSxJQUFJLG1CQUFXLENBQ25CLG1CQUFXLENBQUMsS0FBSyxDQUFDLFlBQVksRUFDOUIsdUJBQXVCLFVBQVUsQ0FBQyxFQUFFLHFCQUFxQixDQUMxRCxDQUFBO1FBQ0gsQ0FBQztRQUVELE1BQU0sYUFBYSxHQUFHLFNBQWtDLENBQUE7UUFDeEQsTUFBTSxhQUFhLEdBQUcsYUFBYSxDQUFDLFFBQVEsSUFBSSxDQUFDLENBQUE7UUFFakQsSUFBSSxVQUFVLENBQUMsUUFBUSxHQUFHLGFBQWEsRUFBRSxDQUFDO1lBQ3hDLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQzlCLG1CQUFtQixVQUFVLENBQUMsUUFBUSwyQkFBMkIsYUFBYSxhQUFhLFVBQVUsQ0FBQyxFQUFFLEVBQUUsQ0FDM0csQ0FBQTtRQUNILENBQUM7SUFDSCxDQUFDO0lBRUQsa0RBQWtEO0lBQ2xELEtBQUssTUFBTSxPQUFPLElBQUksU0FBUyxFQUFFLENBQUM7UUFDaEMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUN4QixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsWUFBWSxFQUM5QixpQ0FBaUMsQ0FDbEMsQ0FBQTtRQUNILENBQUM7UUFFRCxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsSUFBSSxPQUFPLENBQUMsUUFBUSxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQy9DLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQzlCLHdEQUF3RCxPQUFPLENBQUMsVUFBVSxFQUFFLENBQzdFLENBQUE7UUFDSCxDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sSUFBSSw0QkFBWSxDQUE4QjtRQUNuRCxZQUFZO1FBQ1osU0FBUztLQUNWLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FDRixDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGUtc3dhcC1pdGVtcy1zdGVwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3dvcmtmbG93cy9zdGVwcy9zd2FwL3ZhbGlkYXRlLXN3YXAtaXRlbXMtc3RlcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxxREFBdUQ7QUFDdkQscUVBQTRFO0FBQzVFLHFEQUFrRztBQTJCckYsUUFBQSxxQkFBcUIsR0FBRyxJQUFBLDBCQUFVLEVBQzdDLHFCQUFxQixFQUNyQixLQUFLLEVBQ0gsS0FBaUMsRUFDakMsRUFBRSxTQUFTLEVBQUUsRUFDdUMsRUFBRTtJQUN0RCxNQUFNLEVBQUUsS0FBSyxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsR0FBRyxLQUFLLENBQUE7SUFFaEQsSUFBSSxDQUFDLFlBQVksSUFBSSxZQUFZLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQy9DLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQzlCLDJCQUEyQixDQUM1QixDQUFBO0lBQ0gsQ0FBQztJQUVELElBQUksQ0FBQyxTQUFTLElBQUksU0FBUyxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUN6QyxNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsWUFBWSxFQUM5Qix3QkFBd0IsQ0FDekIsQ0FBQTtJQUNILENBQUM7SUFFRCxNQUFNLFVBQVUsR0FBRyxLQUFLLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQTtJQUVwQywyRUFBMkU7SUFDM0UsSUFBSSxDQUFDO1FBQ0gsTUFBTSxXQUFXLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FDbkMsaUNBQXlCLENBQUMsWUFBWSxDQUN2QyxDQUFBO1FBRUQsMkNBQTJDO1FBQzNDLE1BQU0sb0JBQW9CLEdBQUcsSUFBQSxtQ0FBMkIsRUFBQztZQUN2RCxVQUFVLEVBQUUsUUFBUTtZQUNw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

package/.medusa/server/src/workflows/swaps/approve-swap-workflow.js

@@ -4,37 +4,81 @@ exports.approveSwapWorkflow = void 0;
 const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
 const swap_1 = require("../steps/swap");
 exports.approveSwapWorkflow = (0, workflows_sdk_1.createWorkflow)("approve-swap", (input) => {
-    const { swap_id, admin_id, return_location_id, return_shipping_method_id, outbound_shipping_method_id, send_notification, } = input;
-    // Store exchange details but keep status as "requested"
-    // Status will change to "approved" when exchange is confirmed
-    // Store exchange details in metadata for audit trail
-    const { swap: approvedSwap } = (0, swap_1.updateSwapStatusStep)({
+    const { swap_id, admin_id, return_location_id, return_shipping_method_id, outbound_shipping_method_id, shipping_option_id, send_notification, } = input;
+    // Step 1: Retrieve swap to validate it's in requested status
+    const { swap: retrievedSwap } = (0, swap_1.retrieveSwapStep)({
         swap_id,
-        status: "requested", // Keep as requested until exchange is confirmed
+    });
+    // Step 2: Store exchange details and set pending_exchange_creation flag
+    // This must happen before creating return/exchange so the data is available
+    // The pending_exchange_creation flag allows createMedusaReturnStep to work
+    // with "requested" status
+    const { swap: swapWithExchangeDetails } = (0, swap_1.updateSwapExchangeDetailsStep)({
+        swap_id,
+        return_location_id,
+        return_shipping_method_id,
+        outbound_shipping_method_id,
+        send_notification,
         metadata: {
-            approved_at: new Date().toISOString(),
-            approved_by: admin_id,
             pending_exchange_creation: true,
             exchange_details: {
                 return_location_id,
                 return_shipping_method_id,
                 outbound_shipping_method_id,
+                shipping_option_id,
                 send_notification,
                 configured_at: new Date().toISOString(),
             },
         },
     });
-    // Also store exchange details in model fields directly
-    const { swap: swapWithExchangeDetails } = (0, swap_1.updateSwapExchangeDetailsStep)({
+    // Step 3: Create Medusa Return
+    // This will work because pending_exchange_creation flag is set
+    // This will automatically rollback if it fails (workflow handles it)
+    const { return_id, swap: swapWithReturn } = (0, swap_1.createMedusaReturnStep)({
         swap_id,
         return_location_id,
         return_shipping_method_id,
+    });
+    // Step 4: Create Medusa Exchange linked to return
+    // This will automatically rollback if it fails (workflow handles it)
+    // The exchange is created with the admin who approved it
+    // Pass shipping_option_id if provided (selected by admin in popup)
+    const { exchange_id, swap: swapWithExchange } = (0, swap_1.createMedusaExchangeStep)({
+        swap_id,
+        return_id,
         outbound_shipping_method_id,
+        shipping_option_id,
         send_notification,
     });
+    // Step 5: Update swap status to approved and mark exchange as created
+    // This is the ONLY call to updateSwapStatusStep - if any previous step fails,
+    // workflow will rollback and swap will remain in "requested" status
+    const { swap: finalSwap } = (0, swap_1.updateSwapStatusStep)({
+        swap_id,
+        status: "approved",
+        metadata: {
+            approved_at: new Date().toISOString(),
+            approved_by: admin_id,
+            exchange_confirmed_at: new Date().toISOString(),
+            exchange_confirmed_by: admin_id,
+            exchange_id,
+            return_id,
+            pending_exchange_creation: false,
+            exchange_details: {
+                return_location_id,
+                return_shipping_method_id,
+                outbound_shipping_method_id,
+                shipping_option_id,
+                send_notification,
+                configured_at: new Date().toISOString(),
+            },
+        },
+    });
     return new workflows_sdk_1.WorkflowResponse({
-        swap: swapWithExchangeDetails,
+        swap: finalSwap,
+        return_id,
+        exchange_id,
     });
 });
 exports.default = exports.approveSwapWorkflow;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwcm92ZS1zd2FwLXdvcmtmbG93LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3dvcmtmbG93cy9zd2Fwcy9hcHByb3ZlLXN3YXAtd29ya2Zsb3cudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUVBRzBDO0FBQzFDLHdDQUdzQjtBQU1ULFFBQUEsbUJBQW1CLEdBQUcsSUFBQSw4QkFBYyxFQUMvQyxjQUFjLEVBQ2QsQ0FDRSxLQUErQixFQUNjLEVBQUU7SUFDL0MsTUFBTSxFQUNKLE9BQU8sRUFDUCxRQUFRLEVBQ1Isa0JBQWtCLEVBQ2xCLHlCQUF5QixFQUN6QiwyQkFBMkIsRUFDM0IsaUJBQWlCLEdBQ2xCLEdBQUcsS0FBSyxDQUFBO0lBRVQsd0RBQXdEO0lBQ3hELDhEQUE4RDtJQUM5RCxxREFBcUQ7SUFDckQsTUFBTSxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsR0FBRyxJQUFBLDJCQUFvQixFQUFDO1FBQ2xELE9BQU87UUFDUCxNQUFNLEVBQUUsV0FBVyxFQUFFLGdEQUFnRDtRQUNyRSxRQUFRLEVBQUU7WUFDUixXQUFXLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQyxXQUFXLEVBQUU7WUFDckMsV0FBVyxFQUFFLFFBQVE7WUFDckIseUJBQXlCLEVBQUUsSUFBSTtZQUMvQixnQkFBZ0IsRUFBRTtnQkFDaEIsa0JBQWtCO2dCQUNsQix5QkFBeUI7Z0JBQ3pCLDJCQUEyQjtnQkFDM0IsaUJBQWlCO2dCQUNqQixhQUFhLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQyxXQUFXLEVBQUU7YUFDeEM7U0FDRjtLQUNGLENBQUMsQ0FBQTtJQUVGLHVEQUF1RDtJQUN2RCxNQUFNLEVBQUUsSUFBSSxFQUFFLHVCQUF1QixFQUFFLEdBQUcsSUFBQSxvQ0FBNkIsRUFBQztRQUN0RSxPQUFPO1FBQ1Asa0JBQWtCO1FBQ2xCLHlCQUF5QjtRQUN6QiwyQkFBMkI7UUFDM0IsaUJBQWlCO0tBQ2xCLENBQUMsQ0FBQTtJQUVGLE9BQU8sSUFBSSxnQ0FBZ0IsQ0FBNEI7UUFDckQsSUFBSSxFQUFFLHVCQUF1QjtLQUM5QixDQUFDLENBQUE7QUFDSixDQUFDLENBQ0YsQ0FBQTtBQUVELGtCQUFlLDJCQUFtQixDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwcm92ZS1zd2FwLXdvcmtmbG93LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3dvcmtmbG93cy9zd2Fwcy9hcHByb3ZlLXN3YXAtd29ya2Zsb3cudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUVBRzBDO0FBQzFDLHdDQU1zQjtBQU1ULFFBQUEsbUJBQW1CLEdBQUcsSUFBQSw4QkFBYyxFQUMvQyxjQUFjLEVBQ2QsQ0FDRSxLQUErQixFQUNjLEVBQUU7SUFDL0MsTUFBTSxFQUNKLE9BQU8sRUFDUCxRQUFRLEVBQ1Isa0JBQWtCLEVBQ2xCLHlCQUF5QixFQUN6QiwyQkFBMkIsRUFDM0Isa0JBQWtCLEVBQ2xCLGlCQUFpQixHQUNsQixHQUFHLEtBQUssQ0FBQTtJQUVULDZEQUE2RDtJQUM3RCxNQUFNLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxHQUFHLElBQUEsdUJBQWdCLEVBQUM7UUFDL0MsT0FBTztLQUNSLENBQUMsQ0FBQTtJQUVGLHdFQUF3RTtJQUN4RSw0RUFBNEU7SUFDNUUsMkVBQTJFO0lBQzNFLDBCQUEwQjtJQUMxQixNQUFNLEVBQUUsSUFBSSxFQUFFLHVCQUF1QixFQUFFLEdBQUcsSUFBQSxvQ0FBNkIsRUFBQztRQUN0RSxPQUFPO1FBQ1Asa0JBQWtCO1FBQ2xCLHlCQUF5QjtRQUN6QiwyQkFBMkI7UUFDM0IsaUJBQWlCO1FBQ2pCLFFBQVEsRUFBRTtZQUNSLHlCQUF5QixFQUFFLElBQUk7WUFDL0IsZ0JBQWdCLEVBQUU7Z0JBQ2hCLGtCQUFrQjtnQkFDbEIseUJBQXlCO2dCQUN6QiwyQkFBMkI7Z0JBQzNCLGtCQUFrQjtnQkFDbEIsaUJBQWlCO2dCQUNqQixhQUFhLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQyxXQUFXLEVBQUU7YUFDeEM7U0FDRjtLQUNGLENBQUMsQ0FBQTtJQUVGLCtCQUErQjtJQUMvQiwrREFBK0Q7SUFDL0QscUVBQXFFO0lBQ3JFLE1BQU0sRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxHQUFHLElBQUEsNkJBQXNCLEVBQUM7UUFDakUsT0FBTztRQUNQLGtCQUFrQjtRQUNsQix5QkFBeUI7S0FDMUIsQ0FBQyxDQUFBO0lBRUYsa0RBQWtEO0lBQ2xELHFFQUFxRTtJQUNyRSx5REFBeUQ7SUFDekQsbUVBQW1FO0lBQ25FLE1BQU0sRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLGdCQUFnQixFQUFFLEdBQUcsSUFBQSwrQkFBd0IsRUFBQztRQUN2RSxPQUFPO1FBQ1AsU0FBUztRQUNULDJCQUEyQjtRQUMzQixrQkFBa0I7UUFDbEIsaUJBQWlCO0tBQ2xCLENBQUMsQ0FBQTtJQUVGLHNFQUFzRTtJQUN0RSw4RUFBOEU7SUFDOUUsb0VBQW9FO0lBQ3BFLE1BQU0sRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLEdBQUcsSUFBQSwyQkFBb0IsRUFBQztRQUMvQyxPQUFPO1FBQ1AsTUFBTSxFQUFFLFVBQVU7UUFDbEIsUUFBUSxFQUFFO1lBQ1IsV0FBVyxFQUFFLElBQUksSUFBSSxFQUFFLENBQUMsV0FBVyxFQUFFO1lBQ3JDLFdBQVcsRUFBRSxRQUFRO1lBQ3JCLHFCQUFxQixFQUFFLElBQUksSUFBSSxFQUFFLENBQUMsV0FBVyxFQUFFO1lBQy9DLHFCQUFxQixFQUFFLFFBQVE7WUFDL0IsV0FBVztZQUNYLFNBQVM7WUFDVCx5QkFBeUIsRUFBRSxLQUFLO1lBQ2hDLGdCQUFnQixFQUFFO2dCQUNoQixrQkFBa0I7Z0JBQ2xCLHlCQUF5QjtnQkFDekIsMkJBQTJCO2dCQUMzQixrQkFBa0I7Z0JBQ2xCLGlCQUFpQjtnQkFDakIsYUFBYSxFQUFFLElBQUksSUFBSSxFQUFFLENBQUMsV0FBVyxFQUFFO2FBQ3hDO1NBQ0Y7S0FDRixDQUFDLENBQUE7SUFFRixPQUFPLElBQUksZ0NBQWdCLENBQTRCO1FBQ3JELElBQUksRUFBRSxTQUFTO1FBQ2YsU0FBUztRQUNULFdBQVc7S0FDWixDQUFDLENBQUE7QUFDSixDQUFDLENBQ0YsQ0FBQTtBQUVELGtCQUFlLDJCQUFtQixDQUFBIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "order-management",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "description": "A starter for Medusa plugins.",
   "author": "Medusa (https://medusajs.com)",
   "license": "MIT",

package/.medusa/server/src/api/admin/swaps/[id]/confirm-exchange/route.js

@@ -1,109 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.POST = void 0;
-const utils_1 = require("@medusajs/framework/utils");
-const confirm_exchange_workflow_1 = require("../../../../../workflows/swaps/confirm-exchange-workflow");
-const zod_1 = require("zod");
-const ConfirmExchangeSchema = zod_1.z.object({
-    return_items: zod_1.z.array(zod_1.z.object({
-        item_id: zod_1.z.string(),
-        quantity: zod_1.z.number().positive(),
-        reason_id: zod_1.z.string().optional(),
-    })),
-    new_items: zod_1.z.array(zod_1.z.object({
-        variant_id: zod_1.z.string(),
-        quantity: zod_1.z.number().positive(),
-    })),
-    return_location_id: zod_1.z.string().optional(),
-    return_shipping_method_id: zod_1.z.string().optional(),
-    outbound_shipping_method_id: zod_1.z.string().optional(),
-    send_notification: zod_1.z.boolean().optional().default(false),
-});
-const POST = async (req, res) => {
-    const { id } = req.params;
-    if (!id) {
-        res.status(400).json({ message: "Swap ID is required" });
-        return;
-    }
-    // Type-safe access to auth_context
-    const authContext = req.auth_context;
-    const adminId = authContext?.actor_id || authContext?.user_id || "admin";
-    try {
-        // Parse and validate request body
-        const exchangeData = ConfirmExchangeSchema.parse(req.body || {});
-        // Create exchange and approve swap
-        const { result } = await (0, confirm_exchange_workflow_1.confirmExchangeWorkflow)(req.scope).run({
-            input: {
-                swap_id: id,
-                admin_id: adminId,
-                return_items: exchangeData.return_items,
-                new_items: exchangeData.new_items,
-                return_location_id: exchangeData.return_location_id,
-                return_shipping_method_id: exchangeData.return_shipping_method_id,
-                outbound_shipping_method_id: exchangeData.outbound_shipping_method_id,
-                send_notification: exchangeData.send_notification,
-            },
-        });
-        res.json({
-            swap: result.swap,
-            return_id: result.return_id,
-            exchange_id: result.exchange_id,
-            message: "Exchange created and swap approved successfully.",
-        });
-    }
-    catch (error) {
-        // Handle Zod validation errors
-        if (error instanceof zod_1.z.ZodError) {
-            res.status(400).json({
-                message: "Invalid request data",
-                errors: error.errors,
-            });
-            return;
-        }
-        // Extract error message - handle various error formats
-        let errorMessage = "Unknown error";
-        let errorStack;
-        let errorType;
-        if (error instanceof Error) {
-            errorMessage = error.message;
-            errorStack = error.stack;
-            errorType = error.type;
-        }
-        else if (error && typeof error === "object") {
-            const errorObj = error;
-            errorMessage = String(errorObj.message ||
-                errorObj.error ||
-                errorObj.reason ||
-                JSON.stringify(errorObj));
-            errorStack = errorObj.stack;
-            errorType = errorObj.type;
-        }
-        else {
-            errorMessage = String(error);
-        }
-        console.error("[Confirm Exchange] Error:", {
-            swap_id: id,
-            error_message: errorMessage,
-            error_type: errorType,
-            error_stack: errorStack,
-        });
-        if (error instanceof utils_1.MedusaError) {
-            const statusCode = error.type === utils_1.MedusaError.Types.NOT_FOUND
-                ? 404
-                : error.type === utils_1.MedusaError.Types.INVALID_DATA
-                    ? 400
-                    : 500;
-            res.status(statusCode).json({
-                message: error.message,
-                type: error.type,
-            });
-            return;
-        }
-        res.status(500).json({
-            message: "Failed to confirm exchange",
-            error: errorMessage,
-        });
-    }
-};
-exports.POST = POST;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3N3YXBzL1tpZF0vY29uZmlybS1leGNoYW5nZS9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxxREFBdUQ7QUFDdkQsd0dBQWtHO0FBQ2xHLDZCQUF1QjtBQUV2QixNQUFNLHFCQUFxQixHQUFHLE9BQUMsQ0FBQyxNQUFNLENBQUM7SUFDckMsWUFBWSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQ25CLE9BQUMsQ0FBQyxNQUFNLENBQUM7UUFDUCxPQUFPLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRTtRQUNuQixRQUFRLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtRQUMvQixTQUFTLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtLQUNqQyxDQUFDLENBQ0g7SUFDRCxTQUFTLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FDaEIsT0FBQyxDQUFDLE1BQU0sQ0FBQztRQUNQLFVBQVUsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFO1FBQ3RCLFFBQVEsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFO0tBQ2hDLENBQUMsQ0FDSDtJQUNELGtCQUFrQixFQUFFLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDekMseUJBQXlCLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUNoRCwyQkFBMkIsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQ2xELGlCQUFpQixFQUFFLE9BQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDO0NBQ3pELENBQUMsQ0FBQTtBQUVLLE1BQU0sSUFBSSxHQUFHLEtBQUssRUFDdkIsR0FBa0Is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

package/.medusa/server/src/workflows/swaps/confirm-exchange-workflow.js

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.confirmExchangeWorkflow = void 0;
-const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
-const swap_1 = require("../steps/swap");
-exports.confirmExchangeWorkflow = (0, workflows_sdk_1.createWorkflow)("confirm-exchange", (input) => {
-    const { swap_id, admin_id, return_items, new_items, return_location_id, return_shipping_method_id, outbound_shipping_method_id, send_notification, } = input;
-    // Step 1: Retrieve swap to validate it's in requested status
-    const { swap: retrievedSwap } = (0, swap_1.retrieveSwapStep)({
-        swap_id,
-    });
-    // Step 2: Create Medusa Return
-    // Pass return_items from input (from exchange form)
-    const { return_id, swap: swapWithReturn } = (0, swap_1.createMedusaReturnStep)({
-        swap_id,
-        return_location_id,
-        return_shipping_method_id,
-        return_items: return_items,
-    });
-    // Step 3: Create Medusa Exchange linked to return
-    // Pass new_items from input (from exchange form)
-    // This will trigger Medusa's native exchange workflow which handles:
-    // - Fulfillment creation for new items
-    // - Payment Collection creation if difference_due > 0 (customer owes)
-    // - Refund processing if difference_due < 0 (customer gets refund)
-    // - Status transitions (requested → received → shipped → delivered)
-    const { exchange_id, swap: swapWithExchange } = (0, swap_1.createMedusaExchangeStep)({
-        swap_id,
-        return_id,
-        outbound_shipping_method_id,
-        send_notification,
-        new_items: new_items,
-    });
-    // Step 4: Update swap status to "approved" after successful exchange creation
-    const { swap: finalSwap } = (0, swap_1.updateSwapStatusStep)({
-        swap_id,
-        status: "approved",
-        metadata: {
-            exchange_confirmed_at: new Date().toISOString(),
-            exchange_confirmed_by: admin_id,
-            pending_exchange_creation: false,
-        },
-    });
-    return new workflows_sdk_1.WorkflowResponse({
-        swap: finalSwap,
-        return_id,
-        exchange_id,
-    });
-});
-exports.default = exports.confirmExchangeWorkflow;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlybS1leGNoYW5nZS13b3JrZmxvdy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy93b3JrZmxvd3Mvc3dhcHMvY29uZmlybS1leGNoYW5nZS13b3JrZmxvdy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxxRUFHMEM7QUFDMUMsd0NBS3NCO0FBTVQsUUFBQSx1QkFBdUIsR0FBRyxJQUFBLDhCQUFjLEVBQ25ELGtCQUFrQixFQUNsQixDQUNFLEtBQW1DLEVBQ2MsRUFBRTtJQUNuRCxNQUFNLEVBQ0osT0FBTyxFQUNQLFFBQVEsRUFDUixZQUFZLEVBQ1osU0FBUyxFQUNULGtCQUFrQixFQUNsQix5QkFBeUIsRUFDekIsMkJBQTJCLEVBQzNCLGlCQUFpQixHQUNsQixHQUFHLEtBQUssQ0FBQTtJQUVULDZEQUE2RDtJQUM3RCxNQUFNLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxHQUFHLElBQUEsdUJBQWdCLEVBQUM7UUFDL0MsT0FBTztLQUNSLENBQUMsQ0FBQTtJQUVGLCtCQUErQjtJQUMvQixvREFBb0Q7SUFDcEQsTUFBTSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLEdBQUcsSUFBQSw2QkFBc0IsRUFBQztRQUNqRSxPQUFPO1FBQ1Asa0JBQWtCO1FBQ2xCLHlCQUF5QjtRQUN6QixZQUFZLEVBQUUsWUFBWTtLQUMzQixDQUFDLENBQUE7SUFFRixrREFBa0Q7SUFDbEQsaURBQWlEO0lBQ2pELHFFQUFxRTtJQUNyRSx1Q0FBdUM7SUFDdkMsc0VBQXNFO0lBQ3RFLG1FQUFtRTtJQUNuRSxvRUFBb0U7SUFDcEUsTUFBTSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsZ0JBQWdCLEVBQUUsR0FBRyxJQUFBLCtCQUF3QixFQUFDO1FBQ3ZFLE9BQU87UUFDUCxTQUFTO1FBQ1QsMkJBQTJCO1FBQzNCLGlCQUFpQjtRQUNqQixTQUFTLEVBQUUsU0FBUztLQUNyQixDQUFDLENBQUE7SUFFRiw4RUFBOEU7SUFDOUUsTUFBTSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsR0FBRyxJQUFBLDJCQUFvQixFQUFDO1FBQy9DLE9BQU87UUFDUCxNQUFNLEVBQUUsVUFBVTtRQUNsQixRQUFRLEVBQUU7WUFDUixxQkFBcUIsRUFBRSxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRTtZQUMvQyxxQkFBcUIsRUFBRSxRQUFRO1lBQy9CLHlCQUF5QixFQUFFLEtBQUs7U0FDakM7S0FDRixDQUFDLENBQUE7SUFFRixPQUFPLElBQUksZ0NBQWdCLENBQWdDO1FBQ3pELElBQUksRUFBRSxTQUFTO1FBQ2YsU0FBUztRQUNULFdBQVc7S0FDWixDQUFDLENBQUE7QUFDSixDQUFDLENBQ0YsQ0FBQTtBQUVELGtCQUFlLCtCQUF1QixDQUFBIn0=