@7365admin1/module-hygiene 4.25.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;
@@ -3235,6 +3245,14 @@ function useAreaChecklistRepo() {
   const namespace_collection = "site.cleaning.schedule.areas";
   const collection = db.collection(namespace_collection);
   const { delNamespace, setCache, getCache } = useCache5(namespace_collection);
+  async function invalidateNamespaceCache(context) {
+    try {
+      await delNamespace();
+      logger17.info(`Cache cleared for namespace: ${namespace_collection}`);
+    } catch (err) {
+      logger17.error(`Failed to clear cache for ${context}`, err);
+    }
+  }
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -3289,14 +3307,7 @@ function useAreaChecklistRepo() {
       }
       const processedValue = MAreaChecklist(value);
       const result = await collection.insertOne(processedValue, { session });
-      delNamespace().then(() => {
-        logger17.info(`Cache cleared for namespace: ${namespace_collection}`);
-      }).catch((err) => {
-        logger17.error(
-          `Failed to clear cache for namespace: ${namespace_collection}`,
-          err
-        );
-      });
+      await invalidateNamespaceCache("area checklist create");
       return result.insertedId;
     } catch (error) {
       if (error?.code === 11e3) {
@@ -4033,14 +4044,7 @@ function useAreaChecklistRepo() {
       if (res.modifiedCount === 0) {
         throw new InternalServerError5("Unable to update area checklist unit.");
       }
-      delNamespace().then(() => {
-        logger17.info(`Cache cleared for namespace: ${namespace_collection}`);
-      }).catch((err) => {
-        logger17.error(
-          `Failed to clear cache for namespace: ${namespace_collection}`,
-          err
-        );
-      });
+      await invalidateNamespaceCache("area checklist unit update");
       return res.modifiedCount;
     } catch (error) {
       logger17.error("Error updating area checklist unit:", error.message);
@@ -4066,14 +4070,7 @@ function useAreaChecklistRepo() {
       if (res.modifiedCount === 0) {
         throw new InternalServerError5("Unable to update area checklist.");
       }
-      delNamespace().then(() => {
-        logger17.info(`Cache cleared for namespace: ${namespace_collection}`);
-      }).catch((err) => {
-        logger17.error(
-          `Failed to clear cache for namespace: ${namespace_collection}`,
-          err
-        );
-      });
+      await invalidateNamespaceCache("area checklist update");
       return res.modifiedCount;
     } catch (error) {
       throw error;
@@ -4103,14 +4100,7 @@ function useAreaChecklistRepo() {
           "Unable to update area checklist status."
         );
       }
-      delNamespace().then(() => {
-        logger17.info(`Cache cleared for namespace: ${namespace_collection}`);
-      }).catch((err) => {
-        logger17.error(
-          `Failed to clear cache for namespace: ${namespace_collection}`,
-          err
-        );
-      });
+      await invalidateNamespaceCache("area checklist status update");
       return res.modifiedCount;
     } catch (error) {
       throw error;
@@ -4523,16 +4513,14 @@ function useAreaChecklistService() {
       if (allUnitsResult && allUnitsResult.items && allUnitsResult.items.length > 0) {
         const sets = allUnitsResult.items;
         const allUnits = sets.flatMap((set2) => set2.units || []);
-        const openCount = allUnits.filter(
-          (unit) => unit.status === "Open"
-        ).length;
-        const completedCount = allUnits.filter(
-          (unit) => unit.status === "Completed"
-        ).length;
         const totalCount = allUnits.length;
-        if (completedCount === totalCount) {
+        const actionedCount = allUnits.filter((unit) => {
+          const status = String(unit.status ?? "").toLowerCase();
+          return unit.approve === true || unit.reject === true || status === "completed" || status === "closed";
+        }).length;
+        if (totalCount > 0 && actionedCount === totalCount) {
           areaStatus = "completed";
-        } else if (openCount === totalCount) {
+        } else if (actionedCount === 0) {
           areaStatus = "open";
         } else {
           areaStatus = "ongoing";
@@ -4551,11 +4539,12 @@ function useAreaChecklistService() {
         );
         if (allAreasResult && allAreasResult.items && allAreasResult.items.length > 0) {
           const areas = allAreasResult.items;
+          const normalizeStatus = (status) => String(status ?? "").toLowerCase();
           const openAreasCount = areas.filter(
-            (area) => area.status === "Open"
+            (area) => normalizeStatus(area.status) === "open"
           ).length;
           const completedAreasCount = areas.filter(
-            (area) => area.status === "Completed"
+            (area) => normalizeStatus(area.status) === "completed"
           ).length;
           const totalAreasCount = areas.length;
           let parentStatus = "open";