@7365admin1/core 3.6.0 → 3.7.0

package/dist/index.mjs

@@ -18547,7 +18547,7 @@ function useServiceProviderRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = { status };
-    const cacheOptions = { status };
+    const cacheOptions = { status, page, limit };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     cacheOptions.sort = JSON.stringify(sort);
     if (search) {
@@ -21385,6 +21385,10 @@ function useVisitorTransactionRepo() {
       const data = paginate17(items, page, limit, totalCount);
       return data;
     } catch (error) {
+      logger48.error("Error in getAll visitor transaction repo", {
+        message: error.message,
+        stack: error.stack
+      });
       throw error;
     }
   }
@@ -21457,6 +21461,22 @@ function useVisitorTransactionRepo() {
       ]).toArray();
       return result;
     } catch (error) {
+      if (error instanceof Error) {
+        logger48.error(
+          "Error in getVisitorTransactionById visitor transaction repo",
+          {
+            message: error.message,
+            stack: error.stack
+          }
+        );
+      } else {
+        logger48.error(
+          "Unknown error in getVisitorTransactionById visitor transaction repo",
+          {
+            error
+          }
+        );
+      }
       throw error;
     }
   }
@@ -21471,9 +21491,19 @@ function useVisitorTransactionRepo() {
       const data = await collection.findOne(query);
       return data;
     } catch (error) {
-      throw new InternalServerError24(
-        "Failed to fetch visitor transaction by plate number."
-      );
+      if (error instanceof Error) {
+        logger48.error("Error in getOpenByPlateNumber visitor transaction repo", {
+          message: error.message,
+          stack: error.stack
+        });
+      } else {
+        logger48.error(
+          "Unknown error in getOpenByPlateNumber visitor transaction repo",
+          {
+            error
+          }
+        );
+      }
     }
   }
   async function updateById(_id, value, session, isManualCheckOut = true) {
@@ -25762,7 +25792,6 @@ function useBuildingUnitRepo() {
     const buildingCollection = await db?.collection("buildings").findOne({ _id: toObjectId11(block) });
     const blockNumber = buildingCollection?.block;
     query.block = blockNumber !== void 0 ? blockNumber : block;
-    console.log("Query for getBuildingUnits:", query);
     try {
       const data = await collection.aggregate([{ $match: query }, { $project: { name: 1 } }]).toArray();
       setCache(cacheKey, data, 15 * 60).then(() => {
@@ -25819,6 +25848,20 @@ function useBuildingUnitRepo() {
     try {
       const data = await collection.aggregate([
         { $match: query },
+        {
+          $lookup: {
+            from: "buildings",
+            localField: "building",
+            foreignField: "_id",
+            pipeline: [{ $project: { _id: 0, name: 1 } }],
+            as: "_blockData"
+          }
+        },
+        {
+          $unwind: { path: "$_blockData", preserveNullAndEmptyArrays: true }
+        },
+        { $addFields: { blockName: { $ifNull: ["$_blockData.name", ""] } } },
+        { $unset: "_blockData" },
         {
           $lookup: {
             from: "building-levels",
@@ -25828,7 +25871,9 @@ function useBuildingUnitRepo() {
             as: "_levelData"
           }
         },
-        { $unwind: { path: "$_levelData", preserveNullAndEmptyArrays: true } },
+        {
+          $unwind: { path: "$_levelData", preserveNullAndEmptyArrays: true }
+        },
         { $addFields: { levelName: { $ifNull: ["$_levelData.name", ""] } } },
         { $unset: "_levelData" }
       ]).toArray();
@@ -25934,7 +25979,6 @@ function useBuildingUnitRepo() {
         level,
         status: "active"
       };
-      console.log(query);
       const result = await collection.findOne(query);
       setCache(cacheKey, result, 300).then(() => {
         logger54.log({
@@ -44025,14 +44069,14 @@ function useSiteUnitBillingService() {
           billing_item.units,
           billing_item.site?.toString() || ""
         );
-        if (unitsWithOwner?.length) {
+        if (unitsWithOwner?.length > 0) {
           const buildUnitBilling = (unit) => ({
-            site: billing_item.site,
-            org: billing_item.org,
+            site: billing_item.site.toString(),
+            org: billing_item.org.toString(),
             billItem: billing_item._id,
             billName: billing_item.name,
-            unitId: unit._id,
-            unit: unit.block + " / " + unit.level + " / " + unit.name,
+            unitId: unit._id.toString(),
+            unit: unit.blockName + " / " + unit.levelName + " / " + unit.name,
             unitOwner: unit.ownerName,
             email: unit.email,
             contactNumber: unit.contact,
@@ -44058,6 +44102,7 @@ function useSiteUnitBillingService() {
         );
         await session.commitTransaction();
       } catch (error) {
+        console.log("BILLING ERROR:", error.message, error);
         logger122.log({
           level: "error",
           message: `Failed to proccess cron billing: ${error.message}`
@@ -56583,6 +56628,7 @@ function useNewDashboardRepo() {
   const area_checklist_namespace_collection = "site.cleaning.schedule.areas";
   const supply_namespace_collection = "site.supplies";
   const work_order_namespace_collection = "work-orders2";
+  const facility_bookings_namespace_collection2 = "facilities-booking";
   const areaChecklistCollection = db.collection(
     area_checklist_namespace_collection
   );
@@ -56598,171 +56644,724 @@ function useNewDashboardRepo() {
     pest_control_services: "Pest Control",
     pool_maintenance_services: "Pool Maintenance"
   };
-  async function getMetric(collectionString, siteId, period) {
-    const site = toObjectId16(siteId);
-    const range = getPeriodRangeWithPrevious(period);
-    const collection = db.collection(collectionString);
-    const current = await collection.countDocuments({
-      site,
-      $or: [
+  function formatEndDate(date) {
+    if (typeof date === "string") {
+      const dateWithoutTimezone = date.replace(/\s*\+\d{2}:\d{2}$/, "");
+      date = new Date(dateWithoutTimezone);
+    }
+    const singaporeMoment = moment2.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;
+  };
+  async function getSecurityDashboard({
+    siteId = "",
+    period = "today" /* TODAY */,
+    type
+  }) {
+    const siteIdObj = toObjectId16(siteId);
+    const visitorMatchObj = {};
+    if (type) {
+      visitorMatchObj.type = type;
+    }
+    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 incidentCollection = db.collection(incidents_namespace_collection);
+    const visitorCollection = db.collection(visitors_namespace_collection);
+    const nfcPatrolLogCollection = db.collection("nfc-patrol-logs");
+    const [
+      workOrderReport,
+      yesterdayWorkOrderReport,
+      todayWorkOrderReport,
+      incidentReport,
+      yesterdayIncidentReport,
+      todayIncidentReport,
+      visitorReport,
+      yesterdayVisitorReport,
+      todayVisitorReport,
+      currentlyOnSiteCount,
+      patrolReport,
+      yesterdayPatrolReport,
+      todayPatrolReport
+    ] = await Promise.all([
+      workOrderCollection.aggregate([
         {
-          createdAt: {
-            $gte: range.current.start,
-            $lte: range.current.end
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            service: "Security",
+            createdAt: periodRange,
+            status: { $nin: ["completed"] }
           }
         },
         {
-          createdAt: {
-            $gte: new Date(range.current.start),
-            $lte: new Date(range.current.end)
+          $facet: {
+            total: [{ $count: "count" }],
+            inProgress: [
+              { $match: { status: "in-progress" } },
+              { $count: "count" }
+            ]
           }
         }
-      ]
-    });
-    const previous = await collection.countDocuments({
-      site,
-      $or: [
+      ]).toArray(),
+      workOrderCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            service: "Security",
+            createdAt: { $gte: yesterday, $lte: yesterdayEnd },
+            status: { $nin: ["completed"] }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      workOrderCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            service: "Security",
+            createdAt: { $gte: today, $lte: todayEnd },
+            status: { $nin: ["completed"] }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      incidentCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            status: { $in: ["pending", "Pending"] },
+            createdAt: periodRange
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      incidentCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            status: { $in: ["pending", "Pending"] },
+            createdAt: { $gte: yesterday, $lte: yesterdayEnd }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      incidentCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            status: { $in: ["pending", "Pending"] },
+            createdAt: { $gte: today, $lte: todayEnd }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      visitorCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            ...visitorMatchObj,
+            createdAt: periodRange,
+            status: { $ne: "deleted" }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      visitorCollection.aggregate([
         {
-          createdAt: {
-            $gte: range.previous.start,
-            $lte: range.previous.end
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            ...visitorMatchObj,
+            createdAt: { $gte: yesterday, $lte: yesterdayEnd },
+            status: { $ne: "deleted" }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      visitorCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            ...visitorMatchObj,
+            createdAt: { $gte: today, $lte: todayEnd },
+            status: { $ne: "deleted" }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      visitorCollection.countDocuments({
+        site: { $in: [siteIdObj, siteId] },
+        ...visitorMatchObj,
+        checkIn: { $ne: null },
+        checkOut: null,
+        status: { $ne: "deleted" }
+      }),
+      nfcPatrolLogCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            createdAt: periodRange
           }
         },
         {
-          createdAt: {
-            $gte: new Date(range.previous.start),
-            $lte: new Date(range.previous.end)
+          $unwind: "$checkPoints"
+        },
+        {
+          $facet: {
+            total: [{ $count: "count" }],
+            completed: [
+              { $match: { "checkPoints.status": "Completed" } },
+              { $count: "count" }
+            ],
+            skipped: [
+              { $match: { "checkPoints.status": "Skipped" } },
+              { $count: "count" }
+            ]
           }
         }
-      ]
-    });
-    return {
-      count: current,
-      percentage: calculatePercentage(current, previous)
+      ]).toArray(),
+      nfcPatrolLogCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            createdAt: { $gte: yesterday, $lte: yesterdayEnd }
+          }
+        },
+        {
+          $unwind: "$checkPoints"
+        },
+        {
+          $facet: {
+            total: [{ $count: "count" }],
+            completed: [
+              { $match: { "checkPoints.status": "Completed" } },
+              { $count: "count" }
+            ],
+            skipped: [
+              { $match: { "checkPoints.status": "Skipped" } },
+              { $count: "count" }
+            ]
+          }
+        }
+      ]).toArray(),
+      nfcPatrolLogCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            createdAt: { $gte: today, $lte: todayEnd }
+          }
+        },
+        {
+          $unwind: "$checkPoints"
+        },
+        {
+          $facet: {
+            total: [{ $count: "count" }],
+            completed: [
+              { $match: { "checkPoints.status": "Completed" } },
+              { $count: "count" }
+            ],
+            skipped: [
+              { $match: { "checkPoints.status": "Skipped" } },
+              { $count: "count" }
+            ]
+          }
+        }
+      ]).toArray()
+    ]);
+    const wFacet = workOrderReport[0] ?? { total: [], inProgress: [] };
+    const pFacet = patrolReport[0] ?? {
+      total: [],
+      completed: [],
+      skipped: []
     };
-  }
-  async function getSecurityDashboard({
-    siteId = "",
-    feedback = "today" /* TODAY */,
-    workOrder = "today" /* TODAY */,
-    vehicle = "today" /* TODAY */,
-    building = "today" /* TODAY */,
-    visitor = "today" /* TODAY */,
-    incident = "today" /* TODAY */,
-    guest = "today" /* TODAY */
-  }) {
-    const feedbacks = await getMetric(
-      feedbacks_namespace_collection,
-      siteId,
-      feedback
-    );
-    const workOrders = await getMetric(
-      work_orders_namespace_collection,
-      siteId,
-      workOrder
-    );
-    const vehicles = await getMetric(
-      vehicles_namespace_collection,
-      siteId,
-      vehicle
-    );
-    const buildings = await getMetric(
-      buildings_namespace_collection,
-      siteId,
-      building
-    );
-    const visitors = await getMetric(
-      visitors_namespace_collection,
-      siteId,
-      visitor
-    );
-    const incidents = await getMetric(
-      incidents_namespace_collection,
-      siteId,
-      incident
+    const totalCheckpoints = pFacet.total[0]?.count ?? 0;
+    const completedCheckpoints = pFacet.completed[0]?.count ?? 0;
+    const skippedCheckpoints = pFacet.skipped[0]?.count ?? 0;
+    const complianceRate = totalCheckpoints > 0 ? Math.round(completedCheckpoints / totalCheckpoints * 100 * 100) / 100 : 100;
+    const yPatrolFacet = yesterdayPatrolReport[0] ?? {
+      total: [],
+      completed: []
+    };
+    const yTotal = yPatrolFacet.total[0]?.count ?? 0;
+    const yCompleted = yPatrolFacet.completed[0]?.count ?? 0;
+    const yesterdayCompliance = yTotal > 0 ? yCompleted / yTotal * 100 : 0;
+    const tPatrolFacet = todayPatrolReport[0] ?? {
+      total: [],
+      completed: []
+    };
+    const tTotal = tPatrolFacet.total[0]?.count ?? 0;
+    const tCompleted = tPatrolFacet.completed[0]?.count ?? 0;
+    const todayCompliance = tTotal > 0 ? tCompleted / tTotal * 100 : 0;
+    const todayString = moment2.tz("Asia/Singapore").format("YYYY-MM-DD");
+    const dayIndex = moment2.tz("Asia/Singapore").day();
+    const routes = await db.collection("nfc-patrol-routes").find({
+      site: { $in: [siteIdObj, siteId] },
+      days: { $in: [dayIndex] },
+      status: { $ne: "Inactive" }
+    }).toArray();
+    const expandedRoutes = [];
+    for (const route of routes) {
+      if (route.startTimes && Array.isArray(route.startTimes)) {
+        for (const startTime of route.startTimes) {
+          expandedRoutes.push({
+            route,
+            startTime,
+            itemIndex: 0
+          });
+        }
+      }
+    }
+    expandedRoutes.sort((a, b) => a.startTime.localeCompare(b.startTime));
+    const limitedRoutes = expandedRoutes.slice(0, 4);
+    limitedRoutes.forEach((item, idx) => {
+      item.itemIndex = idx + 1;
+    });
+    const activePatrolItems = await Promise.all(
+      limitedRoutes.map(async ({ route, startTime, itemIndex }) => {
+        const log = await db.collection("nfc-patrol-logs").findOne({
+          site: { $in: [siteIdObj, siteId] },
+          date: todayString,
+          "route._id": { $in: [route._id, route._id.toString()] },
+          "route.startTime": startTime
+        });
+        let person = "Unassigned";
+        if (log && log.createdBy) {
+          const userDoc = await db.collection("users").findOne({
+            _id: toObjectId16(log.createdBy)
+          });
+          if (userDoc && userDoc.name) {
+            person = userDoc.name;
+          }
+        }
+        let status = "pending";
+        if (log) {
+          status = "completed";
+        } else {
+          const routeTime = moment2.tz(
+            `${todayString} ${startTime}`,
+            "YYYY-MM-DD HH:mm",
+            "Asia/Singapore"
+          );
+          const nowSg = moment2.tz("Asia/Singapore");
+          const diffMinutes = nowSg.diff(routeTime, "minutes");
+          if (diffMinutes >= 0) {
+            if (diffMinutes <= 120) {
+              status = "on paused";
+            } else {
+              status = "incomplete";
+            }
+          } else {
+            status = "pending";
+          }
+        }
+        return {
+          id: `${route._id.toString()}_${startTime}`,
+          title: route.name,
+          subtitle: `ID${String(itemIndex).padStart(3, "0")}`,
+          person,
+          status,
+          time: startTime
+        };
+      })
     );
-    const guests = await getMetric(guests_namespace_collection, siteId, guest);
     const data = {
-      feedbacks,
-      workOrders,
-      vehicles,
-      buildings,
-      visitors,
-      incidents,
-      guests
+      openWorkOrder: {
+        count: wFacet.total[0]?.count ?? 0,
+        inProgress: wFacet.inProgress[0]?.count ?? 0,
+        percentage: calculatePercentageChange(
+          todayWorkOrderReport[0]?.count ?? 0,
+          yesterdayWorkOrderReport[0]?.count ?? 0
+        )
+      },
+      openIncidents: {
+        count: incidentReport[0]?.count ?? 0,
+        highSeverity: 0,
+        percentage: calculatePercentageChange(
+          todayIncidentReport[0]?.count ?? 0,
+          yesterdayIncidentReport[0]?.count ?? 0
+        )
+      },
+      visitors: {
+        count: visitorReport[0]?.count ?? 0,
+        currentlyOnSite: currentlyOnSiteCount,
+        percentage: calculatePercentageChange(
+          todayVisitorReport[0]?.count ?? 0,
+          yesterdayVisitorReport[0]?.count ?? 0
+        )
+      },
+      patrolCompliance: {
+        count: complianceRate,
+        missedCheckpoints: skippedCheckpoints,
+        missed: skippedCheckpoints,
+        percentage: calculatePercentageChange(
+          todayCompliance,
+          yesterdayCompliance
+        )
+      },
+      activePatrolItems
     };
     return data;
   }
-  async function getPropertyManagementDashboard({
-    siteId = "",
-    feedback = "today" /* TODAY */,
-    workOrder = "today" /* TODAY */,
-    sitePeople = "today" /* TODAY */,
-    facilityBooking = "today" /* TODAY */,
-    bulletinBoard = "today" /* TODAY */,
-    event = "today" /* TODAY */,
-    vehicle = "today" /* TODAY */,
-    building = "today" /* TODAY */,
-    visitor = "today" /* TODAY */,
-    incident = "today" /* TODAY */
-  }) {
-    const feedbacks = await getMetric(
-      feedbacks_namespace_collection,
-      siteId,
-      feedback
-    );
-    const workOrders = await getMetric(
-      work_orders_namespace_collection,
-      siteId,
-      workOrder
-    );
-    const vehicles = await getMetric(
-      vehicles_namespace_collection,
-      siteId,
-      vehicle
-    );
-    const buildings = await getMetric(
-      buildings_namespace_collection,
-      siteId,
-      building
-    );
-    const visitors = await getMetric(
-      visitors_namespace_collection,
-      siteId,
-      visitor
-    );
-    const incidents = await getMetric(
-      incidents_namespace_collection,
-      siteId,
-      incident
-    );
-    const _sitePeople = await getMetric(
-      site_people_namespace_collection,
-      siteId,
-      sitePeople
+  async function getPropertyManagementDashboard(siteId, period = "today" /* TODAY */, type, facility) {
+    const siteIdObj = toObjectId16(siteId);
+    const startOfToday = moment2.tz("Asia/Singapore").startOf("day").toDate();
+    const endOfToday = moment2.tz("Asia/Singapore").endOf("day").toDate();
+    const upcomingEvents = await db.collection(events_namespace_collection).find({
+      site: { $in: [siteIdObj, siteId] },
+      status: { $nin: ["deleted", "Deleted"] },
+      $or: [
+        { dateTime: { $gte: startOfToday } },
+        { dateTime: { $gte: startOfToday.toISOString() } }
+      ]
+    }).sort({ dateTime: 1 }).limit(4).toArray();
+    const todayReminders = await db.collection(events_namespace_collection).find({
+      site: { $in: [siteIdObj, siteId] },
+      status: { $nin: ["deleted", "Deleted"] },
+      $or: [
+        { dateTime: { $gte: startOfToday, $lte: endOfToday } },
+        {
+          dateTime: {
+            $gte: startOfToday.toISOString(),
+            $lte: endOfToday.toISOString()
+          }
+        }
+      ]
+    }).sort({ dateTime: 1 }).limit(4).toArray();
+    const [pendingIncidentDocs, pendingFacilityBookingDocs] = await Promise.all(
+      [
+        db.collection(incidents_namespace_collection).find({
+          site: { $in: [siteIdObj, siteId] },
+          status: { $in: ["pending", "Pending"] }
+        }).sort({ createdAt: -1 }).toArray(),
+        db.collection(facility_bookings_namespace_collection2).find({
+          site: { $in: [siteIdObj, siteId] },
+          status: { $in: ["Pending", "pending", "For Review", "for review"] }
+        }).sort({ createdAt: -1 }).toArray()
+      ]
     );
-    const bulletinBoards = await getMetric(
-      bulletin_boards_namespace_collection,
-      siteId,
-      bulletinBoard
+    const pendingIncidentCount = pendingIncidentDocs.length;
+    const pendingFacilityBookingCount = pendingFacilityBookingDocs.length;
+    const todayAttentions = [];
+    if (pendingIncidentCount > 0) {
+      todayAttentions.push({
+        id: "incidents-pending",
+        title: `${pendingIncidentCount} incident${pendingIncidentCount === 1 ? "" : "s"} pending acknowledge`,
+        createdAt: pendingIncidentDocs[0].updatedAt || pendingIncidentDocs[0].createdAt || /* @__PURE__ */ new Date()
+      });
+    }
+    if (pendingFacilityBookingCount > 0) {
+      todayAttentions.push({
+        id: "facility-booking-pending",
+        title: `${pendingFacilityBookingCount} facility booking${pendingFacilityBookingCount === 1 ? "" : "s"} need approval`,
+        createdAt: pendingFacilityBookingDocs[0].createdAt || /* @__PURE__ */ new Date()
+      });
+    }
+    todayAttentions.sort(
+      (a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
     );
-    const events = await getMetric(events_namespace_collection, siteId, event);
-    const facilityBookings = await getMetric(
-      facility_bookings_namespace_collection,
-      siteId,
-      facilityBooking
+    const visitorMatchObj = {};
+    if (type) {
+      visitorMatchObj.type = type;
+    }
+    const facilityMatchObj = {};
+    if (facility) {
+      try {
+        facilityMatchObj.facility = { $in: [facility, new ObjectId121(facility)] };
+      } catch (e) {
+        facilityMatchObj.facility = facility;
+      }
+    }
+    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 incidentCollection = db.collection(incidents_namespace_collection);
+    const visitorCollection = db.collection(visitors_namespace_collection);
+    const facilityCollection = db.collection(
+      facility_bookings_namespace_collection2
     );
+    const [
+      workOrderReport,
+      yesterdayWorkOrderReport,
+      todayWorkOrderReport,
+      incidentReport,
+      yesterdayIncidentReport,
+      todayIncidentReport,
+      visitorReport,
+      yesterdayVisitorReport,
+      todayVisitorReport,
+      currentlyOnSiteCount,
+      facilityReport,
+      yesterdayFacilityReport,
+      todayFacilityReport
+    ] = await Promise.all([
+      workOrderCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            createdAt: periodRange,
+            status: { $nin: ["completed"] }
+          }
+        },
+        {
+          $facet: {
+            total: [{ $count: "count" }],
+            inProgress: [
+              { $match: { status: "in-progress" } },
+              { $count: "count" }
+            ]
+          }
+        }
+      ]).toArray(),
+      workOrderCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            createdAt: { $gte: yesterday, $lte: yesterdayEnd },
+            status: { $nin: ["completed"] }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      workOrderCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            createdAt: { $gte: today, $lte: todayEnd },
+            status: { $nin: ["completed"] }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      incidentCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            status: { $in: ["pending", "Pending"] },
+            createdAt: periodRange
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      incidentCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            status: { $in: ["pending", "Pending"] },
+            createdAt: { $gte: yesterday, $lte: yesterdayEnd }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      incidentCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            status: { $in: ["pending", "Pending"] },
+            createdAt: { $gte: today, $lte: todayEnd }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      visitorCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            ...visitorMatchObj,
+            createdAt: periodRange,
+            status: { $ne: "deleted" }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      visitorCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            ...visitorMatchObj,
+            createdAt: { $gte: yesterday, $lte: yesterdayEnd },
+            status: { $ne: "deleted" }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      visitorCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            ...visitorMatchObj,
+            createdAt: { $gte: today, $lte: todayEnd },
+            status: { $ne: "deleted" }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      visitorCollection.countDocuments({
+        site: { $in: [siteIdObj, siteId] },
+        ...visitorMatchObj,
+        checkIn: { $ne: null },
+        checkOut: null,
+        status: { $ne: "deleted" }
+      }),
+      facilityCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            ...facilityMatchObj,
+            $or: [
+              { createdAt: periodRange },
+              {
+                createdAt: {
+                  $gte: periodRange.$gte.toISOString(),
+                  $lte: periodRange.$lte.toISOString()
+                }
+              }
+            ],
+            status: { $nin: ["deleted", "Deleted"] }
+          }
+        },
+        {
+          $facet: {
+            total: [{ $count: "count" }],
+            ongoing: [
+              {
+                $match: {
+                  status: {
+                    $in: ["Approved", "Ongoing"]
+                  }
+                }
+              },
+              { $count: "count" }
+            ],
+            waitingApproval: [
+              {
+                $match: {
+                  status: {
+                    $in: ["Pending", "pending", "For Review", "for review"]
+                  }
+                }
+              },
+              { $count: "count" }
+            ]
+          }
+        }
+      ]).toArray(),
+      facilityCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            ...facilityMatchObj,
+            $or: [
+              { createdAt: { $gte: yesterday, $lte: yesterdayEnd } },
+              {
+                createdAt: {
+                  $gte: yesterday.toISOString(),
+                  $lte: yesterdayEnd.toISOString()
+                }
+              }
+            ],
+            status: { $nin: ["deleted", "Deleted"] }
+          }
+        },
+        { $count: "count" }
+      ]).toArray(),
+      facilityCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            ...facilityMatchObj,
+            $or: [
+              { createdAt: { $gte: today, $lte: todayEnd } },
+              {
+                createdAt: {
+                  $gte: today.toISOString(),
+                  $lte: todayEnd.toISOString()
+                }
+              }
+            ],
+            status: { $nin: ["deleted", "Deleted"] }
+          }
+        },
+        { $count: "count" }
+      ]).toArray()
+    ]);
+    const wFacet = workOrderReport[0] ?? { total: [], inProgress: [] };
+    const fFacet = facilityReport[0] ?? {
+      total: [],
+      ongoing: [],
+      waitingApproval: []
+    };
     const data = {
-      feedbacks,
-      workOrders,
-      vehicles,
-      buildings,
-      visitors,
-      incidents,
-      sitePeople: _sitePeople,
-      bulletinBoards,
-      events,
-      facilityBookings
+      openWorkOrder: {
+        count: wFacet.total[0]?.count ?? 0,
+        inProgress: wFacet.inProgress[0]?.count ?? 0,
+        percentage: calculatePercentageChange(
+          todayWorkOrderReport[0]?.count ?? 0,
+          yesterdayWorkOrderReport[0]?.count ?? 0
+        )
+      },
+      openIncidents: {
+        count: incidentReport[0]?.count ?? 0,
+        highSeverity: 0,
+        percentage: calculatePercentageChange(
+          todayIncidentReport[0]?.count ?? 0,
+          yesterdayIncidentReport[0]?.count ?? 0
+        )
+      },
+      visitors: {
+        count: visitorReport[0]?.count ?? 0,
+        currentlyOnSite: currentlyOnSiteCount,
+        percentage: calculatePercentageChange(
+          todayVisitorReport[0]?.count ?? 0,
+          yesterdayVisitorReport[0]?.count ?? 0
+        )
+      },
+      facilityBooking: {
+        count: fFacet.total[0]?.count ?? 0,
+        ongoing: fFacet.ongoing[0]?.count ?? 0,
+        waitingApproval: fFacet.waitingApproval[0]?.count ?? 0,
+        percentage: calculatePercentageChange(
+          todayFacilityReport[0]?.count ?? 0,
+          yesterdayFacilityReport[0]?.count ?? 0
+        )
+      },
+      upcomingEvents,
+      todayReminders,
+      todayAttentions
     };
     return data;
   }
@@ -56792,61 +57391,13 @@ function useNewDashboardRepo() {
   async function getServiceDashboard({
     site,
     serviceType,
-    period = "today" /* TODAY */,
-    type,
-    facility
+    period = "today" /* TODAY */
   }) {
     try {
       site = new ObjectId121(site);
     } catch (error) {
       throw new BadRequestError182("Invalid site ID format.");
     }
-    const visitorMatchObj = {};
-    if (type) {
-      visitorMatchObj.type = type;
-    }
-    const facilityMatchObj = {};
-    if (facility) {
-      try {
-        facilityMatchObj.facility = { $in: [facility, new ObjectId121(facility)] };
-      } catch (e) {
-        facilityMatchObj.facility = facility;
-      }
-    }
-    function formatEndDate(date) {
-      if (typeof date === "string") {
-        const dateWithoutTimezone = date.replace(/\s*\+\d{2}:\d{2}$/, "");
-        date = new Date(dateWithoutTimezone);
-      }
-      const singaporeMoment = moment2.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 today = /* @__PURE__ */ new Date();
     today.setHours(0, 0, 0, 0);
     const yesterday = /* @__PURE__ */ new Date();
@@ -56857,530 +57408,6 @@ function useNewDashboardRepo() {
     const todayEnd = formatEndDate(/* @__PURE__ */ new Date());
     const periodRange = getDateRange(period);
     try {
-      if (serviceType === "property_management_agency" /* PROPERTY_MANAGEMENT_AGENCY */) {
-        const incidentCollection = db.collection(
-          incidents_namespace_collection
-        );
-        const visitorCollection = db.collection(visitors_namespace_collection);
-        const facilityCollection = db.collection(
-          facility_bookings_namespace_collection
-        );
-        const [
-          workOrderReport2,
-          yesterdayWorkOrderReport2,
-          todayWorkOrderReport2,
-          incidentReport,
-          yesterdayIncidentReport,
-          todayIncidentReport,
-          visitorReport,
-          yesterdayVisitorReport,
-          todayVisitorReport,
-          currentlyOnSiteCount,
-          facilityReport,
-          yesterdayFacilityReport,
-          todayFacilityReport
-        ] = await Promise.all([
-          workOrderCollection.aggregate([
-            {
-              $match: {
-                site,
-                createdAt: periodRange,
-                status: { $nin: ["completed"] }
-              }
-            },
-            {
-              $facet: {
-                total: [{ $count: "count" }],
-                inProgress: [
-                  { $match: { status: "in-progress" } },
-                  { $count: "count" }
-                ]
-              }
-            }
-          ]).toArray(),
-          workOrderCollection.aggregate([
-            {
-              $match: {
-                site,
-                createdAt: { $gte: yesterday, $lte: yesterdayEnd },
-                status: { $nin: ["completed"] }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          workOrderCollection.aggregate([
-            {
-              $match: {
-                site,
-                createdAt: { $gte: today, $lte: todayEnd },
-                status: { $nin: ["completed"] }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          incidentCollection.aggregate([
-            {
-              $match: {
-                site,
-                status: "pending",
-                createdAt: periodRange
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          incidentCollection.aggregate([
-            {
-              $match: {
-                site,
-                status: "pending",
-                createdAt: { $gte: yesterday, $lte: yesterdayEnd }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          incidentCollection.aggregate([
-            {
-              $match: {
-                site,
-                status: "pending",
-                createdAt: { $gte: today, $lte: todayEnd }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          visitorCollection.aggregate([
-            {
-              $match: {
-                site,
-                ...visitorMatchObj,
-                createdAt: periodRange,
-                status: { $ne: "deleted" }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          visitorCollection.aggregate([
-            {
-              $match: {
-                site,
-                ...visitorMatchObj,
-                createdAt: { $gte: yesterday, $lte: yesterdayEnd },
-                status: { $ne: "deleted" }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          visitorCollection.aggregate([
-            {
-              $match: {
-                site,
-                ...visitorMatchObj,
-                createdAt: { $gte: today, $lte: todayEnd },
-                status: { $ne: "deleted" }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          visitorCollection.countDocuments({
-            site,
-            ...visitorMatchObj,
-            checkIn: { $ne: null },
-            checkOut: null,
-            status: { $ne: "deleted" }
-          }),
-          facilityCollection.aggregate([
-            {
-              $match: {
-                site,
-                ...facilityMatchObj,
-                $or: [
-                  { createdAt: periodRange },
-                  {
-                    createdAt: {
-                      $gte: periodRange.$gte.toISOString(),
-                      $lte: periodRange.$lte.toISOString()
-                    }
-                  }
-                ],
-                status: { $nin: ["deleted", "Deleted"] }
-              }
-            },
-            {
-              $facet: {
-                total: [{ $count: "count" }],
-                ongoing: [
-                  {
-                    $match: {
-                      status: {
-                        $in: ["Approved", "Ongoing"]
-                      }
-                    }
-                  },
-                  { $count: "count" }
-                ],
-                waitingApproval: [
-                  {
-                    $match: {
-                      status: {
-                        $in: ["Pending", "For Review"]
-                      }
-                    }
-                  },
-                  { $count: "count" }
-                ]
-              }
-            }
-          ]).toArray(),
-          facilityCollection.aggregate([
-            {
-              $match: {
-                site,
-                ...facilityMatchObj,
-                $or: [
-                  { createdAt: { $gte: yesterday, $lte: yesterdayEnd } },
-                  {
-                    createdAt: {
-                      $gte: yesterday.toISOString(),
-                      $lte: yesterdayEnd.toISOString()
-                    }
-                  }
-                ],
-                status: { $nin: ["deleted", "Deleted"] }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          facilityCollection.aggregate([
-            {
-              $match: {
-                site,
-                ...facilityMatchObj,
-                $or: [
-                  { createdAt: { $gte: today, $lte: todayEnd } },
-                  {
-                    createdAt: {
-                      $gte: today.toISOString(),
-                      $lte: todayEnd.toISOString()
-                    }
-                  }
-                ],
-                status: { $nin: ["deleted", "Deleted"] }
-              }
-            },
-            { $count: "count" }
-          ]).toArray()
-        ]);
-        const wFacet2 = workOrderReport2[0] ?? { total: [], inProgress: [] };
-        const fFacet = facilityReport[0] ?? {
-          total: [],
-          ongoing: [],
-          waitingApproval: []
-        };
-        const result2 = {
-          openWorkOrder: {
-            count: wFacet2.total[0]?.count ?? 0,
-            inProgress: wFacet2.inProgress[0]?.count ?? 0,
-            percentage: calculatePercentageChange(
-              todayWorkOrderReport2[0]?.count ?? 0,
-              yesterdayWorkOrderReport2[0]?.count ?? 0
-            )
-          },
-          openIncidents: {
-            count: incidentReport[0]?.count ?? 0,
-            highSeverity: 0,
-            percentage: calculatePercentageChange(
-              todayIncidentReport[0]?.count ?? 0,
-              yesterdayIncidentReport[0]?.count ?? 0
-            )
-          },
-          visitors: {
-            count: visitorReport[0]?.count ?? 0,
-            currentlyOnSite: currentlyOnSiteCount,
-            percentage: calculatePercentageChange(
-              todayVisitorReport[0]?.count ?? 0,
-              yesterdayVisitorReport[0]?.count ?? 0
-            )
-          },
-          facilityBooking: {
-            count: fFacet.total[0]?.count ?? 0,
-            ongoing: fFacet.ongoing[0]?.count ?? 0,
-            waitingApproval: fFacet.waitingApproval[0]?.count ?? 0,
-            percentage: calculatePercentageChange(
-              todayFacilityReport[0]?.count ?? 0,
-              yesterdayFacilityReport[0]?.count ?? 0
-            )
-          }
-        };
-        return result2;
-      }
-      if (serviceType === "security_agency" /* SECURITY_AGENCY */) {
-        const incidentCollection = db.collection(
-          incidents_namespace_collection
-        );
-        const visitorCollection = db.collection(visitors_namespace_collection);
-        const nfcPatrolLogCollection = db.collection("nfc-patrol-logs");
-        const [
-          workOrderReport2,
-          yesterdayWorkOrderReport2,
-          todayWorkOrderReport2,
-          incidentReport,
-          yesterdayIncidentReport,
-          todayIncidentReport,
-          visitorReport,
-          yesterdayVisitorReport,
-          todayVisitorReport,
-          currentlyOnSiteCount,
-          patrolReport,
-          yesterdayPatrolReport,
-          todayPatrolReport
-        ] = await Promise.all([
-          workOrderCollection.aggregate([
-            {
-              $match: {
-                site,
-                service: "Security",
-                createdAt: periodRange,
-                status: { $nin: ["completed"] }
-              }
-            },
-            {
-              $facet: {
-                total: [{ $count: "count" }],
-                inProgress: [
-                  { $match: { status: "in-progress" } },
-                  { $count: "count" }
-                ]
-              }
-            }
-          ]).toArray(),
-          workOrderCollection.aggregate([
-            {
-              $match: {
-                site,
-                service: "Security",
-                createdAt: { $gte: yesterday, $lte: yesterdayEnd },
-                status: { $nin: ["completed"] }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          workOrderCollection.aggregate([
-            {
-              $match: {
-                site,
-                service: "Security",
-                createdAt: { $gte: today, $lte: todayEnd },
-                status: { $nin: ["completed"] }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          incidentCollection.aggregate([
-            {
-              $match: {
-                site,
-                status: "pending",
-                createdAt: periodRange
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          incidentCollection.aggregate([
-            {
-              $match: {
-                site,
-                status: "pending",
-                createdAt: { $gte: yesterday, $lte: yesterdayEnd }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          incidentCollection.aggregate([
-            {
-              $match: {
-                site,
-                status: "pending",
-                createdAt: { $gte: today, $lte: todayEnd }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          visitorCollection.aggregate([
-            {
-              $match: {
-                site,
-                ...visitorMatchObj,
-                createdAt: periodRange,
-                status: { $ne: "deleted" }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          visitorCollection.aggregate([
-            {
-              $match: {
-                site,
-                ...visitorMatchObj,
-                createdAt: { $gte: yesterday, $lte: yesterdayEnd },
-                status: { $ne: "deleted" }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          visitorCollection.aggregate([
-            {
-              $match: {
-                site,
-                ...visitorMatchObj,
-                createdAt: { $gte: today, $lte: todayEnd },
-                status: { $ne: "deleted" }
-              }
-            },
-            { $count: "count" }
-          ]).toArray(),
-          visitorCollection.countDocuments({
-            site,
-            ...visitorMatchObj,
-            checkIn: { $ne: null },
-            checkOut: null,
-            status: { $ne: "deleted" }
-          }),
-          nfcPatrolLogCollection.aggregate([
-            {
-              $match: {
-                site,
-                createdAt: periodRange
-              }
-            },
-            {
-              $unwind: "$checkPoints"
-            },
-            {
-              $facet: {
-                total: [{ $count: "count" }],
-                completed: [
-                  { $match: { "checkPoints.status": "Completed" } },
-                  { $count: "count" }
-                ],
-                skipped: [
-                  { $match: { "checkPoints.status": "Skipped" } },
-                  { $count: "count" }
-                ]
-              }
-            }
-          ]).toArray(),
-          nfcPatrolLogCollection.aggregate([
-            {
-              $match: {
-                site,
-                createdAt: { $gte: yesterday, $lte: yesterdayEnd }
-              }
-            },
-            {
-              $unwind: "$checkPoints"
-            },
-            {
-              $facet: {
-                total: [{ $count: "count" }],
-                completed: [
-                  { $match: { "checkPoints.status": "Completed" } },
-                  { $count: "count" }
-                ],
-                skipped: [
-                  { $match: { "checkPoints.status": "Skipped" } },
-                  { $count: "count" }
-                ]
-              }
-            }
-          ]).toArray(),
-          nfcPatrolLogCollection.aggregate([
-            {
-              $match: {
-                site,
-                createdAt: { $gte: today, $lte: todayEnd }
-              }
-            },
-            {
-              $unwind: "$checkPoints"
-            },
-            {
-              $facet: {
-                total: [{ $count: "count" }],
-                completed: [
-                  { $match: { "checkPoints.status": "Completed" } },
-                  { $count: "count" }
-                ],
-                skipped: [
-                  { $match: { "checkPoints.status": "Skipped" } },
-                  { $count: "count" }
-                ]
-              }
-            }
-          ]).toArray()
-        ]);
-        const wFacet2 = workOrderReport2[0] ?? { total: [], inProgress: [] };
-        const pFacet = patrolReport[0] ?? {
-          total: [],
-          completed: [],
-          skipped: []
-        };
-        const totalCheckpoints = pFacet.total[0]?.count ?? 0;
-        const completedCheckpoints = pFacet.completed[0]?.count ?? 0;
-        const skippedCheckpoints = pFacet.skipped[0]?.count ?? 0;
-        const complianceRate = totalCheckpoints > 0 ? Math.round(
-          completedCheckpoints / totalCheckpoints * 100 * 100
-        ) / 100 : 100;
-        const yPatrolFacet = yesterdayPatrolReport[0] ?? {
-          total: [],
-          completed: []
-        };
-        const yTotal = yPatrolFacet.total[0]?.count ?? 0;
-        const yCompleted = yPatrolFacet.completed[0]?.count ?? 0;
-        const yesterdayCompliance = yTotal > 0 ? yCompleted / yTotal * 100 : 0;
-        const tPatrolFacet = todayPatrolReport[0] ?? {
-          total: [],
-          completed: []
-        };
-        const tTotal = tPatrolFacet.total[0]?.count ?? 0;
-        const tCompleted = tPatrolFacet.completed[0]?.count ?? 0;
-        const todayCompliance = tTotal > 0 ? tCompleted / tTotal * 100 : 0;
-        const result2 = {
-          openWorkOrder: {
-            count: wFacet2.total[0]?.count ?? 0,
-            inProgress: wFacet2.inProgress[0]?.count ?? 0,
-            percentage: calculatePercentageChange(
-              todayWorkOrderReport2[0]?.count ?? 0,
-              yesterdayWorkOrderReport2[0]?.count ?? 0
-            )
-          },
-          openIncidents: {
-            count: incidentReport[0]?.count ?? 0,
-            highSeverity: 0,
-            percentage: calculatePercentageChange(
-              todayIncidentReport[0]?.count ?? 0,
-              yesterdayIncidentReport[0]?.count ?? 0
-            )
-          },
-          visitors: {
-            count: visitorReport[0]?.count ?? 0,
-            currentlyOnSite: currentlyOnSiteCount,
-            percentage: calculatePercentageChange(
-              todayVisitorReport[0]?.count ?? 0,
-              yesterdayVisitorReport[0]?.count ?? 0
-            )
-          },
-          patrolCompliance: {
-            count: complianceRate,
-            missedCheckpoints: skippedCheckpoints,
-            missed: skippedCheckpoints,
-            percentage: calculatePercentageChange(
-              todayCompliance,
-              yesterdayCompliance
-            )
-          }
-        };
-        return result2;
-      }
       const workOrderService = workOrderServiceMap[serviceType] ?? serviceType;
       const [
         workOrderReport,
@@ -57887,13 +57914,8 @@ function useNewDashboardController() {
     try {
       const schema2 = Joi112.object({
         site: Joi112.string().hex().length(24).required(),
-        feedbackPeriod: periodField,
-        workOrderPeriod: periodField,
-        vehiclePeriod: periodField,
-        buildingPeriod: periodField,
-        visitorPeriod: periodField,
-        incidentPeriod: periodField,
-        guestPeriod: periodField
+        period: periodField,
+        type: Joi112.string().optional().allow("", null)
       });
       const { error, value } = schema2.validate({
         site: req.params.site,
@@ -57905,25 +57927,11 @@ function useNewDashboardController() {
         next(new BadRequestError183(messages));
         return;
       }
-      const {
-        site,
-        feedbackPeriod,
-        workOrderPeriod,
-        vehiclePeriod,
-        buildingPeriod,
-        visitorPeriod,
-        incidentPeriod,
-        guestPeriod
-      } = value;
+      const { site, period, type } = value;
       const data = await _getSecurityDashboard({
         siteId: site,
-        feedback: feedbackPeriod,
-        workOrder: workOrderPeriod,
-        vehicle: vehiclePeriod,
-        building: buildingPeriod,
-        visitor: visitorPeriod,
-        incident: incidentPeriod,
-        guest: guestPeriod
+        period,
+        type
       });
       res.status(200).json(data);
       return;
@@ -57937,16 +57945,9 @@ function useNewDashboardController() {
     try {
       const schema2 = Joi112.object({
         site: Joi112.string().hex().length(24).required(),
-        feedbackPeriod: periodField,
-        workOrderPeriod: periodField,
-        vehiclePeriod: periodField,
-        buildingPeriod: periodField,
-        visitorPeriod: periodField,
-        incidentPeriod: periodField,
-        sitePeoplePeriod: periodField,
-        bulletinBoardPeriod: periodField,
-        eventPeriod: periodField,
-        facilityBookingPeriod: periodField
+        period: periodField,
+        type: Joi112.string().optional().allow("", null),
+        facility: Joi112.string().hex().optional().allow("", null)
       });
       const { error, value } = schema2.validate({
         site: req.params.site,
@@ -57958,32 +57959,13 @@ function useNewDashboardController() {
         next(new BadRequestError183(messages));
         return;
       }
-      const {
+      const { site, period, type, facility } = value;
+      const data = await _getPropertyManagementDashboard(
         site,
-        feedbackPeriod,
-        workOrderPeriod,
-        vehiclePeriod,
-        buildingPeriod,
-        visitorPeriod,
-        incidentPeriod,
-        sitePeoplePeriod,
-        bulletinBoardPeriod,
-        eventPeriod,
-        facilityBookingPeriod
-      } = value;
-      const data = await _getPropertyManagementDashboard({
-        siteId: site,
-        feedback: feedbackPeriod,
-        workOrder: workOrderPeriod,
-        vehicle: vehiclePeriod,
-        building: buildingPeriod,
-        visitor: visitorPeriod,
-        incident: incidentPeriod,
-        sitePeople: sitePeoplePeriod,
-        bulletinBoard: bulletinBoardPeriod,
-        event: eventPeriod,
-        facilityBooking: facilityBookingPeriod
-      });
+        period,
+        type,
+        facility
+      );
       res.status(200).json(data);
       return;
     } catch (error) {
@@ -57997,9 +57979,7 @@ function useNewDashboardController() {
     const validation = Joi112.object({
       site: Joi112.string().hex().required(),
       serviceType: Joi112.string().valid(...Object.values(AppServiceType)).required(),
-      period: Joi112.string().valid(...Object.values(Period)).default("today" /* TODAY */),
-      type: Joi112.string().optional().allow("", null),
-      facility: Joi112.string().hex().optional().allow("", null)
+      period: Joi112.string().valid(...Object.values(Period)).default("today" /* TODAY */)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -58010,15 +57990,11 @@ function useNewDashboardController() {
     const site = req.params.site ?? "";
     const serviceType = req.params.serviceType;
     const period = req.query.period;
-    const type = req.query.type;
-    const facility = req.query.facility;
     try {
       const data = await _getServiceDashboard({
         site,
         period,
-        serviceType,
-        type,
-        facility
+        serviceType
       });
       res.json(data);
       return;
@@ -58043,7 +58019,11 @@ function useNewDashboardController() {
     }
     const { site, serviceType, period } = value;
     try {
-      const data = await _getServiceWeeklyActivity({ site, serviceType, period });
+      const data = await _getServiceWeeklyActivity({
+        site,
+        serviceType,
+        period
+      });
       res.json(data);
       return;
     } catch (error2) {
@@ -66215,7 +66195,11 @@ import Joi143 from "joi";
 import { BadRequestError as BadRequestError221, InternalServerError as InternalServerError81, useAtlas as useAtlas126 } from "@7365admin1/node-server-utils";
 
 // src/repositories/channel-preloved.repo.ts
-import { InternalServerError as InternalServerError80, useAtlas as useAtlas125 } from "@7365admin1/node-server-utils";
+import {
+  InternalServerError as InternalServerError80,
+  paginate as paginate63,
+  useAtlas as useAtlas125
+} from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId148 } from "mongodb";
 
 // src/models/channel-preloved.model.ts
@@ -66263,6 +66247,7 @@ function useChannelPrelovedRepo() {
   if (!db)
     throw new InternalServerError80("Unable to connect to server.");
   const CHANNEL_COLLECTION = "channel-preloved";
+  const CHAT_COLLECTION = "chat-preloved";
   const collection = db.collection(CHANNEL_COLLECTION);
   async function add(value, session) {
     try {
@@ -66281,7 +66266,85 @@ function useChannelPrelovedRepo() {
     };
     return collection.findOne(query, { session });
   }
-  return { add, getByParticipants };
+  async function getChannelMessages(channelId, page = 1, limit = 10, isLoadMore = false, lastMessageId = null) {
+    const chatCollection = db.collection(CHAT_COLLECTION);
+    const normalizedPage = page > 0 ? page - 1 : 0;
+    const normalizedLimit = limit || 10;
+    const matchCriteria = {
+      channelId: new ObjectId148(channelId),
+      deletedAt: null
+    };
+    if (isLoadMore && lastMessageId) {
+      matchCriteria._id = { $lt: new ObjectId148(lastMessageId) };
+    }
+    try {
+      const result = await chatCollection.aggregate([
+        { $match: matchCriteria },
+        {
+          $lookup: {
+            from: "users",
+            localField: "senderId",
+            foreignField: "_id",
+            pipeline: [
+              {
+                $project: {
+                  name: 1,
+                  profile: 1,
+                  type: 1
+                }
+              }
+            ],
+            as: "senderId"
+          }
+        },
+        { $unwind: { path: "$senderId", preserveNullAndEmptyArrays: true } },
+        {
+          $lookup: {
+            from: "bid-preloved",
+            localField: "bidId",
+            foreignField: "_id",
+            pipeline: [
+              { $project: { price: 1, message: 1, status: 1, type: 1 } }
+            ],
+            as: "bidId"
+          }
+        },
+        { $unwind: { path: "$bidId", preserveNullAndEmptyArrays: true } },
+        {
+          $lookup: {
+            from: "post-preloved",
+            localField: "postId",
+            foreignField: "_id",
+            pipeline: [{ $project: { title: 1, status: 1, reserverId: 1 } }],
+            as: "postDetails"
+          }
+        },
+        {
+          $unwind: {
+            path: "$postDetails",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        { $sort: { createdAt: -1 } },
+        {
+          $facet: {
+            totalCount: [{ $count: "count" }],
+            items: [
+              { $skip: normalizedPage * normalizedLimit },
+              { $limit: normalizedLimit }
+            ]
+          }
+        }
+      ]).toArray();
+      const totalCount = result[0].totalCount[0]?.count ?? 0;
+      const items = result[0].items;
+      items.reverse();
+      return paginate63(items, normalizedPage, normalizedLimit, totalCount);
+    } catch (error) {
+      throw error;
+    }
+  }
+  return { add, getByParticipants, getChannelMessages };
 }
 
 // src/services/chat-preloved.service.ts
@@ -66397,8 +66460,9 @@ function useChatPrelovedController() {
 
 // src/controllers/channel-preloved.controller.ts
 import { BadRequestError as BadRequestError223, logger as logger193 } from "@7365admin1/node-server-utils";
+import Joi144 from "joi";
 function useChannelPrelovedController() {
-  const { add: _add } = useChannelPrelovedRepo();
+  const { add: _add, getChannelMessages: _getChannelMessages } = useChannelPrelovedRepo();
   async function add(req, res, next) {
     const { error, value } = schemaChannelPreloved.validate(req.body, {
       abortEarly: false
@@ -66417,11 +66481,51 @@ function useChannelPrelovedController() {
       next(error2);
     }
   }
-  return { add };
+  async function getChannelMessages(req, res, next) {
+    const paramsSchema = Joi144.object({
+      id: Joi144.string().hex().length(24).required()
+    });
+    const querySchema = Joi144.object({
+      page: Joi144.number().integer().min(1).default(1),
+      limit: Joi144.number().integer().min(1).max(100).default(10),
+      isLoadMore: Joi144.boolean().default(false),
+      lastMessageId: Joi144.string().hex().length(24).optional().allow("", null)
+    });
+    const { error: paramError, value: params } = paramsSchema.validate(
+      req.params
+    );
+    if (paramError) {
+      logger193.log({ level: "error", message: paramError.message });
+      next(new BadRequestError223(paramError.message));
+      return;
+    }
+    const { error: queryError, value: query } = querySchema.validate(
+      req.query
+    );
+    if (queryError) {
+      logger193.log({ level: "error", message: queryError.message });
+      next(new BadRequestError223(queryError.message));
+      return;
+    }
+    try {
+      const data = await _getChannelMessages(
+        params.id,
+        query.page,
+        query.limit,
+        query.isLoadMore,
+        query.lastMessageId || null
+      );
+      res.status(200).json(data);
+    } catch (error) {
+      logger193.log({ level: "error", message: error.message });
+      next(error);
+    }
+  }
+  return { add, getChannelMessages };
 }
 
 // src/models/online-forms-v2.model.ts
-import Joi144 from "joi";
+import Joi145 from "joi";
 import { ObjectId as ObjectId149 } from "mongodb";
 var FormEntryStatus = /* @__PURE__ */ ((FormEntryStatus2) => {
   FormEntryStatus2["ACTIVE"] = "active";
@@ -66429,49 +66533,49 @@ var FormEntryStatus = /* @__PURE__ */ ((FormEntryStatus2) => {
   FormEntryStatus2["DELETED"] = "deleted";
   return FormEntryStatus2;
 })(FormEntryStatus || {});
-var schemaFormEntry = Joi144.object({
-  _id: Joi144.string().hex().optional().allow("", null),
-  formType: Joi144.string().required(),
-  block: Joi144.string().optional().allow(null, ""),
-  level: Joi144.string().optional().allow(null, ""),
-  unit: Joi144.string().optional().allow(null, ""),
-  name: Joi144.string().optional().allow(null, ""),
-  phoneNumber: Joi144.string().optional().allow(null, ""),
-  createdBy: Joi144.string().required(),
-  fields: Joi144.object().pattern(
-    Joi144.string(),
-    Joi144.alternatives().try(
-      Joi144.string(),
-      Joi144.number(),
-      Joi144.boolean(),
-      Joi144.valid(null)
+var schemaFormEntry = Joi145.object({
+  _id: Joi145.string().hex().optional().allow("", null),
+  formType: Joi145.string().required(),
+  block: Joi145.string().optional().allow(null, ""),
+  level: Joi145.string().optional().allow(null, ""),
+  unit: Joi145.string().optional().allow(null, ""),
+  name: Joi145.string().optional().allow(null, ""),
+  phoneNumber: Joi145.string().optional().allow(null, ""),
+  createdBy: Joi145.string().required(),
+  fields: Joi145.object().pattern(
+    Joi145.string(),
+    Joi145.alternatives().try(
+      Joi145.string(),
+      Joi145.number(),
+      Joi145.boolean(),
+      Joi145.valid(null)
     )
   ).required(),
-  status: Joi144.string().optional().allow("", null),
-  org: Joi144.string().hex().optional().allow("", null),
-  site: Joi144.string().hex().optional().allow("", null),
-  createdAt: Joi144.date().optional().allow("", null),
-  updatedAt: Joi144.date().optional().allow("", null),
-  deletedAt: Joi144.date().optional().allow("", null)
+  status: Joi145.string().optional().allow("", null),
+  org: Joi145.string().hex().optional().allow("", null),
+  site: Joi145.string().hex().optional().allow("", null),
+  createdAt: Joi145.date().optional().allow("", null),
+  updatedAt: Joi145.date().optional().allow("", null),
+  deletedAt: Joi145.date().optional().allow("", null)
 });
-var schemaUpdateFormEntry = Joi144.object({
-  _id: Joi144.string().hex().required(),
-  formType: Joi144.string().optional().allow("", null),
-  block: Joi144.string().optional().allow(null, ""),
-  level: Joi144.string().optional().allow(null, ""),
-  unit: Joi144.string().optional().allow(null, ""),
-  fields: Joi144.object().pattern(
-    Joi144.string(),
-    Joi144.alternatives().try(
-      Joi144.string(),
-      Joi144.number(),
-      Joi144.boolean(),
-      Joi144.valid(null)
+var schemaUpdateFormEntry = Joi145.object({
+  _id: Joi145.string().hex().required(),
+  formType: Joi145.string().optional().allow("", null),
+  block: Joi145.string().optional().allow(null, ""),
+  level: Joi145.string().optional().allow(null, ""),
+  unit: Joi145.string().optional().allow(null, ""),
+  fields: Joi145.object().pattern(
+    Joi145.string(),
+    Joi145.alternatives().try(
+      Joi145.string(),
+      Joi145.number(),
+      Joi145.boolean(),
+      Joi145.valid(null)
     )
   ).optional(),
-  status: Joi144.string().optional().allow("", null),
-  updatedAt: Joi144.date().optional().allow("", null),
-  deletedAt: Joi144.date().optional().allow("", null)
+  status: Joi145.string().optional().allow("", null),
+  updatedAt: Joi145.date().optional().allow("", null),
+  deletedAt: Joi145.date().optional().allow("", null)
 });
 function MFormEntry(value) {
   const { error } = schemaFormEntry.validate(value);
@@ -66516,34 +66620,34 @@ function MFormEntry(value) {
     deletedAt: value.deletedAt ?? null
   };
 }
-var residentFormEntry = Joi144.object({
-  _id: Joi144.string().hex().optional().allow("", null),
-  typeOfForm: Joi144.string().optional().allow("", null),
-  unitNumber: Joi144.string().optional().allow(null, ""),
-  fields: Joi144.object().pattern(
-    Joi144.string(),
-    Joi144.alternatives().try(
-      Joi144.string(),
-      Joi144.number(),
-      Joi144.boolean(),
-      Joi144.valid(null)
+var residentFormEntry = Joi145.object({
+  _id: Joi145.string().hex().optional().allow("", null),
+  typeOfForm: Joi145.string().optional().allow("", null),
+  unitNumber: Joi145.string().optional().allow(null, ""),
+  fields: Joi145.object().pattern(
+    Joi145.string(),
+    Joi145.alternatives().try(
+      Joi145.string(),
+      Joi145.number(),
+      Joi145.boolean(),
+      Joi145.valid(null)
     )
   ).optional().allow(null, ""),
-  status: Joi144.string().optional().allow("", null),
-  org: Joi144.string().hex().optional().allow("", null),
-  site: Joi144.string().hex().optional().allow("", null),
-  userId: Joi144.string().hex().optional().allow("", null),
-  createdAt: Joi144.date().optional().allow("", null),
-  updatedAt: Joi144.date().optional().allow("", null),
-  deletedAt: Joi144.date().optional().allow("", null),
-  remarks: Joi144.string().optional().allow("", null),
-  managementValues: Joi144.object().pattern(
-    Joi144.string(),
-    Joi144.alternatives().try(
-      Joi144.string(),
-      Joi144.number(),
-      Joi144.boolean(),
-      Joi144.valid(null)
+  status: Joi145.string().optional().allow("", null),
+  org: Joi145.string().hex().optional().allow("", null),
+  site: Joi145.string().hex().optional().allow("", null),
+  userId: Joi145.string().hex().optional().allow("", null),
+  createdAt: Joi145.date().optional().allow("", null),
+  updatedAt: Joi145.date().optional().allow("", null),
+  deletedAt: Joi145.date().optional().allow("", null),
+  remarks: Joi145.string().optional().allow("", null),
+  managementValues: Joi145.object().pattern(
+    Joi145.string(),
+    Joi145.alternatives().try(
+      Joi145.string(),
+      Joi145.number(),
+      Joi145.boolean(),
+      Joi145.valid(null)
     )
   ).optional().allow(null, "")
 });
@@ -66555,7 +66659,7 @@ import {
   logger as logger194,
   makeCacheKey as makeCacheKey65,
   NotFoundError as NotFoundError61,
-  paginate as paginate63,
+  paginate as paginate64,
   useAtlas as useAtlas127,
   useCache as useCache69
 } from "@7365admin1/node-server-utils";
@@ -66653,7 +66757,7 @@ function useFormEntryRepo() {
         { $limit: limit }
       ]).toArray();
       const length = await collection.countDocuments(query);
-      const data = paginate63(items, page, limit, length);
+      const data = paginate64(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
         logger194.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
@@ -66813,7 +66917,7 @@ function useFormEntryRepo() {
 
 // src/controllers/online-forms-v2.controller.ts
 import { BadRequestError as BadRequestError225, logger as logger195 } from "@7365admin1/node-server-utils";
-import Joi145 from "joi";
+import Joi146 from "joi";
 import ExcelJS3 from "exceljs";
 import fs6 from "fs";
 function useFormEntryController() {
@@ -66889,13 +66993,13 @@ function useFormEntryController() {
   }
   async function getAll(req, res, next) {
     try {
-      const schema2 = Joi145.object({
-        search: Joi145.string().optional().allow("", null),
-        page: Joi145.number().integer().min(1).allow("", null).default(1),
-        limit: Joi145.number().integer().min(1).max(100).allow("", null).default(10),
-        status: Joi145.string().optional().allow(null, ""),
-        org: Joi145.string().hex().optional().allow("", null),
-        site: Joi145.string().hex().optional().allow("", null)
+      const schema2 = Joi146.object({
+        search: Joi146.string().optional().allow("", null),
+        page: Joi146.number().integer().min(1).allow("", null).default(1),
+        limit: Joi146.number().integer().min(1).max(100).allow("", null).default(10),
+        status: Joi146.string().optional().allow(null, ""),
+        org: Joi146.string().hex().optional().allow("", null),
+        site: Joi146.string().hex().optional().allow("", null)
       });
       const { error, value } = schema2.validate(req.query);
       if (error) {
@@ -66916,8 +67020,8 @@ function useFormEntryController() {
   }
   async function getFormEntryById(req, res, next) {
     try {
-      const schema2 = Joi145.object({
-        _id: Joi145.string().hex().length(24).required()
+      const schema2 = Joi146.object({
+        _id: Joi146.string().hex().length(24).required()
       });
       const { error, value } = schema2.validate({ _id: req.params.id });
       if (error) {
@@ -66960,7 +67064,7 @@ function useFormEntryController() {
   }
   async function deleteFormEntryById(req, res, next) {
     try {
-      const validation = Joi145.string().hex().required();
+      const validation = Joi146.string().hex().required();
       const _id = req.params.id;
       const { error } = validation.validate(_id);
       if (error) {
@@ -67027,10 +67131,10 @@ function useFormEntryController() {
   async function residentForm(req, res, next) {
     try {
       const { site, userId, org } = req.query;
-      const residentFormPayload = Joi145.object({
-        org: Joi145.string().hex().required(),
-        site: Joi145.string().hex().required(),
-        userId: Joi145.string().hex().required()
+      const residentFormPayload = Joi146.object({
+        org: Joi146.string().hex().required(),
+        site: Joi146.string().hex().required(),
+        userId: Joi146.string().hex().required()
       });
       const { error } = residentFormPayload.validate({ site, userId, org }, { abortEarly: true });
       if (error) {
@@ -67099,7 +67203,7 @@ function useBuildingLevelService() {
 
 // src/controllers/building-level.controller.ts
 import { BadRequestError as BadRequestError226, logger as logger196 } from "@7365admin1/node-server-utils";
-import Joi146 from "joi";
+import Joi147 from "joi";
 function useBuildingLevelController() {
   const { add: _add, updateLevelById: _updateLevelById } = useBuildingLevelService();
   const {
@@ -67128,12 +67232,12 @@ function useBuildingLevelController() {
   }
   async function getAll(req, res, next) {
     try {
-      const validation = Joi146.object({
-        page: Joi146.number().min(1).optional().default(1),
-        limit: Joi146.number().min(1).optional().default(20),
-        search: Joi146.string().optional().allow("", null),
-        site: Joi146.string().hex().length(24).optional().allow("", null),
-        status: Joi146.string().valid(...Object.values(BuildingLevelStatus)).default("active" /* ACTIVE */)
+      const validation = Joi147.object({
+        page: Joi147.number().min(1).optional().default(1),
+        limit: Joi147.number().min(1).optional().default(20),
+        search: Joi147.string().optional().allow("", null),
+        site: Joi147.string().hex().length(24).optional().allow("", null),
+        status: Joi147.string().valid(...Object.values(BuildingLevelStatus)).default("active" /* ACTIVE */)
       });
       const { error, value } = validation.validate(req.query, {
         abortEarly: false
@@ -67160,8 +67264,8 @@ function useBuildingLevelController() {
   }
   async function getById(req, res, next) {
     try {
-      const schema2 = Joi146.object({
-        id: Joi146.string().hex().length(24).required()
+      const schema2 = Joi147.object({
+        id: Joi147.string().hex().length(24).required()
       });
       const { error, value } = schema2.validate({ id: req.params.id });
       if (error) {
@@ -67199,8 +67303,8 @@ function useBuildingLevelController() {
   }
   async function deleteById(req, res, next) {
     try {
-      const schema2 = Joi146.object({
-        id: Joi146.string().hex().required()
+      const schema2 = Joi147.object({
+        id: Joi147.string().hex().required()
       });
       const { error, value } = schema2.validate({ id: req.params.id });
       if (error) {
@@ -67219,11 +67323,11 @@ function useBuildingLevelController() {
   }
   async function batchUpdateByIds(req, res, next) {
     try {
-      const schema2 = Joi146.array().items(
-        Joi146.object({
-          _id: Joi146.string().hex().length(24).required(),
-          value: Joi146.object({
-            name: Joi146.string().optional().allow("", null)
+      const schema2 = Joi147.array().items(
+        Joi147.object({
+          _id: Joi147.string().hex().length(24).required(),
+          value: Joi147.object({
+            name: Joi147.string().optional().allow("", null)
           }).required()
         })
       );
@@ -67246,9 +67350,9 @@ function useBuildingLevelController() {
   }
   async function getBuildingLevelList(req, res, next) {
     try {
-      const schema2 = Joi146.object({
-        site: Joi146.string().hex().length(24).required(),
-        block: Joi146.string().hex().length(24).required()
+      const schema2 = Joi147.object({
+        site: Joi147.string().hex().length(24).required(),
+        block: Joi147.string().hex().length(24).required()
       });
       const { error, value } = schema2.validate({
         site: req.params.siteId,