@7365admin1/core 3.32.2-staging.43 → 3.32.2-staging.45

package/dist/index.d.ts

@@ -2713,7 +2713,7 @@ declare function useAttendanceSettingsController(): {
 declare function useAttendanceRepository(): {
     createIndex: () => Promise<void>;
     checkInAttendance: (value: TAttendanceCheckIn, session?: ClientSession) => Promise<ObjectId>;
-    getAllAttendances: ({ page, limit, search, site, serviceType, }: TGetAttendancesQuery) => Promise<{}>;
+    getAllAttendances: ({ page, limit, search, site, startDate, endDate, serviceType, }: TGetAttendancesQuery) => 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>;

package/dist/index.js

@@ -33236,6 +33236,8 @@ function useAttendanceRepository() {
     limit = 10,
     search = "",
     site,
+    startDate = "",
+    endDate = "",
     serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
@@ -33255,6 +33257,37 @@ function useAttendanceRepository() {
     if (search) {
       cacheOptions.search = search;
     }
+    const singaporeTz = "Asia/Singapore";
+    const normalizedStartDate = typeof startDate === "string" ? startDate : (0, import_moment_timezone2.default)(startDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedEndDate = typeof endDate === "string" ? endDate : (0, import_moment_timezone2.default)(endDate).tz(singaporeTz).format("YYYY-MM-DD");
+    if (startDate && endDate) {
+      const startOfDay = import_moment_timezone2.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
+      const endOfDay = import_moment_timezone2.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_timezone2.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
+        ]
+      };
+      cacheOptions.startDate = normalizedStartDate;
+    } else if (endDate) {
+      query.$expr = {
+        $lte: [
+          { $toDate: "$checkIn.timestamp" },
+          import_moment_timezone2.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) {
@@ -33790,7 +33823,9 @@ function useAttendanceController() {
       limit: import_joi56.default.number().min(1).optional().allow("", null),
       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()
+      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)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -33803,13 +33838,17 @@ 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 _getAllAttendances({
         page,
         limit,
         search,
         site,
-        serviceType
+        serviceType,
+        startDate,
+        endDate
       });
       res.json(data);
       return;