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

package/dist/index.d.ts

@@ -2625,7 +2625,7 @@ type TGetAttendancesQuery = {
     startDate?: string | Date;
     endDate?: string | Date;
 } & Pick<TAttendance, "site" | "serviceType">;
-type TGetAttendancesByUserQuery = Pick<TGetAttendancesQuery, "page" | "limit" | "search" | "site" | "serviceType"> & Pick<TAttendance, "user">;
+type TGetAttendancesByUserQuery = Pick<TGetAttendancesQuery, "page" | "limit" | "search" | "site" | "serviceType" | "startDate" | "endDate"> & Pick<TAttendance, "user">;
 declare const attendanceSchema: Joi.ObjectSchema<any>;
 declare function MAttendance(value: TAttendance): {
     site: string | ObjectId;
@@ -2685,7 +2685,7 @@ declare function useAttendanceRepository(): {
     createIndex: () => Promise<void>;
     checkInAttendance: (value: TAttendanceCheckIn, session?: ClientSession) => Promise<ObjectId>;
     getAllAttendances: ({ page, limit, search, site, startDate, endDate, serviceType, }: TGetAttendancesQuery) => Promise<{}>;
-    getAttendanceByUser: ({ page, limit, search, site, serviceType, user, }: TGetAttendancesByUserQuery) => Promise<{}>;
+    getAttendanceByUser: ({ page, limit, search, site, startDate, endDate, serviceType, user, }: TGetAttendancesByUserQuery) => Promise<{}>;
     getAttendanceById: (_id: string | ObjectId, session?: ClientSession) => Promise<{}>;
     getRawAttendanceById: (_id: string | ObjectId, session?: ClientSession) => Promise<TAttendance>;
     checkOutAttendance: (_id: string | ObjectId, value: TAttendanceCheckOut, session?: ClientSession) => Promise<number>;
@@ -3108,7 +3108,7 @@ declare function useGuestManagementController(): {
 declare const site_people_namespace_collection = "site.people";
 declare function usePersonRepo(): {
     add: (value: TPerson, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, status, dateFrom, dateTo, org, site, type, }: {
+    getAll: ({ search, page, limit, sort, status, dateFrom, dateTo, org, site, type, nric, contact, plateNumber, }: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
@@ -3119,6 +3119,9 @@ declare function usePersonRepo(): {
         org?: string | undefined;
         site?: string | undefined;
         type?: string | undefined;
+        nric?: string | undefined;
+        contact?: string | undefined;
+        plateNumber: string;
     }, session?: ClientSession) => Promise<{
         items: any[];
         pages: number;

package/dist/index.js

@@ -25185,6 +25185,16 @@ var import_node_server_utils78 = require("@7365admin1/node-server-utils");
 // src/repositories/person.repo.ts
 var import_node_server_utils74 = require("@7365admin1/node-server-utils");
 var import_mongodb45 = require("mongodb");
+
+// src/utils/sanitizer.ts
+var makeContainsRegex = (input) => {
+  if (!input)
+    return "";
+  const sanitized = input.replace(/\s+/g, "").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return sanitized;
+};
+
+// src/repositories/person.repo.ts
 var site_people_namespace_collection = "site.people";
 function usePersonRepo() {
   const db = import_node_server_utils74.useAtlas.getDb();
@@ -25257,7 +25267,10 @@ function usePersonRepo() {
     dateTo,
     org = "",
     site = "",
-    type = ""
+    type = "",
+    nric = "",
+    contact = "",
+    plateNumber = ""
   }, session) {
     page = page > 0 ? page - 1 : 0;
     const start = dateFrom ? { $gte: new Date(dateFrom).toISOString() } : void 0;
@@ -25276,12 +25289,28 @@ function usePersonRepo() {
           { name: { $regex: search, $options: "i" } },
           { email: { $regex: search, $options: "i" } },
           { nric: { $regex: search, $options: "i" } },
-          { "plates.plateNumber": { $regex: search, $options: "i" } }
+          { "plates.plateNumber": { $regex: search, $options: "i" } },
+          { contact: { $regex: makeContainsRegex(contact) } },
+          { contacts: { $regex: makeContainsRegex(contact) } },
+          { plateNumbers: { $regex: makeContainsRegex(plateNumber) } }
         ]
       },
       ...import_mongodb45.ObjectId.isValid(org) && { org: new import_mongodb45.ObjectId(org) },
       ...import_mongodb45.ObjectId.isValid(site) && { site: new import_mongodb45.ObjectId(site) },
-      ...PERSON_TYPES.includes(type) && { type }
+      ...PERSON_TYPES.includes(type) && { type },
+      ...nric && { nric: { $regex: makeContainsRegex(nric), $options: "i" } },
+      ...contact && {
+        $or: [
+          { contact: { $regex: makeContainsRegex(contact) } },
+          { contacts: { $regex: makeContainsRegex(contact) } }
+        ]
+      },
+      ...plateNumber && {
+        $or: [
+          { "plates.plateNumber": { $regex: makeContainsRegex(plateNumber) } },
+          { plateNumbers: { $regex: makeContainsRegex(plateNumber) } }
+        ]
+      }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     try {
@@ -33211,6 +33240,8 @@ function useAttendanceRepository() {
     limit = 10,
     search = "",
     site,
+    startDate = "",
+    endDate = "",
     serviceType,
     user
   }) {
@@ -33238,6 +33269,37 @@ function useAttendanceRepository() {
     if (search) {
       cacheOptions.search = search;
     }
+    const singaporeTz = "Asia/Singapore";
+    const normalizedStartDate = typeof startDate === "string" ? startDate : (0, import_moment.default)(startDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedEndDate = typeof endDate === "string" ? endDate : (0, import_moment.default)(endDate).tz(singaporeTz).format("YYYY-MM-DD");
+    if (startDate && endDate) {
+      const startOfDay = import_moment.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
+      const endOfDay = import_moment.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
+      query.$expr = {
+        $and: [
+          { $gte: [{ $toDate: "$checkIn.timestamp" }, startOfDay] },
+          { $lte: [{ $toDate: "$checkIn.timestamp" }, endOfDay] }
+        ]
+      };
+      cacheOptions.startDate = normalizedStartDate;
+      cacheOptions.endDate = normalizedEndDate;
+    } else if (startDate) {
+      query.$expr = {
+        $gte: [
+          { $toDate: "$checkIn.timestamp" },
+          import_moment.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
+        ]
+      };
+      cacheOptions.startDate = normalizedStartDate;
+    } else if (endDate) {
+      query.$expr = {
+        $lte: [
+          { $toDate: "$checkIn.timestamp" },
+          import_moment.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
+        ]
+      };
+      cacheOptions.endDate = normalizedEndDate;
+    }
     const cacheKey = (0, import_node_server_utils103.makeCacheKey)(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -33683,6 +33745,8 @@ function useAttendanceController() {
       search: import_joi56.default.string().optional().allow("", null),
       site: import_joi56.default.string().hex().required(),
       serviceType: import_joi56.default.string().valid(...Object.values(AppServiceType)).required(),
+      dateFrom: import_joi56.default.alternatives().try(import_joi56.default.date(), import_joi56.default.string()).optional().allow("", null),
+      dateTo: import_joi56.default.alternatives().try(import_joi56.default.date(), import_joi56.default.string()).optional().allow("", null),
       user: import_joi56.default.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -33696,6 +33760,8 @@ function useAttendanceController() {
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
     const serviceType = req.query.serviceType ?? "";
+    const startDate = req.query.dateFrom ?? "";
+    const endDate = req.query.dateTo ?? "";
     try {
       const data = await _getAttendanceByUser({
         page,
@@ -33703,7 +33769,9 @@ function useAttendanceController() {
         search,
         site,
         serviceType,
-        user
+        user,
+        startDate,
+        endDate
       });
       res.json(data);
       return;
@@ -37026,17 +37094,21 @@ function usePersonController() {
     const validation = import_joi60.default.object({
       page: import_joi60.default.number().integer().min(1).allow("", null).default(1),
       limit: import_joi60.default.number().integer().min(1).max(100).allow("", null).default(10),
-      sort: import_joi60.default.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
+      sort: import_joi60.default.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", null),
+      order: import_joi60.default.string().pattern(/^(asc|desc)(,(asc|desc))*$/i).optional().allow("", null),
       status: import_joi60.default.string().optional().allow(null, ""),
       search: import_joi60.default.string().optional().allow(null, ""),
       dateFrom: import_joi60.default.date().iso().optional().allow(null, ""),
       dateTo: import_joi60.default.date().iso().optional().allow(null, ""),
-      org: import_joi60.default.string().optional().allow(null, ""),
-      site: import_joi60.default.string().optional().allow(null, ""),
+      org: import_joi60.default.string().hex().length(24).optional().allow(null, ""),
+      site: import_joi60.default.string().hex().length(24).optional().allow(null, ""),
       type: import_joi60.default.alternatives().try(
         import_joi60.default.string().valid(...PERSON_TYPES),
         import_joi60.default.array().items(import_joi60.default.string().valid(...PERSON_TYPES))
-      ).optional().allow(null, "")
+      ).optional().allow(null, ""),
+      nric: import_joi60.default.string().optional().allow(null, ""),
+      contact: import_joi60.default.string().optional().allow(null, ""),
+      plateNumber: import_joi60.default.string().optional().allow(null, "")
     });
     const query = { ...req.query };
     const { error } = validation.validate(query, {
@@ -37057,6 +37129,9 @@ function usePersonController() {
     const org = req.query.org;
     const site = req.query.site;
     const type = req.query.type;
+    const nric = req.query.nric;
+    const contact = req.query.contact;
+    const plateNumber = req.query.plateNumber;
     const sortObj = {};
     const sortFields = String(req.query.sort).split(",");
     const sortOrders = String(req.query.order).split(",");
@@ -37077,7 +37152,10 @@ function usePersonController() {
         dateTo,
         org,
         site,
-        type
+        type,
+        nric,
+        contact,
+        plateNumber
       });
       res.status(200).json(data);
       return;