@riocrypto/common-server 1.0.2674 → 1.0.2675

package/build/helpers/get-bulk-payment-from-reference.js

@@ -38,17 +38,26 @@ const getBulkPaymentFromReference = (reference, mongoose) => __awaiter(void 0, v
     if (!referenceText.includes("bp")) {
         throw new Error("Bulk payment not found");
     }
-    // Match by ID pattern: 2 chars from random portion (8-9) + last 6 chars
-    const bulkPayment = bulkPayments.find((bulkPayment) => {
+    // Priority 1: New format - 2 chars from random portion (8-9) + last 6 chars
+    const bulkPaymentNewFormat = bulkPayments.find((bulkPayment) => {
         const bulkPaymentId = bulkPayment.id.toString().toLowerCase();
         const randomPrefix = bulkPaymentId.slice(8, 10);
         const last6 = bulkPaymentId.slice(-6);
         const reference8Chars = randomPrefix + last6;
         return referenceText.includes(reference8Chars);
     });
-    if (!bulkPayment) {
+    if (bulkPaymentNewFormat) {
+        return bulkPaymentNewFormat;
+    }
+    // Priority 2: Old format - just last 6 chars (backwards compatibility)
+    const bulkPaymentOldFormat = bulkPayments.find((bulkPayment) => {
+        const bulkPaymentId = bulkPayment.id.toString().toLowerCase();
+        const last6 = bulkPaymentId.slice(-6);
+        return referenceText.includes(last6);
+    });
+    if (!bulkPaymentOldFormat) {
         throw new Error("Bulk payment not found");
     }
-    return bulkPayment;
+    return bulkPaymentOldFormat;
 });
 exports.getBulkPaymentFromReference = getBulkPaymentFromReference;

package/build/helpers/get-order-from-reference.js

@@ -33,6 +33,7 @@ const getOrderFromReference = (reference, mongoose) => __awaiter(void 0, void 0,
     const batchSize = 1000;
     let skip = 0;
     let foundOrder = null;
+    let foundOrderOldFormat = null;
     while (!foundOrder) {
         // Query only active orders (exclude completed/cancelled/failed) in batches
         const orders = yield Order.find({
@@ -47,19 +48,29 @@ const getOrderFromReference = (reference, mongoose) => __awaiter(void 0, void 0,
             break;
         }
         // Check each order ID against the reference
-        // Reference format: 2 chars from random portion (8-9) + last 6 chars
+        // Priority 1: New format - 2 chars from random portion (8-9) + last 6 chars
+        // Priority 2: Old format - just last 6 chars (backwards compatibility)
         for (const order of orders) {
             const orderId = order._id.toString().toLowerCase();
             const randomPrefix = orderId.slice(8, 10);
             const last6 = orderId.slice(-6);
             const reference8Chars = randomPrefix + last6;
+            // Check new 8-char format first (takes priority)
             if (referenceText.includes(reference8Chars)) {
                 foundOrder = yield Order.findById(order._id);
                 break;
             }
+            // Track old 6-char format match as fallback (only if no 8-char match yet)
+            if (!foundOrderOldFormat && referenceText.includes(last6)) {
+                foundOrderOldFormat = yield Order.findById(order._id);
+            }
         }
         skip += batchSize;
     }
+    // Use 8-char match if found, otherwise fall back to 6-char match
+    if (!foundOrder && foundOrderOldFormat) {
+        foundOrder = foundOrderOldFormat;
+    }
     if (!foundOrder) {
         throw new Error("Order not found");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.2674",
+  "version": "1.0.2675",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",