@7365admin1/core 3.34.4-staging.20 → 3.34.4-staging.22

package/dist/index.d.ts

@@ -2809,8 +2809,8 @@ type visitorPersonService = {
     nric: string;
     name: string;
     contact: string;
-    plateNumber: string;
-    email: string;
+    plateNumber?: string;
+    email?: string;
     type: visitorType;
     site: string | ObjectId;
     company?: string;
@@ -2821,7 +2821,7 @@ type visitorPersonRepo = {
     name: string;
     contacts: string[];
     plateNumbers: string[];
-    email: string;
+    email?: string;
     type: visitorType;
     site: string | ObjectId;
     companyName: string[];

package/dist/index.js

@@ -34292,8 +34292,20 @@ function usePersonService() {
     const email = value.email?.trim();
     const type = value.type?.trim();
     const company = value.company?.trim();
+    const nricQuery = nric ? { nric: { $regex: `^${escapeRegex(nric)}$`, $options: "i" } } : null;
+    const nameQuery = name ? { name: { $regex: `^${escapeRegex(name)}$`, $options: "i" } } : null;
+    let nricCondition = null;
+    if (nric) {
+      if (nric.length < 9) {
+        if (nameQuery) {
+          nricCondition = { $and: [nricQuery, nameQuery] };
+        }
+      } else {
+        nricCondition = nricQuery;
+      }
+    }
     const orConditions = [
-      ...nric ? [{ nric: { $regex: `^${escapeRegex(nric)}$`, $options: "i" } }] : [],
+      ...nricCondition ? [nricCondition] : [],
       ...contact ? [{ contacts: { $regex: `^\\+?${cleanPhone(escapeRegex(contact))}$`, $options: "i" } }] : [],
       ...plateNumber ? [{ plateNumbers: { $regex: `^${escapeRegex(plateNumber)}$`, $options: "i" } }] : []
     ];
@@ -35687,7 +35699,6 @@ function useVisitorTransactionService() {
         value.unitName = unit?.name;
       }
       const { nric = "", name = "", contact = "", plateNumber = "", email = "", site = "", type = "guest", company, createdBy } = value;
-      console.log("type", type);
       if (/^(guest|walk-in|contractor|delivery)$/.test(type)) {
         await addUpdateFromVisitor({
           nric,
@@ -35699,7 +35710,7 @@ function useVisitorTransactionService() {
           site,
           company,
           updatedBy: createdBy
-        });
+        }, session);
       }
       if (Array.isArray(value.members) && value.members.length > 0) {
         const chunkSize = 10;
@@ -35720,7 +35731,18 @@ function useVisitorTransactionService() {
           await Promise.all(
             chunk.map(async (member) => {
               const clonedMember = structuredClone(member);
-              const { visitorPass, passKeys } = clonedMember;
+              const { visitorPass, passKeys, nric: nric2, name: name2, contact: contact2 } = clonedMember;
+              if (/^(guest|walk-in|contractor|delivery)$/.test(type2 ?? "invalid") && site2) {
+                await addUpdateFromVisitor({
+                  nric: nric2,
+                  name: name2,
+                  contact: contact2,
+                  type: type2,
+                  site: site2,
+                  company: company2,
+                  updatedBy: createdBy
+                }, session);
+              }
               const preparedVisitorPass = Array.isArray(visitorPass) ? visitorPass.map((item) => ({
                 ...item,
                 receivedDate: /* @__PURE__ */ new Date(),
@@ -35907,16 +35929,30 @@ function useVisitorTransactionService() {
         const parsed = new Date(value.checkIn);
         value.checkIn = isNaN(parsed.getTime()) ? null : parsed;
       }
+      const { nric = "", name = "", contact = "", plateNumber = "", email = "", site = "", type = "guest", company, createdBy } = value;
+      if (/^(guest|walk-in|contractor|delivery)$/.test(type)) {
+        await addUpdateFromVisitor({
+          nric,
+          name,
+          contact,
+          plateNumber,
+          email,
+          type,
+          site,
+          company,
+          updatedBy: createdBy
+        }, session);
+      }
       if (value.isMembersAdded != true && Array.isArray(value.members) && value.members.length > 0) {
         const chunkSize = 10;
         const {
           block,
           level,
           unit,
-          site,
+          site: site2,
           org,
-          type,
-          company,
+          type: type2,
+          company: company2,
           remarks,
           contractorType,
           unitName
@@ -35926,7 +35962,18 @@ function useVisitorTransactionService() {
           await Promise.all(
             chunk.map(async (member) => {
               const clonedMember = structuredClone(member);
-              const { visitorPass, passKeys } = clonedMember;
+              const { visitorPass, passKeys, nric: nric2, name: name2, contact: contact2 } = clonedMember;
+              if (/^(guest|walk-in|contractor|delivery)$/.test(type2 ?? "invalid") && site2) {
+                await addUpdateFromVisitor({
+                  nric: nric2,
+                  name: name2,
+                  contact: contact2,
+                  type: type2,
+                  site: site2,
+                  company: company2,
+                  updatedBy: createdBy
+                }, session);
+              }
               const preparedVisitorPass = Array.isArray(visitorPass) ? visitorPass.map((item) => ({
                 ...item,
                 receivedDate: /* @__PURE__ */ new Date(),
@@ -35948,10 +35995,10 @@ function useVisitorTransactionService() {
                   level,
                   unit,
                   unitName,
-                  site,
+                  site: site2,
                   org,
-                  type,
-                  company,
+                  type: type2,
+                  company: company2,
                   remarks,
                   contractorType,
                   checkIn: value.checkIn,
@@ -64503,34 +64550,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
@@ -64953,7 +65028,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;