@7365admin1/module-hygiene 4.26.0 → 4.27.0

package/dist/index.mjs

@@ -2505,6 +2505,7 @@ function MParentChecklist(value) {
 
 // src/repositories/hygiene-parent-checklist.repository.ts
 import { ObjectId as ObjectId7 } from "mongodb";
+import moment2 from "moment-timezone";
 import {
   useAtlas as useAtlas5,
   InternalServerError as InternalServerError4,
@@ -2807,19 +2808,28 @@ function useParentChecklistRepo() {
       query.$text = { $search: search };
       cacheOptions.search = search;
     }
+    const singaporeTz = "Asia/Singapore";
+    const normalizedStartDate = typeof startDate === "string" ? startDate : moment2(startDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedEndDate = typeof endDate === "string" ? endDate : moment2(endDate).tz(singaporeTz).format("YYYY-MM-DD");
     if (startDate && endDate) {
+      const startOfDay = moment2.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
+      const endOfDay = moment2.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
       query.createdAt = {
-        $gte: new Date(startDate),
-        $lte: new Date(endDate)
+        $gte: startOfDay,
+        $lte: endOfDay
       };
-      cacheOptions.startDate = new Date(startDate).toISOString().split("T")[0];
-      cacheOptions.endDate = new Date(endDate).toISOString().split("T")[0];
+      cacheOptions.startDate = normalizedStartDate;
+      cacheOptions.endDate = normalizedEndDate;
     } else if (startDate) {
-      query.createdAt = { $gte: new Date(startDate) };
-      cacheOptions.startDate = new Date(startDate).toISOString().split("T")[0];
+      query.createdAt = {
+        $gte: moment2.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
+      };
+      cacheOptions.startDate = normalizedStartDate;
     } else if (endDate) {
-      query.createdAt = { $lte: new Date(endDate) };
-      cacheOptions.endDate = new Date(endDate).toISOString().split("T")[0];
+      query.createdAt = {
+        $lte: moment2.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
+      };
+      cacheOptions.endDate = normalizedEndDate;
     }
     if (status && status !== "all") {
       query.status = status;