@7365admin1/core 3.34.4-staging.19 → 3.34.4-staging.21

package/dist/index.d.ts

@@ -3108,7 +3108,7 @@ declare function useGuestManagementController(): {
 declare const site_people_namespace_collection = "site.people";
 declare function usePersonRepo(): {
     add: (value: TPerson, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, status, dateFrom, dateTo, org, site, type, }: {
+    getAll: ({ search, page, limit, sort, status, dateFrom, dateTo, org, site, type, nric, contact, plateNumber, }: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
@@ -3119,6 +3119,9 @@ declare function usePersonRepo(): {
         org?: string | undefined;
         site?: string | undefined;
         type?: string | undefined;
+        nric?: string | undefined;
+        contact?: string | undefined;
+        plateNumber: string;
     }, session?: ClientSession) => Promise<{
         items: any[];
         pages: number;

package/dist/index.js

@@ -25185,6 +25185,16 @@ var import_node_server_utils78 = require("@7365admin1/node-server-utils");
 // src/repositories/person.repo.ts
 var import_node_server_utils74 = require("@7365admin1/node-server-utils");
 var import_mongodb45 = require("mongodb");
+
+// src/utils/sanitizer.ts
+var makeContainsRegex = (input) => {
+  if (!input)
+    return "";
+  const sanitized = input.replace(/\s+/g, "").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return sanitized;
+};
+
+// src/repositories/person.repo.ts
 var site_people_namespace_collection = "site.people";
 function usePersonRepo() {
   const db = import_node_server_utils74.useAtlas.getDb();
@@ -25257,7 +25267,10 @@ function usePersonRepo() {
     dateTo,
     org = "",
     site = "",
-    type = ""
+    type = "",
+    nric = "",
+    contact = "",
+    plateNumber = ""
   }, session) {
     page = page > 0 ? page - 1 : 0;
     const start = dateFrom ? { $gte: new Date(dateFrom).toISOString() } : void 0;
@@ -25276,12 +25289,28 @@ function usePersonRepo() {
           { name: { $regex: search, $options: "i" } },
           { email: { $regex: search, $options: "i" } },
           { nric: { $regex: search, $options: "i" } },
-          { "plates.plateNumber": { $regex: search, $options: "i" } }
+          { "plates.plateNumber": { $regex: search, $options: "i" } },
+          { contact: { $regex: makeContainsRegex(contact) } },
+          { contacts: { $regex: makeContainsRegex(contact) } },
+          { plateNumbers: { $regex: makeContainsRegex(plateNumber) } }
         ]
       },
       ...import_mongodb45.ObjectId.isValid(org) && { org: new import_mongodb45.ObjectId(org) },
       ...import_mongodb45.ObjectId.isValid(site) && { site: new import_mongodb45.ObjectId(site) },
-      ...PERSON_TYPES.includes(type) && { type }
+      ...PERSON_TYPES.includes(type) && { type },
+      ...nric && { nric: { $regex: makeContainsRegex(nric), $options: "i" } },
+      ...contact && {
+        $or: [
+          { contact: { $regex: makeContainsRegex(contact) } },
+          { contacts: { $regex: makeContainsRegex(contact) } }
+        ]
+      },
+      ...plateNumber && {
+        $or: [
+          { "plates.plateNumber": { $regex: makeContainsRegex(plateNumber) } },
+          { plateNumbers: { $regex: makeContainsRegex(plateNumber) } }
+        ]
+      }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     try {
@@ -37065,17 +37094,21 @@ function usePersonController() {
     const validation = import_joi60.default.object({
       page: import_joi60.default.number().integer().min(1).allow("", null).default(1),
       limit: import_joi60.default.number().integer().min(1).max(100).allow("", null).default(10),
-      sort: import_joi60.default.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
+      sort: import_joi60.default.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", null),
+      order: import_joi60.default.string().pattern(/^(asc|desc)(,(asc|desc))*$/i).optional().allow("", null),
       status: import_joi60.default.string().optional().allow(null, ""),
       search: import_joi60.default.string().optional().allow(null, ""),
       dateFrom: import_joi60.default.date().iso().optional().allow(null, ""),
       dateTo: import_joi60.default.date().iso().optional().allow(null, ""),
-      org: import_joi60.default.string().optional().allow(null, ""),
-      site: import_joi60.default.string().optional().allow(null, ""),
+      org: import_joi60.default.string().hex().length(24).optional().allow(null, ""),
+      site: import_joi60.default.string().hex().length(24).optional().allow(null, ""),
       type: import_joi60.default.alternatives().try(
         import_joi60.default.string().valid(...PERSON_TYPES),
         import_joi60.default.array().items(import_joi60.default.string().valid(...PERSON_TYPES))
-      ).optional().allow(null, "")
+      ).optional().allow(null, ""),
+      nric: import_joi60.default.string().optional().allow(null, ""),
+      contact: import_joi60.default.string().optional().allow(null, ""),
+      plateNumber: import_joi60.default.string().optional().allow(null, "")
     });
     const query = { ...req.query };
     const { error } = validation.validate(query, {
@@ -37096,6 +37129,9 @@ function usePersonController() {
     const org = req.query.org;
     const site = req.query.site;
     const type = req.query.type;
+    const nric = req.query.nric;
+    const contact = req.query.contact;
+    const plateNumber = req.query.plateNumber;
     const sortObj = {};
     const sortFields = String(req.query.sort).split(",");
     const sortOrders = String(req.query.order).split(",");
@@ -37116,7 +37152,10 @@ function usePersonController() {
         dateTo,
         org,
         site,
-        type
+        type,
+        nric,
+        contact,
+        plateNumber
       });
       res.status(200).json(data);
       return;
@@ -64464,34 +64503,62 @@ var import_axios3 = __toESM(require("axios"));
 
 // src/utils/payment-signature.util.ts
 var crypto3 = __toESM(require("crypto"));
+function hasOwn(obj, key) {
+  return Object.prototype.hasOwnProperty.call(obj, key);
+}
+function sha512(input) {
+  return crypto3.createHash("sha512").update(input).digest("hex");
+}
+function assertSecret(secretKey) {
+  if (!secretKey) {
+    throw new Error("Payment signature: missing secret key.");
+  }
+}
 function paymentSignature(params, secretKey) {
-  const fieldOrder = ["mid", "order_id", "payment_type", "amount", "ccy", "card_no", "exp_date", "cvv2"];
+  assertSecret(secretKey);
+  const fieldOrder = [
+    "mid",
+    "order_id",
+    "payment_type",
+    "amount",
+    "ccy",
+    "card_no",
+    "exp_date",
+    "cvv2"
+  ];
   let concatenated = "";
   fieldOrder.forEach((v) => {
-    if (!params.hasOwnProperty(v)) {
+    if (!hasOwn(params, v)) {
       return;
-    } else if (v === "cvv2") {
-      concatenated += (params[v] ?? "").toString().slice(-1);
+    }
+    const raw = String(params[v] ?? "");
+    if (v === "cvv2") {
+      concatenated += raw.slice(-1);
     } else if (v === "card_no") {
-      concatenated += (params[v] ?? "").substring(0, 6) + (params[v] ?? "").slice(-4);
+      concatenated += raw.substring(0, 6) + raw.slice(-4);
     } else {
-      concatenated += params[v];
+      concatenated += raw;
     }
   });
   concatenated += secretKey;
-  const signature = crypto3.createHash("sha512").update(concatenated).digest("hex");
-  return signature;
+  return sha512(concatenated);
 }
 function genericSignature(params, secretKey) {
-  const paramsCopy = { ...params };
+  assertSecret(secretKey);
+  const paramsCopy = {
+    ...params
+  };
   delete paramsCopy["signature"];
-  const sortedParams = Object.keys(paramsCopy).sort().reduce((obj, key) => {
-    obj[key] = paramsCopy[key];
-    return obj;
-  }, {});
-  const concatenated = Object.values(sortedParams).join("") + secretKey;
-  const signature = crypto3.createHash("sha512").update(concatenated).digest("hex");
-  return signature;
+  const concatenated = Object.keys(paramsCopy).sort().map((key) => {
+    const value = paramsCopy[key];
+    if (value !== null && typeof value === "object") {
+      throw new Error(
+        `Payment signature: non-primitive value for field "${key}".`
+      );
+    }
+    return String(value ?? "");
+  }).join("") + secretKey;
+  return sha512(concatenated);
 }
 
 // src/repositories/reddot-payment.repository.ts
@@ -64914,7 +64981,7 @@ var useRedDotPaymentSvc = () => {
       };
       if (!process.env.MERCHANT_ENQUIRY) {
         throw new Error(
-          "MERCHANT_PAYMENT environment variable is not defined."
+          "MERCHANT_ENQUIRY environment variable is not defined."
         );
       }
       const url = process.env.MERCHANT_ENQUIRY;