@riocrypto/common-server 1.0.1756 → 1.0.1758

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,14 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.generateReference = void 0;
4
4
  const generateReference = (order) => {
5
- // Validate that userId and orderId are valid MongoDB ObjectIDs
6
- const mongoIdRegex = /^[a-f\d]{24}$/i;
7
- if (!mongoIdRegex.test(order.userId) || !mongoIdRegex.test(order.id)) {
8
- throw new Error("Invalid MongoDB ObjectID format");
9
- }
10
- const userIdLast2 = order.userId.slice(-2);
11
- const orderIdLast4 = order.id.slice(-4);
12
- const referenceNumber = userIdLast2 + orderIdLast4;
5
+ const referenceNumber = order.id.slice(-6);
13
6
  return referenceNumber;
14
7
  };
15
8
  exports.generateReference = generateReference;
@@ -10,23 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.getOrderFromReference = void 0;
13
- const user_1 = require("../models/user");
14
13
  const order_1 = require("../models/order");
15
14
  const getOrderFromReference = (reference, mongoose) => __awaiter(void 0, void 0, void 0, function* () {
16
- // Extract the last 2 characters (userId part) and the last 4 characters (orderId part)
17
- const userIdPart = reference.slice(0, 2);
18
- const orderIdPart = reference.slice(2, 6);
19
- // Fetch all users and filter them by the last 2 characters of their ObjectId
20
- const User = (0, user_1.buildUser)(mongoose);
21
- const users = yield User.find().exec();
22
- const user = users.find((user) => user.id.endsWith(userIdPart));
23
- if (!user) {
24
- throw new Error("User not found");
15
+ // Ensure reference is defined and exactly 6 characters long
16
+ if (!reference || reference.length !== 6) {
17
+ throw new Error("Invalid reference. It must be exactly 6 characters long.");
25
18
  }
19
+ // Convert reference to lowercase to ensure case-insensitive comparison
20
+ const orderIdPart = reference.toLowerCase();
26
21
  const Order = (0, order_1.buildOrder)(mongoose);
27
- // Fetch all orders for the user and filter them by the last 4 characters of their ObjectId
28
- const orders = yield Order.find({ userId: user._id }).exec();
29
- const order = orders.find((order) => order.id.endsWith(orderIdPart));
22
+ // Fetch all orders and filter them by the last 6 characters of their ObjectId
23
+ const orders = yield Order.find().exec();
24
+ const order = orders.find((order) => order.id.toString().endsWith(orderIdPart));
30
25
  if (!order) {
31
26
  throw new Error("Order not found");
32
27
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riocrypto/common-server",
3
- "version": "1.0.1756",
3
+ "version": "1.0.1758",
4
4
  "description": "",
5
5
  "main": "./build/index.js",
6
6
  "types": "./build/index.d.ts",