@7365admin1/core 3.5.0 → 3.7.0

package/dist/index.js

@@ -536,13 +536,13 @@ var require_logger = __commonJS({
     "use strict";
     exports.__esModule = true;
     var _utils = require_utils();
-    var logger198 = {
+    var logger197 = {
       methodMap: ["debug", "info", "warn", "error"],
       level: "info",
       // Maps a given level value to the `methodMap` indexes above.
       lookupLevel: function lookupLevel(level) {
         if (typeof level === "string") {
-          var levelMap = _utils.indexOf(logger198.methodMap, level.toLowerCase());
+          var levelMap = _utils.indexOf(logger197.methodMap, level.toLowerCase());
           if (levelMap >= 0) {
             level = levelMap;
           } else {
@@ -553,9 +553,9 @@ var require_logger = __commonJS({
       },
       // Can be overridden in the host environment
       log: function log(level) {
-        level = logger198.lookupLevel(level);
-        if (typeof console !== "undefined" && logger198.lookupLevel(logger198.level) <= level) {
-          var method = logger198.methodMap[level];
+        level = logger197.lookupLevel(level);
+        if (typeof console !== "undefined" && logger197.lookupLevel(logger197.level) <= level) {
+          var method = logger197.methodMap[level];
           if (!console[method]) {
             method = "log";
           }
@@ -566,7 +566,7 @@ var require_logger = __commonJS({
         }
       }
     };
-    exports["default"] = logger198;
+    exports["default"] = logger197;
     module2.exports = exports["default"];
   }
 });
@@ -5993,7 +5993,6 @@ __export(src_exports, {
   OvernightParkingRequestSort: () => OvernightParkingRequestSort,
   OvernightParkingRequestStatus: () => OvernightParkingRequestStatus,
   PERSON_TYPES: () => PERSON_TYPES,
-  PMDashboardCollection: () => PMDashboardCollection,
   PStatus: () => PStatus,
   Period: () => Period,
   PersonStatus: () => PersonStatus,
@@ -6046,8 +6045,6 @@ __export(src_exports, {
   guests_namespace_collection: () => guests_namespace_collection,
   incidentReportLog: () => incidentReportLog,
   incidents_namespace_collection: () => incidents_namespace_collection,
-  landscapeDashboardCollection: () => landscapeDashboardCollection,
-  mAndEDashboardCollection: () => mAndEDashboardCollection,
   manpowerDesignationsSchema: () => manpowerDesignationsSchema,
   manpowerEvents: () => manpowerEvents,
   manpowerMonitoringSchema: () => manpowerMonitoringSchema,
@@ -6060,8 +6057,6 @@ __export(src_exports, {
   orgSchema: () => orgSchema,
   overnight_parking_requests_namespace_collection: () => overnight_parking_requests_namespace_collection,
   parseDahuaFind: () => parseDahuaFind,
-  pestDashboardCollection: () => pestDashboardCollection,
-  poolDashboardCollection: () => poolDashboardCollection,
   promoCodeSchema: () => promoCodeSchema,
   remarksSchema: () => remarksSchema,
   residentFormEntry: () => residentFormEntry,
@@ -6152,7 +6147,6 @@ __export(src_exports, {
   schemaVisitorTransaction: () => schemaVisitorTransaction,
   schemeCamera: () => schemeCamera,
   schemeLogCamera: () => schemeLogCamera,
-  securityDashboardCollection: () => securityDashboardCollection,
   shiftSchema: () => shiftSchema,
   siteSchema: () => siteSchema,
   site_people_namespace_collection: () => site_people_namespace_collection,
@@ -18819,7 +18813,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) {
@@ -21343,11 +21337,22 @@ function useVisitorTransactionRepo() {
         return res.insertedId;
       }
     } catch (error) {
-      console.log("Error in add visitor transaction:", error);
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
+        import_node_server_utils69.logger.warn({
+          operation: "addVisitorTransaction",
+          reason: "Duplicate entry",
+          site: value.site,
+          error: error.message
+        });
         throw new import_node_server_utils69.BadRequestError("Visitor already exists.");
       }
+      import_node_server_utils69.logger.error({
+        operation: "addVisitorTransaction",
+        site: value.site,
+        error: error.message,
+        stack: error.stack
+      });
       throw error;
     }
   }
@@ -21609,6 +21614,10 @@ function useVisitorTransactionRepo() {
       const data = (0, import_node_server_utils69.paginate)(items, page, limit, totalCount);
       return data;
     } catch (error) {
+      import_node_server_utils69.logger.error("Error in getAll visitor transaction repo", {
+        message: error.message,
+        stack: error.stack
+      });
       throw error;
     }
   }
@@ -21681,6 +21690,22 @@ function useVisitorTransactionRepo() {
       ]).toArray();
       return result;
     } catch (error) {
+      if (error instanceof Error) {
+        import_node_server_utils69.logger.error(
+          "Error in getVisitorTransactionById visitor transaction repo",
+          {
+            message: error.message,
+            stack: error.stack
+          }
+        );
+      } else {
+        import_node_server_utils69.logger.error(
+          "Unknown error in getVisitorTransactionById visitor transaction repo",
+          {
+            error
+          }
+        );
+      }
       throw error;
     }
   }
@@ -21695,9 +21720,19 @@ function useVisitorTransactionRepo() {
       const data = await collection.findOne(query);
       return data;
     } catch (error) {
-      throw new import_node_server_utils69.InternalServerError(
-        "Failed to fetch visitor transaction by plate number."
-      );
+      if (error instanceof Error) {
+        import_node_server_utils69.logger.error("Error in getOpenByPlateNumber visitor transaction repo", {
+          message: error.message,
+          stack: error.stack
+        });
+      } else {
+        import_node_server_utils69.logger.error(
+          "Unknown error in getOpenByPlateNumber visitor transaction repo",
+          {
+            error
+          }
+        );
+      }
     }
   }
   async function updateById(_id, value, session, isManualCheckOut = true) {
@@ -25953,7 +25988,6 @@ function useBuildingUnitRepo() {
     const buildingCollection = await db?.collection("buildings").findOne({ _id: (0, import_node_server_utils76.toObjectId)(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(() => {
@@ -26001,30 +26035,44 @@ function useBuildingUnitRepo() {
     }
     const query = {
       site,
-      owner: { $nin: [null, ""] }
+      owner: { $nin: [null, ""] },
+      status: "active"
     };
     if (unitIds && unitIds.length > 0) {
       query._id = { $in: unitIds };
     }
-    const cacheOptions = {
-      site: site.toString()
-    };
-    const cacheKey = (0, import_node_server_utils76.makeCacheKey)(
-      building_units_namespace_collection,
-      cacheOptions
-    );
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      import_node_server_utils76.logger.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
     try {
-      const data = await collection.aggregate([{ $match: query }]).toArray();
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils76.logger.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        import_node_server_utils76.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
+      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",
+            localField: "level",
+            foreignField: "_id",
+            pipeline: [{ $project: { _id: 0, name: 1 } }],
+            as: "_levelData"
+          }
+        },
+        {
+          $unwind: { path: "$_levelData", preserveNullAndEmptyArrays: true }
+        },
+        { $addFields: { levelName: { $ifNull: ["$_levelData.name", ""] } } },
+        { $unset: "_levelData" }
+      ]).toArray();
       return data;
     } catch (error) {
       if (error instanceof import_node_server_utils76.AppError) {
@@ -26127,7 +26175,6 @@ function useBuildingUnitRepo() {
         level,
         status: "active"
       };
-      console.log(query);
       const result = await collection.findOne(query);
       setCache(cacheKey, result, 300).then(() => {
         import_node_server_utils76.logger.log({
@@ -40965,7 +41012,7 @@ var NotificationService = class {
     await send(
       toStringArray(payload.to),
       "Preloved Marketplace",
-      `There is new .`,
+      `New preloved marketplace post added.`,
       {
         prelovedId: payload.prelovedId.toString(),
         status: payload.status,
@@ -43989,14 +44036,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,
@@ -44022,6 +44069,7 @@ function useSiteUnitBillingService() {
         );
         await session.commitTransaction();
       } catch (error) {
+        console.log("BILLING ERROR:", error.message, error);
         import_node_server_utils155.logger.log({
           level: "error",
           message: `Failed to proccess cron billing: ${error.message}`
@@ -56325,18 +56373,14 @@ function useNfcPatrolLogController() {
 
 // src/repositories/new-dashboard.repo.ts
 var import_node_server_utils199 = require("@7365admin1/node-server-utils");
+var import_mongodb121 = require("mongodb");
+var import_moment = __toESM(require("moment"));
 var Period = /* @__PURE__ */ ((Period2) => {
   Period2["TODAY"] = "today";
   Period2["THIS_WEEK"] = "thisWeek";
   Period2["THIS_MONTH"] = "thisMonth";
   return Period2;
 })(Period || {});
-var securityDashboardCollection = "security-dashboard";
-var PMDashboardCollection = "PM-dashboard";
-var pestDashboardCollection = "pest-dashboard";
-var poolDashboardCollection = "pool-dashboard";
-var mAndEDashboardCollection = "M&E-dashboard";
-var landscapeDashboardCollection = "landscape-dashboard";
 function getPeriodRangeWithPrevious(period) {
   const now = /* @__PURE__ */ new Date();
   let currentStart = /* @__PURE__ */ new Date();
@@ -56409,356 +56453,1275 @@ function useNewDashboardRepo() {
   if (!db) {
     throw new import_node_server_utils199.InternalServerError("Unable to connect to server.");
   }
-  const { delNamespace, getCache, setCache } = (0, import_node_server_utils199.useCache)(
-    securityDashboardCollection
+  const cleaning_schedule_namespace_collection = "site.cleaning.schedules";
+  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
   );
-  async function getMetric(collectionString, siteId, period) {
-    const site = (0, import_node_server_utils199.toObjectId)(siteId);
-    const range = getPeriodRangeWithPrevious(period);
-    const collection = db.collection(collectionString);
-    const current = await collection.countDocuments({
-      site,
-      createdAt: {
-        $gte: range.current.start,
-        $lte: range.current.end
-      }
-    });
-    const previous = await collection.countDocuments({
-      site,
-      createdAt: {
-        $gte: range.previous.start,
-        $lte: range.previous.end
-      }
+  const supplyCollection = db.collection(supply_namespace_collection);
+  const workOrderCollection = db.collection(work_order_namespace_collection);
+  const attendanceCollection = db.collection("site.attendances");
+  const feedbackCollection = db.collection("feedbacks2");
+  const workOrderServiceMap = {
+    security_agency: "Security",
+    cleaning_services: "Cleaning",
+    mechanical_electrical_services: "M&E",
+    landscaping_services: "Landscape",
+    pest_control_services: "Pest Control",
+    pool_maintenance_services: "Pool Maintenance"
+  };
+  function formatEndDate(date) {
+    if (typeof date === "string") {
+      const dateWithoutTimezone = date.replace(/\s*\+\d{2}:\d{2}$/, "");
+      date = new Date(dateWithoutTimezone);
+    }
+    const singaporeMoment = import_moment.default.tz(date, "Asia/Singapore");
+    singaporeMoment.set({
+      hour: 23,
+      minute: 59,
+      second: 59,
+      millisecond: 999
     });
-    return {
-      count: current,
-      percentage: calculatePercentage(current, previous)
-    };
+    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 = "",
-    feedback = "today" /* TODAY */,
-    workOrder = "today" /* TODAY */,
-    vehicle = "today" /* TODAY */,
-    building = "today" /* TODAY */,
-    visitor = "today" /* TODAY */,
-    incident = "today" /* TODAY */,
-    guest = "today" /* TODAY */
+    period = "today" /* TODAY */,
+    type
   }) {
-    const cacheOptions = {
-      siteId,
-      feedback,
-      workOrder,
-      vehicle,
-      building,
-      visitor,
-      incident
+    const siteIdObj = (0, import_node_server_utils199.toObjectId)(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([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            service: "Security",
+            createdAt: periodRange,
+            status: { $nin: ["completed"] }
+          }
+        },
+        {
+          $facet: {
+            total: [{ $count: "count" }],
+            inProgress: [
+              { $match: { status: "in-progress" } },
+              { $count: "count" }
+            ]
+          }
+        }
+      ]).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([
+        {
+          $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
+          }
+        },
+        {
+          $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: 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: []
     };
-    const cacheKey = (0, import_node_server_utils199.makeCacheKey)(securityDashboardCollection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      import_node_server_utils199.logger.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
+    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 = import_moment.default.tz("Asia/Singapore").format("YYYY-MM-DD");
+    const dayIndex = import_moment.default.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
+          });
+        }
+      }
     }
-    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
+    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: (0, import_node_server_utils199.toObjectId)(log.createdBy)
+          });
+          if (userDoc && userDoc.name) {
+            person = userDoc.name;
+          }
+        }
+        let status = "pending";
+        if (log) {
+          status = "completed";
+        } else {
+          const routeTime = import_moment.default.tz(
+            `${todayString} ${startTime}`,
+            "YYYY-MM-DD HH:mm",
+            "Asia/Singapore"
+          );
+          const nowSg = import_moment.default.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
     };
-    setCache(cacheKey, data, 15 * 60).then(() => {
-      import_node_server_utils199.logger.info(`Cache set for key: ${cacheKey}`);
-    }).catch((err) => {
-      import_node_server_utils199.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-    });
     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 cacheOptions = {
-      siteId,
-      feedback,
-      workOrder,
-      sitePeople,
-      facilityBooking,
-      bulletinBoard,
-      event,
-      vehicle,
-      building,
-      visitor,
-      incident
-    };
-    const cacheKey = (0, import_node_server_utils199.makeCacheKey)(PMDashboardCollection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      import_node_server_utils199.logger.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
-    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 = (0, import_node_server_utils199.toObjectId)(siteId);
+    const startOfToday = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
+    const endOfToday = import_moment.default.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 import_mongodb121.ObjectId(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
     };
-    setCache(cacheKey, data, 15 * 60).then(() => {
-      import_node_server_utils199.logger.info(`Cache set for key: ${cacheKey}`);
-    }).catch((err) => {
-      import_node_server_utils199.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-    });
     return data;
   }
-  async function getPestManagementDashboard({
-    siteId = "",
-    feedback = "today" /* TODAY */,
-    workOrder = "today" /* TODAY */
+  function areaChecklistScheduleLookup(site, serviceType, createdAtRange) {
+    return [
+      { $match: { serviceType } },
+      {
+        $lookup: {
+          from: cleaning_schedule_namespace_collection,
+          localField: "schedule",
+          foreignField: "_id",
+          as: "scheduleDoc",
+          pipeline: [
+            {
+              $match: {
+                site,
+                serviceType,
+                createdAt: createdAtRange
+              }
+            }
+          ]
+        }
+      },
+      { $unwind: { path: "$scheduleDoc", preserveNullAndEmptyArrays: false } }
+    ];
+  }
+  async function getServiceDashboard({
+    site,
+    serviceType,
+    period = "today" /* TODAY */
   }) {
-    const cacheOptions = {
-      siteId,
-      feedback,
-      workOrder
-    };
-    const cacheKey = (0, import_node_server_utils199.makeCacheKey)(pestDashboardCollection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      import_node_server_utils199.logger.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
+    try {
+      site = new import_mongodb121.ObjectId(site);
+    } catch (error) {
+      throw new import_node_server_utils199.BadRequestError("Invalid site ID format.");
+    }
+    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);
+    try {
+      const workOrderService = workOrderServiceMap[serviceType] ?? serviceType;
+      const [
+        workOrderReport,
+        supplyAlertReport,
+        taskCompletedReport,
+        yesterdayWorkOrderReport,
+        todayWorkOrderReport,
+        yesterdayTaskCompletedReport,
+        todayTaskCompletedReport
+      ] = await Promise.all([
+        workOrderCollection.aggregate([
+          {
+            $match: {
+              site,
+              service: workOrderService,
+              createdAt: periodRange,
+              status: { $nin: ["completed"] }
+            }
+          },
+          {
+            $facet: {
+              total: [{ $count: "count" }],
+              inProgress: [
+                { $match: { status: "in-progress" } },
+                { $count: "count" }
+              ]
+            }
+          }
+        ]).toArray(),
+        supplyCollection.aggregate([
+          { $match: { site, serviceType, status: "active" } },
+          { $sort: { qty: 1 } },
+          { $limit: 3 },
+          { $project: { _id: 1, name: 1, qty: 1 } }
+        ]).toArray(),
+        areaChecklistCollection.aggregate([
+          ...areaChecklistScheduleLookup(site, serviceType, periodRange),
+          {
+            $facet: {
+              total: [{ $count: "count" }],
+              completed: [
+                { $match: { status: "completed" } },
+                { $count: "count" }
+              ],
+              inProgress: [
+                { $match: { status: { $in: ["open", "ongoing"] } } },
+                { $count: "count" }
+              ]
+            }
+          }
+        ]).toArray(),
+        workOrderCollection.aggregate([
+          {
+            $match: {
+              site,
+              service: workOrderService,
+              createdAt: { $gte: yesterday, $lte: yesterdayEnd },
+              status: { $nin: ["completed"] }
+            }
+          },
+          { $count: "count" }
+        ]).toArray(),
+        workOrderCollection.aggregate([
+          {
+            $match: {
+              site,
+              service: workOrderService,
+              createdAt: { $gte: today, $lte: todayEnd },
+              status: { $nin: ["completed"] }
+            }
+          },
+          { $count: "count" }
+        ]).toArray(),
+        areaChecklistCollection.aggregate([
+          ...areaChecklistScheduleLookup(site, serviceType, {
+            $gte: yesterday,
+            $lte: yesterdayEnd
+          }),
+          { $match: { status: "completed" } },
+          { $count: "count" }
+        ]).toArray(),
+        areaChecklistCollection.aggregate([
+          ...areaChecklistScheduleLookup(site, serviceType, {
+            $gte: today,
+            $lte: todayEnd
+          }),
+          { $match: { status: "completed" } },
+          { $count: "count" }
+        ]).toArray()
+      ]);
+      const wFacet = workOrderReport[0] ?? { total: [], inProgress: [] };
+      const tFacet = taskCompletedReport[0] ?? {
+        total: [],
+        completed: [],
+        inProgress: []
+      };
+      const result = {
+        openWorkOrder: {
+          count: wFacet.total[0]?.count ?? 0,
+          inProgress: wFacet.inProgress[0]?.count ?? 0,
+          percentage: calculatePercentageChange(
+            todayWorkOrderReport[0]?.count ?? 0,
+            yesterdayWorkOrderReport[0]?.count ?? 0
+          )
+        },
+        supplyAlert: {
+          items: supplyAlertReport.map((item) => ({
+            name: item.name,
+            qty: item.qty
+          }))
+        },
+        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
+          )
+        }
+      };
+      return result;
+    } catch (error) {
+      throw error;
     }
-    const feedbacks = await getMetric(
-      feedbacks_namespace_collection,
-      siteId,
-      feedback
-    );
-    const workOrders = await getMetric(
-      work_orders_namespace_collection,
-      siteId,
-      workOrder
-    );
-    const data = {
-      feedbacks,
-      workOrders
-    };
-    setCache(cacheKey, data, 15 * 60).then(() => {
-      import_node_server_utils199.logger.info(`Cache set for key: ${cacheKey}`);
-    }).catch((err) => {
-      import_node_server_utils199.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-    });
-    return data;
   }
-  async function getPoolManagementDashboard({
-    siteId = "",
-    feedback = "today" /* TODAY */,
-    workOrder = "today" /* TODAY */
+  async function getServiceWeeklyActivity({
+    site,
+    serviceType,
+    period = "today" /* TODAY */
   }) {
-    const cacheOptions = {
-      siteId,
-      feedback,
-      workOrder
-    };
-    const cacheKey = (0, import_node_server_utils199.makeCacheKey)(poolDashboardCollection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      import_node_server_utils199.logger.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
+    const cacheOptions = { serviceType, period };
+    try {
+      site = new import_mongodb121.ObjectId(site);
+      cacheOptions.site = site.toString();
+    } catch {
+      throw new import_node_server_utils199.BadRequestError("Invalid site ID format.");
+    }
+    const workOrderService = workOrderServiceMap[serviceType] ?? serviceType;
+    let rangeStart;
+    let rangeEnd;
+    let labels = [];
+    let getIntervalIndex;
+    if (period === "today" /* TODAY */) {
+      rangeStart = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
+      rangeEnd = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
+      labels = ["12 AM", "4 AM", "8 AM", "12 PM", "4 PM", "8 PM"];
+      getIntervalIndex = (date) => {
+        const hour = (0, import_moment.default)(date).tz("Asia/Singapore").hour();
+        return Math.floor(hour / 4);
+      };
+    } else if (period === "thisWeek" /* THIS_WEEK */) {
+      rangeStart = import_moment.default.tz("Asia/Singapore").startOf("isoWeek").toDate();
+      rangeEnd = import_moment.default.tz("Asia/Singapore").endOf("isoWeek").toDate();
+      labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+      getIntervalIndex = (date) => {
+        const day = (0, import_moment.default)(date).tz("Asia/Singapore").isoWeekday();
+        return day - 1;
+      };
+    } else if (period === "thisMonth" /* THIS_MONTH */) {
+      rangeStart = import_moment.default.tz("Asia/Singapore").startOf("month").toDate();
+      rangeEnd = import_moment.default.tz("Asia/Singapore").endOf("month").toDate();
+      const daysInMonth = import_moment.default.tz("Asia/Singapore").daysInMonth();
+      labels = Array.from({ length: daysInMonth }, (_, i) => String(i + 1));
+      getIntervalIndex = (date) => {
+        return (0, import_moment.default)(date).tz("Asia/Singapore").date() - 1;
+      };
+    } else {
+      throw new import_node_server_utils199.BadRequestError("Invalid period.");
+    }
+    try {
+      const workOrders = await workOrderCollection.find({
+        site,
+        service: workOrderService,
+        status: { $nin: ["deleted", "Deleted"] },
+        $or: [
+          { createdAt: { $gte: rangeStart, $lte: rangeEnd } },
+          {
+            createdAt: {
+              $gte: rangeStart.toISOString(),
+              $lte: rangeEnd.toISOString()
+            }
+          }
+        ]
+      }).project({ status: 1, createdAt: 1 }).toArray();
+      const chartData = labels.map((label) => ({
+        day: label,
+        label,
+        openWorkOrder: 0,
+        closedWorkOrder: 0,
+        workOrder: 0,
+        taskCompleted: 0
+      }));
+      for (const wo of workOrders) {
+        const dateVal = wo.createdAt instanceof Date ? wo.createdAt : new Date(wo.createdAt);
+        const index = getIntervalIndex(dateVal);
+        if (index >= 0 && index < chartData.length) {
+          const isCompleted = wo.status === "completed" || wo.status === "Completed";
+          if (isCompleted) {
+            chartData[index].closedWorkOrder++;
+            chartData[index].taskCompleted++;
+          } else {
+            chartData[index].openWorkOrder++;
+            chartData[index].workOrder++;
+          }
+        }
+      }
+      return chartData;
+    } catch (error) {
+      throw error;
     }
-    const feedbacks = await getMetric(
-      feedbacks_namespace_collection,
-      siteId,
-      feedback
-    );
-    const workOrders = await getMetric(
-      work_orders_namespace_collection,
-      siteId,
-      workOrder
-    );
-    const data = {
-      feedbacks,
-      workOrders
-    };
-    setCache(cacheKey, data, 15 * 60).then(() => {
-      import_node_server_utils199.logger.info(`Cache set for key: ${cacheKey}`);
-    }).catch((err) => {
-      import_node_server_utils199.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-    });
-    return data;
   }
-  async function getMAndEManagementDashboard({
-    siteId = "",
-    feedback = "today" /* TODAY */,
-    workOrder = "today" /* TODAY */
+  async function getServiceTodayTaskSchedule({
+    site,
+    serviceType,
+    page = 1,
+    limit = 10
   }) {
-    const cacheOptions = {
-      siteId,
-      feedback,
-      workOrder
-    };
-    const cacheKey = (0, import_node_server_utils199.makeCacheKey)(mAndEDashboardCollection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      import_node_server_utils199.logger.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
+    page = page > 0 ? page - 1 : 0;
+    const cacheOptions = { serviceType, page, limit };
+    try {
+      site = new import_mongodb121.ObjectId(site);
+      cacheOptions.site = site.toString();
+    } catch {
+      throw new import_node_server_utils199.BadRequestError("Invalid site ID format.");
+    }
+    const todayStart = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
+    const todayEnd = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
+    const todayRange = { $gte: todayStart, $lte: todayEnd };
+    try {
+      const [items, countResult] = await Promise.all([
+        areaChecklistCollection.aggregate([
+          ...areaChecklistScheduleLookup(site, serviceType, todayRange),
+          {
+            $addFields: {
+              _assigneeId: {
+                $reduce: {
+                  input: { $ifNull: ["$checklist", []] },
+                  initialValue: null,
+                  in: {
+                    $cond: {
+                      if: { $ne: ["$$value", null] },
+                      then: "$$value",
+                      else: {
+                        $reduce: {
+                          input: { $ifNull: ["$$this.units", []] },
+                          initialValue: null,
+                          in: {
+                            $cond: {
+                              if: { $ne: ["$$value", null] },
+                              then: "$$value",
+                              else: {
+                                $cond: {
+                                  if: { $gt: ["$$this.completedBy", null] },
+                                  then: "$$this.completedBy",
+                                  else: null
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          {
+            $lookup: {
+              from: "users",
+              localField: "_assigneeId",
+              foreignField: "_id",
+              as: "_assigneeDoc"
+            }
+          },
+          { $sort: { createdAt: -1, _id: -1 } },
+          {
+            $project: {
+              name: 1,
+              type: 1,
+              status: 1,
+              assigneeName: { $arrayElemAt: ["$_assigneeDoc.name", 0] }
+            }
+          },
+          { $skip: page * limit },
+          { $limit: limit }
+        ]).toArray(),
+        areaChecklistCollection.aggregate([
+          ...areaChecklistScheduleLookup(site, serviceType, todayRange),
+          { $count: "count" }
+        ]).toArray()
+      ]);
+      const length = countResult[0]?.count ?? 0;
+      const data = (0, import_node_server_utils199.paginate)(items, page, limit, length);
+      return data;
+    } catch (error) {
+      throw error;
     }
-    const feedbacks = await getMetric(
-      feedbacks_namespace_collection,
-      siteId,
-      feedback
-    );
-    const workOrders = await getMetric(
-      work_orders_namespace_collection,
-      siteId,
-      workOrder
-    );
-    const data = {
-      feedbacks,
-      workOrders
-    };
-    setCache(cacheKey, data, 15 * 60).then(() => {
-      import_node_server_utils199.logger.info(`Cache set for key: ${cacheKey}`);
-    }).catch((err) => {
-      import_node_server_utils199.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-    });
-    return data;
   }
-  async function getLandscapeDashboard({
-    siteId = "",
-    feedback = "today" /* TODAY */,
-    workOrder = "today" /* TODAY */
+  async function getServiceStaffAttendance({
+    site,
+    serviceType,
+    page = 1,
+    limit = 10
   }) {
-    const cacheOptions = {
-      siteId,
-      feedback,
-      workOrder
-    };
-    const cacheKey = (0, import_node_server_utils199.makeCacheKey)(landscapeDashboardCollection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      import_node_server_utils199.logger.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
+    page = page > 0 ? page - 1 : 0;
+    const cacheOptions = { serviceType, page, limit };
+    try {
+      site = new import_mongodb121.ObjectId(site);
+      cacheOptions.site = site.toString();
+    } catch {
+      throw new import_node_server_utils199.BadRequestError("Invalid site ID format.");
+    }
+    const todayStart = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
+    const todayEnd = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
+    const todayStartStr = todayStart.toISOString();
+    const todayEndStr = todayEnd.toISOString();
+    try {
+      const [items, length] = await Promise.all([
+        attendanceCollection.aggregate([
+          {
+            $match: {
+              site,
+              serviceType,
+              $or: [
+                { createdAt: { $gte: todayStart, $lte: todayEnd } },
+                { createdAt: { $gte: todayStartStr, $lte: todayEndStr } }
+              ]
+            }
+          },
+          {
+            $lookup: {
+              from: "users",
+              localField: "user",
+              foreignField: "_id",
+              as: "_userDoc"
+            }
+          },
+          {
+            $lookup: {
+              from: "members",
+              let: { userId: "$user", siteId: "$site", type: "$serviceType" },
+              pipeline: [
+                {
+                  $match: {
+                    $expr: {
+                      $and: [
+                        { $eq: ["$user", "$$userId"] },
+                        { $eq: ["$siteId", "$$siteId"] },
+                        { $eq: ["$type", "$$type"] },
+                        { $ne: ["$status", "deleted"] }
+                      ]
+                    }
+                  }
+                }
+              ],
+              as: "_memberDoc"
+            }
+          },
+          {
+            $unwind: {
+              path: "$_memberDoc",
+              preserveNullAndEmptyArrays: true
+            }
+          },
+          {
+            $lookup: {
+              from: "roles",
+              localField: "_memberDoc.role",
+              foreignField: "_id",
+              as: "_roleDoc"
+            }
+          },
+          {
+            $unwind: {
+              path: "$_roleDoc",
+              preserveNullAndEmptyArrays: true
+            }
+          },
+          { $sort: { createdAt: -1, _id: -1 } },
+          {
+            $project: {
+              checkIn: 1,
+              checkOut: 1,
+              createdAt: 1,
+              userName: { $arrayElemAt: ["$_userDoc.name", 0] },
+              userRole: { $ifNull: ["$_roleDoc.name", ""] },
+              totalHours: {
+                $round: [
+                  {
+                    $divide: [
+                      {
+                        $subtract: [
+                          {
+                            $toDate: {
+                              $ifNull: ["$checkOut.timestamp", "$$NOW"]
+                            }
+                          },
+                          { $toDate: "$checkIn.timestamp" }
+                        ]
+                      },
+                      36e5
+                    ]
+                  },
+                  2
+                ]
+              }
+            }
+          },
+          { $skip: page * limit },
+          { $limit: limit }
+        ]).toArray(),
+        attendanceCollection.countDocuments({
+          site,
+          serviceType,
+          $or: [
+            { createdAt: { $gte: todayStart, $lte: todayEnd } },
+            { createdAt: { $gte: todayStartStr, $lte: todayEndStr } }
+          ]
+        })
+      ]);
+      const data = (0, import_node_server_utils199.paginate)(items, page, limit, length);
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function getServiceRecentFeedbacks({
+    site,
+    serviceType,
+    page = 1,
+    limit = 10
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const cacheOptions = { serviceType, page, limit };
+    try {
+      site = new import_mongodb121.ObjectId(site);
+      cacheOptions.site = site.toString();
+    } catch {
+      throw new import_node_server_utils199.BadRequestError("Invalid site ID format.");
+    }
+    const workOrderService = workOrderServiceMap[serviceType] ?? serviceType;
+    try {
+      const [items, length] = await Promise.all([
+        feedbackCollection.aggregate([
+          { $match: { site, service: workOrderService } },
+          { $sort: { createdAt: -1, _id: -1 } },
+          {
+            $lookup: {
+              from: "users",
+              localField: "createdBy",
+              foreignField: "_id",
+              as: "_createdByDoc"
+            }
+          },
+          {
+            $project: {
+              description: 1,
+              subject: 1,
+              app: 1,
+              status: 1,
+              createdAt: 1,
+              createdByName: { $arrayElemAt: ["$_createdByDoc.name", 0] }
+            }
+          },
+          { $skip: page * limit },
+          { $limit: limit }
+        ]).toArray(),
+        feedbackCollection.countDocuments({ site, service: workOrderService })
+      ]);
+      const data = (0, import_node_server_utils199.paginate)(items, page, limit, length);
+      return data;
+    } catch (error) {
+      throw error;
     }
-    const feedbacks = await getMetric(
-      feedbacks_namespace_collection,
-      siteId,
-      feedback
-    );
-    const workOrders = await getMetric(
-      work_orders_namespace_collection,
-      siteId,
-      workOrder
-    );
-    const data = {
-      feedbacks,
-      workOrders
-    };
-    setCache(cacheKey, data, 15 * 60).then(() => {
-      import_node_server_utils199.logger.info(`Cache set for key: ${cacheKey}`);
-    }).catch((err) => {
-      import_node_server_utils199.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-    });
-    return data;
   }
   return {
     getSecurityDashboard,
     getPropertyManagementDashboard,
-    getPestManagementDashboard,
-    getPoolManagementDashboard,
-    getMAndEManagementDashboard,
-    getLandscapeDashboard
+    getServiceDashboard,
+    getServiceWeeklyActivity,
+    getServiceTodayTaskSchedule,
+    getServiceStaffAttendance,
+    getServiceRecentFeedbacks
   };
 }
 
@@ -56769,23 +57732,19 @@ function useNewDashboardController() {
   const {
     getSecurityDashboard: _getSecurityDashboard,
     getPropertyManagementDashboard: _getPropertyManagementDashboard,
-    getPestManagementDashboard: _getPestManagementDashboard,
-    getPoolManagementDashboard: _getPoolManagementDashboard,
-    getMAndEManagementDashboard: _getMAndEManagementDashboard,
-    getLandscapeDashboard: _getLandscapeDashboard
+    getServiceDashboard: _getServiceDashboard,
+    getServiceWeeklyActivity: _getServiceWeeklyActivity,
+    getServiceTodayTaskSchedule: _getServiceTodayTaskSchedule,
+    getServiceStaffAttendance: _getServiceStaffAttendance,
+    getServiceRecentFeedbacks: _getServiceRecentFeedbacks
   } = useNewDashboardRepo();
   const periodField = import_joi112.default.string().valid(...Object.values(Period)).default("today" /* TODAY */);
   async function getSecurityDashboard(req, res, next) {
     try {
       const schema2 = import_joi112.default.object({
         site: import_joi112.default.string().hex().length(24).required(),
-        feedbackPeriod: periodField,
-        workOrderPeriod: periodField,
-        vehiclePeriod: periodField,
-        buildingPeriod: periodField,
-        visitorPeriod: periodField,
-        incidentPeriod: periodField,
-        guestPeriod: periodField
+        period: periodField,
+        type: import_joi112.default.string().optional().allow("", null)
       });
       const { error, value } = schema2.validate({
         site: req.params.site,
@@ -56797,25 +57756,11 @@ function useNewDashboardController() {
         next(new import_node_server_utils200.BadRequestError(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;
@@ -56829,16 +57774,9 @@ function useNewDashboardController() {
     try {
       const schema2 = import_joi112.default.object({
         site: import_joi112.default.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: import_joi112.default.string().optional().allow("", null),
+        facility: import_joi112.default.string().hex().optional().allow("", null)
       });
       const { error, value } = schema2.validate({
         site: req.params.site,
@@ -56850,32 +57788,13 @@ function useNewDashboardController() {
         next(new import_node_server_utils200.BadRequestError(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) {
@@ -56884,143 +57803,177 @@ function useNewDashboardController() {
       return;
     }
   }
-  async function getPestManagementDashboard(req, res, next) {
+  async function getServiceDashboard(req, res, next) {
+    const query = { ...req.query, ...req.params };
+    const validation = import_joi112.default.object({
+      site: import_joi112.default.string().hex().required(),
+      serviceType: import_joi112.default.string().valid(...Object.values(AppServiceType)).required(),
+      period: import_joi112.default.string().valid(...Object.values(Period)).default("today" /* TODAY */)
+    });
+    const { error } = validation.validate(query);
+    if (error) {
+      import_node_server_utils200.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils200.BadRequestError(error.message));
+      return;
+    }
+    const site = req.params.site ?? "";
+    const serviceType = req.params.serviceType;
+    const period = req.query.period;
     try {
-      const schema2 = import_joi112.default.object({
-        site: import_joi112.default.string().hex().length(24).required(),
-        feedbackPeriod: periodField,
-        workOrderPeriod: periodField
-      });
-      const { error, value } = schema2.validate({
-        site: req.params.site,
-        ...req.query
-      });
-      if (error) {
-        const messages = error.details.map((d) => d.message).join(", ");
-        import_node_server_utils200.logger.log({ level: "error", message: messages });
-        next(new import_node_server_utils200.BadRequestError(messages));
-        return;
-      }
-      const { site, feedbackPeriod, workOrderPeriod } = value;
-      const data = await _getPestManagementDashboard({
-        siteId: site,
-        feedback: feedbackPeriod,
-        workOrder: workOrderPeriod
+      const data = await _getServiceDashboard({
+        site,
+        period,
+        serviceType
       });
-      res.status(200).json(data);
+      res.json(data);
       return;
-    } catch (error) {
-      import_node_server_utils200.logger.log({ level: "error", message: error.message });
-      next(error);
+    } catch (error2) {
+      import_node_server_utils200.logger.log({ level: "error", message: error2.message });
+      next(error2);
       return;
     }
   }
-  async function getPoolManagementDashboard(req, res, next) {
+  async function getServiceWeeklyActivity(req, res, next) {
+    const query = { ...req.params, ...req.query };
+    const validation = import_joi112.default.object({
+      site: import_joi112.default.string().hex().required(),
+      serviceType: import_joi112.default.string().valid(...Object.values(AppServiceType)).required(),
+      period: import_joi112.default.string().valid(...Object.values(Period)).default("today" /* TODAY */)
+    });
+    const { error, value } = validation.validate(query);
+    if (error) {
+      import_node_server_utils200.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils200.BadRequestError(error.message));
+      return;
+    }
+    const { site, serviceType, period } = value;
     try {
-      const schema2 = import_joi112.default.object({
-        site: import_joi112.default.string().hex().length(24).required(),
-        feedbackPeriod: periodField,
-        workOrderPeriod: periodField
-      });
-      const { error, value } = schema2.validate({
-        site: req.params.site,
-        ...req.query
-      });
-      if (error) {
-        const messages = error.details.map((d) => d.message).join(", ");
-        import_node_server_utils200.logger.log({ level: "error", message: messages });
-        next(new import_node_server_utils200.BadRequestError(messages));
-        return;
-      }
-      const { site, feedbackPeriod, workOrderPeriod } = value;
-      const data = await _getPestManagementDashboard({
-        siteId: site,
-        feedback: feedbackPeriod,
-        workOrder: workOrderPeriod
+      const data = await _getServiceWeeklyActivity({
+        site,
+        serviceType,
+        period
       });
-      res.status(200).json(data);
+      res.json(data);
       return;
-    } catch (error) {
-      import_node_server_utils200.logger.log({ level: "error", message: error.message });
-      next(error);
+    } catch (error2) {
+      import_node_server_utils200.logger.log({ level: "error", message: error2.message });
+      next(error2);
       return;
     }
   }
-  async function getMAndEManagementDashboard(req, res, next) {
+  async function getServiceTodayTaskSchedule(req, res, next) {
+    const query = { ...req.query, ...req.params };
+    const validation = import_joi112.default.object({
+      site: import_joi112.default.string().hex().required(),
+      serviceType: import_joi112.default.string().valid(...Object.values(AppServiceType)).required(),
+      page: import_joi112.default.number().min(1).optional().allow("", null),
+      limit: import_joi112.default.number().min(1).optional().allow("", null)
+    });
+    const { error } = validation.validate(query);
+    if (error) {
+      import_node_server_utils200.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils200.BadRequestError(error.message));
+      return;
+    }
+    const site = req.params.site;
+    const serviceType = req.params.serviceType;
+    const page = parseInt(req.query.page) ?? 1;
+    const limit = parseInt(req.query.limit) ?? 10;
     try {
-      const schema2 = import_joi112.default.object({
-        site: import_joi112.default.string().hex().length(24).required(),
-        feedbackPeriod: periodField,
-        workOrderPeriod: periodField
-      });
-      const { error, value } = schema2.validate({
-        site: req.params.site,
-        ...req.query
-      });
-      if (error) {
-        const messages = error.details.map((d) => d.message).join(", ");
-        import_node_server_utils200.logger.log({ level: "error", message: messages });
-        next(new import_node_server_utils200.BadRequestError(messages));
-        return;
-      }
-      const { site, feedbackPeriod, workOrderPeriod } = value;
-      const data = await _getMAndEManagementDashboard({
-        siteId: site,
-        feedback: feedbackPeriod,
-        workOrder: workOrderPeriod
+      const data = await _getServiceTodayTaskSchedule({
+        site,
+        serviceType,
+        page,
+        limit
       });
-      res.status(200).json(data);
+      res.json(data);
       return;
-    } catch (error) {
-      import_node_server_utils200.logger.log({ level: "error", message: error.message });
-      next(error);
+    } catch (error2) {
+      import_node_server_utils200.logger.log({ level: "error", message: error2.message });
+      next(error2);
       return;
     }
   }
-  async function getLandscapeDashboard(req, res, next) {
+  async function getServiceStaffAttendance(req, res, next) {
+    const query = { ...req.query, ...req.params };
+    const validation = import_joi112.default.object({
+      site: import_joi112.default.string().hex().required(),
+      serviceType: import_joi112.default.string().valid(...Object.values(AppServiceType)).required(),
+      page: import_joi112.default.number().min(1).optional().allow("", null),
+      limit: import_joi112.default.number().min(1).optional().allow("", null)
+    });
+    const { error } = validation.validate(query);
+    if (error) {
+      import_node_server_utils200.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils200.BadRequestError(error.message));
+      return;
+    }
+    const site = req.params.site;
+    const serviceType = req.params.serviceType;
+    const page = parseInt(req.query.page) ?? 1;
+    const limit = parseInt(req.query.limit) ?? 10;
     try {
-      const schema2 = import_joi112.default.object({
-        site: import_joi112.default.string().hex().length(24).required(),
-        feedbackPeriod: periodField,
-        workOrderPeriod: periodField
-      });
-      const { error, value } = schema2.validate({
-        site: req.params.site,
-        ...req.query
-      });
-      if (error) {
-        const messages = error.details.map((d) => d.message).join(", ");
-        import_node_server_utils200.logger.log({ level: "error", message: messages });
-        next(new import_node_server_utils200.BadRequestError(messages));
-        return;
-      }
-      const { site, feedbackPeriod, workOrderPeriod } = value;
-      const data = await _getLandscapeDashboard({
-        siteId: site,
-        feedback: feedbackPeriod,
-        workOrder: workOrderPeriod
+      const data = await _getServiceStaffAttendance({
+        site,
+        serviceType,
+        page,
+        limit
       });
-      res.status(200).json(data);
+      res.json(data);
       return;
-    } catch (error) {
+    } catch (error2) {
+      import_node_server_utils200.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getServiceRecentFeedbacks(req, res, next) {
+    const query = { ...req.query, ...req.params };
+    const validation = import_joi112.default.object({
+      site: import_joi112.default.string().hex().required(),
+      serviceType: import_joi112.default.string().valid(...Object.values(AppServiceType)).required(),
+      page: import_joi112.default.number().min(1).optional().allow("", null),
+      limit: import_joi112.default.number().min(1).optional().allow("", null)
+    });
+    const { error } = validation.validate(query);
+    if (error) {
       import_node_server_utils200.logger.log({ level: "error", message: error.message });
-      next(error);
+      next(new import_node_server_utils200.BadRequestError(error.message));
+      return;
+    }
+    const site = req.params.site;
+    const serviceType = req.params.serviceType;
+    const page = parseInt(req.query.page) ?? 1;
+    const limit = parseInt(req.query.limit) ?? 10;
+    try {
+      const data = await _getServiceRecentFeedbacks({
+        site,
+        serviceType,
+        page,
+        limit
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils200.logger.log({ level: "error", message: error2.message });
+      next(error2);
       return;
     }
   }
   return {
     getSecurityDashboard,
     getPropertyManagementDashboard,
-    getPestManagementDashboard,
-    getPoolManagementDashboard,
-    getMAndEManagementDashboard,
-    getLandscapeDashboard
+    getServiceDashboard,
+    getServiceWeeklyActivity,
+    getServiceTodayTaskSchedule,
+    getServiceStaffAttendance,
+    getServiceRecentFeedbacks
   };
 }
 
 // src/models/manpower-monitoring.model.ts
 var import_joi113 = __toESM(require("joi"));
-var import_mongodb121 = require("mongodb");
+var import_mongodb122 = require("mongodb");
 var shiftSchema = import_joi113.default.object({
   name: import_joi113.default.string().required(),
   checkIn: import_joi113.default.string().optional().allow("", null),
@@ -57045,7 +57998,7 @@ var manpowerMonitoringSchema = import_joi113.default.object({
 });
 var MManpowerMonitoring = class {
   constructor(data) {
-    this._id = new import_mongodb121.ObjectId();
+    this._id = new import_mongodb122.ObjectId();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName;
@@ -57154,7 +58107,7 @@ function filterByShiftTime(attendance, shiftData, timezone, format2) {
     return checkInLocal.isBetween(shiftStart, shiftEnd, null, "[]");
   });
 }
-function paginate51(data, page, limit) {
+function paginate52(data, page, limit) {
   const length = data.length;
   const startIndex = (page - 1) * limit;
   const endIndex = startIndex + limit;
@@ -57502,7 +58455,7 @@ var hrmlabs_attendance_util_default = {
   hrmLabsAuthentication,
   fetchAttendanceData,
   filterByShiftTime,
-  paginate: paginate51,
+  paginate: paginate52,
   designationCount,
   totalCountPerShift,
   filterByStatus,
@@ -57512,7 +58465,7 @@ var hrmlabs_attendance_util_default = {
 };
 
 // src/repositories/manpower-monitoring.repo.ts
-var import_mongodb122 = require("mongodb");
+var import_mongodb123 = require("mongodb");
 var { hrmLabsAuthentication: hrmLabsAuthentication2, fetchSites: fetchSites2 } = hrmlabs_attendance_util_default;
 function useManpowerMonitoringRepo() {
   const db = import_node_server_utils201.useAtlas.getDb();
@@ -57547,11 +58500,11 @@ function useManpowerMonitoringRepo() {
     try {
       value = new MManpowerMonitoring(value);
       if (value.createdBy)
-        value.createdBy = new import_mongodb122.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb123.ObjectId(value.createdBy);
       if (value.siteId)
-        value.siteId = new import_mongodb122.ObjectId(value.siteId);
+        value.siteId = new import_mongodb123.ObjectId(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new import_mongodb122.ObjectId(value.serviceProviderId);
+        value.serviceProviderId = new import_mongodb123.ObjectId(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -57592,8 +58545,8 @@ function useManpowerMonitoringRepo() {
   }
   async function getManpowerSettingsBySiteId(_id, serviceProviderId) {
     try {
-      _id = new import_mongodb122.ObjectId(_id);
-      serviceProviderId = new import_mongodb122.ObjectId(serviceProviderId);
+      _id = new import_mongodb123.ObjectId(_id);
+      serviceProviderId = new import_mongodb123.ObjectId(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -57609,7 +58562,7 @@ function useManpowerMonitoringRepo() {
   }
   async function updateManpowerMonitoringSettings(_id, value) {
     try {
-      _id = new import_mongodb122.ObjectId(_id);
+      _id = new import_mongodb123.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils201.BadRequestError("Invalid ID format.");
     }
@@ -57636,7 +58589,7 @@ function useManpowerMonitoringRepo() {
       for (let item of value) {
         item = new MManpowerMonitoring(item);
         const data = await collection.findOne({
-          siteId: new import_mongodb122.ObjectId(item.siteId)
+          siteId: new import_mongodb123.ObjectId(item.siteId)
         });
         if (data) {
           let updateValue;
@@ -57661,11 +58614,11 @@ function useManpowerMonitoringRepo() {
           }
         } else {
           if (item.createdBy)
-            item.createdBy = new import_mongodb122.ObjectId(item.createdBy);
+            item.createdBy = new import_mongodb123.ObjectId(item.createdBy);
           if (item.siteId)
-            item.siteId = new import_mongodb122.ObjectId(item.siteId);
+            item.siteId = new import_mongodb123.ObjectId(item.siteId);
           if (item.serviceProviderId)
-            item.serviceProviderId = new import_mongodb122.ObjectId(item.serviceProviderId);
+            item.serviceProviderId = new import_mongodb123.ObjectId(item.serviceProviderId);
           const result = await collection.insertOne(item);
           if (result.insertedId) {
             results.inserted++;
@@ -57689,7 +58642,7 @@ function useManpowerMonitoringRepo() {
     const siteUrl = process.env.HRMLABS_SITE_URL;
     try {
       const serviceProvider = await serviceProviderCollection.findOne({
-        _id: new import_mongodb122.ObjectId(serviceProviderId)
+        _id: new import_mongodb123.ObjectId(serviceProviderId)
       });
       if (!serviceProvider) {
         throw new Error("Service Provider not found.");
@@ -57732,7 +58685,7 @@ var import_node_server_utils202 = require("@7365admin1/node-server-utils");
 
 // src/models/manpower-remarks.model.ts
 var import_joi114 = __toESM(require("joi"));
-var import_mongodb123 = require("mongodb");
+var import_mongodb124 = require("mongodb");
 var remarksSchema = import_joi114.default.object({
   name: import_joi114.default.string().required(),
   remark: import_joi114.default.object({
@@ -57756,7 +58709,7 @@ var manpowerRemarksSchema = import_joi114.default.object({
 });
 var MManpowerRemarks = class {
   constructor(data) {
-    this._id = new import_mongodb123.ObjectId();
+    this._id = new import_mongodb124.ObjectId();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
@@ -57774,7 +58727,7 @@ var MManpowerRemarks = class {
 };
 
 // src/repositories/manpower-remarks.repo.ts
-var import_mongodb124 = require("mongodb");
+var import_mongodb125 = require("mongodb");
 var import_moment_timezone3 = __toESM(require("moment-timezone"));
 function useManpowerRemarksRepo() {
   const db = import_node_server_utils202.useAtlas.getDb();
@@ -57808,9 +58761,9 @@ function useManpowerRemarksRepo() {
     try {
       value = new MManpowerRemarks(value);
       if (value.siteId)
-        value.siteId = new import_mongodb124.ObjectId(value.siteId);
+        value.siteId = new import_mongodb125.ObjectId(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new import_mongodb124.ObjectId(value.serviceProviderId);
+        value.serviceProviderId = new import_mongodb125.ObjectId(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -57830,7 +58783,7 @@ function useManpowerRemarksRepo() {
       limit = limit || 10;
       const searchQuery = {};
       const nowSGT = (0, import_moment_timezone3.default)().tz("Asia/Singapore");
-      searchQuery.serviceProviderId = new import_mongodb124.ObjectId(serviceProviderId);
+      searchQuery.serviceProviderId = new import_mongodb125.ObjectId(serviceProviderId);
       if (search != "") {
         searchQuery.siteName = { $regex: search, $options: "i" };
       }
@@ -57862,8 +58815,8 @@ function useManpowerRemarksRepo() {
   }
   async function getManpowerRemarksBySiteId(_id, date, serviceProviderId) {
     try {
-      _id = new import_mongodb124.ObjectId(_id);
-      serviceProviderId = new import_mongodb124.ObjectId(serviceProviderId);
+      _id = new import_mongodb125.ObjectId(_id);
+      serviceProviderId = new import_mongodb125.ObjectId(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -57880,13 +58833,13 @@ function useManpowerRemarksRepo() {
   }
   async function updateManpowerRemarks(_id, value) {
     try {
-      _id = new import_mongodb124.ObjectId(_id);
+      _id = new import_mongodb125.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils202.BadRequestError("Invalid ID format.");
     }
     try {
       if (value.createdBy) {
-        value.createdBy = new import_mongodb124.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb125.ObjectId(value.createdBy);
       }
       const updateValue = {
         ...value,
@@ -57903,7 +58856,7 @@ function useManpowerRemarksRepo() {
   }
   async function updateRemarksStatus(_id, value) {
     try {
-      _id = new import_mongodb124.ObjectId(_id);
+      _id = new import_mongodb125.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils202.BadRequestError("Invalid ID format.");
     }
@@ -58173,7 +59126,7 @@ function useManpowerMonitoringCtrl() {
 
 // src/models/manpower-designations.model.ts
 var import_joi116 = __toESM(require("joi"));
-var import_mongodb125 = require("mongodb");
+var import_mongodb126 = require("mongodb");
 var designationsSchema = import_joi116.default.object({
   title: import_joi116.default.string().required(),
   shifts: import_joi116.default.object({
@@ -58192,7 +59145,7 @@ var manpowerDesignationsSchema = import_joi116.default.object({
 });
 var MManpowerDesignations = class {
   constructor(data) {
-    this._id = new import_mongodb125.ObjectId();
+    this._id = new import_mongodb126.ObjectId();
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
     this.serviceProviderId = data.serviceProviderId || "";
@@ -58206,7 +59159,7 @@ var MManpowerDesignations = class {
 
 // src/repositories/manpower-designations.repo.ts
 var import_node_server_utils205 = require("@7365admin1/node-server-utils");
-var import_mongodb126 = require("mongodb");
+var import_mongodb127 = require("mongodb");
 function useManpowerDesignationRepo() {
   const db = import_node_server_utils205.useAtlas.getDb();
   if (!db) {
@@ -58238,11 +59191,11 @@ function useManpowerDesignationRepo() {
     try {
       value = new MManpowerDesignations(value);
       if (value.createdBy)
-        value.createdBy = new import_mongodb126.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb127.ObjectId(value.createdBy);
       if (value.siteId)
-        value.siteId = new import_mongodb126.ObjectId(value.siteId);
+        value.siteId = new import_mongodb127.ObjectId(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new import_mongodb126.ObjectId(value.serviceProviderId);
+        value.serviceProviderId = new import_mongodb127.ObjectId(value.serviceProviderId);
       const result = await collection.insertOne(value);
       return result;
     } catch (error) {
@@ -58251,8 +59204,8 @@ function useManpowerDesignationRepo() {
   }
   async function getManpowerDesignationsBySiteId(_id, serviceProviderId) {
     try {
-      _id = new import_mongodb126.ObjectId(_id);
-      serviceProviderId = new import_mongodb126.ObjectId(serviceProviderId);
+      _id = new import_mongodb127.ObjectId(_id);
+      serviceProviderId = new import_mongodb127.ObjectId(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -58268,7 +59221,7 @@ function useManpowerDesignationRepo() {
   }
   async function updateManpowerDesignations(_id, value) {
     try {
-      _id = new import_mongodb126.ObjectId(_id);
+      _id = new import_mongodb127.ObjectId(_id);
     } catch (error) {
       throw new Error("Invalid ID format.");
     }
@@ -58372,7 +59325,7 @@ function useManpowerDesignationCtrl() {
 
 // src/models/overnight-parking.model.ts
 var import_joi118 = __toESM(require("joi"));
-var import_mongodb127 = require("mongodb");
+var import_mongodb128 = require("mongodb");
 var dayScheduleSchema = import_joi118.default.object({
   isEnabled: import_joi118.default.boolean().required(),
   startTime: import_joi118.default.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().allow(null, "").messages({
@@ -58414,7 +59367,7 @@ function MOvernightParkingApprovalHours(value) {
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb127.ObjectId(value.site);
+      value.site = new import_mongodb128.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
@@ -59177,7 +60130,7 @@ var {
   hrmLabsAuthentication: hrmLabsAuthentication3,
   fetchAttendanceData: fetchAttendanceData2,
   filterByShiftTime: filterByShiftTime2,
-  paginate: paginate57,
+  paginate: paginate58,
   designationCount: designationCount2,
   totalCountPerShift: totalCountPerShift2,
   filterByStatus: filterByStatus2,
@@ -59278,7 +60231,7 @@ function useHrmLabsAttendanceSrvc() {
           status
         );
       }
-      const paginatedItems = paginate57(filteredAttendance, page, limit);
+      const paginatedItems = paginate58(filteredAttendance, page, limit);
       return {
         items: paginatedItems.items,
         pages: paginatedItems.pages,
@@ -60019,7 +60972,7 @@ function useManpowerRemarkCtrl() {
 
 // src/models/manpower-sites.model.ts
 var import_joi124 = __toESM(require("joi"));
-var import_mongodb128 = require("mongodb");
+var import_mongodb129 = require("mongodb");
 var manpowerSitesSchema = import_joi124.default.object({
   id: import_joi124.default.string().hex().required(),
   text: import_joi124.default.string().hex().optional().allow("", null),
@@ -60030,7 +60983,7 @@ var manpowerSitesSchema = import_joi124.default.object({
 });
 var MManpowerSites = class {
   constructor(data) {
-    this._id = new import_mongodb128.ObjectId();
+    this._id = new import_mongodb129.ObjectId();
     this.id = data.id || "";
     this.text = data.text || "";
     this.contractID = data.contractID || "";
@@ -60240,7 +61193,7 @@ function useManpowerSitesCtrl() {
 
 // src/utils/cron.util.ts
 var import_node_server_utils219 = require("@7365admin1/node-server-utils");
-var import_mongodb129 = require("mongodb");
+var import_mongodb130 = require("mongodb");
 var import_moment_timezone5 = __toESM(require("moment-timezone"));
 var createManpowerRemarksDaily = async () => {
   const db = import_node_server_utils219.useAtlas.getDb();
@@ -60400,7 +61353,7 @@ var updateRemarksisAcknowledged = async () => {
     for (const id of updatedIds) {
       const doc = await remarks.findOne({ _id: id });
       const setting = await settings.findOne(
-        { siteId: new import_mongodb129.ObjectId(doc?.siteId) },
+        { siteId: new import_mongodb130.ObjectId(doc?.siteId) },
         { projection: { emails: 1 } }
       );
       const payload = {
@@ -60486,7 +61439,7 @@ var updateRemarksStatusEod = async () => {
   for (const doc of docs) {
     let shiftsToCheck = [];
     const endShiftTime = await settings.findOne(
-      { siteId: new import_mongodb129.ObjectId(doc.siteId) },
+      { siteId: new import_mongodb130.ObjectId(doc.siteId) },
       { projection: { shifts: 1, shiftType: 1 } }
     );
     if (doc.createdAtSGT === nowSGT) {
@@ -60592,7 +61545,7 @@ var isWithinHour = (alertTime, timeNow) => {
 
 // src/events/manpower.event.ts
 var import_node_server_utils220 = require("@7365admin1/node-server-utils");
-var import_mongodb130 = require("mongodb");
+var import_mongodb131 = require("mongodb");
 var import_moment_timezone6 = __toESM(require("moment-timezone"));
 async function manpowerEvents(io) {
   let intervalId = null;
@@ -60618,7 +61571,7 @@ async function manpowerEvents(io) {
     }).toArray();
     for (const doc of docs) {
       const siteSettings = await settings.findOne(
-        { siteId: new import_mongodb130.ObjectId(doc.siteId), enabled: true },
+        { siteId: new import_mongodb131.ObjectId(doc.siteId), enabled: true },
         { projection: { shifts: 1, shiftType: 1 } }
       );
       const shiftType = siteSettings?.shiftType || "2-shifts";
@@ -60737,11 +61690,11 @@ function genericSignature(params, secretKey) {
 }
 
 // src/repositories/reddot-payment.repository.ts
-var import_mongodb132 = require("mongodb");
+var import_mongodb133 = require("mongodb");
 
 // src/models/billing-payments.model.ts
 var import_node_server_utils221 = require("@7365admin1/node-server-utils");
-var import_mongodb131 = require("mongodb");
+var import_mongodb132 = require("mongodb");
 var import_joi126 = __toESM(require("joi"));
 var schemaBillingItems = import_joi126.default.object({
   _id: import_joi126.default.string().hex().optional(),
@@ -60775,21 +61728,21 @@ function MBillingItems(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb131.ObjectId(value._id);
+      value._id = new import_mongodb132.ObjectId(value._id);
     } catch {
       throw new import_node_server_utils221.BadRequestError("Invalid _id format");
     }
   }
   if (value.unitId && typeof value.unitId === "string") {
     try {
-      value.unitId = new import_mongodb131.ObjectId(value.unitId);
+      value.unitId = new import_mongodb132.ObjectId(value.unitId);
     } catch {
       throw new import_node_server_utils221.BadRequestError("Invalid unitId id format");
     }
   }
   if (value.paidBy && typeof value.paidBy === "string") {
     try {
-      value.paidBy = new import_mongodb131.ObjectId(value.paidBy);
+      value.paidBy = new import_mongodb132.ObjectId(value.paidBy);
     } catch {
       throw new import_node_server_utils221.BadRequestError("Invalid paidBy id format");
     }
@@ -60799,7 +61752,7 @@ function MBillingItems(value) {
       value.unitBillingItems = value.unitBillingItems.map((unitBillingItem) => {
         if (typeof unitBillingItem._id === "string") {
           try {
-            unitBillingItem._id = new import_mongodb131.ObjectId(unitBillingItem._id);
+            unitBillingItem._id = new import_mongodb132.ObjectId(unitBillingItem._id);
           } catch {
             throw new import_node_server_utils221.BadRequestError("Invalid unit billing id format");
           }
@@ -60811,7 +61764,7 @@ function MBillingItems(value) {
     }
   }
   return {
-    _id: value._id ?? new import_mongodb131.ObjectId(),
+    _id: value._id ?? new import_mongodb132.ObjectId(),
     unitBillingItems: value.unitBillingItems ?? [],
     unitId: value.unitId ?? "",
     unitOwner: value.unitOwner ?? "",
@@ -60879,7 +61832,7 @@ var useRedDotPaymentRepo = () => {
         const res = await paymentCollection().insertOne(payload, { session });
         const unit = payload.unitId?.toString().slice(-4);
         const dateFormatted = formatDateString(/* @__PURE__ */ new Date());
-        const newId = new import_mongodb132.ObjectId(res.insertedId).toString().slice(-6);
+        const newId = new import_mongodb133.ObjectId(res.insertedId).toString().slice(-6);
         const referenceNumber = `${unit}${newId}${dateFormatted}`;
         await paymentCollection().updateOne(
           { _id: res.insertedId },
@@ -61979,7 +62932,7 @@ var import_node_server_utils228 = require("@7365admin1/node-server-utils");
 var import_uuid2 = require("uuid");
 
 // src/repositories/user-v2.repo.ts
-var import_mongodb133 = require("mongodb");
+var import_mongodb134 = require("mongodb");
 var import_node_server_utils227 = require("@7365admin1/node-server-utils");
 function useUserRepoV2() {
   const { updateFeedbackCreatedByName } = useFeedbackRepo();
@@ -62180,7 +63133,7 @@ function useUserRepoV2() {
     }
     if (organization) {
       try {
-        query.defaultOrg = new import_mongodb133.ObjectId(organization);
+        query.defaultOrg = new import_mongodb134.ObjectId(organization);
         cacheOptions.organization = organization.toString();
       } catch (error) {
         throw new import_node_server_utils227.BadRequestError("Invalid organization ID format.");
@@ -62319,13 +63272,13 @@ function useUserRepoV2() {
       );
     }
     try {
-      _id = new import_mongodb133.ObjectId(_id);
+      _id = new import_mongodb134.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils227.BadRequestError("Invalid ID.");
     }
     if (field === "defaultOrg") {
       try {
-        value = new import_mongodb133.ObjectId(value);
+        value = new import_mongodb134.ObjectId(value);
       } catch (error) {
         throw new import_node_server_utils227.BadRequestError("Invalid organization ID.");
       }
@@ -62366,7 +63319,7 @@ function useUserRepoV2() {
     year
   }, session) {
     try {
-      _id = new import_mongodb133.ObjectId(_id);
+      _id = new import_mongodb134.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils227.BadRequestError("Invalid user ID format.");
     }
@@ -62396,7 +63349,7 @@ function useUserRepoV2() {
   }
   async function updatePassword({ _id, password }, session) {
     try {
-      _id = new import_mongodb133.ObjectId(_id);
+      _id = new import_mongodb134.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils227.BadRequestError("Invalid user ID format.");
     }
@@ -63151,38 +64104,38 @@ function useUserControllerV2() {
 
 // src/models/role-v2.model.ts
 var import_node_server_utils232 = require("@7365admin1/node-server-utils");
-var import_mongodb134 = require("mongodb");
+var import_mongodb135 = require("mongodb");
 var MRoleV2 = class {
   constructor(value) {
     if (typeof value._id === "string") {
       try {
-        value._id = new import_mongodb134.ObjectId(value._id);
+        value._id = new import_mongodb135.ObjectId(value._id);
       } catch (error) {
         throw new import_node_server_utils232.BadRequestError("Invalid role-v2 ID format.");
       }
     }
     if (typeof value.site === "string" && value.site.length === 24) {
       try {
-        value.site = new import_mongodb134.ObjectId(value.site);
+        value.site = new import_mongodb135.ObjectId(value.site);
       } catch (error) {
         throw new import_node_server_utils232.BadRequestError("Invalid site ID format.");
       }
     }
     if (typeof value.org === "string" && value.org.length === 24) {
       try {
-        value.org = new import_mongodb134.ObjectId(value.org);
+        value.org = new import_mongodb135.ObjectId(value.org);
       } catch (error) {
         throw new import_node_server_utils232.BadRequestError("Invalid org ID format.");
       }
     }
     if (value.createdBy) {
       try {
-        value.createdBy = new import_mongodb134.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb135.ObjectId(value.createdBy);
       } catch (error) {
         throw new import_node_server_utils232.BadRequestError("Invalid created by ID format.");
       }
     }
-    this._id = value._id ?? new import_mongodb134.ObjectId();
+    this._id = value._id ?? new import_mongodb135.ObjectId();
     this.name = value.name ?? "";
     this.permissions = value.permissions ?? [];
     this.site = value.site ?? "";
@@ -63317,7 +64270,7 @@ function useRoleControllerV2() {
 
 // src/models/post-preloved.model.ts
 var import_joi133 = __toESM(require("joi"));
-var import_mongodb135 = require("mongodb");
+var import_mongodb136 = require("mongodb");
 var PostStatus = /* @__PURE__ */ ((PostStatus2) => {
   PostStatus2["PUBLISHED"] = "published";
   PostStatus2["RESERVED"] = "reserved";
@@ -63373,28 +64326,28 @@ function MPost(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb135.ObjectId(value._id);
+      value._id = new import_mongodb136.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb135.ObjectId(value.site);
+      value.site = new import_mongodb136.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new import_mongodb135.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb136.ObjectId(value.createdBy);
     } catch {
       throw new Error("Invalid createdBy ID.");
     }
   }
   if (value.reserverId && typeof value.reserverId === "string") {
     try {
-      value.reserverId = new import_mongodb135.ObjectId(value.reserverId);
+      value.reserverId = new import_mongodb136.ObjectId(value.reserverId);
     } catch {
       throw new Error("Invalid reserver ID.");
     }
@@ -63403,7 +64356,7 @@ function MPost(value) {
     value.attachments = value.attachments.map((id) => {
       if (typeof id === "string") {
         try {
-          return new import_mongodb135.ObjectId(id);
+          return new import_mongodb136.ObjectId(id);
         } catch {
           throw new Error("Invalid attachment ID.");
         }
@@ -63413,20 +64366,20 @@ function MPost(value) {
   }
   if (value.category && typeof value.category === "string") {
     try {
-      value.category = new import_mongodb135.ObjectId(value.category);
+      value.category = new import_mongodb136.ObjectId(value.category);
     } catch {
       throw new Error("Invalid category ID.");
     }
   }
   if (value.subcategory && typeof value.subcategory === "string") {
     try {
-      value.subcategory = new import_mongodb135.ObjectId(value.subcategory);
+      value.subcategory = new import_mongodb136.ObjectId(value.subcategory);
     } catch {
       throw new Error("Invalid subcategory ID.");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb135.ObjectId(),
+    _id: value._id ?? new import_mongodb136.ObjectId(),
     title: value.title ?? "",
     description: value.description ?? "",
     attachments: value.attachments ?? [],
@@ -63446,7 +64399,7 @@ function MPost(value) {
 
 // src/repositories/post-preloved.repo.ts
 var import_node_server_utils235 = require("@7365admin1/node-server-utils");
-var import_mongodb136 = require("mongodb");
+var import_mongodb137 = require("mongodb");
 function usePostPrelovedRepo() {
   const db = import_node_server_utils235.useAtlas.getDb();
   if (!db) {
@@ -63510,14 +64463,14 @@ function usePostPrelovedRepo() {
   }
   async function getById(_id, userId) {
     try {
-      _id = new import_mongodb136.ObjectId(_id);
+      _id = new import_mongodb137.ObjectId(_id);
     } catch {
       throw new import_node_server_utils235.BadRequestError("Invalid post ID format.");
     }
     let userObjectId = null;
     if (userId) {
       try {
-        userObjectId = new import_mongodb136.ObjectId(userId);
+        userObjectId = new import_mongodb137.ObjectId(userId);
       } catch {
         throw new import_node_server_utils235.BadRequestError("Invalid user ID format.");
       }
@@ -63587,7 +64540,7 @@ function usePostPrelovedRepo() {
     page = page > 0 ? page - 1 : 0;
     if (site) {
       try {
-        site = new import_mongodb136.ObjectId(site);
+        site = new import_mongodb137.ObjectId(site);
       } catch {
         throw new import_node_server_utils235.BadRequestError("Invalid site ID format.");
       }
@@ -63596,14 +64549,14 @@ function usePostPrelovedRepo() {
     let subcategoryIds = null;
     if (category && subcategory) {
       try {
-        categoryId = new import_mongodb136.ObjectId(category);
+        categoryId = new import_mongodb137.ObjectId(category);
       } catch {
         throw new import_node_server_utils235.BadRequestError("Invalid category ID format.");
       }
       if (subcategory.length > 0) {
         subcategoryIds = subcategory.map((id) => {
           try {
-            return new import_mongodb136.ObjectId(id);
+            return new import_mongodb137.ObjectId(id);
           } catch {
             throw new import_node_server_utils235.BadRequestError("Invalid subcategory ID format.");
           }
@@ -63628,7 +64581,7 @@ function usePostPrelovedRepo() {
     let userObjectId = null;
     if (userId) {
       try {
-        userObjectId = new import_mongodb136.ObjectId(userId);
+        userObjectId = new import_mongodb137.ObjectId(userId);
       } catch {
         throw new import_node_server_utils235.BadRequestError("Invalid user ID format.");
       }
@@ -63677,7 +64630,7 @@ function usePostPrelovedRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new import_mongodb136.ObjectId(_id);
+      _id = new import_mongodb137.ObjectId(_id);
     } catch {
       throw new import_node_server_utils235.BadRequestError("Invalid post ID format.");
     }
@@ -63698,7 +64651,7 @@ function usePostPrelovedRepo() {
   }
   async function deleteById(_id, session) {
     try {
-      _id = new import_mongodb136.ObjectId(_id);
+      _id = new import_mongodb137.ObjectId(_id);
     } catch {
       throw new import_node_server_utils235.BadRequestError("Invalid post ID format.");
     }
@@ -63724,7 +64677,7 @@ function usePostPrelovedRepo() {
   }
   async function updateStatus(_id, status, session) {
     try {
-      _id = new import_mongodb136.ObjectId(_id);
+      _id = new import_mongodb137.ObjectId(_id);
     } catch {
       throw new import_node_server_utils235.BadRequestError("Invalid post ID format.");
     }
@@ -63760,11 +64713,11 @@ var import_node_server_utils237 = require("@7365admin1/node-server-utils");
 
 // src/repositories/post-favorite.repo.ts
 var import_node_server_utils236 = require("@7365admin1/node-server-utils");
-var import_mongodb138 = require("mongodb");
+var import_mongodb139 = require("mongodb");
 
 // src/models/post-favorite.model.ts
 var import_joi134 = __toESM(require("joi"));
-var import_mongodb137 = require("mongodb");
+var import_mongodb138 = require("mongodb");
 var schemaUpdatePostFavorite = import_joi134.default.object({
   userId: import_joi134.default.string().hex().length(24).required()
 });
@@ -63782,14 +64735,14 @@ function MPostFavorite(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb137.ObjectId(value._id);
+      value._id = new import_mongodb138.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.postId && typeof value.postId === "string") {
     try {
-      value.postId = new import_mongodb137.ObjectId(value.postId);
+      value.postId = new import_mongodb138.ObjectId(value.postId);
     } catch {
       throw new Error("Invalid post ID.");
     }
@@ -63798,7 +64751,7 @@ function MPostFavorite(value) {
     value.userIds = value.userIds.map((id) => {
       if (typeof id === "string") {
         try {
-          return new import_mongodb137.ObjectId(id);
+          return new import_mongodb138.ObjectId(id);
         } catch {
           throw new Error("Invalid user ID.");
         }
@@ -63807,7 +64760,7 @@ function MPostFavorite(value) {
     });
   }
   return {
-    _id: value._id ?? new import_mongodb137.ObjectId(),
+    _id: value._id ?? new import_mongodb138.ObjectId(),
     postId: value.postId ?? "",
     userIds: value.userIds ?? [],
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
@@ -63837,7 +64790,7 @@ function usePostFavoriteRepo() {
   }
   async function getById(_id) {
     try {
-      _id = new import_mongodb138.ObjectId(_id);
+      _id = new import_mongodb139.ObjectId(_id);
     } catch {
       throw new import_node_server_utils236.BadRequestError("Invalid favorite ID format.");
     }
@@ -63848,7 +64801,7 @@ function usePostFavoriteRepo() {
   }
   async function getByPostId(postId) {
     try {
-      postId = new import_mongodb138.ObjectId(postId);
+      postId = new import_mongodb139.ObjectId(postId);
     } catch {
       throw new import_node_server_utils236.BadRequestError("Invalid post ID format.");
     }
@@ -63859,13 +64812,13 @@ function usePostFavoriteRepo() {
   }
   async function updateById(_id, userId, session) {
     try {
-      _id = new import_mongodb138.ObjectId(_id);
+      _id = new import_mongodb139.ObjectId(_id);
     } catch {
       throw new import_node_server_utils236.BadRequestError("Invalid favorite ID format.");
     }
     let userObjectId;
     try {
-      userObjectId = new import_mongodb138.ObjectId(userId);
+      userObjectId = new import_mongodb139.ObjectId(userId);
     } catch {
       throw new import_node_server_utils236.BadRequestError("Invalid user ID format.");
     }
@@ -63896,7 +64849,7 @@ function usePostFavoriteRepo() {
 }
 
 // src/services/post-preloved.service.ts
-var import_mongodb139 = require("mongodb");
+var import_mongodb140 = require("mongodb");
 function usePostFavoriteService() {
   const { add: _addPost } = usePostPrelovedRepo();
   const { addFavorite: _addFavorite } = usePostFavoriteRepo();
@@ -63914,7 +64867,7 @@ function usePostFavoriteService() {
       let siteId = value.site;
       let postId = post.toString();
       if (value.site) {
-        siteId = new import_mongodb139.ObjectId(value.site);
+        siteId = new import_mongodb140.ObjectId(value.site);
       }
       if (post) {
         postId = post.toString();
@@ -64273,7 +65226,7 @@ function usePostFavoriteController() {
 
 // src/models/category-preloved.model.ts
 var import_joi137 = __toESM(require("joi"));
-var import_mongodb140 = require("mongodb");
+var import_mongodb141 = require("mongodb");
 var schemaCategoryPreloved = import_joi137.default.object({
   name: import_joi137.default.string().required(),
   createdBy: import_joi137.default.string().hex().optional().allow("", null),
@@ -64290,14 +65243,14 @@ function MCategoryPreloved(value) {
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new import_mongodb140.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb141.ObjectId(value.createdBy);
     } catch {
       throw new Error("Invalid createdBy ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb140.ObjectId(value.site);
+      value.site = new import_mongodb141.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
@@ -64313,7 +65266,7 @@ function MCategoryPreloved(value) {
 
 // src/repositories/category-preloved.repo.ts
 var import_node_server_utils241 = require("@7365admin1/node-server-utils");
-var import_mongodb141 = require("mongodb");
+var import_mongodb142 = require("mongodb");
 function useCategoryPrelovedRepo() {
   const db = import_node_server_utils241.useAtlas.getDb();
   if (!db) {
@@ -64327,7 +65280,7 @@ function useCategoryPrelovedRepo() {
   } = {}) {
     if (site) {
       try {
-        site = new import_mongodb141.ObjectId(site);
+        site = new import_mongodb142.ObjectId(site);
       } catch {
         throw new import_node_server_utils241.BadRequestError("Invalid site ID format.");
       }
@@ -64346,7 +65299,7 @@ function useCategoryPrelovedRepo() {
   async function getById(_id) {
     let objectId2;
     try {
-      objectId2 = new import_mongodb141.ObjectId(_id);
+      objectId2 = new import_mongodb142.ObjectId(_id);
     } catch {
       throw new import_node_server_utils241.BadRequestError("Invalid category-preloved ID format.");
     }
@@ -64376,7 +65329,7 @@ function useCategoryPrelovedRepo() {
   async function updateById(_id, value) {
     let objectId2;
     try {
-      objectId2 = new import_mongodb141.ObjectId(_id);
+      objectId2 = new import_mongodb142.ObjectId(_id);
     } catch {
       throw new import_node_server_utils241.BadRequestError("Invalid category ID format.");
     }
@@ -64394,7 +65347,7 @@ function useCategoryPrelovedRepo() {
   async function deleteById(_id) {
     let objectId2;
     try {
-      objectId2 = new import_mongodb141.ObjectId(_id);
+      objectId2 = new import_mongodb142.ObjectId(_id);
     } catch {
       throw new import_node_server_utils241.BadRequestError("Invalid category ID format.");
     }
@@ -64515,7 +65468,7 @@ function useCategoryPrelovedController() {
 
 // src/models/subcategory-preloved.model.ts
 var import_joi139 = __toESM(require("joi"));
-var import_mongodb142 = require("mongodb");
+var import_mongodb143 = require("mongodb");
 var schemaSubcategoryPreloved = import_joi139.default.object({
   name: import_joi139.default.string().required(),
   createdBy: import_joi139.default.string().hex().optional().allow("", null),
@@ -64534,21 +65487,21 @@ function MSubcategoryPreloved(value) {
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new import_mongodb142.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb143.ObjectId(value.createdBy);
     } catch {
       throw new Error("Invalid createdBy ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb142.ObjectId(value.site);
+      value.site = new import_mongodb143.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.category_id && typeof value.category_id === "string") {
     try {
-      value.category_id = new import_mongodb142.ObjectId(value.category_id);
+      value.category_id = new import_mongodb143.ObjectId(value.category_id);
     } catch {
       throw new Error("Invalid category ID.");
     }
@@ -64565,7 +65518,7 @@ function MSubcategoryPreloved(value) {
 
 // src/repositories/subcategory-preloved.repo.ts
 var import_node_server_utils243 = require("@7365admin1/node-server-utils");
-var import_mongodb143 = require("mongodb");
+var import_mongodb144 = require("mongodb");
 function useSubcategoryPrelovedRepo() {
   const db = import_node_server_utils243.useAtlas.getDb();
   if (!db) {
@@ -64580,14 +65533,14 @@ function useSubcategoryPrelovedRepo() {
   } = {}) {
     if (site) {
       try {
-        site = new import_mongodb143.ObjectId(site);
+        site = new import_mongodb144.ObjectId(site);
       } catch {
         throw new import_node_server_utils243.BadRequestError("Invalid site ID format.");
       }
     }
     if (category_id) {
       try {
-        category_id = new import_mongodb143.ObjectId(category_id);
+        category_id = new import_mongodb144.ObjectId(category_id);
       } catch {
         throw new import_node_server_utils243.BadRequestError("Invalid category ID format.");
       }
@@ -64606,7 +65559,7 @@ function useSubcategoryPrelovedRepo() {
   async function getById(_id) {
     let objectId2;
     try {
-      objectId2 = new import_mongodb143.ObjectId(_id);
+      objectId2 = new import_mongodb144.ObjectId(_id);
     } catch {
       throw new import_node_server_utils243.BadRequestError("Invalid subcategory-preloved ID format.");
     }
@@ -64635,20 +65588,20 @@ function useSubcategoryPrelovedRepo() {
   async function updateById(_id, value, session) {
     let objectId2;
     try {
-      objectId2 = new import_mongodb143.ObjectId(_id);
+      objectId2 = new import_mongodb144.ObjectId(_id);
     } catch {
       throw new import_node_server_utils243.BadRequestError("Invalid subcategory ID format.");
     }
     if (value.category_id && typeof value.category_id === "string") {
       try {
-        value.category_id = new import_mongodb143.ObjectId(value.category_id);
+        value.category_id = new import_mongodb144.ObjectId(value.category_id);
       } catch {
         throw new import_node_server_utils243.BadRequestError("Invalid category ID format.");
       }
     }
     if (value.site && typeof value.site === "string") {
       try {
-        value.site = new import_mongodb143.ObjectId(value.site);
+        value.site = new import_mongodb144.ObjectId(value.site);
       } catch {
         throw new import_node_server_utils243.BadRequestError("Invalid site ID format.");
       }
@@ -64666,7 +65619,7 @@ function useSubcategoryPrelovedRepo() {
   async function deleteById(_id, session) {
     let objectId2;
     try {
-      objectId2 = new import_mongodb143.ObjectId(_id);
+      objectId2 = new import_mongodb144.ObjectId(_id);
     } catch {
       throw new import_node_server_utils243.BadRequestError("Invalid subcategory ID format.");
     }
@@ -64798,7 +65751,7 @@ function useSubcategoryPrelovedController() {
 
 // src/models/chat-preloved.model.ts
 var import_joi141 = __toESM(require("joi"));
-var import_mongodb144 = require("mongodb");
+var import_mongodb145 = require("mongodb");
 var schemaMessage = import_joi141.default.object({
   text: import_joi141.default.string().required(),
   date: import_joi141.default.date().optional().allow(null),
@@ -64829,7 +65782,7 @@ var schemaChatPreloved = import_joi141.default.object({
 function toObjectId21(value, label) {
   if (typeof value === "string") {
     try {
-      return new import_mongodb144.ObjectId(value);
+      return new import_mongodb145.ObjectId(value);
     } catch {
       throw new Error(`Invalid ${label}.`);
     }
@@ -64861,7 +65814,7 @@ function MChatPreloved(value) {
     value.attachments = value.attachments.map((id) => toObjectId21(id, "attachment ID"));
   }
   return {
-    _id: new import_mongodb144.ObjectId(),
+    _id: new import_mongodb145.ObjectId(),
     channelId: value.channelId ?? "",
     senderId: value.senderId ?? "",
     postId: value.postId ?? null,
@@ -64885,7 +65838,7 @@ function MChatPreloved(value) {
 
 // src/repositories/chat-preloved.repo.ts
 var import_node_server_utils245 = require("@7365admin1/node-server-utils");
-var import_mongodb145 = require("mongodb");
+var import_mongodb146 = require("mongodb");
 function useChatPrelovedRepo() {
   const db = import_node_server_utils245.useAtlas.getDb();
   if (!db)
@@ -64904,7 +65857,7 @@ function useChatPrelovedRepo() {
   async function updateById(_id, value) {
     let objectId2;
     try {
-      objectId2 = new import_mongodb145.ObjectId(_id);
+      objectId2 = new import_mongodb146.ObjectId(_id);
     } catch {
       throw new import_node_server_utils245.BadRequestError("Invalid chat ID format.");
     }
@@ -64921,7 +65874,7 @@ function useChatPrelovedRepo() {
   async function deleteById(_id) {
     let objectId2;
     try {
-      objectId2 = new import_mongodb145.ObjectId(_id);
+      objectId2 = new import_mongodb146.ObjectId(_id);
     } catch {
       throw new import_node_server_utils245.BadRequestError("Invalid chat ID format.");
     }
@@ -64940,79 +65893,28 @@ function useChatPrelovedRepo() {
 }
 
 // src/controllers/chat-preloved.controller.ts
+var import_node_server_utils248 = require("@7365admin1/node-server-utils");
+var import_joi143 = __toESM(require("joi"));
+
+// src/services/chat-preloved.service.ts
+var import_node_server_utils247 = require("@7365admin1/node-server-utils");
+
+// src/repositories/channel-preloved.repo.ts
 var import_node_server_utils246 = require("@7365admin1/node-server-utils");
-var import_joi142 = __toESM(require("joi"));
-function useChatPrelovedController() {
-  const { add: _add, updateById: _updateById, deleteById: _deleteById } = useChatPrelovedRepo();
-  async function add(req, res, next) {
-    const { error, value } = schemaChatPreloved.validate(req.body, {
-      abortEarly: false
-    });
-    if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils246.logger.log({ level: "error", message: messages });
-      next(new import_node_server_utils246.BadRequestError(messages));
-      return;
-    }
-    try {
-      const data = await _add(value);
-      res.status(201).json(data);
-    } catch (error2) {
-      import_node_server_utils246.logger.log({ level: "error", message: error2.message });
-      next(error2);
-    }
-  }
-  async function updateById(req, res, next) {
-    const { error, value } = schemaUpdateChatPreloved.validate(req.body, {
-      abortEarly: false
-    });
-    if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils246.logger.log({ level: "error", message: messages });
-      next(new import_node_server_utils246.BadRequestError(messages));
-      return;
-    }
-    try {
-      const data = await _updateById(req.params.id, value);
-      res.status(200).json(data);
-    } catch (error2) {
-      import_node_server_utils246.logger.log({ level: "error", message: error2.message });
-      next(error2);
-    }
-  }
-  async function deleteById(req, res, next) {
-    const schema2 = import_joi142.default.object({
-      _id: import_joi142.default.string().hex().length(24).required()
-    });
-    const { error, value } = schema2.validate({ _id: req.params.id });
-    if (error) {
-      import_node_server_utils246.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils246.BadRequestError(error.message));
-      return;
-    }
-    try {
-      const data = await _deleteById(value._id);
-      res.status(200).json(data);
-    } catch (error2) {
-      import_node_server_utils246.logger.log({ level: "error", message: error2.message });
-      next(error2);
-    }
-  }
-  return { add, updateById, deleteById };
-}
+var import_mongodb148 = require("mongodb");
 
 // src/models/channel-preloved.model.ts
-var import_joi143 = __toESM(require("joi"));
-var import_mongodb146 = require("mongodb");
-var schemaChannelPreloved = import_joi143.default.object({
-  receiverId: import_joi143.default.string().hex().length(24).required(),
-  senderId: import_joi143.default.string().hex().length(24).required(),
-  postId: import_joi143.default.string().hex().length(24).required()
+var import_joi142 = __toESM(require("joi"));
+var import_mongodb147 = require("mongodb");
+var schemaChannelPreloved = import_joi142.default.object({
+  receiverId: import_joi142.default.string().hex().length(24).required(),
+  senderId: import_joi142.default.string().hex().length(24).required(),
+  postId: import_joi142.default.string().hex().length(24).required()
 });
 function toObjectId22(value, label) {
   if (typeof value === "string") {
     try {
-      return new import_mongodb146.ObjectId(value);
+      return new import_mongodb147.ObjectId(value);
     } catch {
       throw new Error(`Invalid ${label}.`);
     }
@@ -65030,7 +65932,7 @@ function MChannelPreloved(value) {
   if (value.postId)
     value.postId = toObjectId22(value.postId, "post ID");
   return {
-    _id: new import_mongodb146.ObjectId(),
+    _id: new import_mongodb147.ObjectId(),
     name: `seven365-${(/* @__PURE__ */ new Date()).getTime()}`,
     receiverId: value.receiverId,
     senderId: value.senderId,
@@ -65041,12 +65943,12 @@ function MChannelPreloved(value) {
 }
 
 // src/repositories/channel-preloved.repo.ts
-var import_node_server_utils247 = require("@7365admin1/node-server-utils");
 function useChannelPrelovedRepo() {
-  const db = import_node_server_utils247.useAtlas.getDb();
+  const db = import_node_server_utils246.useAtlas.getDb();
   if (!db)
-    throw new import_node_server_utils247.InternalServerError("Unable to connect to server.");
+    throw new import_node_server_utils246.InternalServerError("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 {
@@ -65057,15 +65959,151 @@ function useChannelPrelovedRepo() {
       throw error;
     }
   }
+  async function getByParticipants(senderId, receiverId, postId, session) {
+    const query = {
+      senderId: new import_mongodb148.ObjectId(senderId),
+      receiverId: new import_mongodb148.ObjectId(receiverId),
+      postId: new import_mongodb148.ObjectId(postId)
+    };
+    return collection.findOne(query, { session });
+  }
+  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 import_mongodb148.ObjectId(channelId),
+      deletedAt: null
+    };
+    if (isLoadMore && lastMessageId) {
+      matchCriteria._id = { $lt: new import_mongodb148.ObjectId(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 (0, import_node_server_utils246.paginate)(items, normalizedPage, normalizedLimit, totalCount);
+    } catch (error) {
+      throw error;
+    }
+  }
+  return { add, getByParticipants, getChannelMessages };
+}
+
+// src/services/chat-preloved.service.ts
+function useChatPrelovedService() {
+  const { add: _addChat } = useChatPrelovedRepo();
+  const { add: _addChannel, getByParticipants: _getByParticipants } = useChannelPrelovedRepo();
+  async function add(value) {
+    const client = import_node_server_utils247.useAtlas.getClient();
+    if (!client)
+      throw new import_node_server_utils247.InternalServerError("Unable to connect to server.");
+    const session = client.startSession();
+    session.startTransaction();
+    try {
+      let channelId = value.channelId;
+      if (!channelId) {
+        if (!value.postId) {
+          throw new import_node_server_utils247.BadRequestError("postId is required when creating a new channel.");
+        }
+        const existing = await _getByParticipants(
+          value.senderId,
+          value.receiverId,
+          value.postId,
+          session
+        );
+        if (existing) {
+          channelId = existing._id.toString();
+        } else {
+          const newChannelId = await _addChannel(
+            {
+              receiverId: value.receiverId,
+              senderId: value.senderId,
+              postId: value.postId
+            },
+            session
+          );
+          channelId = newChannelId.toString();
+        }
+      }
+      const { receiverId, ...chatPayload } = value;
+      const insertedId = await _addChat({ ...chatPayload, channelId }, session);
+      await session.commitTransaction();
+      return { insertedId, channelId };
+    } catch (error) {
+      await session.abortTransaction();
+      throw error;
+    } finally {
+      session.endSession();
+    }
+  }
   return { add };
 }
 
-// src/controllers/channel-preloved.controller.ts
-var import_node_server_utils248 = require("@7365admin1/node-server-utils");
-function useChannelPrelovedController() {
-  const { add: _add } = useChannelPrelovedRepo();
+// src/controllers/chat-preloved.controller.ts
+function useChatPrelovedController() {
+  const { add: _add } = useChatPrelovedService();
+  const { updateById: _updateById, deleteById: _deleteById } = useChatPrelovedRepo();
   async function add(req, res, next) {
-    const { error, value } = schemaChannelPreloved.validate(req.body, {
+    const { error, value } = schemaChatPreloved.validate(req.body, {
       abortEarly: false
     });
     if (error) {
@@ -65082,61 +66120,163 @@ function useChannelPrelovedController() {
       next(error2);
     }
   }
-  return { add };
+  async function updateById(req, res, next) {
+    const { error, value } = schemaUpdateChatPreloved.validate(req.body, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils248.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils248.BadRequestError(messages));
+      return;
+    }
+    try {
+      const data = await _updateById(req.params.id, value);
+      res.status(200).json(data);
+    } catch (error2) {
+      import_node_server_utils248.logger.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
+  async function deleteById(req, res, next) {
+    const schema2 = import_joi143.default.object({
+      _id: import_joi143.default.string().hex().length(24).required()
+    });
+    const { error, value } = schema2.validate({ _id: req.params.id });
+    if (error) {
+      import_node_server_utils248.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils248.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _deleteById(value._id);
+      res.status(200).json(data);
+    } catch (error2) {
+      import_node_server_utils248.logger.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
+  return { add, updateById, deleteById };
 }
 
-// src/models/online-forms-v2.model.ts
+// src/controllers/channel-preloved.controller.ts
+var import_node_server_utils249 = require("@7365admin1/node-server-utils");
 var import_joi144 = __toESM(require("joi"));
-var import_mongodb147 = require("mongodb");
+function useChannelPrelovedController() {
+  const { add: _add, getChannelMessages: _getChannelMessages } = useChannelPrelovedRepo();
+  async function add(req, res, next) {
+    const { error, value } = schemaChannelPreloved.validate(req.body, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils249.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils249.BadRequestError(messages));
+      return;
+    }
+    try {
+      const data = await _add(value);
+      res.status(201).json(data);
+    } catch (error2) {
+      import_node_server_utils249.logger.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
+  async function getChannelMessages(req, res, next) {
+    const paramsSchema = import_joi144.default.object({
+      id: import_joi144.default.string().hex().length(24).required()
+    });
+    const querySchema = import_joi144.default.object({
+      page: import_joi144.default.number().integer().min(1).default(1),
+      limit: import_joi144.default.number().integer().min(1).max(100).default(10),
+      isLoadMore: import_joi144.default.boolean().default(false),
+      lastMessageId: import_joi144.default.string().hex().length(24).optional().allow("", null)
+    });
+    const { error: paramError, value: params } = paramsSchema.validate(
+      req.params
+    );
+    if (paramError) {
+      import_node_server_utils249.logger.log({ level: "error", message: paramError.message });
+      next(new import_node_server_utils249.BadRequestError(paramError.message));
+      return;
+    }
+    const { error: queryError, value: query } = querySchema.validate(
+      req.query
+    );
+    if (queryError) {
+      import_node_server_utils249.logger.log({ level: "error", message: queryError.message });
+      next(new import_node_server_utils249.BadRequestError(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) {
+      import_node_server_utils249.logger.log({ level: "error", message: error.message });
+      next(error);
+    }
+  }
+  return { add, getChannelMessages };
+}
+
+// src/models/online-forms-v2.model.ts
+var import_joi145 = __toESM(require("joi"));
+var import_mongodb149 = require("mongodb");
 var FormEntryStatus = /* @__PURE__ */ ((FormEntryStatus2) => {
   FormEntryStatus2["ACTIVE"] = "active";
   FormEntryStatus2["INACTIVE"] = "inactive";
   FormEntryStatus2["DELETED"] = "deleted";
   return FormEntryStatus2;
 })(FormEntryStatus || {});
-var schemaFormEntry = import_joi144.default.object({
-  _id: import_joi144.default.string().hex().optional().allow("", null),
-  formType: import_joi144.default.string().required(),
-  block: import_joi144.default.string().optional().allow(null, ""),
-  level: import_joi144.default.string().optional().allow(null, ""),
-  unit: import_joi144.default.string().optional().allow(null, ""),
-  name: import_joi144.default.string().optional().allow(null, ""),
-  phoneNumber: import_joi144.default.string().optional().allow(null, ""),
-  createdBy: import_joi144.default.string().required(),
-  fields: import_joi144.default.object().pattern(
-    import_joi144.default.string(),
-    import_joi144.default.alternatives().try(
-      import_joi144.default.string(),
-      import_joi144.default.number(),
-      import_joi144.default.boolean(),
-      import_joi144.default.valid(null)
+var schemaFormEntry = import_joi145.default.object({
+  _id: import_joi145.default.string().hex().optional().allow("", null),
+  formType: import_joi145.default.string().required(),
+  block: import_joi145.default.string().optional().allow(null, ""),
+  level: import_joi145.default.string().optional().allow(null, ""),
+  unit: import_joi145.default.string().optional().allow(null, ""),
+  name: import_joi145.default.string().optional().allow(null, ""),
+  phoneNumber: import_joi145.default.string().optional().allow(null, ""),
+  createdBy: import_joi145.default.string().required(),
+  fields: import_joi145.default.object().pattern(
+    import_joi145.default.string(),
+    import_joi145.default.alternatives().try(
+      import_joi145.default.string(),
+      import_joi145.default.number(),
+      import_joi145.default.boolean(),
+      import_joi145.default.valid(null)
     )
   ).required(),
-  status: import_joi144.default.string().optional().allow("", null),
-  org: import_joi144.default.string().hex().optional().allow("", null),
-  site: import_joi144.default.string().hex().optional().allow("", null),
-  createdAt: import_joi144.default.date().optional().allow("", null),
-  updatedAt: import_joi144.default.date().optional().allow("", null),
-  deletedAt: import_joi144.default.date().optional().allow("", null)
+  status: import_joi145.default.string().optional().allow("", null),
+  org: import_joi145.default.string().hex().optional().allow("", null),
+  site: import_joi145.default.string().hex().optional().allow("", null),
+  createdAt: import_joi145.default.date().optional().allow("", null),
+  updatedAt: import_joi145.default.date().optional().allow("", null),
+  deletedAt: import_joi145.default.date().optional().allow("", null)
 });
-var schemaUpdateFormEntry = import_joi144.default.object({
-  _id: import_joi144.default.string().hex().required(),
-  formType: import_joi144.default.string().optional().allow("", null),
-  block: import_joi144.default.string().optional().allow(null, ""),
-  level: import_joi144.default.string().optional().allow(null, ""),
-  unit: import_joi144.default.string().optional().allow(null, ""),
-  fields: import_joi144.default.object().pattern(
-    import_joi144.default.string(),
-    import_joi144.default.alternatives().try(
-      import_joi144.default.string(),
-      import_joi144.default.number(),
-      import_joi144.default.boolean(),
-      import_joi144.default.valid(null)
+var schemaUpdateFormEntry = import_joi145.default.object({
+  _id: import_joi145.default.string().hex().required(),
+  formType: import_joi145.default.string().optional().allow("", null),
+  block: import_joi145.default.string().optional().allow(null, ""),
+  level: import_joi145.default.string().optional().allow(null, ""),
+  unit: import_joi145.default.string().optional().allow(null, ""),
+  fields: import_joi145.default.object().pattern(
+    import_joi145.default.string(),
+    import_joi145.default.alternatives().try(
+      import_joi145.default.string(),
+      import_joi145.default.number(),
+      import_joi145.default.boolean(),
+      import_joi145.default.valid(null)
     )
   ).optional(),
-  status: import_joi144.default.string().optional().allow("", null),
-  updatedAt: import_joi144.default.date().optional().allow("", null),
-  deletedAt: import_joi144.default.date().optional().allow("", null)
+  status: import_joi145.default.string().optional().allow("", null),
+  updatedAt: import_joi145.default.date().optional().allow("", null),
+  deletedAt: import_joi145.default.date().optional().allow("", null)
 });
 function MFormEntry(value) {
   const { error } = schemaFormEntry.validate(value);
@@ -65145,21 +66285,21 @@ function MFormEntry(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb147.ObjectId(value._id);
+      value._id = new import_mongodb149.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new import_mongodb147.ObjectId(value.org);
+      value.org = new import_mongodb149.ObjectId(value.org);
     } catch {
       throw new Error("Invalid org ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb147.ObjectId(value.site);
+      value.site = new import_mongodb149.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
@@ -65181,39 +66321,49 @@ function MFormEntry(value) {
     deletedAt: value.deletedAt ?? null
   };
 }
-var residentFormEntry = import_joi144.default.object({
-  _id: import_joi144.default.string().hex().optional().allow("", null),
-  typeOfForm: import_joi144.default.string().optional().allow("", null),
-  unitNumber: import_joi144.default.string().optional().allow(null, ""),
-  fields: import_joi144.default.object().pattern(
-    import_joi144.default.string(),
-    import_joi144.default.alternatives().try(
-      import_joi144.default.string(),
-      import_joi144.default.number(),
-      import_joi144.default.boolean(),
-      import_joi144.default.valid(null)
+var residentFormEntry = import_joi145.default.object({
+  _id: import_joi145.default.string().hex().optional().allow("", null),
+  typeOfForm: import_joi145.default.string().optional().allow("", null),
+  unitNumber: import_joi145.default.string().optional().allow(null, ""),
+  fields: import_joi145.default.object().pattern(
+    import_joi145.default.string(),
+    import_joi145.default.alternatives().try(
+      import_joi145.default.string(),
+      import_joi145.default.number(),
+      import_joi145.default.boolean(),
+      import_joi145.default.valid(null)
     )
   ).optional().allow(null, ""),
-  status: import_joi144.default.string().optional().allow("", null),
-  org: import_joi144.default.string().hex().optional().allow("", null),
-  site: import_joi144.default.string().hex().optional().allow("", null),
-  userId: import_joi144.default.string().hex().optional().allow("", null),
-  createdAt: import_joi144.default.date().optional().allow("", null),
-  updatedAt: import_joi144.default.date().optional().allow("", null),
-  deletedAt: import_joi144.default.date().optional().allow("", null)
+  status: import_joi145.default.string().optional().allow("", null),
+  org: import_joi145.default.string().hex().optional().allow("", null),
+  site: import_joi145.default.string().hex().optional().allow("", null),
+  userId: import_joi145.default.string().hex().optional().allow("", null),
+  createdAt: import_joi145.default.date().optional().allow("", null),
+  updatedAt: import_joi145.default.date().optional().allow("", null),
+  deletedAt: import_joi145.default.date().optional().allow("", null),
+  remarks: import_joi145.default.string().optional().allow("", null),
+  managementValues: import_joi145.default.object().pattern(
+    import_joi145.default.string(),
+    import_joi145.default.alternatives().try(
+      import_joi145.default.string(),
+      import_joi145.default.number(),
+      import_joi145.default.boolean(),
+      import_joi145.default.valid(null)
+    )
+  ).optional().allow(null, "")
 });
 
 // src/repositories/online-forms-v2.repository.ts
-var import_node_server_utils249 = require("@7365admin1/node-server-utils");
-var import_mongodb148 = require("mongodb");
+var import_node_server_utils250 = require("@7365admin1/node-server-utils");
+var import_mongodb150 = require("mongodb");
 var online_forms_namespace_collection = "online-forms";
 function useFormEntryRepo() {
-  const db = import_node_server_utils249.useAtlas.getDb();
+  const db = import_node_server_utils250.useAtlas.getDb();
   if (!db) {
-    throw new import_node_server_utils249.InternalServerError("Unable to connect to server.");
+    throw new import_node_server_utils250.InternalServerError("Unable to connect to server.");
   }
   const collection = db.collection(online_forms_namespace_collection);
-  const { delNamespace, getCache, setCache } = (0, import_node_server_utils249.useCache)(
+  const { delNamespace, getCache, setCache } = (0, import_node_server_utils250.useCache)(
     online_forms_namespace_collection
   );
   async function createTextIndex() {
@@ -65222,7 +66372,7 @@ function useFormEntryRepo() {
         name: "text"
       });
     } catch (error) {
-      throw new import_node_server_utils249.InternalServerError(
+      throw new import_node_server_utils250.InternalServerError(
         "Failed to create text index on online form."
       );
     }
@@ -65232,11 +66382,11 @@ function useFormEntryRepo() {
       value = MFormEntry(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        import_node_server_utils249.logger.info(
+        import_node_server_utils250.logger.info(
           `Cache cleared for namespace: ${online_forms_namespace_collection}`
         );
       }).catch((err) => {
-        import_node_server_utils249.logger.error(
+        import_node_server_utils250.logger.error(
           `Failed to clear cache for namespace: ${online_forms_namespace_collection}`,
           err
         );
@@ -65245,7 +66395,7 @@ function useFormEntryRepo() {
     } catch (error) {
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
-        throw new import_node_server_utils249.BadRequestError("Online Form already exists.");
+        throw new import_node_server_utils250.BadRequestError("Online Form already exists.");
       }
       throw error;
     }
@@ -65261,8 +66411,8 @@ function useFormEntryRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
-    site = new import_mongodb148.ObjectId(site);
-    org = new import_mongodb148.ObjectId(org);
+    site = new import_mongodb150.ObjectId(site);
+    org = new import_mongodb150.ObjectId(org);
     const cacheOptions = {
       page,
       limit,
@@ -65282,13 +66432,13 @@ function useFormEntryRepo() {
         { unitNumber: { $regex: search, $options: "i" } }
       ];
     }
-    const cacheKey = (0, import_node_server_utils249.makeCacheKey)(
+    const cacheKey = (0, import_node_server_utils250.makeCacheKey)(
       online_forms_namespace_collection,
       cacheOptions
     );
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      import_node_server_utils249.logger.info(`Cache hit for key: ${cacheKey}`);
+      import_node_server_utils250.logger.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -65299,11 +66449,11 @@ function useFormEntryRepo() {
         { $limit: limit }
       ]).toArray();
       const length = await collection.countDocuments(query);
-      const data = (0, import_node_server_utils249.paginate)(items, page, limit, length);
+      const data = (0, import_node_server_utils250.paginate)(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils249.logger.info(`Cache set for key: ${cacheKey}`);
+        import_node_server_utils250.logger.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        import_node_server_utils249.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+        import_node_server_utils250.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -65311,27 +66461,27 @@ function useFormEntryRepo() {
     }
   }
   async function getFormEntryById(_id) {
-    const cacheKey = (0, import_node_server_utils249.makeCacheKey)(online_forms_namespace_collection, { _id });
+    const cacheKey = (0, import_node_server_utils250.makeCacheKey)(online_forms_namespace_collection, { _id });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      import_node_server_utils249.logger.info(`Cache hit for key: ${cacheKey}`);
+      import_node_server_utils250.logger.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
-      _id = new import_mongodb148.ObjectId(_id);
+      _id = new import_mongodb150.ObjectId(_id);
     } catch (error) {
-      throw new import_node_server_utils249.BadRequestError("Invalid online form ID format.");
+      throw new import_node_server_utils250.BadRequestError("Invalid online form ID format.");
     }
     const query = { _id, status: { $ne: "deleted" } };
     try {
       const [data] = await collection.aggregate([{ $match: query }]).toArray();
       if (!data) {
-        throw new import_node_server_utils249.NotFoundError("Document not found.");
+        throw new import_node_server_utils250.NotFoundError("Document not found.");
       }
       setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils249.logger.info(`Cache set for key: ${cacheKey}`);
+        import_node_server_utils250.logger.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        import_node_server_utils249.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+        import_node_server_utils250.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -65340,9 +66490,9 @@ function useFormEntryRepo() {
   }
   async function updateFormEntryById(_id, value) {
     try {
-      _id = new import_mongodb148.ObjectId(_id);
+      _id = new import_mongodb150.ObjectId(_id);
     } catch (error) {
-      throw new import_node_server_utils249.BadRequestError("Invalid online form ID format.");
+      throw new import_node_server_utils250.BadRequestError("Invalid online form ID format.");
     }
     try {
       const updateValue = {
@@ -65351,14 +66501,14 @@ function useFormEntryRepo() {
       };
       const res = await collection.updateOne({ _id }, { $set: updateValue });
       if (res.modifiedCount === 0) {
-        throw new import_node_server_utils249.InternalServerError("Unable to update online form.");
+        throw new import_node_server_utils250.InternalServerError("Unable to update online form.");
       }
       delNamespace().then(() => {
-        import_node_server_utils249.logger.info(
+        import_node_server_utils250.logger.info(
           `Cache cleared for namespace: ${online_forms_namespace_collection}`
         );
       }).catch((err) => {
-        import_node_server_utils249.logger.error(
+        import_node_server_utils250.logger.error(
           `Failed to clear cache for namespace: ${online_forms_namespace_collection}`,
           err
         );
@@ -65370,9 +66520,9 @@ function useFormEntryRepo() {
   }
   async function deleteOnlineFormById(_id, session) {
     try {
-      _id = new import_mongodb148.ObjectId(_id);
+      _id = new import_mongodb150.ObjectId(_id);
     } catch (error) {
-      throw new import_node_server_utils249.BadRequestError("Invalid online form ID format.");
+      throw new import_node_server_utils250.BadRequestError("Invalid online form ID format.");
     }
     try {
       const updateValue = {
@@ -65386,12 +66536,12 @@ function useFormEntryRepo() {
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new import_node_server_utils249.InternalServerError("Unable to delete online form.");
+        throw new import_node_server_utils250.InternalServerError("Unable to delete online form.");
       }
       delNamespace().then(() => {
-        import_node_server_utils249.logger.info(`Cache cleared for namespace: ${online_forms_namespace_collection}`);
+        import_node_server_utils250.logger.info(`Cache cleared for namespace: ${online_forms_namespace_collection}`);
       }).catch((err) => {
-        import_node_server_utils249.logger.error(
+        import_node_server_utils250.logger.error(
           `Failed to clear cache for namespace: ${online_forms_namespace_collection}`,
           err
         );
@@ -65403,16 +66553,16 @@ function useFormEntryRepo() {
   }
   async function addResidentForm(value, session) {
     try {
-      value.site = new import_mongodb148.ObjectId(value.site);
-      value.org = new import_mongodb148.ObjectId(value.org);
-      value.userId = new import_mongodb148.ObjectId(value.userId);
+      value.site = new import_mongodb150.ObjectId(value.site);
+      value.org = new import_mongodb150.ObjectId(value.org);
+      value.userId = new import_mongodb150.ObjectId(value.userId);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        import_node_server_utils249.logger.info(
+        import_node_server_utils250.logger.info(
           `Cache cleared for namespace: ${online_forms_namespace_collection}`
         );
       }).catch((err) => {
-        import_node_server_utils249.logger.error(
+        import_node_server_utils250.logger.error(
           `Failed to clear cache for namespace: ${online_forms_namespace_collection}`,
           err
         );
@@ -65421,16 +66571,16 @@ function useFormEntryRepo() {
     } catch (error) {
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
-        throw new import_node_server_utils249.BadRequestError("Online Form already exists.");
+        throw new import_node_server_utils250.BadRequestError("Online Form already exists.");
       }
       throw error;
     }
   }
   async function residentForm({ userId, site, org }) {
     try {
-      const user = new import_mongodb148.ObjectId(userId);
-      const siteId = new import_mongodb148.ObjectId(site);
-      const orgId = new import_mongodb148.ObjectId(org);
+      const user = new import_mongodb150.ObjectId(userId);
+      const siteId = new import_mongodb150.ObjectId(site);
+      const orgId = new import_mongodb150.ObjectId(org);
       const res = await collection.aggregate([
         {
           $match: {
@@ -65458,8 +66608,8 @@ function useFormEntryRepo() {
 }
 
 // src/controllers/online-forms-v2.controller.ts
-var import_node_server_utils250 = require("@7365admin1/node-server-utils");
-var import_joi145 = __toESM(require("joi"));
+var import_node_server_utils251 = require("@7365admin1/node-server-utils");
+var import_joi146 = __toESM(require("joi"));
 var import_exceljs3 = __toESM(require("exceljs"));
 var import_fs7 = __toESM(require("fs"));
 function useFormEntryController() {
@@ -65485,14 +66635,14 @@ function useFormEntryController() {
   async function uploadFormEntrys(req, res, next) {
     try {
       if (!req.file) {
-        next(new import_node_server_utils250.BadRequestError("Excel file is required."));
+        next(new import_node_server_utils251.BadRequestError("Excel file is required."));
         return;
       }
       const workbook = new import_exceljs3.default.Workbook();
       await workbook.xlsx.readFile(req.file.path);
       const worksheet = workbook.worksheets[0];
       if (!worksheet) {
-        next(new import_node_server_utils250.BadRequestError("No worksheet found in uploaded Excel file."));
+        next(new import_node_server_utils251.BadRequestError("No worksheet found in uploaded Excel file."));
         return;
       }
       const headerRow = worksheet.getRow(1);
@@ -65520,8 +66670,8 @@ function useFormEntryController() {
       });
       if (error) {
         const messages = error.details.map((d) => d.message).join(", ");
-        import_node_server_utils250.logger.log({ level: "error", message: messages });
-        next(new import_node_server_utils250.BadRequestError(messages));
+        import_node_server_utils251.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils251.BadRequestError(messages));
         return;
       }
       const result = await _add(value);
@@ -65529,25 +66679,25 @@ function useFormEntryController() {
       import_fs7.default.unlink(req.file.path, () => {
       });
     } catch (error) {
-      import_node_server_utils250.logger.log({ level: "error", message: error.message });
+      import_node_server_utils251.logger.log({ level: "error", message: error.message });
       next(error);
     }
   }
   async function getAll(req, res, next) {
     try {
-      const schema2 = import_joi145.default.object({
-        search: import_joi145.default.string().optional().allow("", null),
-        page: import_joi145.default.number().integer().min(1).allow("", null).default(1),
-        limit: import_joi145.default.number().integer().min(1).max(100).allow("", null).default(10),
-        status: import_joi145.default.string().optional().allow(null, ""),
-        org: import_joi145.default.string().hex().optional().allow("", null),
-        site: import_joi145.default.string().hex().optional().allow("", null)
+      const schema2 = import_joi146.default.object({
+        search: import_joi146.default.string().optional().allow("", null),
+        page: import_joi146.default.number().integer().min(1).allow("", null).default(1),
+        limit: import_joi146.default.number().integer().min(1).max(100).allow("", null).default(10),
+        status: import_joi146.default.string().optional().allow(null, ""),
+        org: import_joi146.default.string().hex().optional().allow("", null),
+        site: import_joi146.default.string().hex().optional().allow("", null)
       });
       const { error, value } = schema2.validate(req.query);
       if (error) {
         const messages = error.details.map((d) => d.message).join(", ");
-        import_node_server_utils250.logger.log({ level: "error", message: messages });
-        next(new import_node_server_utils250.BadRequestError(messages));
+        import_node_server_utils251.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils251.BadRequestError(messages));
         return;
       }
       const { search, page, limit, status, org, site } = value;
@@ -65555,21 +66705,21 @@ function useFormEntryController() {
       res.json(data);
       return;
     } catch (error) {
-      import_node_server_utils250.logger.log({ level: "error", message: error.message });
+      import_node_server_utils251.logger.log({ level: "error", message: error.message });
       next(error);
       return;
     }
   }
   async function getFormEntryById(req, res, next) {
     try {
-      const schema2 = import_joi145.default.object({
-        _id: import_joi145.default.string().hex().length(24).required()
+      const schema2 = import_joi146.default.object({
+        _id: import_joi146.default.string().hex().length(24).required()
       });
       const { error, value } = schema2.validate({ _id: req.params.id });
       if (error) {
         const messages = error.details.map((d) => d.message).join(", ");
-        import_node_server_utils250.logger.log({ level: "error", message: messages });
-        next(new import_node_server_utils250.BadRequestError(messages));
+        import_node_server_utils251.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils251.BadRequestError(messages));
         return;
       }
       const { _id } = value;
@@ -65577,7 +66727,7 @@ function useFormEntryController() {
       res.json(data);
       return;
     } catch (error) {
-      import_node_server_utils250.logger.log({ level: "error", message: error.message });
+      import_node_server_utils251.logger.log({ level: "error", message: error.message });
       next(error);
       return;
     }
@@ -65590,8 +66740,8 @@ function useFormEntryController() {
       });
       if (error) {
         const messages = error.details.map((d) => d.message).join(", ");
-        import_node_server_utils250.logger.log({ level: "error", message: messages });
-        next(new import_node_server_utils250.BadRequestError(messages));
+        import_node_server_utils251.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils251.BadRequestError(messages));
         return;
       }
       const { _id, ...rest } = value;
@@ -65599,26 +66749,26 @@ function useFormEntryController() {
       res.json({ message: "Successfully updated online form." });
       return;
     } catch (error) {
-      import_node_server_utils250.logger.log({ level: "error", message: error.message });
+      import_node_server_utils251.logger.log({ level: "error", message: error.message });
       next(error);
       return;
     }
   }
   async function deleteFormEntryById(req, res, next) {
     try {
-      const validation = import_joi145.default.string().hex().required();
+      const validation = import_joi146.default.string().hex().required();
       const _id = req.params.id;
       const { error } = validation.validate(_id);
       if (error) {
-        import_node_server_utils250.logger.log({ level: "error", message: error.message });
-        next(new import_node_server_utils250.BadRequestError(error.message));
+        import_node_server_utils251.logger.log({ level: "error", message: error.message });
+        next(new import_node_server_utils251.BadRequestError(error.message));
         return;
       }
       await _deleteOnlineFormById(_id);
       res.json({ message: "Successfully deleted online form." });
       return;
     } catch (error) {
-      import_node_server_utils250.logger.log({ level: "error", message: error.message });
+      import_node_server_utils251.logger.log({ level: "error", message: error.message });
       next(error);
       return;
     }
@@ -65635,8 +66785,8 @@ function useFormEntryController() {
     });
     if (error) {
       const messages = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils250.logger.log({ level: "error", message: messages });
-      next(new import_node_server_utils250.BadRequestError(messages));
+      import_node_server_utils251.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils251.BadRequestError(messages));
       return;
     }
     try {
@@ -65644,7 +66794,7 @@ function useFormEntryController() {
       res.status(201).json({ message: data });
       return;
     } catch (error2) {
-      import_node_server_utils250.logger.log({ level: "error", message: error2.message });
+      import_node_server_utils251.logger.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -65656,8 +66806,8 @@ function useFormEntryController() {
     });
     if (error) {
       const messages = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils250.logger.log({ level: "error", message: messages });
-      next(new import_node_server_utils250.BadRequestError(messages));
+      import_node_server_utils251.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils251.BadRequestError(messages));
       return;
     }
     try {
@@ -65665,7 +66815,7 @@ function useFormEntryController() {
       res.status(201).json({ message: data });
       return;
     } catch (error2) {
-      import_node_server_utils250.logger.log({ level: "error", message: error2.message });
+      import_node_server_utils251.logger.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -65673,22 +66823,22 @@ function useFormEntryController() {
   async function residentForm(req, res, next) {
     try {
       const { site, userId, org } = req.query;
-      const residentFormPayload = import_joi145.default.object({
-        org: import_joi145.default.string().hex().required(),
-        site: import_joi145.default.string().hex().required(),
-        userId: import_joi145.default.string().hex().required()
+      const residentFormPayload = import_joi146.default.object({
+        org: import_joi146.default.string().hex().required(),
+        site: import_joi146.default.string().hex().required(),
+        userId: import_joi146.default.string().hex().required()
       });
       const { error } = residentFormPayload.validate({ site, userId, org }, { abortEarly: true });
       if (error) {
         const messages = error.details.map((d) => d.message).join(", ");
-        import_node_server_utils250.logger.log({ level: "error", message: messages });
-        next(new import_node_server_utils250.BadRequestError(messages));
+        import_node_server_utils251.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils251.BadRequestError(messages));
         return;
       }
       const result = await _residentForm({ userId, site, org });
       res.json(result);
     } catch (error) {
-      import_node_server_utils250.logger.log({ level: "error", message: error.message });
+      import_node_server_utils251.logger.log({ level: "error", message: error.message });
       next(error);
       return;
     }
@@ -65706,11 +66856,11 @@ function useFormEntryController() {
 }
 
 // src/services/building-level.service.ts
-var import_node_server_utils251 = require("@7365admin1/node-server-utils");
+var import_node_server_utils252 = require("@7365admin1/node-server-utils");
 function useBuildingLevelService() {
   const { add: _add, updateLevelById: _updateLevelById } = useBuildingLevelRepo();
   async function add(value) {
-    const session = import_node_server_utils251.useAtlas.getClient()?.startSession();
+    const session = import_node_server_utils252.useAtlas.getClient()?.startSession();
     try {
       session?.startTransaction();
       await _add(value, session);
@@ -65724,7 +66874,7 @@ function useBuildingLevelService() {
     }
   }
   async function updateLevelById(_id, value) {
-    const session = import_node_server_utils251.useAtlas.getClient()?.startSession();
+    const session = import_node_server_utils252.useAtlas.getClient()?.startSession();
     try {
       session?.startTransaction();
       await _updateLevelById(_id, value, session);
@@ -65744,8 +66894,8 @@ function useBuildingLevelService() {
 }
 
 // src/controllers/building-level.controller.ts
-var import_node_server_utils252 = require("@7365admin1/node-server-utils");
-var import_joi146 = __toESM(require("joi"));
+var import_node_server_utils253 = require("@7365admin1/node-server-utils");
+var import_joi147 = __toESM(require("joi"));
 function useBuildingLevelController() {
   const { add: _add, updateLevelById: _updateLevelById } = useBuildingLevelService();
   const {
@@ -65762,8 +66912,8 @@ function useBuildingLevelController() {
       });
       if (error) {
         const messages = error.details.map((d) => d.message).join(", ");
-        import_node_server_utils252.logger.log({ level: "error", message: messages });
-        next(new import_node_server_utils252.BadRequestError(messages));
+        import_node_server_utils253.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils253.BadRequestError(messages));
         return;
       }
       const result = await _add(value);
@@ -65774,20 +66924,20 @@ function useBuildingLevelController() {
   }
   async function getAll(req, res, next) {
     try {
-      const validation = import_joi146.default.object({
-        page: import_joi146.default.number().min(1).optional().default(1),
-        limit: import_joi146.default.number().min(1).optional().default(20),
-        search: import_joi146.default.string().optional().allow("", null),
-        site: import_joi146.default.string().hex().length(24).optional().allow("", null),
-        status: import_joi146.default.string().valid(...Object.values(BuildingLevelStatus)).default("active" /* ACTIVE */)
+      const validation = import_joi147.default.object({
+        page: import_joi147.default.number().min(1).optional().default(1),
+        limit: import_joi147.default.number().min(1).optional().default(20),
+        search: import_joi147.default.string().optional().allow("", null),
+        site: import_joi147.default.string().hex().length(24).optional().allow("", null),
+        status: import_joi147.default.string().valid(...Object.values(BuildingLevelStatus)).default("active" /* ACTIVE */)
       });
       const { error, value } = validation.validate(req.query, {
         abortEarly: false
       });
       if (error) {
         const messages = error.details.map((d) => d.message);
-        import_node_server_utils252.logger.log({ level: "error", message: messages.join(", ") });
-        next(new import_node_server_utils252.BadRequestError(messages.join(", ")));
+        import_node_server_utils253.logger.log({ level: "error", message: messages.join(", ") });
+        next(new import_node_server_utils253.BadRequestError(messages.join(", ")));
         return;
       }
       const { page, limit, status, site, search } = value;
@@ -65806,14 +66956,14 @@ function useBuildingLevelController() {
   }
   async function getById(req, res, next) {
     try {
-      const schema2 = import_joi146.default.object({
-        id: import_joi146.default.string().hex().length(24).required()
+      const schema2 = import_joi147.default.object({
+        id: import_joi147.default.string().hex().length(24).required()
       });
       const { error, value } = schema2.validate({ id: req.params.id });
       if (error) {
         const messages = error.details.map((d) => d.message);
-        import_node_server_utils252.logger.log({ level: "error", message: messages.join(", ") });
-        next(new import_node_server_utils252.BadRequestError(messages.join(", ")));
+        import_node_server_utils253.logger.log({ level: "error", message: messages.join(", ") });
+        next(new import_node_server_utils253.BadRequestError(messages.join(", ")));
         return;
       }
       const { id } = value;
@@ -65832,8 +66982,8 @@ function useBuildingLevelController() {
       });
       if (error) {
         const messages = error.details.map((d) => d.message);
-        import_node_server_utils252.logger.log({ level: "error", message: messages.join(", ") });
-        next(new import_node_server_utils252.BadRequestError(messages.join(", ")));
+        import_node_server_utils253.logger.log({ level: "error", message: messages.join(", ") });
+        next(new import_node_server_utils253.BadRequestError(messages.join(", ")));
         return;
       }
       const { _id, ...rest } = value;
@@ -65845,14 +66995,14 @@ function useBuildingLevelController() {
   }
   async function deleteById(req, res, next) {
     try {
-      const schema2 = import_joi146.default.object({
-        id: import_joi146.default.string().hex().required()
+      const schema2 = import_joi147.default.object({
+        id: import_joi147.default.string().hex().required()
       });
       const { error, value } = schema2.validate({ id: req.params.id });
       if (error) {
         const messages = error.details.map((d) => d.message);
-        import_node_server_utils252.logger.log({ level: "error", message: messages.join(", ") });
-        next(new import_node_server_utils252.BadRequestError(messages.join(", ")));
+        import_node_server_utils253.logger.log({ level: "error", message: messages.join(", ") });
+        next(new import_node_server_utils253.BadRequestError(messages.join(", ")));
         return;
       }
       const { id } = value;
@@ -65865,19 +67015,19 @@ function useBuildingLevelController() {
   }
   async function batchUpdateByIds(req, res, next) {
     try {
-      const schema2 = import_joi146.default.array().items(
-        import_joi146.default.object({
-          _id: import_joi146.default.string().hex().length(24).required(),
-          value: import_joi146.default.object({
-            name: import_joi146.default.string().optional().allow("", null)
+      const schema2 = import_joi147.default.array().items(
+        import_joi147.default.object({
+          _id: import_joi147.default.string().hex().length(24).required(),
+          value: import_joi147.default.object({
+            name: import_joi147.default.string().optional().allow("", null)
           }).required()
         })
       );
       const { error, value } = schema2.validate(req.body);
       if (error) {
         const messages = error.details.map((d) => d.message);
-        import_node_server_utils252.logger.log({ level: "error", message: messages.join(", ") });
-        next(new import_node_server_utils252.BadRequestError(messages.join(", ")));
+        import_node_server_utils253.logger.log({ level: "error", message: messages.join(", ") });
+        next(new import_node_server_utils253.BadRequestError(messages.join(", ")));
         return;
       }
       const updates = value.map((item) => ({
@@ -65892,9 +67042,9 @@ function useBuildingLevelController() {
   }
   async function getBuildingLevelList(req, res, next) {
     try {
-      const schema2 = import_joi146.default.object({
-        site: import_joi146.default.string().hex().length(24).required(),
-        block: import_joi146.default.string().hex().length(24).required()
+      const schema2 = import_joi147.default.object({
+        site: import_joi147.default.string().hex().length(24).required(),
+        block: import_joi147.default.string().hex().length(24).required()
       });
       const { error, value } = schema2.validate({
         site: req.params.siteId,
@@ -65902,8 +67052,8 @@ function useBuildingLevelController() {
       });
       if (error) {
         const messages = error.details.map((d) => d.message).join(", ");
-        import_node_server_utils252.logger.log({ level: "error", message: messages });
-        next(new import_node_server_utils252.BadRequestError(messages));
+        import_node_server_utils253.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils253.BadRequestError(messages));
         return;
       }
       const { site, block } = value;
@@ -66030,7 +67180,6 @@ function useBuildingLevelController() {
   OvernightParkingRequestSort,
   OvernightParkingRequestStatus,
   PERSON_TYPES,
-  PMDashboardCollection,
   PStatus,
   Period,
   PersonStatus,
@@ -66083,8 +67232,6 @@ function useBuildingLevelController() {
   guests_namespace_collection,
   incidentReportLog,
   incidents_namespace_collection,
-  landscapeDashboardCollection,
-  mAndEDashboardCollection,
   manpowerDesignationsSchema,
   manpowerEvents,
   manpowerMonitoringSchema,
@@ -66097,8 +67244,6 @@ function useBuildingLevelController() {
   orgSchema,
   overnight_parking_requests_namespace_collection,
   parseDahuaFind,
-  pestDashboardCollection,
-  poolDashboardCollection,
   promoCodeSchema,
   remarksSchema,
   residentFormEntry,
@@ -66189,7 +67334,6 @@ function useBuildingLevelController() {
   schemaVisitorTransaction,
   schemeCamera,
   schemeLogCamera,
-  securityDashboardCollection,
   shiftSchema,
   siteSchema,
   site_people_namespace_collection,