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

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>;
@@ -6104,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[];
@@ -6136,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

@@ -33211,6 +33211,8 @@ function useAttendanceRepository() {
     limit = 10,
     search = "",
     site,
+    startDate = "",
+    endDate = "",
     serviceType,
     user
   }) {
@@ -33238,6 +33240,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 +33716,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 +33731,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 +33740,9 @@ function useAttendanceController() {
         search,
         site,
         serviceType,
-        user
+        user,
+        startDate,
+        endDate
       });
       res.json(data);
       return;
@@ -58589,13 +58628,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;
@@ -58916,49 +58951,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) {