@riocrypto/common-server 1.0.1755 → 1.0.1757

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

@@ -10,24 +10,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOrderFromReference = void 0;
-const user_1 = require("../models/user");
 const order_1 = require("../models/order");
+const user_1 = require("../models/user");
 const getOrderFromReference = (reference, mongoose) => __awaiter(void 0, void 0, void 0, function* () {
     // 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
+    const userIdPart = reference.slice(0, 2).toLocaleLowerCase();
+    const orderIdPart = reference.slice(2, 6).toLocaleLowerCase();
     const User = (0, user_1.buildUser)(mongoose);
-    const user = yield User.findOne({ _id: { $regex: userIdPart + "$" } }).exec();
+    const users = yield User.find().exec();
+    // Ensure userIdPart is defined and only contains two characters
+    if (!userIdPart || userIdPart.length !== 2) {
+        throw new Error("Invalid userIdPart. It must be exactly 2 characters long.");
+    }
+    // Find the user whose id ends with the given part
+    const user = users.find((user) => {
+        const userIdStr = user.id.toString(); // Convert id to string if it isn't
+        return userIdStr.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.1755",
+  "version": "1.0.1757",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",