@7365admin1/core 3.34.4-staging.18 → 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>;

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;