@riocrypto/common-server 1.0.1757 → 1.0.1759

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

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

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

@@ -11,29 +11,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOrderFromReference = void 0;
 const order_1 = require("../models/order");
-const user_1 = require("../models/user");
+const common_1 = require("@riocrypto/common");
 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).toLocaleLowerCase();
-    const orderIdPart = reference.slice(2, 6).toLocaleLowerCase();
-    const User = (0, user_1.buildUser)(mongoose);
-    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");
+    // Ensure reference is defined and exactly 6 characters long
+    if (!reference || reference.length !== 6) {
+        throw new Error("Invalid reference. It must be exactly 6 characters long.");
     }
+    // Convert reference to lowercase to ensure case-insensitive comparison
+    const orderIdPart = reference.toLowerCase();
     const Order = (0, order_1.buildOrder)(mongoose);
-    // 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));
+    const orders = yield Order.find({
+        status: { $in: [common_1.OrderStatus.AwaitingPayment, common_1.OrderStatus.Processing] },
+    });
+    const order = orders.find((order) => order.id.toString().endsWith(orderIdPart));
     if (!order) {
         throw new Error("Order not found");
     }

package/package.json

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