@7365admin1/core 3.34.4-staging.21 → 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,