@7365admin1/core 3.37.0 → 3.39.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 3.39.0
+
+### Minor Changes
+
+- 7bd9e97: VMS pass and key bugfixes, nfc patrol search filter, etc
+
+## 3.38.0
+
+### Minor Changes
+
+- d433685: VMS Checkout Bugfix
+
 ## 3.37.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -6107,8 +6107,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[];
@@ -6139,7 +6139,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

@@ -25303,9 +25303,9 @@ function usePersonRepo() {
           { email: { $regex: search, $options: "i" } },
           { nric: { $regex: search, $options: "i" } },
           { "plates.plateNumber": { $regex: search, $options: "i" } },
-          { contact: { $regex: makeContainsRegex(contact) } },
-          { contacts: { $regex: makeContainsRegex(contact) } },
-          { plateNumbers: { $regex: makeContainsRegex(plateNumber) } }
+          { contact: { $regex: makeContainsRegex(search) } },
+          { contacts: { $regex: makeContainsRegex(search) } },
+          { plateNumbers: { $regex: makeContainsRegex(search) } }
         ]
       },
       ...import_mongodb45.ObjectId.isValid(org) && { org: new import_mongodb45.ObjectId(org) },
@@ -25918,7 +25918,7 @@ function usePersonRepo() {
       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.");
+      throw new import_node_server_utils74.InternalServerError("Failed to find persons" + error);
     }
   }
   async function addFromVisitor(value, session) {
@@ -33150,7 +33150,7 @@ function useAttendanceRepository() {
             localField: "user",
             foreignField: "_id",
             as: "user",
-            pipeline: [{ $project: { name: 1 } }]
+            pipeline: [{ $project: { name: 1, profile: 1 } }]
           }
         },
         { $unwind: { path: "$user", preserveNullAndEmptyArrays: true } }
@@ -33164,6 +33164,7 @@ function useAttendanceRepository() {
         {
           $project: {
             userName: "$user.name",
+            userProfile: "$user.profile",
             checkInTimestamp: "$checkIn.timestamp",
             checkOutTimestamp: "$checkOut.timestamp",
             createdAt: 1
@@ -35636,7 +35637,7 @@ function useVisitorTransactionService() {
         value.unitName = unit?.name;
       }
       const { nric = "", name = "", contact = "", plateNumber = "", email = "", site = "", type = "guest", company, createdBy } = value;
-      if (/^(guest|walk-in|contractor|delivery)$/.test(type)) {
+      if (/^(guest|walk-in|contractor|delivery)$/.test(type) && site) {
         await addUpdateFromVisitor({
           nric,
           name,
@@ -35867,7 +35868,7 @@ function useVisitorTransactionService() {
         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)) {
+      if (/^(guest|walk-in|contractor|delivery)$/.test(type) && site) {
         await addUpdateFromVisitor({
           nric,
           name,
@@ -36051,7 +36052,9 @@ function useVisitorTransactionService() {
               value.site,
               session,
               void 0,
-              id
+              id,
+              void 0,
+              true
             );
             item.receivedDate = /* @__PURE__ */ new Date();
             item.status = "Not Returned" /* NOT_RETURNED */;
@@ -36100,7 +36103,9 @@ function useVisitorTransactionService() {
               value.site,
               session,
               void 0,
-              id
+              id,
+              void 0,
+              true
             );
             item.receivedDate = /* @__PURE__ */ new Date();
             item.status = "Not Returned" /* NOT_RETURNED */;
@@ -55287,8 +55292,11 @@ function useNfcPatrolRouteRepo() {
     const query = {
       site
     };
-    if (search) {
-      query.$text = { $search: search };
+    if (search?.trim()) {
+      query.name = {
+        $regex: search.trim(),
+        $options: "i"
+      };
     }
     if (filter === "today" || filter === "notToday") {
       const singaporeDateString = (/* @__PURE__ */ new Date()).toLocaleString("en-US", {
@@ -58651,13 +58659,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;
@@ -58978,47 +58982,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,
-      route: {
-        _id: req.query["route._id"],
-        startTime: req.query["route.startTime"]
-      }
+      type: req.query.type,
+      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, route } = value;
     try {
       const data = await _getAllBySite({
-        page,
-        limit,
-        site,
-        date,
-        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) {
@@ -64548,34 +64557,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
@@ -64998,7 +65035,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;