@7365admin1/core 3.34.4-staging.15 → 3.34.4-staging.17

package/dist/index.d.ts

@@ -2763,6 +2763,7 @@ type TPerson = {
     deletedAt?: string | Date;
     plateNumbers?: string[];
     contacts?: string[];
+    updatedBy?: string | ObjectId;
 };
 declare const PERSON_TYPES: readonly ["walk-in", "drop-off", "contractor", "delivery", "pick-up", "guest", "tenant", "resident"];
 type PersonType = (typeof PERSON_TYPES)[number];
@@ -2813,7 +2814,7 @@ type visitorPersonService = {
     type: visitorType;
     site: string | ObjectId;
     company?: string;
-    updatedBy?: string | ObjectId;
+    updatedBy?: string | ObjectId | undefined;
 };
 type visitorPersonRepo = {
     nric: string;
@@ -2825,8 +2826,6 @@ type visitorPersonRepo = {
     site: string | ObjectId;
     companyName: string[];
     status: string;
-    createdAt: string | Date;
-    updatedAt: string | Date;
     createdBy?: string | ObjectId | undefined;
     updatedBy?: string | ObjectId | undefined;
 };
@@ -3155,7 +3154,7 @@ declare function usePersonRepo(): {
     getByUserId: (userId: string | ObjectId) => Promise<TPerson | null>;
     reviewResidentPerson: (_id: ObjectId | string, value: Partial<TPerson>, session?: ClientSession) => Promise<mongodb.UpdateResult<TPerson>>;
     addFromVisitor: (value: visitorPersonRepo, session?: ClientSession) => Promise<mongodb.InsertOneResult<TPerson>>;
-    findFirstOne: (query: Record<string, any>, session?: ClientSession) => Promise<mongodb.WithId<TPerson>[]>;
+    findFirstTen: (query: Record<string, any>, session?: ClientSession) => Promise<mongodb.WithId<TPerson>[]>;
 };
 
 declare function usePersonController(): {
@@ -6181,7 +6180,14 @@ declare function useNewDashboardRepo(): {
             missed: any;
             percentage: number;
         };
-        activePatrolItems: any[];
+        activePatrolItems: {
+            id: string;
+            title: any;
+            subtitle: string;
+            person: any;
+            status: any;
+            time: string;
+        }[];
     }>;
     getPropertyManagementDashboard: (siteId: string, period?: Period, type?: string, facility?: string) => Promise<{
         openWorkOrder: {

package/dist/index.js

@@ -25359,6 +25359,9 @@ function usePersonRepo() {
       throw new import_node_server_utils74.BadRequestError("Invalid person transaction ID format.");
     }
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    if (value.updatedBy) {
+      value.updatedBy = await convertObjectIdUtil2(value.updatedBy, "updatedBy");
+    }
     try {
       const result = await collection.updateOne(
         { _id },
@@ -25851,10 +25854,10 @@ function usePersonRepo() {
       throw error;
     }
   }
-  async function findFirstOne(query, session) {
+  async function findFirstTen(query, session) {
     try {
       query.site = await convertObjectIdUtil2(query.site, "site");
-      const data = await collection.find(query, { session }).limit(1).toArray();
+      const data = await collection.find(query, { session }).limit(10).toArray();
       return data;
     } catch (error) {
       throw new import_node_server_utils74.InternalServerError("Failed to find many persons.");
@@ -25862,7 +25865,17 @@ function usePersonRepo() {
   }
   async function addFromVisitor(value, session) {
     value.site = await convertObjectIdUtil2(value.site, "site");
-    const res = await collection.insertOne(value, { session });
+    if (value.updatedBy) {
+      value.updatedBy = await convertObjectIdUtil2(value.updatedBy, "updatedBy");
+    }
+    if (value.createdBy) {
+      value.createdBy = await convertObjectIdUtil2(value.createdBy, "createdBy");
+    }
+    const res = await collection.insertOne({
+      ...value,
+      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+      updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+    }, { session });
     console.log("person.repo addFromVisitor res", res);
     return res;
   }
@@ -25886,7 +25899,7 @@ function usePersonRepo() {
     getByUserId,
     reviewResidentPerson,
     addFromVisitor,
-    findFirstOne
+    findFirstTen
   };
 }
 
@@ -33807,7 +33820,7 @@ function usePersonService() {
     getByUserId: _getByUserId,
     reviewResidentPerson: _reviewResidentPerson,
     addFromVisitor: _addFromVisitor,
-    findFirstOne
+    findFirstTen
   } = usePersonRepo();
   const { addPlateNumber: _addPlateNumber } = useDahuaService();
   const {
@@ -34197,43 +34210,116 @@ function usePersonService() {
     }
   }
   async function addUpdateFromVisitor(value, session) {
+    value.type = value.type == "walk-in" ? "guest" : value.type;
     let updateId = null;
+    let add2 = true;
     let set = {};
-    if (value?.nric) {
-      const existingPerson = await findFirstOne({ nric: value.nric, site: value.site }, session);
-      if (Array.isArray(existingPerson) && existingPerson.length > 0) {
-        updateId = existingPerson[0]._id;
-        if (value.contact && Array.isArray(existingPerson[0].contacts) && !existingPerson[0].contacts.includes(value.contact)) {
-          set = { contacts: [...existingPerson[0].contacts, value.contact] };
+    const cleanInput = (str) => str.replace(/\s+/g, "");
+    const cleanPhone = (str) => str.replace(/\D/g, "");
+    const escapeRegex = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const nric = value.nric ? cleanInput(value.nric) : "";
+    const name = value.name?.trim();
+    const contact = value.contact?.trim();
+    const plateNumber = value.plateNumber ? cleanInput(value.plateNumber) : "";
+    const email = value.email?.trim();
+    const type = value.type?.trim();
+    const company = value.company?.trim();
+    const orConditions = [
+      ...nric ? [{ nric: { $regex: `^${escapeRegex(nric)}$`, $options: "i" } }] : [],
+      ...contact ? [{ contacts: { $regex: `^\\+?${cleanPhone(escapeRegex(contact))}$`, $options: "i" } }] : [],
+      ...plateNumber ? [{ plateNumbers: { $regex: `^${escapeRegex(plateNumber)}$`, $options: "i" } }] : []
+    ];
+    const existingPerson2 = await findFirstTen(
+      {
+        type,
+        site: value.site,
+        ...orConditions.length > 0 && { $or: orConditions }
+      },
+      session
+    );
+    if (Array.isArray(existingPerson2) && existingPerson2.length > 0) {
+      let matchedPerson = nric ? existingPerson2.find((person) => person.nric === nric) : null;
+      if (matchedPerson) {
+        add2 = false;
+        updateId = matchedPerson._id;
+        if (contact && Array.isArray(matchedPerson.contacts) && !matchedPerson.contacts.includes(contact)) {
+          set = { contacts: [...matchedPerson.contacts, contact] };
         }
-        if (value.plateNumber && Array.isArray(existingPerson[0].plateNumbers) && !existingPerson[0].plateNumbers.includes(value.plateNumber)) {
-          set = { ...set, plateNumbers: [...existingPerson[0].plateNumbers, value.plateNumber] };
+        if (plateNumber && Array.isArray(matchedPerson.plateNumbers) && !matchedPerson.plateNumbers.includes(plateNumber)) {
+          set = { ...set, plateNumbers: [...matchedPerson.plateNumbers, plateNumber] };
         }
-        if (value.company && Array.isArray(existingPerson[0].companyName) && !existingPerson[0].companyName.includes(value.company)) {
-          set = { ...set, companyName: [...existingPerson[0].companyName, value.company] };
+        if (company && Array.isArray(matchedPerson.companyName) && !matchedPerson.companyName.includes(company)) {
+          set = { ...set, companyName: [...matchedPerson.companyName, company] };
         }
+        if (name && name != matchedPerson.name) {
+          set = { ...set, name };
+        }
+        if (email && email != matchedPerson.email) {
+          set = { ...set, email };
+        }
+      } else {
+        matchedPerson = contact ? existingPerson2.find((person) => Array.isArray(person.contacts) && person.contacts.includes(contact)) : null;
       }
-    } else {
+      if (matchedPerson) {
+        add2 = false;
+        updateId = matchedPerson._id;
+        if (nric && nric !== matchedPerson.nric) {
+          set = { ...set, nric };
+        }
+        if (plateNumber && Array.isArray(matchedPerson.plateNumbers) && !matchedPerson.plateNumbers.includes(plateNumber)) {
+          set = { ...set, plateNumbers: [...matchedPerson.plateNumbers, plateNumber] };
+        }
+        if (company && Array.isArray(matchedPerson.companyName) && !matchedPerson.companyName.includes(company)) {
+          set = { ...set, companyName: [...matchedPerson.companyName, company] };
+        }
+        if (name && name !== matchedPerson.name) {
+          set = { ...set, name };
+        }
+        if (email && email !== matchedPerson.email) {
+          set = { ...set, email };
+        }
+      } else {
+        matchedPerson = plateNumber ? existingPerson2.find((person) => Array.isArray(person.plateNumbers) && person.plateNumbers.includes(plateNumber)) : null;
+      }
+      if (matchedPerson && (contact && Array.isArray(matchedPerson.contacts) && !matchedPerson.contacts.includes(contact) && (nric && nric != matchedPerson.nric) || !nric && !contact)) {
+        add2 = false;
+        updateId = matchedPerson._id;
+        if (nric && nric !== matchedPerson.nric) {
+          set = { ...set, nric };
+        }
+        if (contact && Array.isArray(matchedPerson.contacts) && !matchedPerson.contacts.includes(contact)) {
+          set = { contacts: [...matchedPerson.contacts, contact] };
+        }
+        if (company && Array.isArray(matchedPerson.companyName) && !matchedPerson.companyName.includes(company)) {
+          set = { ...set, companyName: [...matchedPerson.companyName, company] };
+        }
+        if (name && name !== matchedPerson.name) {
+          set = { ...set, name };
+        }
+        if (email && email !== matchedPerson.email) {
+          set = { ...set, email };
+        }
+      }
+    }
+    if (add2) {
       const data = {
         nric: value.nric,
         name: value.name,
         contacts: value.contact ? [value.contact] : [],
         plateNumbers: value.plateNumber ? [value.plateNumber] : [],
-        type: value.type,
+        type,
         email: value.email,
         site: value.site,
         status: "active",
         companyName: value.company ? [value.company] : [],
         createdBy: value.updatedBy,
-        updatedBy: value.updatedBy,
-        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        updatedBy: value.updatedBy
       };
-      const res = await _addFromVisitor(data, session);
+      const res_addFromVisitor = await _addFromVisitor(data, session);
     }
     if (updateId && Object.keys(set).length > 0) {
       set = { ...set, updatedBy: value.updatedBy, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
-      const updateRes = await _updateById(updateId, set, session);
+      const res_updateById = await _updateById(updateId, set, session);
     }
   }
   return {
@@ -35533,8 +35619,9 @@ 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)) {
-        const res = await addUpdateFromVisitor({
+        await addUpdateFromVisitor({
           nric,
           name,
           contact,
@@ -58990,6 +59077,17 @@ function useNewDashboardRepo() {
       $lte: now.clone().endOf("day").toDate()
     };
   }
+  function getActivePatrolDateRange(period) {
+    switch (period) {
+      case "thisWeek" /* THIS_WEEK */:
+        return getDateRange("thisWeek" /* THIS_WEEK */);
+      case "thisMonth" /* THIS_MONTH */:
+        return getDateRange("thisMonth" /* THIS_MONTH */);
+      case "today" /* TODAY */:
+      default:
+        return getDateRange("today" /* TODAY */);
+    }
+  }
   function getSiteDayRange(date = import_moment2.default.tz("Asia/Singapore")) {
     return {
       $gte: date.clone().startOf("day").toDate(),
@@ -59002,6 +59100,33 @@ function useNewDashboardRepo() {
     }
     return Math.round((currentCount - previousCount) / previousCount * 100 * 100) / 100;
   };
+  async function getPatrolLogPerson(log) {
+    if (!log) {
+      return "Unassigned";
+    }
+    if (log.assignee && log.assignee.length > 0) {
+      const userIds = log.assignee.map((id) => (0, import_node_server_utils201.toObjectId)(id));
+      const userDocs = await db.collection("members").find({ _id: { $in: userIds } }).toArray();
+      if (userDocs && userDocs.length > 0) {
+        return userDocs.map((u) => u.name || u.email || "").filter(Boolean).join(", ");
+      }
+    }
+    if (log.createdBy) {
+      const userDoc = await db.collection("members").findOne({
+        _id: (0, import_node_server_utils201.toObjectId)(log.createdBy)
+      });
+      if (userDoc && userDoc.name) {
+        return userDoc.name;
+      }
+    }
+    return "Unassigned";
+  }
+  function getPatrolLogStatus(log, defaultStatus = "completed") {
+    if (!log?.status) {
+      return defaultStatus;
+    }
+    return Array.isArray(log.status) ? log.status.join(", ") : log.status;
+  }
   async function getSecurityDashboard({
     siteId = "",
     period = "today" /* TODAY */,
@@ -59176,11 +59301,11 @@ function useNewDashboardRepo() {
           $facet: {
             total: [{ $count: "count" }],
             completed: [
-              { $match: { "cameras.status": "Completed" } },
+              { $match: { status: "complete" } },
               { $count: "count" }
             ],
             skipped: [
-              { $match: { "cameras.status": "Skipped" } },
+              { $match: { status: "incomplete" } },
               { $count: "count" }
             ]
           }
@@ -59200,11 +59325,11 @@ function useNewDashboardRepo() {
           $facet: {
             total: [{ $count: "count" }],
             completed: [
-              { $match: { "cameras.status": "Completed" } },
+              { $match: { status: "complete" } },
               { $count: "count" }
             ],
             skipped: [
-              { $match: { "cameras.status": "Skipped" } },
+              { $match: { status: "incomplete" } },
               { $count: "count" }
             ]
           }
@@ -59224,11 +59349,11 @@ function useNewDashboardRepo() {
           $facet: {
             total: [{ $count: "count" }],
             completed: [
-              { $match: { "cameras.status": "Completed" } },
+              { $match: { status: "complete" } },
               { $count: "count" }
             ],
             skipped: [
-              { $match: { "cameras.status": "Skipped" } },
+              { $match: { status: "incomplete" } },
               { $count: "count" }
             ]
           }
@@ -59259,127 +59384,27 @@ function useNewDashboardRepo() {
     const tTotal = tPatrolFacet.total[0]?.count ?? 0;
     const tCompleted = tPatrolFacet.completed[0]?.count ?? 0;
     const todayCompliance = tTotal > 0 ? tCompleted / tTotal * 100 : 0;
-    let activePatrolItems = [];
-    if (period === "today" /* TODAY */) {
-      const todayString = import_moment2.default.tz("Asia/Singapore").format("YYYY-MM-DD");
-      const dayIndex = import_moment2.default.tz("Asia/Singapore").day();
-      const repeatDay = dayIndex === 0 ? 7 : dayIndex;
-      const routes = await db.collection("patrol.route").find({
-        site: { $in: [siteIdObj, siteId] },
-        repeat: { $in: [repeatDay, String(repeatDay)] },
-        status: { $ne: "deleted" }
-      }).toArray();
-      const expandedRoutes = [];
-      for (const route of routes) {
-        if (route.start) {
-          expandedRoutes.push({
-            route,
-            startTime: route.start,
-            itemIndex: 0
-          });
-        }
-      }
-      expandedRoutes.sort((a, b) => a.startTime.localeCompare(b.startTime));
-      const limitedRoutes = expandedRoutes.slice(0, 4);
-      limitedRoutes.forEach((item, idx) => {
-        item.itemIndex = idx + 1;
-      });
-      activePatrolItems = await Promise.all(
-        limitedRoutes.map(async ({ route, startTime, itemIndex }) => {
-          const log = await db.collection("patrol.logs").findOne({
-            site: { $in: [siteIdObj, siteId] },
-            route: { $in: [route._id, route._id.toString()] },
-            createdAt: { $gte: today, $lte: todayEnd }
-          });
-          let person = "Unassigned";
-          if (log && log.assignee && log.assignee.length > 0) {
-            const userIds = log.assignee.map((id) => (0, import_node_server_utils201.toObjectId)(id));
-            const userDocs = await db.collection("members").find({ _id: { $in: userIds } }).toArray();
-            if (userDocs && userDocs.length > 0) {
-              person = userDocs.map((u) => u.name || u.email || "").filter(Boolean).join(", ");
-            }
-          } else if (log && log.createdBy) {
-            const userDoc = await db.collection("members").findOne({
-              _id: (0, import_node_server_utils201.toObjectId)(log.createdBy)
-            });
-            if (userDoc && userDoc.name) {
-              person = userDoc.name;
-            }
-          }
-          let status = "pending";
-          if (log) {
-            if (log.status) {
-              status = Array.isArray(log.status) ? log.status.join(", ") : log.status;
-            } else {
-              status = "completed";
-            }
-          } else {
-            const routeTime = import_moment2.default.tz(
-              `${todayString} ${startTime}`,
-              "YYYY-MM-DD HH:mm",
-              "Asia/Singapore"
-            );
-            const nowSg = import_moment2.default.tz("Asia/Singapore");
-            const diffMinutes = nowSg.diff(routeTime, "minutes");
-            if (diffMinutes >= 0) {
-              if (diffMinutes <= 120) {
-                status = "on paused";
-              } else {
-                status = "incomplete";
-              }
-            } else {
-              status = "pending";
-            }
-          }
-          return {
-            id: `${route._id.toString()}_${startTime}`,
-            title: route.name,
-            subtitle: `ID${String(itemIndex).padStart(3, "0")}`,
-            person,
-            status,
-            time: startTime
-          };
-        })
-      );
-    } else {
-      const logs = await db.collection("patrol.logs").find({
-        site: { $in: [siteIdObj, siteId] },
-        createdAt: periodRange
-      }).sort({ createdAt: -1 }).limit(4).toArray();
-      activePatrolItems = await Promise.all(
-        logs.map(async (log) => {
-          let person = "Unassigned";
-          if (log.assignee && log.assignee.length > 0) {
-            const userIds = log.assignee.map((id) => (0, import_node_server_utils201.toObjectId)(id));
-            const userDocs = await db.collection("members").find({ _id: { $in: userIds } }).toArray();
-            if (userDocs && userDocs.length > 0) {
-              person = userDocs.map((u) => u.name || u.email || "").filter(Boolean).join(", ");
-            }
-          } else if (log.createdBy) {
-            const userDoc = await db.collection("members").findOne({
-              _id: (0, import_node_server_utils201.toObjectId)(log.createdBy)
-            });
-            if (userDoc && userDoc.name) {
-              person = userDoc.name;
-            }
-          }
-          let status = "completed";
-          if (log.status) {
-            status = Array.isArray(log.status) ? log.status.join(", ") : log.status;
-          }
-          const logTime = (0, import_moment2.default)(log.createdAt).tz("Asia/Singapore").format("HH:mm");
-          const logDate = (0, import_moment2.default)(log.createdAt).tz("Asia/Singapore").format("DD/MM/YYYY");
-          return {
-            id: log._id.toString(),
-            title: log.name,
-            subtitle: logDate,
-            person,
-            status,
-            time: logTime
-          };
-        })
-      );
-    }
+    const activePatrolDateRange = getActivePatrolDateRange(period);
+    const activePatrolLogs = await db.collection("patrol.logs").find({
+      site: { $in: [siteIdObj, siteId] },
+      createdAt: activePatrolDateRange
+    }).sort({ createdAt: -1 }).limit(4).toArray();
+    const activePatrolItems = await Promise.all(
+      activePatrolLogs.map(async (log) => {
+        const person = await getPatrolLogPerson(log);
+        const status = getPatrolLogStatus(log);
+        const logTime = (0, import_moment2.default)(log.createdAt).tz("Asia/Singapore").format("HH:mm");
+        const logDate = (0, import_moment2.default)(log.createdAt).tz("Asia/Singapore").format("DD/MM/YYYY");
+        return {
+          id: log._id.toString(),
+          title: log.name,
+          subtitle: logDate,
+          person,
+          status,
+          time: logTime
+        };
+      })
+    );
     const data = {
       openWorkOrder: {
         count: wFacet.total[0]?.count ?? 0,