@7365admin1/module-hygiene 4.28.1-staging.6 → 4.28.1-staging.8

package/dist/index.mjs

@@ -9,7 +9,7 @@ var allowedStatus = [
 var allowedPeriods = ["today", "thisWeek", "thisMonth"];
 
 // src/repositories/hygiene-dashboard.repository.ts
-import moment from "moment-timezone";
+import moment2 from "moment-timezone";
 import { ObjectId } from "mongodb";
 import {
   useAtlas,
@@ -20,6 +20,54 @@ import {
   paginate,
   logger
 } from "@7365admin1/node-server-utils";
+
+// src/utils/hygiene-dashboard-metrics.util.ts
+import moment from "moment-timezone";
+var DASHBOARD_TIMEZONE = "Asia/Singapore";
+var PERIOD_UNITS = {
+  thisWeek: { boundary: "isoWeek", step: "week" },
+  thisMonth: { boundary: "month", step: "month" }
+};
+var DAY_UNIT = {
+  boundary: "day",
+  step: "day"
+};
+function unitsOf(period) {
+  return PERIOD_UNITS[period] ?? DAY_UNIT;
+}
+function at(now) {
+  return now === void 0 || now === null ? moment.tz(DASHBOARD_TIMEZONE) : moment.tz(now, DASHBOARD_TIMEZONE);
+}
+function getPeriodRange(period, now) {
+  const { boundary } = unitsOf(period);
+  const point = at(now);
+  return {
+    $gte: point.clone().startOf(boundary).toDate(),
+    $lte: point.clone().endOf(boundary).toDate()
+  };
+}
+function getPreviousPeriodRange(period, now) {
+  const { boundary, step } = unitsOf(period);
+  const point = at(now).subtract(1, step);
+  return {
+    $gte: point.clone().startOf(boundary).toDate(),
+    $lte: point.clone().endOf(boundary).toDate()
+  };
+}
+function calculatePercentageChange(currentCount, previousCount) {
+  if (typeof currentCount !== "number" || !Number.isFinite(currentCount)) {
+    return null;
+  }
+  if (typeof previousCount !== "number" || !Number.isFinite(previousCount)) {
+    return null;
+  }
+  if (previousCount === 0)
+    return null;
+  return Math.round((currentCount - previousCount) / previousCount * 100 * 100) / 100;
+}
+var SUPPLY_ALERT_HAS_NO_PRIOR_PERIOD = "Supply alerts count what is out of stock right now, and the supply record keeps no history, so there is no earlier period to compare against.";
+
+// src/repositories/hygiene-dashboard.repository.ts
 function useHygieneDashboardRepository() {
   const db = useAtlas.getDb();
   if (!db) {
@@ -90,59 +138,16 @@ function useHygieneDashboardRepository() {
       logger.info(`Cache hit for dashboard: ${dashboardCacheKey}`);
       return cachedDashboard;
     }
-    function formatEndDate(date) {
-      if (typeof date === "string") {
-        const dateWithoutTimezone = date.replace(/\s*\+\d{2}:\d{2}$/, "");
-        date = new Date(dateWithoutTimezone);
-      }
-      const singaporeMoment = moment.tz(date, "Asia/Singapore");
-      singaporeMoment.set({
-        hour: 23,
-        minute: 59,
-        second: 59,
-        millisecond: 999
-      });
-      return singaporeMoment.toDate();
-    }
-    function getDateRange(p) {
-      const start = /* @__PURE__ */ new Date();
-      start.setHours(0, 0, 0, 0);
-      if (p === "today") {
-        return { $gte: start, $lte: formatEndDate(start) };
-      }
-      const days = p === "thisWeek" ? 7 : 30;
-      const rangeStart = /* @__PURE__ */ new Date();
-      rangeStart.setDate(start.getDate() - days);
-      rangeStart.setHours(0, 0, 0, 0);
-      return { $gte: rangeStart, $lte: formatEndDate(/* @__PURE__ */ new Date()) };
-    }
-    const calculatePercentageChange = (currentCount, previousCount) => {
-      if (previousCount === 0) {
-        return currentCount > 0 ? 100 : 0;
-      }
-      return Math.round(
-        (currentCount - previousCount) / previousCount * 100 * 100
-      ) / 100;
-    };
     const workOrderService = workOrderServiceMap[serviceType] ?? serviceType;
     try {
-      const today = /* @__PURE__ */ new Date();
-      today.setHours(0, 0, 0, 0);
-      const yesterday = /* @__PURE__ */ new Date();
-      yesterday.setDate(today.getDate() - 1);
-      yesterday.setHours(0, 0, 0, 0);
-      const yesterdayEnd = new Date(yesterday);
-      yesterdayEnd.setHours(23, 59, 59, 999);
-      const todayEnd = formatEndDate(/* @__PURE__ */ new Date());
-      const periodRange = getDateRange(period);
+      const periodRange = getPeriodRange(period);
+      const priorPeriodRange = getPreviousPeriodRange(period);
       const [
         workOrderReport,
         supplyAlertReport,
         taskCompletedReport,
-        yesterdayWorkOrderReport,
-        todayWorkOrderReport,
-        yesterdayTaskCompletedReport,
-        todayTaskCompletedReport
+        priorWorkOrderReport,
+        priorTaskCompletedReport
       ] = await Promise.all([
         // 1. Open work orders (period-filtered) with inProgress breakdown
         workOrderCollection.aggregate([
@@ -186,45 +191,28 @@ function useHygieneDashboardRepository() {
             }
           }
         ]).toArray(),
-        // 4. Yesterday open work orders (for % change)
-        workOrderCollection.aggregate([
-          {
-            $match: {
-              site,
-              service: workOrderService,
-              createdAt: { $gte: yesterday, $lte: yesterdayEnd },
-              status: { $nin: ["completed"] }
-            }
-          },
-          { $count: "count" }
-        ]).toArray(),
-        // 5. Today open work orders (for % change)
+        /*
+                  4. Open work orders in the PREVIOUS period (for % change).
+        
+                  The current side of the comparison is no longer queried separately:
+                  it is now the same range as tile 1, so `wFacet.total` below IS the
+                  current count. Two aggregations dropped, not by cutting a measure but
+                  because the fix made them duplicates.
+                */
         workOrderCollection.aggregate([
           {
             $match: {
               site,
               service: workOrderService,
-              createdAt: { $gte: today, $lte: todayEnd },
+              createdAt: priorPeriodRange,
               status: { $nin: ["completed"] }
             }
           },
           { $count: "count" }
         ]).toArray(),
-        // 6. Yesterday task completed — area checklists (for % change)
+        // 5. Task completed in the PREVIOUS period — area checklists (for % change)
         areaChecklistCollection.aggregate([
-          ...areaChecklistScheduleLookup(site, serviceType, {
-            $gte: yesterday,
-            $lte: yesterdayEnd
-          }),
-          { $match: { status: "completed" } },
-          { $count: "count" }
-        ]).toArray(),
-        // 7. Today task completed — area checklists (for % change)
-        areaChecklistCollection.aggregate([
-          ...areaChecklistScheduleLookup(site, serviceType, {
-            $gte: today,
-            $lte: todayEnd
-          }),
+          ...areaChecklistScheduleLookup(site, serviceType, priorPeriodRange),
           { $match: { status: "completed" } },
           { $count: "count" }
         ]).toArray()
@@ -240,21 +228,26 @@ function useHygieneDashboardRepository() {
           count: wFacet.total[0]?.count ?? 0,
           inProgress: wFacet.inProgress[0]?.count ?? 0,
           percentage: calculatePercentageChange(
-            todayWorkOrderReport[0]?.count ?? 0,
-            yesterdayWorkOrderReport[0]?.count ?? 0
+            wFacet.total[0]?.count ?? 0,
+            priorWorkOrderReport[0]?.count ?? 0
           )
         },
         supplyAlert: {
+          // The count is real: active supplies at qty 0 for this site and
+          // service. The percentage beside it was the literal 0 and had never
+          // been computed from anything — see the util for why there is no
+          // prior period to compute one from.
           count: supplyAlertReport[0]?.count ?? 0,
-          percentage: 0
+          percentage: null,
+          percentageUnavailableReason: SUPPLY_ALERT_HAS_NO_PRIOR_PERIOD
         },
         taskCompleted: {
           completed: tFacet.completed[0]?.count ?? 0,
           total: tFacet.total[0]?.count ?? 0,
           inProgress: tFacet.inProgress[0]?.count ?? 0,
           percentage: calculatePercentageChange(
-            todayTaskCompletedReport[0]?.count ?? 0,
-            yesterdayTaskCompletedReport[0]?.count ?? 0
+            tFacet.completed[0]?.count ?? 0,
+            priorTaskCompletedReport[0]?.count ?? 0
           )
         }
       };
@@ -292,8 +285,8 @@ function useHygieneDashboardRepository() {
       return cachedData;
     }
     const workOrderService = workOrderServiceMap[serviceType] ?? serviceType;
-    const weekStart = moment.tz("Asia/Singapore").startOf("isoWeek").toDate();
-    const weekEnd = moment.tz("Asia/Singapore").endOf("isoWeek").toDate();
+    const weekStart = moment2.tz("Asia/Singapore").startOf("isoWeek").toDate();
+    const weekEnd = moment2.tz("Asia/Singapore").endOf("isoWeek").toDate();
     const weekRange = { $gte: weekStart, $lte: weekEnd };
     const dayLabels = {
       1: "Sun",
@@ -373,8 +366,8 @@ function useHygieneDashboardRepository() {
       logger.info(`Cache hit for todayTaskSchedule: ${cacheKey}`);
       return cachedData;
     }
-    const todayStart = moment.tz("Asia/Singapore").startOf("day").toDate();
-    const todayEnd = moment.tz("Asia/Singapore").endOf("day").toDate();
+    const todayStart = moment2.tz("Asia/Singapore").startOf("day").toDate();
+    const todayEnd = moment2.tz("Asia/Singapore").endOf("day").toDate();
     const todayRange = { $gte: todayStart, $lte: todayEnd };
     try {
       const [items, countResult] = await Promise.all([
@@ -478,8 +471,8 @@ function useHygieneDashboardRepository() {
       logger.info(`Cache hit for staffAttendance: ${cacheKey}`);
       return cachedData;
     }
-    const todayStart = moment.tz("Asia/Singapore").startOf("day").toDate();
-    const todayEnd = moment.tz("Asia/Singapore").endOf("day").toDate();
+    const todayStart = moment2.tz("Asia/Singapore").startOf("day").toDate();
+    const todayEnd = moment2.tz("Asia/Singapore").endOf("day").toDate();
     const todayStartStr = todayStart.toISOString();
     const todayEndStr = todayEnd.toISOString();
     try {
@@ -1608,7 +1601,7 @@ function useUnitRepository() {
 function useAreaService() {
   const { createArea: _createArea, getAreasForChecklist } = useAreaRepo();
   const { generateAreaExcel } = useAreaExportService();
-  const { getUnits: _getUnits } = useUnitRepository();
+  const { createUnit: _createUnit, getUnits: _getUnits } = useUnitRepository();
   async function importArea({
     dataJson,
     site,
@@ -1690,23 +1683,40 @@ function useAreaService() {
               areaData.set = setNumber;
             }
           }
-          if (row.UNITS && availableUnits.length > 0) {
+          if (row.UNITS) {
             const unitNames = String(row.UNITS).split(",").map((u) => u.trim()).filter((u) => u);
             if (unitNames.length > 0) {
               const areaUnits = [];
               for (const unitName of unitNames) {
-                const foundUnit = availableUnits.find(
+                let foundUnit = availableUnits.find(
                   (u) => u.name.toLowerCase() === unitName.toLowerCase()
                 );
+                if (!foundUnit) {
+                  try {
+                    const insertedUnitId = await _createUnit({
+                      name: unitName,
+                      site,
+                      serviceType
+                    });
+                    foundUnit = {
+                      _id: insertedUnitId,
+                      name: unitName
+                    };
+                    availableUnits.push(foundUnit);
+                    logger8.info(
+                      `Successfully created missing unit "${unitName}" for area "${areaName}"`
+                    );
+                  } catch (error) {
+                    logger8.warn(
+                      `Unit "${unitName}" could not be created for area "${areaName}": ${error.message}`
+                    );
+                  }
+                }
                 if (foundUnit) {
                   areaUnits.push({
                     unit: foundUnit._id,
                     name: foundUnit.name
                   });
-                } else {
-                  logger8.warn(
-                    `Unit "${unitName}" not found in site for area "${areaName}"`
-                  );
                 }
               }
               if (areaUnits.length > 0) {
@@ -2098,6 +2108,13 @@ function useUnitService() {
     updateUnit: _updateUnit,
     deleteUnit: _deleteUnit
   } = useUnitRepository();
+  function getUnitNamesFromRow(row) {
+    const unitValue = row?.UNIT ?? row?.UNITS;
+    if (!unitValue) {
+      return [];
+    }
+    return String(unitValue).split(",").map((unit) => unit.trim()).filter((unit) => unit && !unit.startsWith("Sample:"));
+  }
   async function importUnit({
     dataJson,
     site,
@@ -2123,36 +2140,35 @@ function useUnitService() {
     try {
       for (let i = 0; i < dataArray.length; i++) {
         const row = dataArray[i];
-        if (!row?.UNIT) {
-          logger11.warn(`Skipping row ${i + 1} with missing UNIT:`, row);
-          skippedRows.push(i + 1);
-          continue;
-        }
-        const unitName = String(row.UNIT).trim();
-        if (!unitName) {
-          logger11.warn(`Skipping row ${i + 1} with empty unit name`);
+        const unitNames = getUnitNamesFromRow(row);
+        if (unitNames.length === 0) {
+          logger11.warn(`Skipping row ${i + 1} with missing UNIT/UNITS:`, row);
           skippedRows.push(i + 1);
           continue;
         }
-        if (unitName.startsWith("Sample:")) {
-          logger11.warn(`Skipping row ${i + 1} with sample unit: ${unitName}`);
-          skippedRows.push(i + 1);
-          continue;
-        }
-        try {
-          const insertedId = await _createUnit({
-            name: unitName,
-            site,
-            serviceType
-          });
-          insertedUnitIds.push(insertedId);
-          logger11.info(`Successfully created unit: ${unitName}`);
-        } catch (error) {
-          logger11.error(`Error creating unit "${unitName}": ${error.message}`);
-          if (error.message.includes("Unit already exists")) {
-            duplicateUnits.push(unitName);
-          } else {
-            failedUnits.push(unitName);
+        const uniqueUnitNames = Array.from(
+          new Set(unitNames.map((unitName) => unitName.toLowerCase()))
+        ).map(
+          (lowerUnitName) => unitNames.find(
+            (unitName) => unitName.toLowerCase() === lowerUnitName
+          )
+        );
+        for (const unitName of uniqueUnitNames) {
+          try {
+            const insertedId = await _createUnit({
+              name: unitName,
+              site,
+              serviceType
+            });
+            insertedUnitIds.push(insertedId);
+            logger11.info(`Successfully created unit: ${unitName}`);
+          } catch (error) {
+            logger11.error(`Error creating unit "${unitName}": ${error.message}`);
+            if (error.message.includes("Unit already exists")) {
+              duplicateUnits.push(unitName);
+            } else {
+              failedUnits.push(unitName);
+            }
           }
         }
       }
@@ -2505,7 +2521,7 @@ function MParentChecklist(value) {
 
 // src/repositories/hygiene-parent-checklist.repository.ts
 import { ObjectId as ObjectId7 } from "mongodb";
-import moment2 from "moment-timezone";
+import moment3 from "moment-timezone";
 import {
   useAtlas as useAtlas5,
   InternalServerError as InternalServerError4,
@@ -2809,11 +2825,11 @@ function useParentChecklistRepo() {
       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");
+    const normalizedStartDate = typeof startDate === "string" ? startDate : moment3(startDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedEndDate = typeof endDate === "string" ? endDate : moment3(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();
+      const startOfDay = moment3.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
+      const endOfDay = moment3.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
       query.createdAt = {
         $gte: startOfDay,
         $lte: endOfDay
@@ -2822,12 +2838,12 @@ function useParentChecklistRepo() {
       cacheOptions.endDate = normalizedEndDate;
     } else if (startDate) {
       query.createdAt = {
-        $gte: moment2.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
+        $gte: moment3.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
       };
       cacheOptions.startDate = normalizedStartDate;
     } else if (endDate) {
       query.createdAt = {
-        $lte: moment2.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
+        $lte: moment3.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
       };
       cacheOptions.endDate = normalizedEndDate;
     }