@7365admin1/core 3.34.4-staging.16 → 3.34.4-staging.18

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(): {
@@ -6105,8 +6104,8 @@ declare function useNfcPatrolLogRepo(): {
         date?: string | undefined;
         type?: "month" | undefined;
         route?: {
-            _id: ObjectId | string;
-            startTime: string;
+            _id?: string | ObjectId | undefined;
+            startTime?: string | undefined;
         } | undefined;
     }, session?: ClientSession) => Promise<{
         items: any[];
@@ -6137,7 +6136,7 @@ declare function useNfcPatrolLogService(): {
 
 declare function useNfcPatrolLogController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
-    getAllBySite: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getAllBySite: (req: Request, res: Response, next: NextFunction) => Promise<void | Response<any, Record<string, any>>>;
     completeCheckpoint: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getLog: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     sign: (req: Request, res: Response, next: NextFunction) => Promise<void>;

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,
@@ -58502,13 +58589,9 @@ function useNfcPatrolLogRepo() {
     };
     if (date) {
       if (type === "month") {
-        const [year, month] = date.split("-").map(Number);
-        const endDay = new Date(year, month, 0).getDate();
         query.date = {
-          $gte: `${year}-${String(month).padStart(2, "0")}-01`,
-          $lte: `${year}-${String(month).padStart(2, "0")}-${String(
-            endDay
-          ).padStart(2, "0")}`
+          $gte: `${date}-01-01`,
+          $lte: `${date}-12-31`
         };
       } else {
         query.date = date;
@@ -58829,49 +58912,52 @@ function useNfcPatrolLogController() {
       page: import_joi111.default.number().integer().min(1).default(1),
       limit: import_joi111.default.number().integer().min(1).max(100).default(10),
       site: import_joi111.default.string().length(24).hex().required(),
-      date: import_joi111.default.string().pattern(/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/).required().messages({
-        "string.pattern.base": "Date must be in YYYY-MM-DD format (e.g. 2026-07-17)"
+      date: import_joi111.default.string().pattern(/^\d{4}(-(0[1-9]|1[0-2])(-(0[1-9]|[12][0-9]|3[01]))?)?$/).optional().messages({
+        "string.pattern.base": "Date must be YYYY or YYYY-MM or YYYY-MM-DD"
       }),
       type: import_joi111.default.string().valid("month").optional(),
       route: import_joi111.default.object({
-        _id: import_joi111.default.string().length(24).hex().required(),
-        startTime: import_joi111.default.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).required()
-      }).required()
+        _id: import_joi111.default.string().length(24).hex().optional(),
+        startTime: import_joi111.default.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().messages({
+          "string.pattern.base": "startTime must be in HH:mm 24-hour format"
+        })
+      }).min(1).optional()
     });
     const query = {
+      page: req.query.page,
+      limit: req.query.limit,
       site: req.query.site,
       date: req.query.date,
       type: req.query.type,
-      route: {
-        _id: req.query["route._id"],
-        startTime: req.query["route.startTime"]
-      }
+      route: req.query["route._id"] || req.query["route.startTime"] ? {
+        ...req.query["route._id"] ? { _id: req.query["route._id"] } : {},
+        ...req.query["route.startTime"] ? { startTime: req.query["route.startTime"] } : {}
+      } : void 0
     };
     const { error, value } = validation.validate(query, {
-      abortEarly: false
+      abortEarly: false,
+      allowUnknown: true,
+      stripUnknown: true
     });
     if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils200.logger.log({ level: "error", message: messages });
-      next(new import_node_server_utils200.BadRequestError(messages));
-      return;
+      return next(
+        new import_node_server_utils200.BadRequestError(
+          error.details.map((d) => d.message).join(", ")
+        )
+      );
     }
-    const { page, limit, site, date, type, route } = value;
     try {
       const data = await _getAllBySite({
-        page,
-        limit,
-        site,
-        date,
-        type,
-        route
+        page: value.page,
+        limit: value.limit,
+        site: value.site,
+        date: value.date,
+        type: value.type,
+        route: value.route
       });
-      res.status(200).json(data);
-      return;
+      return res.status(200).json(data);
     } catch (error2) {
-      import_node_server_utils200.logger.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
+      return next(error2);
     }
   }
   async function completeCheckpoint(req, res, next) {