@riocrypto/common-server 1.0.1754 → 1.0.1756

package/build/helpers/generate-payment-reference.d.ts

@@ -1 +1,2 @@
-export declare const generateReference: (userId: string, orderId: string) => string;
+import { OrderDoc } from "../models/order";
+export declare const generateReference: (order: OrderDoc) => string;

package/build/helpers/generate-payment-reference.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateReference = void 0;
-const generateReference = (userId, orderId) => {
+const generateReference = (order) => {
     // Validate that userId and orderId are valid MongoDB ObjectIDs
     const mongoIdRegex = /^[a-f\d]{24}$/i;
-    if (!mongoIdRegex.test(userId) || !mongoIdRegex.test(orderId)) {
+    if (!mongoIdRegex.test(order.userId) || !mongoIdRegex.test(order.id)) {
         throw new Error("Invalid MongoDB ObjectID format");
     }
-    const userIdLast2 = userId.slice(-2);
-    const orderIdLast4 = orderId.slice(-4);
+    const userIdLast2 = order.userId.slice(-2);
+    const orderIdLast4 = order.id.slice(-4);
     const referenceNumber = userIdLast2 + orderIdLast4;
     return referenceNumber;
 };

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

@@ -16,18 +16,20 @@ const getOrderFromReference = (reference, mongoose) => __awaiter(void 0, void 0,
     // Extract the last 2 characters (userId part) and the last 4 characters (orderId part)
     const userIdPart = reference.slice(0, 2);
     const orderIdPart = reference.slice(2, 6);
-    // Find the user whose ID ends with the extracted userIdPart
+    // Fetch all users and filter them by the last 2 characters of their ObjectId
     const User = (0, user_1.buildUser)(mongoose);
-    const user = yield User.findOne({ _id: { $regex: userIdPart + "$" } }).exec();
+    const users = yield User.find().exec();
+    const user = users.find((user) => user.id.endsWith(userIdPart));
     if (!user) {
         throw new Error("User not found");
     }
     const Order = (0, order_1.buildOrder)(mongoose);
-    // Find the order whose ID ends with the extracted orderIdPart and belongs to the user
-    const order = yield Order.findOne({
-        _id: { $regex: orderIdPart + "$" },
-        userId: user._id,
-    }).exec();
+    // Fetch all orders for the user and filter them by the last 4 characters of their ObjectId
+    const orders = yield Order.find({ userId: user._id }).exec();
+    const order = orders.find((order) => order.id.endsWith(orderIdPart));
+    if (!order) {
+        throw new Error("Order not found");
+    }
     return order;
 });
 exports.getOrderFromReference = getOrderFromReference;

package/package.json

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