@7365admin1/core 2.75.0 → 2.77.0

package/dist/index.js

@@ -3181,6 +3181,20 @@ function useUserRepo() {
       throw new import_node_server_utils10.InternalServerError("Failed to update user.");
     }
   }
+  async function updateUserOrgById(id, org, session) {
+    const _id = (0, import_node_server_utils10.toObjectId)(id);
+    const orgId = (0, import_node_server_utils10.toObjectId)(org);
+    try {
+      await collection.updateOne(
+        { _id },
+        { $set: { defaultOrg: orgId, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      return "Successfully updated user organization.";
+    } catch (error) {
+      throw new import_node_server_utils10.InternalServerError("Failed to update user organization.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -3198,7 +3212,8 @@ function useUserRepo() {
     updateDefaultOrgByEmail,
     getUserByEmailStatus,
     updateUserSIDById,
-    resetPassword
+    resetPassword,
+    updateUserOrgById
   };
 }
 
@@ -3722,6 +3737,20 @@ function useMemberRepo() {
         { $sort: { _id: -1 } },
         { $skip: page * limit },
         { $limit: limit },
+        {
+          $lookup: {
+            from: "organizations",
+            localField: "org",
+            foreignField: "_id",
+            as: "orgData"
+          }
+        },
+        {
+          $unwind: {
+            path: "$orgData",
+            preserveNullAndEmptyArrays: true
+          }
+        },
         {
           $lookup: {
             from: "organizations",
@@ -3741,7 +3770,16 @@ function useMemberRepo() {
             _id: "$org",
             text: { $first: "$orgName" },
             value: { $first: "$org" },
-            defaultSite: { $first: "$defaultSite.defaultSite" }
+            defaultSite: { $first: "$defaultSite.defaultSite" },
+            onboardingRequired: {
+              $first: "$orgData.onboardingRequired"
+            },
+            onboardingCompleted: {
+              $first: "$orgData.onboardingCompleted"
+            },
+            onboardingCompletedAt: {
+              $first: "$orgData.onboardingCompletedAt"
+            }
           }
         },
         {
@@ -3749,15 +3787,16 @@ function useMemberRepo() {
             _id: 0,
             text: 1,
             value: 1,
-            defaultSite: 1
+            defaultSite: 1,
+            onboardingRequired: 1,
+            onboardingCompleted: 1,
+            onboardingCompletedAt: 1
           }
         }
       ]).toArray();
       const length = await collection.distinct("org", query).then((orgs) => orgs.length);
       const data = (0, import_node_server_utils12.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils12.logger.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
+      setCache(cacheKey, data, 15 * 60).catch((err) => {
         import_node_server_utils12.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
@@ -4605,6 +4644,9 @@ var orgSchema = import_joi8.default.object({
   busInst: import_joi8.default.string().optional().allow("", null),
   status: import_joi8.default.string().optional().allow("", null),
   defaultSite: import_joi8.default.string().hex().optional().allow("", null),
+  onboardingRequired: import_joi8.default.boolean().optional(),
+  onboardingCompleted: import_joi8.default.boolean().optional(),
+  onboardingCompletedAt: import_joi8.default.date().optional().allow(null),
   terms: import_joi8.default.string().optional().allow("", null),
   policies: import_joi8.default.string().optional().allow("", null),
   createdAt: import_joi8.default.string().optional().allow("", null),
@@ -4634,6 +4676,9 @@ function MOrg(value) {
     busInst: value.busInst,
     status: value.status || "active",
     defaultSite: value.defaultSite,
+    onboardingRequired: value.onboardingRequired || false,
+    onboardingCompleted: value.onboardingCompleted || false,
+    onboardingCompletedAt: value.onboardingCompletedAt || null,
     terms: value.terms ?? "",
     policies: value.policies ?? "",
     createdAt: value.createdAt || /* @__PURE__ */ new Date(),
@@ -7897,7 +7942,8 @@ function useUserController() {
         "dateOfBirth",
         "profile",
         "gender",
-        "defaultOrg"
+        "defaultOrg",
+        "status"
       ).required(),
       value: import_joi13.default.when("field", {
         switch: [
@@ -9334,7 +9380,7 @@ function useOrgController() {
       return;
     }
     try {
-      const _id = await _add(req.body);
+      const _id = await _add({ ...req.body, onboardingRequired: true, onboardingCompleted: false, onboardingCompletedAt: null });
       const data = await _getById(_id);
       res.status(201).json({
         message: "Successfully created organization.",
@@ -15623,10 +15669,10 @@ var import_node_server_utils71 = require("@7365admin1/node-server-utils");
 var import_node_server_utils70 = require("@7365admin1/node-server-utils");
 var import_joi38 = __toESM(require("joi"));
 var import_mongodb41 = require("mongodb");
-var VehicleType = /* @__PURE__ */ ((VehicleType2) => {
-  VehicleType2["WHITELIST"] = "whitelist";
-  VehicleType2["BLOCKLIST"] = "blocklist";
-  return VehicleType2;
+var VehicleType = /* @__PURE__ */ ((VehicleType3) => {
+  VehicleType3["WHITELIST"] = "whitelist";
+  VehicleType3["BLOCKLIST"] = "blocklist";
+  return VehicleType3;
 })(VehicleType || {});
 var VehicleCategory = /* @__PURE__ */ ((VehicleCategory2) => {
   VehicleCategory2["RESIDENT"] = "resident";
@@ -16686,6 +16732,77 @@ function useDahuaDigest({
     streaming
   });
 }
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+function isDahuaInvalidAuthority(value) {
+  const text = String(value || "").toLowerCase();
+  return text.includes("invalid authority");
+}
+function getDahuaResponseText(response) {
+  return response?.data?.toString?.("utf-8") ?? "";
+}
+function getDahuaStatusCode(response) {
+  return response?.statusCode || response?.status || response?.res?.status;
+}
+async function useDahuaDigestWithRetry({
+  host,
+  username,
+  password,
+  endpoint,
+  method = "GET",
+  headers = {},
+  timeout = 1e4,
+  streaming = false,
+  retries = 3,
+  retryDelayMs = 0
+}) {
+  let lastError;
+  for (let attempt = 1; attempt <= retries; attempt++) {
+    try {
+      const response = await useDahuaDigest({
+        host,
+        username,
+        password,
+        endpoint,
+        method,
+        headers,
+        timeout,
+        streaming
+      });
+      const text = getDahuaResponseText(response);
+      const statusCode = getDahuaStatusCode(response);
+      const isOk = statusCode === 200 && text.includes("OK");
+      if (isOk) {
+        return response;
+      }
+      const shouldRetry = isDahuaInvalidAuthority(text);
+      if (shouldRetry && attempt < retries) {
+        loggerDahua.warn(
+          `[${host}] Dahua Invalid Authority. Retrying ${attempt}/${retries}`
+        );
+        if (retryDelayMs > 0) {
+          await sleep(retryDelayMs);
+        }
+        continue;
+      }
+      throw new Error(`Dahua response: ${text || `HTTP ${statusCode}`}`);
+    } catch (error) {
+      lastError = error;
+      const message = error?.message || String(error);
+      const shouldRetry = isDahuaInvalidAuthority(message);
+      if (shouldRetry && attempt < retries) {
+        loggerDahua.warn(
+          `[${host}] Dahua Invalid Authority error. Retrying ${attempt}/${retries}`
+        );
+        if (retryDelayMs > 0) {
+          await sleep(retryDelayMs);
+        }
+        continue;
+      }
+      throw error;
+    }
+  }
+  throw lastError;
+}
 function createFileNameFromEvent(utcSeconds, utcMilliseconds) {
   const date = new Date(utcSeconds * 1e3 + utcMilliseconds);
   const year = date.getUTCFullYear();
@@ -17336,6 +17453,50 @@ function useDahuaService() {
       );
     }
   }
+  async function openBarrier(value) {
+    const validation = import_joi40.default.object({
+      host: import_joi40.default.string().required(),
+      username: import_joi40.default.string().required(),
+      password: import_joi40.default.string().required(),
+      plateNumber: import_joi40.default.string().required(),
+      channel: import_joi40.default.number().integer().min(1).default(1)
+    });
+    const { error, value: payload } = validation.validate(value, {
+      stripUnknown: true
+    });
+    if (error) {
+      throw new import_node_server_utils72.BadRequestError(`Validation error: ${error.message}`);
+    }
+    try {
+      const query = new URLSearchParams({
+        action: "openStrobe",
+        channel: String(payload.channel),
+        "info.openType": "Normal",
+        "info.plateNumber": payload.plateNumber || "VISITOR"
+      });
+      const endpoint = `/cgi-bin/trafficSnap.cgi?${query.toString()}`;
+      const response = await useDahuaDigestWithRetry({
+        host: payload.host,
+        username: payload.username,
+        password: payload.password,
+        endpoint,
+        retries: 10,
+        retryDelayMs: 0
+      });
+      const text = response?.data?.toString?.("utf-8") ?? "";
+      if (!text.includes("OK")) {
+        throw new Error(`Failed to open barrier. Dahua response: ${text}`);
+      }
+      return {
+        success: true,
+        message: "Barrier opened successfully",
+        raw: text
+      };
+    } catch (error2) {
+      loggerDahua.error(`[${value.host}] Error opening barrier:`, error2);
+      throw error2;
+    }
+  }
   return {
     getSnapshot,
     listenToCamera,
@@ -17343,7 +17504,8 @@ function useDahuaService() {
     removePlateNumber,
     updatePlateNumber,
     getPlateNumber,
-    bulkInsertPlateNumber
+    bulkInsertPlateNumber,
+    openBarrier
   };
 }
 
@@ -17550,6 +17712,43 @@ function useSiteCameraRepo() {
       throw new import_node_server_utils73.BadRequestError("Failed to retrieve site cameras.");
     }
   }
+  async function getVisitorsInBySite(site) {
+    try {
+      const pipeline = [
+        { $match: { site: (0, import_node_server_utils73.toObjectId)(site), type: "anpr", status: "active", direction: { $in: ["visitors", "entry", "both"] } } },
+        { $limit: 1 },
+        {
+          $lookup: {
+            from: "anpr-settings",
+            localField: "site",
+            foreignField: "site",
+            as: "anprSettingsDetails"
+          }
+        },
+        {
+          $unwind: {
+            path: "$anprSettingsDetails",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $addFields: {
+            ANPRSwitches: "$anprSettingsDetails.ANPRSwitches"
+          }
+        },
+        {
+          $project: { anprSettingsDetails: 0 }
+        }
+      ];
+      const cameras = await collection.aggregate(pipeline).toArray();
+      return cameras?.find((cam) => cam.direction === "visitors" || cam.direction === "entry" || cam.direction === "both");
+    } catch (error) {
+      if (error instanceof import_node_server_utils73.BadRequestError) {
+        throw error;
+      }
+      throw new import_node_server_utils73.BadRequestError("Failed to retrieve site cameras.");
+    }
+  }
   async function getBySiteGuardPost(site, guardPost) {
     try {
       site = new import_mongodb43.ObjectId(site);
@@ -17904,6 +18103,7 @@ function useSiteCameraRepo() {
     getAll,
     findSiteCameras,
     getBySite,
+    getVisitorsInBySite,
     getBySites,
     delCachedData,
     getBySiteGuardPost,
@@ -26098,13 +26298,14 @@ function useVisitorTransactionService() {
     getByNRIC,
     updateById: _updateById
   } = usePersonRepo();
-  const { getBySite: _getBySite } = useSiteCameraRepo();
+  const { getBySite: _getBySite, getVisitorsInBySite: _getVisitorsInBySite } = useSiteCameraRepo();
   const { getSiteById: _getSiteById } = useSiteRepo();
   const {
     addPlateNumber: _addPlateNumber,
     removePlateNumber: _removePlateNumber,
     getPlateNumber: _getPlateNumber,
-    updatePlateNumber: _updatePlateNumber
+    updatePlateNumber: _updatePlateNumber,
+    openBarrier: _openBarrier
   } = useDahuaService();
   const { getAllSites: _getAllSites } = useSiteRepo();
   const { getByUserId: _getByUserId } = usePersonRepo();
@@ -26180,28 +26381,30 @@ function useVisitorTransactionService() {
       "contractor" /* CONTRACTOR */,
       "walk-in" /* WALK_IN */,
       "guest" /* GUEST */,
-      "delivery" /* DELIVERY */,
-      "pick-up" /* PICK_UP */
+      "delivery" /* DELIVERY */
+      // PersonTypes.PICK_UP,
     ];
     const start = value.checkIn ? new Date(value.checkIn) : /* @__PURE__ */ new Date();
     try {
       session?.startTransaction();
       let camera;
-      let site;
-      if (value.site) {
-        [camera, site] = await Promise.all([
-          _getBySite(value.site, { type: "anpr" /* ANPR */ }),
-          _getSiteById(value.site)
-        ]);
+      if (value.site && value.plateNumber) {
+        try {
+          camera = await _getVisitorsInBySite(value.site);
+          if (!camera) {
+            import_node_server_utils106.logger.warn(`No camera document found for site: ${value.site}`);
+          }
+        } catch (error) {
+          import_node_server_utils106.logger.error(
+            `Error _getVisitorsInBySite camera for site ${value.site}:`,
+            error
+          );
+        }
       }
       if (!value.unitName && value.unit) {
         const unit = await _getUnitById(value.unit);
         value.unitName = unit?.name;
       }
-      const hourExpiration = site?.dahuaTimeExpiration ? site?.dahuaTimeExpiration : 24 * 60;
-      const end = value.checkOut ? new Date(value.checkOut) : new Date(start.getTime() + hourExpiration * 60 * 1e3);
-      const startDahuaDate = formatDahuaDate(start);
-      const endDahuaDate = formatDahuaDate(end);
       if (allowedPersonTypes.includes(value?.type)) {
         const nric = value?.nric || "";
         const person = await getByNRIC(nric);
@@ -26238,7 +26441,7 @@ function useVisitorTransactionService() {
           block,
           level,
           unit,
-          site: site2,
+          site,
           org,
           type,
           company,
@@ -26294,14 +26497,14 @@ function useVisitorTransactionService() {
                   level,
                   unit,
                   unitName,
-                  site: site2,
+                  site,
                   org,
                   type,
                   company,
                   remarks,
                   contractorType,
                   checkIn: start,
-                  expiredAt: end,
+                  // expiredAt: end,
                   visitorPass: visitorPass ?? [],
                   passKeys: passKeys ?? [],
                   status: "registered" /* REGISTERED */
@@ -26312,11 +26515,13 @@ function useVisitorTransactionService() {
           );
         }
       }
+      let host;
+      let username;
+      let password;
       if (camera && value.plateNumber && camera.host && camera.username && camera.password) {
-        const host = camera.host;
-        const username = camera.username;
-        const password = camera.password;
-        const redlist = "TrafficRedList" /* TRAFFIC_REDLIST */;
+        host = camera.host;
+        username = camera.username;
+        password = camera.password;
         const blacklist = "TrafficBlackList" /* TRAFFIC_BLACKLIST */;
         const _plateNumber = value.plateNumber;
         const dahuaBlocklistQuery = {
@@ -26332,74 +26537,6 @@ function useVisitorTransactionService() {
         const found = foundMatch ? Number(foundMatch[1]) : 0;
         if (found === 1)
           throw new import_node_server_utils106.BadRequestError("This plate number is blocklisted");
-        const dahuaQuery = {
-          host,
-          username,
-          password,
-          plateNumber: _plateNumber,
-          mode: redlist
-        };
-        const raw = await _getPlateNumber(dahuaQuery);
-        const parsed = parseDahuaFind(raw);
-        if (!parsed.exists) {
-          const dahuaPayload = {
-            host,
-            username,
-            password,
-            plateNumber: _plateNumber,
-            mode: redlist,
-            start: startDahuaDate,
-            end: endDahuaDate,
-            owner: value.name ?? "",
-            isOpenGate: site?.isOpenGate ?? true
-          };
-          const dahuaResponse = await _addPlateNumber(dahuaPayload);
-          if (dahuaResponse?.statusCode !== 200) {
-            throw new import_node_server_utils106.BadRequestError(
-              `Failed to add plate number to ANPR whitelist`
-            );
-          }
-          const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
-          value.recNo = responseData.split("=")[1]?.trim();
-          value.checkIn = start;
-          value.expiredAt = end;
-          const vehiclePayload = {
-            name: value.name ?? "",
-            category: value.type,
-            org: value.org,
-            site: value.site,
-            plateNumber: value.plateNumber,
-            type: "whitelist" /* WHITELIST */,
-            nric: value.nric,
-            start,
-            end,
-            recNo: value.recNo,
-            ...value.block && { block: value.block },
-            ...value.level && { level: value.level },
-            ...value.unit && { unit: value.unit }
-          };
-          await addVehicle(vehiclePayload);
-        } else {
-          const dahuaPayload = {
-            host,
-            username,
-            password,
-            plateNumber: _plateNumber,
-            recno: parsed.recNo,
-            mode: redlist,
-            start: startDahuaDate,
-            end: endDahuaDate,
-            owner: value.name ?? "",
-            isOpenGate: site?.isOpenGate ?? true
-          };
-          const dahuaResponse = await _updatePlateNumber(dahuaPayload);
-          if (dahuaResponse?.statusCode !== 200) {
-            throw new import_node_server_utils106.BadRequestError(
-              `Failed to update plate number to ANPR ${"whitelist" /* WHITELIST */}`
-            );
-          }
-          value.recNo = parsed.recNo;
-        }
       }
       if (value.visitorPass && Array.isArray(value.visitorPass) && value.visitorPass.length > 0 && value.visitorPass) {
         for (const vp of value.visitorPass) {
@@ -26437,6 +26574,27 @@ function useVisitorTransactionService() {
       }
       const result = await _add(value, session);
       await session?.commitTransaction();
+      let openBarrier = null;
+      const isOpenBarrier = allowedPersonTypes.includes(value?.type) || camera?.ANPRSwitches?.openBarrierPickUpDropOff == true;
+      if (isOpenBarrier && value.plateNumber && host && username && password) {
+        try {
+          import_node_server_utils106.logger.info(`Attempting to open barrier at host: ${host}`);
+          openBarrier = await _openBarrier({
+            host,
+            username,
+            password,
+            plateNumber: value?.plateNumber
+          });
+          import_node_server_utils106.logger.info(`Barrier command sent successfully to ${host}`, { response: openBarrier });
+        } catch (error) {
+          import_node_server_utils106.logger.error(
+            `Failed to open barrier at host ${host}. Critical system error:`,
+            error
+          );
+          openBarrier = { success: false, error: error?.message };
+        }
+      }
+      console.log("Open barrier response:", openBarrier);
       return result;
     } catch (error) {
       await session?.abortTransaction();
@@ -26449,6 +26607,43 @@ function useVisitorTransactionService() {
     const session = import_node_server_utils106.useAtlas.getClient()?.startSession();
     session?.startTransaction();
     try {
+      let camera;
+      let host;
+      let username;
+      let password;
+      if (value.site && value.plateNumber) {
+        try {
+          camera = await _getVisitorsInBySite(value.site);
+          if (!camera) {
+            import_node_server_utils106.logger.warn(`No camera document found for site: ${value.site}`);
+          }
+        } catch (error) {
+          import_node_server_utils106.logger.error(
+            `Error _getVisitorsInBySite camera for site ${value.site}:`,
+            error
+          );
+        }
+      }
+      if (camera && value.plateNumber && camera.host && camera.username && camera.password) {
+        host = camera.host;
+        username = camera.username;
+        password = camera.password;
+        const blacklist = "TrafficBlackList" /* TRAFFIC_BLACKLIST */;
+        const _plateNumber = value.plateNumber;
+        const dahuaBlocklistQuery = {
+          host,
+          username,
+          password,
+          plateNumber: _plateNumber,
+          mode: blacklist
+        };
+        const isBlocklistedRaw = await _getPlateNumber(dahuaBlocklistQuery);
+        const rawString = isBlocklistedRaw?.toString?.("utf-8") ?? String(isBlocklistedRaw);
+        const foundMatch = rawString.match(/found=(\d+)/);
+        const found = foundMatch ? Number(foundMatch[1]) : 0;
+        if (found === 1)
+          throw new import_node_server_utils106.BadRequestError("This plate number is blocklisted");
+      }
       if (Array.isArray(value.visitorPass) && value.visitorPass.length > 0) {
         const keptVisitorPass = [];
         for (const vp of value.visitorPass) {
@@ -26512,6 +26707,34 @@ function useVisitorTransactionService() {
         value.unitName = unit?.name;
       }
       await _updateVisitorTansactionById(id, value, session);
+      const allowedPersonTypes = [
+        "contractor" /* CONTRACTOR */,
+        "walk-in" /* WALK_IN */,
+        "guest" /* GUEST */,
+        "delivery" /* DELIVERY */
+        // PersonTypes.PICK_UP,
+      ];
+      let openBarrier = null;
+      const isOpenBarrier = allowedPersonTypes.includes(value?.type) || camera?.ANPRSwitches?.openBarrierPickUpDropOff == true;
+      if (isOpenBarrier && value.plateNumber && host && username && password) {
+        try {
+          import_node_server_utils106.logger.info(`Attempting to open barrier at host: ${host}`);
+          openBarrier = await _openBarrier({
+            host,
+            username,
+            password,
+            plateNumber: value?.plateNumber
+          });
+          import_node_server_utils106.logger.info(`Barrier command sent successfully to ${host}`, { response: openBarrier });
+        } catch (error) {
+          import_node_server_utils106.logger.error(
+            `Failed to open barrier at host ${host}. Critical system error:`,
+            error
+          );
+          openBarrier = { success: false, error: error?.message };
+        }
+      }
+      console.log("Open barrier response:", openBarrier);
       await session?.commitTransaction();
       return "Successfully updated visitor transaction.";
     } catch (error) {
@@ -27458,6 +27681,7 @@ var import_node_server_utils112 = require("@7365admin1/node-server-utils");
 
 // src/services/person.service.ts
 var import_node_server_utils111 = require("@7365admin1/node-server-utils");
+var import_mongodb64 = require("mongodb");
 function usePersonService() {
   const MailerConfig = {
     host: MAILER_TRANSPORT_HOST,
@@ -27479,7 +27703,8 @@ function usePersonService() {
     createUser: addUser,
     getUserByEmail,
     updateUserFieldById: _updateUserFieldById,
-    getUserById
+    getUserById,
+    updateUserOrgById: _updateUserOrgById
   } = useUserRepo();
   const { add: addMember } = useMemberRepo();
   const { getById: _getUnitById, updateById: updateUnitById } = useBuildingUnitRepo();
@@ -27570,8 +27795,27 @@ function usePersonService() {
       }
       await _add(value, session);
       await session.commitTransaction();
+      if (value.email && isValidType && value.platform === "mobile") {
+        const emailContent = (0, import_node_server_utils111.compileHandlebar)({
+          context: { name: value.name },
+          filePath: (0, import_node_server_utils111.getDirectory)(
+            __dirname,
+            "./public/handlebars/registration-pending"
+          )
+        });
+        mailer.sendMail({
+          to: value.email,
+          subject: "Registration Received \u2013 Pending Review",
+          html: emailContent,
+          sender: "iService365"
+        }).catch((error) => {
+          import_node_server_utils111.logger.error(`Failed to send registration pending email: ${error}`);
+        });
+      }
       return "People added successfully.";
     } catch (error) {
+      console.log("error message service", error);
+      console.log("error message service", error.message);
       import_node_server_utils111.logger.error("Error in people service add:", error);
       await session.abortTransaction();
       throw error;
@@ -27592,7 +27836,21 @@ function usePersonService() {
       }
       const isNameUpdated = typeof value.name === "string" && value.name.trim() !== person.name;
       const isOwnerChanged = value.isOwner !== person.isOwner;
+      if (value.org && typeof value.org === "string") {
+        value.org = new import_mongodb64.ObjectId(value.org);
+      }
+      if (value.site && typeof value.site === "string") {
+        value.site = new import_mongodb64.ObjectId(value.site);
+      }
+      const isOrgChanged = value.org && person.org?.toString() !== value.org.toString();
       await _updateById(_id, value, session);
+      if (isOrgChanged && person.user) {
+        await _updateUserOrgById(
+          person.user.toString(),
+          value.org,
+          session
+        );
+      }
       if (value.unit && (isNameUpdated || isOwnerChanged || value.isOwner)) {
         const unit = await _getUnitById(value.unit.toString());
         if (unit) {
@@ -27614,7 +27872,11 @@ function usePersonService() {
             updatePayload.ownerName = value.name || "";
           }
           if (Object.keys(updatePayload).length > 0 && unit && unit._id) {
-            await updateUnitById(unit._id.toString(), updatePayload, session);
+            await updateUnitById(
+              unit._id.toString(),
+              updatePayload,
+              session
+            );
           }
         }
       }
@@ -27704,13 +27966,13 @@ function usePersonService() {
             title = "We request resubmission for your application";
             hideLogin = false;
             statusLogo = `${statusIconPath}/resubmission-icon.png`;
-            message2 = `Hi ${person.name}, please resubmit your application with the required updates.`;
+            message2 = `Hi ${person.name}, please resubmit your application with the required updates.${value.remarks ? ` Remarks: ${value.remarks}` : ""}`;
             break;
           case "rejected":
             userStatus = "rejected";
-            title = "Your account request for deletion has been rejected.";
+            title = "Your account request for application has been rejected.";
             statusLogo = `${statusIconPath}/deleted-icon.png`;
-            message2 = `Hi ${person.name}, unfortunately your application has been rejected. Please contact support for more information.`;
+            message2 = `Hi ${person.name}, unfortunately your application has been rejected.${value.remarks ? ` Remarks: ${value.remarks}` : " Please contact support for more information."}`;
             break;
           default:
             throw new Error("Invalid review status");
@@ -28147,7 +28409,7 @@ function usePersonController() {
 // src/models/robot.model.ts
 var import_node_server_utils113 = require("@7365admin1/node-server-utils");
 var import_joi61 = __toESM(require("joi"));
-var import_mongodb64 = require("mongodb");
+var import_mongodb65 = require("mongodb");
 var metadataSchema4 = {
   orgId: import_joi61.default.string().hex().optional().allow("", null),
   siteId: import_joi61.default.string().hex().optional().allow("", null),
@@ -28172,21 +28434,21 @@ function MRobot(value) {
   }
   if (value.metadata?.orgId) {
     try {
-      value.metadata.orgId = new import_mongodb64.ObjectId(value.metadata.orgId);
+      value.metadata.orgId = new import_mongodb65.ObjectId(value.metadata.orgId);
     } catch (error2) {
       throw new import_node_server_utils113.BadRequestError("Invalid organization ID format.");
     }
   }
   if (value.metadata?.siteId) {
     try {
-      value.metadata.siteId = new import_mongodb64.ObjectId(value.metadata.siteId);
+      value.metadata.siteId = new import_mongodb65.ObjectId(value.metadata.siteId);
     } catch (error2) {
       throw new import_node_server_utils113.BadRequestError("Invalid site ID format.");
     }
   }
   if (value.metadata?.administratorId) {
     try {
-      value.metadata.administratorId = new import_mongodb64.ObjectId(
+      value.metadata.administratorId = new import_mongodb65.ObjectId(
         value.metadata.administratorId
       );
     } catch (error2) {
@@ -28195,7 +28457,7 @@ function MRobot(value) {
   }
   if (value.createdBy) {
     try {
-      value.createdBy = new import_mongodb64.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb65.ObjectId(value.createdBy);
     } catch (error2) {
       throw new import_node_server_utils113.BadRequestError("Invalid created by ID format.");
     }
@@ -28220,7 +28482,7 @@ function MRobot(value) {
 }
 
 // src/repositories/robot.repo.ts
-var import_mongodb65 = require("mongodb");
+var import_mongodb66 = require("mongodb");
 var import_node_server_utils114 = require("@7365admin1/node-server-utils");
 function useRobotRepo() {
   const db = import_node_server_utils114.useAtlas.getDb();
@@ -28281,12 +28543,12 @@ function useRobotRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     try {
-      organization = new import_mongodb65.ObjectId(organization);
+      organization = new import_mongodb66.ObjectId(organization);
     } catch (error) {
       throw new import_node_server_utils114.BadRequestError("Invalid organization ID format.");
     }
     try {
-      site = new import_mongodb65.ObjectId(site);
+      site = new import_mongodb66.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils114.BadRequestError("Invalid site ID format.");
     }
@@ -28509,7 +28771,7 @@ function useRobotController() {
 
 // src/models/patrol-question.model.ts
 var import_node_server_utils117 = require("@7365admin1/node-server-utils");
-var import_mongodb66 = require("mongodb");
+var import_mongodb67 = require("mongodb");
 var import_joi63 = __toESM(require("joi"));
 var schemaPatrolQuestion = import_joi63.default.object({
   _id: import_joi63.default.string().hex().optional(),
@@ -28535,14 +28797,14 @@ function MPatrolQuestion(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb66.ObjectId(value._id);
+      value._id = new import_mongodb67.ObjectId(value._id);
     } catch {
       throw new import_node_server_utils117.BadRequestError("Invalid _id format");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb66.ObjectId(),
-    site: new import_mongodb66.ObjectId(value.site),
+    _id: value._id ?? new import_mongodb67.ObjectId(),
+    site: new import_mongodb67.ObjectId(value.site),
     question: value.question,
     answers: value.answers,
     status: value.status ?? "active",
@@ -28554,7 +28816,7 @@ function MPatrolQuestion(value) {
 
 // src/repositories/patrol-question.repo.ts
 var import_node_server_utils118 = require("@7365admin1/node-server-utils");
-var import_mongodb67 = require("mongodb");
+var import_mongodb68 = require("mongodb");
 function usePatrolQuestionRepo() {
   const db = import_node_server_utils118.useAtlas.getDb();
   if (!db) {
@@ -28633,7 +28895,7 @@ function usePatrolQuestionRepo() {
           { answers: { $regex: search, $options: "i" } }
         ]
       },
-      ...import_mongodb67.ObjectId.isValid(site) && { site: new import_mongodb67.ObjectId(site) }
+      ...import_mongodb68.ObjectId.isValid(site) && { site: new import_mongodb68.ObjectId(site) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
@@ -28673,7 +28935,7 @@ function usePatrolQuestionRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new import_mongodb67.ObjectId(_id);
+      _id = new import_mongodb68.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils118.BadRequestError(
         "Invalid patrol question transaction ID format."
@@ -28694,7 +28956,7 @@ function usePatrolQuestionRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new import_mongodb67.ObjectId(_id);
+      _id = new import_mongodb68.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils118.BadRequestError("Invalid customer ID format.");
     }
@@ -28716,7 +28978,7 @@ function usePatrolQuestionRepo() {
   }
   async function getById(_id, session) {
     try {
-      _id = new import_mongodb67.ObjectId(_id);
+      _id = new import_mongodb68.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils118.BadRequestError("Invalid patrol question ID format.");
     }
@@ -28891,7 +29153,7 @@ function usePatrolQuestionController() {
 
 // src/models/patrol-route.model.ts
 var import_node_server_utils120 = require("@7365admin1/node-server-utils");
-var import_mongodb68 = require("mongodb");
+var import_mongodb69 = require("mongodb");
 var import_joi65 = __toESM(require("joi"));
 var schemeCamera = import_joi65.default.object({
   camera: import_joi65.default.string().hex().required(),
@@ -28939,14 +29201,14 @@ function MPatrolRoute(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb68.ObjectId(value._id);
+      value._id = new import_mongodb69.ObjectId(value._id);
     } catch {
       throw new import_node_server_utils120.BadRequestError("Invalid _id format");
     }
   }
   if (value.assignee && Array.isArray(value.assignee)) {
     try {
-      value.assignee = value.assignee.map((id) => new import_mongodb68.ObjectId(id));
+      value.assignee = value.assignee.map((id) => new import_mongodb69.ObjectId(id));
     } catch {
       throw new import_node_server_utils120.BadRequestError("Invalid assignee id format");
     }
@@ -28955,7 +29217,7 @@ function MPatrolRoute(value) {
     value.cameras = value.cameras.map((camera) => {
       if (typeof camera.camera === "string") {
         try {
-          camera.camera = new import_mongodb68.ObjectId(camera.camera);
+          camera.camera = new import_mongodb69.ObjectId(camera.camera);
         } catch {
           throw new import_node_server_utils120.BadRequestError("Invalid camera id format");
         }
@@ -28963,7 +29225,7 @@ function MPatrolRoute(value) {
       camera.questions = camera.questions.map((question) => {
         if (typeof question.questionId === "string") {
           try {
-            question.questionId = new import_mongodb68.ObjectId(question.questionId);
+            question.questionId = new import_mongodb69.ObjectId(question.questionId);
           } catch {
             throw new import_node_server_utils120.BadRequestError("Invalid question id format");
           }
@@ -28974,8 +29236,8 @@ function MPatrolRoute(value) {
     });
   }
   return {
-    _id: value._id ?? new import_mongodb68.ObjectId(),
-    site: new import_mongodb68.ObjectId(value.site),
+    _id: value._id ?? new import_mongodb69.ObjectId(),
+    site: new import_mongodb69.ObjectId(value.site),
     name: value.name,
     assignee: value.assignee,
     start: value.start,
@@ -28992,7 +29254,7 @@ function MPatrolRoute(value) {
 
 // src/repositories/patrol-route.repo.ts
 var import_node_server_utils121 = require("@7365admin1/node-server-utils");
-var import_mongodb69 = require("mongodb");
+var import_mongodb70 = require("mongodb");
 function usePatrolRouteRepo() {
   const db = import_node_server_utils121.useAtlas.getDb();
   if (!db) {
@@ -29068,7 +29330,7 @@ function usePatrolRouteRepo() {
     page = page > 0 ? page - 1 : 0;
     const query = {
       status,
-      ...import_mongodb69.ObjectId.isValid(site) && { site: new import_mongodb69.ObjectId(site) }
+      ...import_mongodb70.ObjectId.isValid(site) && { site: new import_mongodb70.ObjectId(site) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
@@ -29151,20 +29413,20 @@ function usePatrolRouteRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new import_mongodb69.ObjectId(_id);
+      _id = new import_mongodb70.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils121.BadRequestError("Invalid patrol route transaction ID format.");
     }
-    if (value.site && import_mongodb69.ObjectId.isValid(value.site.toString())) {
+    if (value.site && import_mongodb70.ObjectId.isValid(value.site.toString())) {
       try {
-        value.site = new import_mongodb69.ObjectId(value.site.toString());
+        value.site = new import_mongodb70.ObjectId(value.site.toString());
       } catch {
         throw new import_node_server_utils121.BadRequestError("Invalid _id format");
       }
     }
     if (value.assignee && Array.isArray(value.assignee)) {
       try {
-        value.assignee = value.assignee.map((id) => new import_mongodb69.ObjectId(id));
+        value.assignee = value.assignee.map((id) => new import_mongodb70.ObjectId(id));
       } catch {
         throw new import_node_server_utils121.BadRequestError("Invalid _id format");
       }
@@ -29184,7 +29446,7 @@ function usePatrolRouteRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new import_mongodb69.ObjectId(_id);
+      _id = new import_mongodb70.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils121.BadRequestError("Invalid patrol route transaction ID format.");
     }
@@ -29233,7 +29495,7 @@ function usePatrolRouteRepo() {
     const query = {
       status,
       ...search && { $text: { $search: search } },
-      ...import_mongodb69.ObjectId.isValid(site) && { site: new import_mongodb69.ObjectId(site) }
+      ...import_mongodb70.ObjectId.isValid(site) && { site: new import_mongodb70.ObjectId(site) }
     };
     if (day && start) {
       const [hour, minute] = start?.split(":") ?? ["0", "0"];
@@ -29316,7 +29578,7 @@ function usePatrolRouteRepo() {
               id: "$_id",
               start: startOfDay,
               end: endOfDay,
-              site: import_mongodb69.ObjectId.isValid(site) ? new import_mongodb69.ObjectId(site) : null
+              site: import_mongodb70.ObjectId.isValid(site) ? new import_mongodb70.ObjectId(site) : null
             },
             pipeline: [
               {
@@ -29362,7 +29624,7 @@ function usePatrolRouteRepo() {
   }
   async function getById(_id, session) {
     try {
-      _id = new import_mongodb69.ObjectId(_id);
+      _id = new import_mongodb70.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils121.BadRequestError("Invalid patrol log ID format.");
     }
@@ -29607,7 +29869,7 @@ function usePatrolRouteController() {
 
 // src/models/patrol-log.model.ts
 var import_node_server_utils123 = require("@7365admin1/node-server-utils");
-var import_mongodb70 = require("mongodb");
+var import_mongodb71 = require("mongodb");
 var import_joi67 = __toESM(require("joi"));
 var schemeLogCamera = import_joi67.default.object({
   camera: import_joi67.default.string().hex().required(),
@@ -29668,41 +29930,41 @@ function MPatrolLog(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb70.ObjectId(value._id);
+      value._id = new import_mongodb71.ObjectId(value._id);
     } catch {
       throw new import_node_server_utils123.BadRequestError("Invalid _id format");
     }
   }
   if (value.route && typeof value.route === "string") {
     try {
-      value.route = new import_mongodb70.ObjectId(value.route);
+      value.route = new import_mongodb71.ObjectId(value.route);
     } catch {
       throw new import_node_server_utils123.BadRequestError("Invalid route id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb70.ObjectId(value.site);
+      value.site = new import_mongodb71.ObjectId(value.site);
     } catch {
       throw new import_node_server_utils123.BadRequestError("Invalid site id format");
     }
   }
   const assignee = (value.assignee || []).map((id) => {
     try {
-      return new import_mongodb70.ObjectId(id);
+      return new import_mongodb71.ObjectId(id);
     } catch {
       throw new import_node_server_utils123.BadRequestError("Invalid assignee id format");
     }
   });
   if (value.incidentReport && typeof value.incidentReport.id === "string") {
     try {
-      value.incidentReport.id = new import_mongodb70.ObjectId(value.incidentReport.id);
+      value.incidentReport.id = new import_mongodb71.ObjectId(value.incidentReport.id);
     } catch {
       throw new import_node_server_utils123.BadRequestError("Invalid incident report id format");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb70.ObjectId(),
+    _id: value._id ?? new import_mongodb71.ObjectId(),
     site: value.site,
     name: value.name,
     assignee,
@@ -29721,7 +29983,7 @@ function MPatrolLog(value) {
 
 // src/repositories/patrol-log.repo.ts
 var import_node_server_utils124 = require("@7365admin1/node-server-utils");
-var import_mongodb71 = require("mongodb");
+var import_mongodb72 = require("mongodb");
 function usePatrolLogRepo() {
   const db = import_node_server_utils124.useAtlas.getDb();
   if (!db) {
@@ -29812,7 +30074,7 @@ function usePatrolLogRepo() {
         };
       }
       const query = {
-        ...import_mongodb71.ObjectId.isValid(site) && { site: new import_mongodb71.ObjectId(site) },
+        ...import_mongodb72.ObjectId.isValid(site) && { site: new import_mongodb72.ObjectId(site) },
         ...dateExpr
       };
       sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
@@ -29952,7 +30214,7 @@ function usePatrolLogRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new import_mongodb71.ObjectId(_id);
+      _id = new import_mongodb72.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils124.BadRequestError("Invalid patrol log transaction ID format.");
     }
@@ -29971,7 +30233,7 @@ function usePatrolLogRepo() {
   }
   async function deleteById(_id, session) {
     try {
-      _id = new import_mongodb71.ObjectId(_id);
+      _id = new import_mongodb72.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils124.BadRequestError("Invalid patrol log ID format.");
     }
@@ -29985,7 +30247,7 @@ function usePatrolLogRepo() {
   }
   async function getById(_id, session) {
     try {
-      _id = new import_mongodb71.ObjectId(_id);
+      _id = new import_mongodb72.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils124.BadRequestError("Invalid patrol log ID format.");
     }
@@ -30233,7 +30495,7 @@ function usePatrolLogController() {
 
 // src/models/site-facility.model.ts
 var import_joi69 = __toESM(require("joi"));
-var import_mongodb72 = require("mongodb");
+var import_mongodb73 = require("mongodb");
 var timeSlotSchema = import_joi69.default.array().items(
   import_joi69.default.object({
     start: import_joi69.default.string().optional().allow("", null),
@@ -30393,28 +30655,28 @@ function MSiteFacility(value) {
     throw new Error(error.details[0].message);
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb72.ObjectId(value._id);
+      value._id = new import_mongodb73.ObjectId(value._id);
     } catch {
       throw new Error("Invalid _id.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb72.ObjectId(value.site);
+      value.site = new import_mongodb73.ObjectId(value.site);
     } catch {
       throw new Error("Invalid _id.");
     }
   }
   if (value.featuredImage && typeof value.featuredImage === "string") {
     try {
-      value.featuredImage = new import_mongodb72.ObjectId(value.featuredImage);
+      value.featuredImage = new import_mongodb73.ObjectId(value.featuredImage);
     } catch {
       throw new Error("Invalid featuredImage ID.");
     }
   }
   if (Array.isArray(value.gallery)) {
     try {
-      value.gallery = value.gallery.map((id) => new import_mongodb72.ObjectId(id));
+      value.gallery = value.gallery.map((id) => new import_mongodb73.ObjectId(id));
     } catch {
       throw new Error("Invalid ID in gallery array.");
     }
@@ -30498,7 +30760,7 @@ function MSiteFacility(value) {
 
 // src/repositories/site-facility.repo.ts
 var import_node_server_utils127 = require("@7365admin1/node-server-utils");
-var import_mongodb73 = require("mongodb");
+var import_mongodb74 = require("mongodb");
 function useSiteFacilityRepo() {
   const db = import_node_server_utils127.useAtlas.getDb();
   if (!db) {
@@ -30566,7 +30828,7 @@ function useSiteFacilityRepo() {
     };
     if (site) {
       try {
-        site = new import_mongodb73.ObjectId(site);
+        site = new import_mongodb74.ObjectId(site);
         query.site = site;
         cacheOptions.site = site.toString();
       } catch (error) {
@@ -30611,7 +30873,7 @@ function useSiteFacilityRepo() {
   }
   async function getSiteFacilityById(_id, session) {
     try {
-      _id = new import_mongodb73.ObjectId(_id);
+      _id = new import_mongodb74.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils127.BadRequestError("Invalid site facility ID format.");
     }
@@ -30639,20 +30901,20 @@ function useSiteFacilityRepo() {
   async function updateSiteFacilityById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new import_mongodb73.ObjectId(_id);
+      _id = new import_mongodb74.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils127.BadRequestError("Invalid ID format.");
     }
     if (value.featuredImage) {
       try {
-        value.featuredImage = new import_mongodb73.ObjectId(value.featuredImage);
+        value.featuredImage = new import_mongodb74.ObjectId(value.featuredImage);
       } catch (error) {
         throw new import_node_server_utils127.BadRequestError("Invalid ID format for featured image.");
       }
     }
     if (Array.isArray(value.gallery)) {
       try {
-        value.gallery = value.gallery.map((id) => new import_mongodb73.ObjectId(id));
+        value.gallery = value.gallery.map((id) => new import_mongodb74.ObjectId(id));
       } catch {
         throw new Error("Invalid ID in gallery array.");
       }
@@ -30698,7 +30960,7 @@ function useSiteFacilityRepo() {
   }
   async function deleteSiteFacilityById(_id) {
     try {
-      _id = new import_mongodb73.ObjectId(_id);
+      _id = new import_mongodb74.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils127.BadRequestError("Invalid site facility ID format.");
     }
@@ -30727,12 +30989,12 @@ function useSiteFacilityRepo() {
   }
   async function getSiteFacilityTimeSlotById(_id, site, session) {
     try {
-      _id = new import_mongodb73.ObjectId(_id);
+      _id = new import_mongodb74.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils127.BadRequestError("Invalid facility ID format.");
     }
     try {
-      site = new import_mongodb73.ObjectId(site);
+      site = new import_mongodb74.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils127.BadRequestError("Invalid site ID format.");
     }
@@ -31075,7 +31337,7 @@ function useSiteFacilityController() {
 
 // src/models/service-provider-billing.model.ts
 var import_joi71 = __toESM(require("joi"));
-var import_mongodb74 = require("mongodb");
+var import_mongodb75 = require("mongodb");
 var schemaServiceProviderBilling = import_joi71.default.object({
   _id: import_joi71.default.string().hex().optional().allow("", null),
   attachments: import_joi71.default.array().items(import_joi71.default.string().hex()).required(),
@@ -31109,7 +31371,7 @@ function MServiceProviderBilling(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb74.ObjectId(value._id);
+      value._id = new import_mongodb75.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
@@ -31118,7 +31380,7 @@ function MServiceProviderBilling(value) {
     value.acknowledgedBy = value.acknowledgedBy.map((item) => {
       if (item.user && typeof item.user === "string") {
         try {
-          item.user = new import_mongodb74.ObjectId(item.user);
+          item.user = new import_mongodb75.ObjectId(item.user);
         } catch (error2) {
           throw new Error("Invalid ID format for acknowledgedBy.user.");
         }
@@ -31128,13 +31390,13 @@ function MServiceProviderBilling(value) {
   }
   if (value.orgId && typeof value.orgId === "string") {
     try {
-      value.orgId = new import_mongodb74.ObjectId(value.orgId);
+      value.orgId = new import_mongodb75.ObjectId(value.orgId);
     } catch {
       throw new Error("Invalid org ID.");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb74.ObjectId(),
+    _id: value._id ?? new import_mongodb75.ObjectId(),
     attachments: value.attachments,
     acknowledgedBy: value.acknowledgedBy || [],
     status: value.status,
@@ -31147,7 +31409,7 @@ function MServiceProviderBilling(value) {
 
 // src/repositories/service-provider-billing.repo.ts
 var import_node_server_utils130 = require("@7365admin1/node-server-utils");
-var import_mongodb75 = require("mongodb");
+var import_mongodb76 = require("mongodb");
 function useServiceProviderBillingRepo() {
   const db = import_node_server_utils130.useAtlas.getDb();
   if (!db) {
@@ -31194,7 +31456,7 @@ function useServiceProviderBillingRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      org = new import_mongodb75.ObjectId(org);
+      org = new import_mongodb76.ObjectId(org);
     } catch (error) {
       throw new import_node_server_utils130.BadRequestError("Invalid org ID format.");
     }
@@ -31244,7 +31506,7 @@ function useServiceProviderBillingRepo() {
   }
   async function getSiteServiceProviderBillingById(_id, session) {
     try {
-      _id = new import_mongodb75.ObjectId(_id);
+      _id = new import_mongodb76.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils130.BadRequestError("Invalid service provider billing ID format.");
     }
@@ -31272,7 +31534,7 @@ function useServiceProviderBillingRepo() {
   async function updateServiceProviderBillingById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new import_mongodb75.ObjectId(_id);
+      _id = new import_mongodb76.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils130.BadRequestError("Invalid ID format.");
     }
@@ -31280,7 +31542,7 @@ function useServiceProviderBillingRepo() {
       value.acknowledgedBy = value.acknowledgedBy.map((item) => {
         if (item.user && typeof item.user === "string") {
           try {
-            item.user = new import_mongodb75.ObjectId(item.user);
+            item.user = new import_mongodb76.ObjectId(item.user);
           } catch (error) {
             throw new Error("Invalid ID format for acknowledgedBy.user.");
           }
@@ -31314,7 +31576,7 @@ function useServiceProviderBillingRepo() {
   }
   async function deleteServiceProviderBillingById(_id) {
     try {
-      _id = new import_mongodb75.ObjectId(_id);
+      _id = new import_mongodb76.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils130.BadRequestError("Invalid service provider billing ID format.");
     }
@@ -31552,7 +31814,7 @@ function useServiceProviderBillingController() {
 
 // src/models/site-facility-booking.model.ts
 var import_joi73 = __toESM(require("joi"));
-var import_mongodb76 = require("mongodb");
+var import_mongodb77 = require("mongodb");
 var FacilitySort = /* @__PURE__ */ ((FacilitySort2) => {
   FacilitySort2["CREATED_AT"] = "createdAt";
   FacilitySort2["NAME"] = "name";
@@ -31662,48 +31924,48 @@ function MSiteFacilityBooking(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb76.ObjectId(value._id);
+      value._id = new import_mongodb77.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb76.ObjectId(value.site);
+      value.site = new import_mongodb77.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.user && typeof value.user === "string") {
     try {
-      value.user = new import_mongodb76.ObjectId(value.user);
+      value.user = new import_mongodb77.ObjectId(value.user);
     } catch {
       throw new Error("Invalid user ID.");
     }
   }
   if (value.approvedBy && typeof value.approvedBy === "string") {
     try {
-      value.approvedBy = new import_mongodb76.ObjectId(value.approvedBy);
+      value.approvedBy = new import_mongodb77.ObjectId(value.approvedBy);
     } catch {
       throw new Error("Invalid approved by ID.");
     }
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new import_mongodb76.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb77.ObjectId(value.createdBy);
     } catch {
       throw new Error("Invalid created by ID.");
     }
   }
   if (value.updatedBy && typeof value.updatedBy === "string") {
     try {
-      value.updatedBy = new import_mongodb76.ObjectId(value.updatedBy);
+      value.updatedBy = new import_mongodb77.ObjectId(value.updatedBy);
     } catch {
       throw new Error("Invalid updated by ID.");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb76.ObjectId(),
+    _id: value._id ?? new import_mongodb77.ObjectId(),
     facility: value.facility ?? "",
     slot: value.slot ?? "",
     slotName: value.slotName ?? "",
@@ -31789,7 +32051,7 @@ function MSiteFacilityBooking(value) {
 
 // src/repositories/site-facility-booking.repo.ts
 var import_node_server_utils133 = require("@7365admin1/node-server-utils");
-var import_mongodb77 = require("mongodb");
+var import_mongodb78 = require("mongodb");
 var facility_bookings_namespace_collection = "site.facilty-booking";
 function useSiteFacilityBookingRepo() {
   const db = import_node_server_utils133.useAtlas.getDb();
@@ -31952,7 +32214,7 @@ function useSiteFacilityBookingRepo() {
   }
   async function deleteSiteFacilityBookingById(_id) {
     try {
-      _id = new import_mongodb77.ObjectId(_id);
+      _id = new import_mongodb78.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils133.BadRequestError("Invalid site facility booking ID format.");
     }
@@ -32189,7 +32451,7 @@ function useSiteFacilityBookingController() {
 
 // src/models/document-management.model.ts
 var import_joi75 = __toESM(require("joi"));
-var import_mongodb78 = require("mongodb");
+var import_mongodb79 = require("mongodb");
 var schemaDocumentManagement = import_joi75.default.object({
   _id: import_joi75.default.string().hex().optional().allow("", null),
   name: import_joi75.default.string().required(),
@@ -32227,28 +32489,28 @@ function MDocumentManagement(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb78.ObjectId(value._id);
+      value._id = new import_mongodb79.ObjectId(value._id);
     } catch (error2) {
       throw new Error("Invalid ID.");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new import_mongodb78.ObjectId(value.org);
+      value.org = new import_mongodb79.ObjectId(value.org);
     } catch (error2) {
       throw new Error("Invalid org ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb78.ObjectId(value.site);
+      value.site = new import_mongodb79.ObjectId(value.site);
     } catch (error2) {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.parentId && typeof value.parentId === "string") {
     try {
-      value.parentId = new import_mongodb78.ObjectId(value.parentId);
+      value.parentId = new import_mongodb79.ObjectId(value.parentId);
     } catch (error2) {
       throw new Error("Invalid parentId.");
     }
@@ -32273,7 +32535,7 @@ function MDocumentManagement(value) {
 
 // src/repositories/document-management.repo.ts
 var import_node_server_utils136 = require("@7365admin1/node-server-utils");
-var import_mongodb79 = require("mongodb");
+var import_mongodb80 = require("mongodb");
 function useDocumentManagementRepo() {
   const db = import_node_server_utils136.useAtlas.getDb();
   if (!db) {
@@ -32335,7 +32597,7 @@ function useDocumentManagementRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new import_mongodb79.ObjectId(site);
+      site = new import_mongodb80.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils136.BadRequestError("Invalid site ID format.");
     }
@@ -32352,12 +32614,12 @@ function useDocumentManagementRepo() {
       cacheOptions.type = type;
     }
     if (org) {
-      query.org = new import_mongodb79.ObjectId(org);
+      query.org = new import_mongodb80.ObjectId(org);
       cacheOptions.org = org.toString();
     }
     if (parentId) {
       try {
-        query.parentId = new import_mongodb79.ObjectId(parentId);
+        query.parentId = new import_mongodb80.ObjectId(parentId);
         cacheOptions.parentId = parentId.toString();
       } catch (error) {
         throw new import_node_server_utils136.BadRequestError("Invalid parentId format.");
@@ -32411,7 +32673,7 @@ function useDocumentManagementRepo() {
   }
   async function getDocumentById(_id) {
     try {
-      _id = new import_mongodb79.ObjectId(_id);
+      _id = new import_mongodb80.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils136.BadRequestError("Invalid document ID format.");
     }
@@ -32456,7 +32718,7 @@ function useDocumentManagementRepo() {
   }
   async function updateDocumentById(_id, value) {
     try {
-      _id = new import_mongodb79.ObjectId(_id);
+      _id = new import_mongodb80.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils136.BadRequestError("Invalid document ID format.");
     }
@@ -32484,7 +32746,7 @@ function useDocumentManagementRepo() {
   }
   async function deleteDocumentById(_id, session) {
     try {
-      _id = new import_mongodb79.ObjectId(_id);
+      _id = new import_mongodb80.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils136.BadRequestError("Invalid document ID format.");
     }
@@ -32517,7 +32779,7 @@ function useDocumentManagementRepo() {
   }
   async function getDocumentManagementBySiteId(site, type) {
     try {
-      site = new import_mongodb79.ObjectId(site);
+      site = new import_mongodb80.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils136.BadRequestError("Invalid document management site ID format.");
     }
@@ -32843,7 +33105,7 @@ function useDocumentManagementController() {
 
 // src/models/bulletin-board.model.ts
 var import_joi77 = __toESM(require("joi"));
-var import_mongodb80 = require("mongodb");
+var import_mongodb81 = require("mongodb");
 var BulletinRecipient = /* @__PURE__ */ ((BulletinRecipient2) => {
   BulletinRecipient2["RESIDENT"] = "resident";
   BulletinRecipient2["SECURITY_AGENCY"] = "security_agency";
@@ -32923,21 +33185,21 @@ function MBulletinBoard(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb80.ObjectId(value._id);
+      value._id = new import_mongodb81.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb80.ObjectId(value.site);
+      value.site = new import_mongodb81.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.orgId && typeof value.orgId === "string") {
     try {
-      value.orgId = new import_mongodb80.ObjectId(value.orgId);
+      value.orgId = new import_mongodb81.ObjectId(value.orgId);
     } catch {
       throw new Error("Invalid org ID.");
     }
@@ -32946,7 +33208,7 @@ function MBulletinBoard(value) {
     value.file = value.file.map((f) => {
       if (f._id && typeof f._id === "string") {
         try {
-          return { ...f, _id: new import_mongodb80.ObjectId(f._id) };
+          return { ...f, _id: new import_mongodb81.ObjectId(f._id) };
         } catch {
           throw new Error("Invalid file ID.");
         }
@@ -32955,7 +33217,7 @@ function MBulletinBoard(value) {
     });
   }
   return {
-    _id: value._id ?? new import_mongodb80.ObjectId(),
+    _id: value._id ?? new import_mongodb81.ObjectId(),
     site: value.site ?? "",
     orgId: value.orgId ?? "",
     recipients: value.recipients ?? [],
@@ -32974,7 +33236,7 @@ function MBulletinBoard(value) {
 
 // src/repositories/bulletin-board.repo.ts
 var import_node_server_utils139 = require("@7365admin1/node-server-utils");
-var import_mongodb81 = require("mongodb");
+var import_mongodb82 = require("mongodb");
 var bulletin_boards_namespace_collection = "bulletin-boards";
 function useBulletinBoardRepo() {
   const db = import_node_server_utils139.useAtlas.getDb();
@@ -33027,7 +33289,7 @@ function useBulletinBoardRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new import_mongodb81.ObjectId(site);
+      site = new import_mongodb82.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils139.BadRequestError("Invalid site ID format.");
     }
@@ -33086,7 +33348,7 @@ function useBulletinBoardRepo() {
   }
   async function getBulletinBoardById(_id, session) {
     try {
-      _id = new import_mongodb81.ObjectId(_id);
+      _id = new import_mongodb82.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils139.BadRequestError("Invalid bulletin board ID format.");
     }
@@ -33116,13 +33378,13 @@ function useBulletinBoardRepo() {
   async function updateBulletinBoardById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new import_mongodb81.ObjectId(_id);
+      _id = new import_mongodb82.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils139.BadRequestError("Invalid ID format.");
     }
     if (value.site && typeof value.site === "string") {
       try {
-        value.site = new import_mongodb81.ObjectId(value.site);
+        value.site = new import_mongodb82.ObjectId(value.site);
       } catch {
         throw new Error("Invalid site ID.");
       }
@@ -33153,7 +33415,7 @@ function useBulletinBoardRepo() {
   }
   async function deleteBulletinBoardById(_id, session) {
     try {
-      _id = new import_mongodb81.ObjectId(_id);
+      _id = new import_mongodb82.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils139.BadRequestError("Invalid bulletin board ID format.");
     }
@@ -33587,7 +33849,7 @@ function useBulletinBoardController() {
 
 // src/models/site-billing-item.model.ts
 var import_node_server_utils142 = require("@7365admin1/node-server-utils");
-var import_mongodb82 = require("mongodb");
+var import_mongodb83 = require("mongodb");
 var import_joi79 = __toESM(require("joi"));
 
 // src/types/enums/billing-frequency.enum.ts
@@ -33658,21 +33920,21 @@ function MBillingItem(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb82.ObjectId(value._id);
+      value._id = new import_mongodb83.ObjectId(value._id);
     } catch {
       throw new import_node_server_utils142.BadRequestError("Invalid _id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb82.ObjectId(value.site);
+      value.site = new import_mongodb83.ObjectId(value.site);
     } catch {
       throw new import_node_server_utils142.BadRequestError("Invalid site id format");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new import_mongodb82.ObjectId(value.org);
+      value.org = new import_mongodb83.ObjectId(value.org);
     } catch {
       throw new import_node_server_utils142.BadRequestError("Invalid org id format");
     }
@@ -33681,7 +33943,7 @@ function MBillingItem(value) {
     value.units = value.units.map((unit) => {
       if (unit._id && typeof unit._id === "string") {
         try {
-          unit._id = new import_mongodb82.ObjectId(unit._id);
+          unit._id = new import_mongodb83.ObjectId(unit._id);
         } catch {
           throw new import_node_server_utils142.BadRequestError("Invalid unit id format");
         }
@@ -33690,7 +33952,7 @@ function MBillingItem(value) {
     });
   }
   return {
-    _id: value._id ?? new import_mongodb82.ObjectId(),
+    _id: value._id ?? new import_mongodb83.ObjectId(),
     site: value.site,
     org: value.org,
     name: value.name,
@@ -33718,7 +33980,7 @@ function MBillingItem(value) {
 
 // src/repositories/site-billing-item.repo.ts
 var import_node_server_utils143 = require("@7365admin1/node-server-utils");
-var import_mongodb83 = require("mongodb");
+var import_mongodb84 = require("mongodb");
 function useSiteBillingItemRepo() {
   const db = import_node_server_utils143.useAtlas.getDb();
   if (!db) {
@@ -33805,7 +34067,7 @@ function useSiteBillingItemRepo() {
           }
         ]
       },
-      ...import_mongodb83.ObjectId.isValid(site) && { site: new import_mongodb83.ObjectId(site) }
+      ...import_mongodb84.ObjectId.isValid(site) && { site: new import_mongodb84.ObjectId(site) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
@@ -33845,7 +34107,7 @@ function useSiteBillingItemRepo() {
   }
   async function getById(_id, session) {
     try {
-      _id = new import_mongodb83.ObjectId(_id);
+      _id = new import_mongodb84.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils143.BadRequestError("Invalid ID.");
     }
@@ -33884,22 +34146,22 @@ function useSiteBillingItemRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new import_mongodb83.ObjectId(_id);
+      _id = new import_mongodb84.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils143.BadRequestError(
         "Invalid site billing item transaction ID format."
       );
     }
-    if (value.site && import_mongodb83.ObjectId.isValid(value.site.toString())) {
+    if (value.site && import_mongodb84.ObjectId.isValid(value.site.toString())) {
       try {
-        value.site = new import_mongodb83.ObjectId(value.site.toString());
+        value.site = new import_mongodb84.ObjectId(value.site.toString());
       } catch {
         throw new import_node_server_utils143.BadRequestError("Invalid _id format");
       }
     }
-    if (value.org && import_mongodb83.ObjectId.isValid(value.org.toString())) {
+    if (value.org && import_mongodb84.ObjectId.isValid(value.org.toString())) {
       try {
-        value.org = new import_mongodb83.ObjectId(value.org.toString());
+        value.org = new import_mongodb84.ObjectId(value.org.toString());
       } catch {
         throw new import_node_server_utils143.BadRequestError("Invalid _id format");
       }
@@ -33919,7 +34181,7 @@ function useSiteBillingItemRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new import_mongodb83.ObjectId(_id);
+      _id = new import_mongodb84.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils143.BadRequestError(
         "Invalid site billing item transaction ID format."
@@ -33976,7 +34238,7 @@ var import_node_server_utils145 = require("@7365admin1/node-server-utils");
 
 // src/models/site-billing-configuration.model.ts
 var import_node_server_utils144 = require("@7365admin1/node-server-utils");
-var import_mongodb84 = require("mongodb");
+var import_mongodb85 = require("mongodb");
 var import_joi80 = __toESM(require("joi"));
 var schemaBillingConfiguration = import_joi80.default.object({
   _id: import_joi80.default.string().hex().optional(),
@@ -34037,34 +34299,34 @@ function MBillingConfiguration(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb84.ObjectId(value._id);
+      value._id = new import_mongodb85.ObjectId(value._id);
     } catch {
       throw new import_node_server_utils144.BadRequestError("Invalid _id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb84.ObjectId(value.site);
+      value.site = new import_mongodb85.ObjectId(value.site);
     } catch {
       throw new import_node_server_utils144.BadRequestError("Invalid site id format");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new import_mongodb84.ObjectId(value.org);
+      value.org = new import_mongodb85.ObjectId(value.org);
     } catch {
       throw new import_node_server_utils144.BadRequestError("Invalid org id format");
     }
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new import_mongodb84.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb85.ObjectId(value.createdBy);
     } catch {
       throw new import_node_server_utils144.BadRequestError("Invalid createdBy id format");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb84.ObjectId(),
+    _id: value._id ?? new import_mongodb85.ObjectId(),
     site: value.site,
     org: value.org,
     siteName: value.siteName,
@@ -34093,7 +34355,7 @@ function MBillingConfiguration(value) {
 }
 
 // src/repositories/site-billing-configuration.repo.ts
-var import_mongodb85 = require("mongodb");
+var import_mongodb86 = require("mongodb");
 function useSiteBillingConfigurationRepo() {
   const db = import_node_server_utils145.useAtlas.getDb();
   if (!db) {
@@ -34166,7 +34428,7 @@ function useSiteBillingConfigurationRepo() {
     const query = {
       status,
       ...search && { $text: { $search: search } },
-      ...import_mongodb85.ObjectId.isValid(site) && { site: new import_mongodb85.ObjectId(site) }
+      ...import_mongodb86.ObjectId.isValid(site) && { site: new import_mongodb86.ObjectId(site) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
@@ -34206,7 +34468,7 @@ function useSiteBillingConfigurationRepo() {
   }
   async function getById(_id) {
     try {
-      _id = new import_mongodb85.ObjectId(_id);
+      _id = new import_mongodb86.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils145.BadRequestError("Invalid ID.");
     }
@@ -34247,22 +34509,22 @@ function useSiteBillingConfigurationRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new import_mongodb85.ObjectId(_id);
+      _id = new import_mongodb86.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils145.BadRequestError(
         "Invalid site billing configuration transaction ID format."
       );
     }
-    if (value.site && import_mongodb85.ObjectId.isValid(value.site.toString())) {
+    if (value.site && import_mongodb86.ObjectId.isValid(value.site.toString())) {
       try {
-        value.site = new import_mongodb85.ObjectId(value.site.toString());
+        value.site = new import_mongodb86.ObjectId(value.site.toString());
       } catch {
         throw new import_node_server_utils145.BadRequestError("Invalid _id format");
       }
     }
-    if (value.org && import_mongodb85.ObjectId.isValid(value.org.toString())) {
+    if (value.org && import_mongodb86.ObjectId.isValid(value.org.toString())) {
       try {
-        value.org = new import_mongodb85.ObjectId(value.org.toString());
+        value.org = new import_mongodb86.ObjectId(value.org.toString());
       } catch {
         throw new import_node_server_utils145.BadRequestError("Invalid _id format");
       }
@@ -34282,7 +34544,7 @@ function useSiteBillingConfigurationRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new import_mongodb85.ObjectId(_id);
+      _id = new import_mongodb86.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils145.BadRequestError(
         "Invalid site billing configuration transaction ID format."
@@ -34860,7 +35122,7 @@ function useSiteBillingConfigurationController() {
 }
 
 // src/models/event-management.model.ts
-var import_mongodb86 = require("mongodb");
+var import_mongodb87 = require("mongodb");
 var import_joi83 = __toESM(require("joi"));
 var EventStatus = /* @__PURE__ */ ((EventStatus2) => {
   EventStatus2["PLANNED"] = "planned";
@@ -34904,20 +35166,20 @@ var schemaUpdateEventManagement = import_joi83.default.object({
 function MEventManagement(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb86.ObjectId(value._id);
+      value._id = new import_mongodb87.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb86.ObjectId(value.site);
+      value.site = new import_mongodb87.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb86.ObjectId(),
+    _id: value._id ?? new import_mongodb87.ObjectId(),
     site: value.site,
     title: value.title,
     description: value.description ?? "",
@@ -34932,7 +35194,7 @@ function MEventManagement(value) {
 
 // src/repositories/event-management.repo.ts
 var import_node_server_utils150 = require("@7365admin1/node-server-utils");
-var import_mongodb87 = require("mongodb");
+var import_mongodb88 = require("mongodb");
 var events_namespace_collection = "event-management";
 function useEventManagementRepo() {
   const db = import_node_server_utils150.useAtlas.getDb();
@@ -35000,7 +35262,7 @@ function useEventManagementRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new import_mongodb87.ObjectId(site);
+      site = new import_mongodb88.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils150.BadRequestError("Invalid site ID format.");
     }
@@ -35088,7 +35350,7 @@ function useEventManagementRepo() {
   }
   async function getEventManagementById(_id, session) {
     try {
-      _id = new import_mongodb87.ObjectId(_id);
+      _id = new import_mongodb88.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils150.BadRequestError("Invalid event ID format.");
     }
@@ -35116,13 +35378,13 @@ function useEventManagementRepo() {
   async function updateEventManagementById(_id, value, session) {
     value.updatedAt = /* @__PURE__ */ new Date();
     try {
-      _id = new import_mongodb87.ObjectId(_id);
+      _id = new import_mongodb88.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils150.BadRequestError("Invalid ID format.");
     }
     if (value.site && typeof value.site === "string") {
       try {
-        value.site = new import_mongodb87.ObjectId(value.site);
+        value.site = new import_mongodb88.ObjectId(value.site);
       } catch {
         throw new Error("Invalid site ID.");
       }
@@ -35153,7 +35415,7 @@ function useEventManagementRepo() {
   }
   async function deleteEventManagementById(_id) {
     try {
-      _id = new import_mongodb87.ObjectId(_id);
+      _id = new import_mongodb88.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils150.BadRequestError("Invalid event ID format.");
     }
@@ -35441,7 +35703,7 @@ function useEventManagementController() {
 
 // src/models/site-unit-billing.model.ts
 var import_node_server_utils153 = require("@7365admin1/node-server-utils");
-var import_mongodb88 = require("mongodb");
+var import_mongodb89 = require("mongodb");
 var import_joi85 = __toESM(require("joi"));
 var Status = /* @__PURE__ */ ((Status2) => {
   Status2["PENDING"] = "pending";
@@ -35536,48 +35798,48 @@ function MUnitBilling(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb88.ObjectId(value._id);
+      value._id = new import_mongodb89.ObjectId(value._id);
     } catch {
       throw new import_node_server_utils153.BadRequestError("Invalid _id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb88.ObjectId(value.site);
+      value.site = new import_mongodb89.ObjectId(value.site);
     } catch {
       throw new import_node_server_utils153.BadRequestError("Invalid site id format");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new import_mongodb88.ObjectId(value.org);
+      value.org = new import_mongodb89.ObjectId(value.org);
     } catch {
       throw new import_node_server_utils153.BadRequestError("Invalid org id format");
     }
   }
   if (value.paidBy && typeof value.paidBy === "string") {
     try {
-      value.paidBy = new import_mongodb88.ObjectId(value.paidBy);
+      value.paidBy = new import_mongodb89.ObjectId(value.paidBy);
     } catch {
       throw new import_node_server_utils153.BadRequestError("Invalid paidBy id format");
     }
   }
   if (value.billItem && typeof value.billItem === "string") {
     try {
-      value.billItem = new import_mongodb88.ObjectId(value.billItem);
+      value.billItem = new import_mongodb89.ObjectId(value.billItem);
     } catch {
       throw new import_node_server_utils153.BadRequestError("Invalid billItem id format");
     }
   }
   if (value.unitId && typeof value.unitId === "string") {
     try {
-      value.unitId = new import_mongodb88.ObjectId(value.unitId);
+      value.unitId = new import_mongodb89.ObjectId(value.unitId);
     } catch {
       throw new import_node_server_utils153.BadRequestError("Invalid unitId id format");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb88.ObjectId(),
+    _id: value._id ?? new import_mongodb89.ObjectId(),
     site: value.site ?? "",
     org: value.org ?? "",
     billItem: value.billItem ?? "",
@@ -35613,7 +35875,7 @@ function MUnitBilling(value) {
 
 // src/repositories/site-unit-billing.repo.ts
 var import_node_server_utils154 = require("@7365admin1/node-server-utils");
-var import_mongodb89 = require("mongodb");
+var import_mongodb90 = require("mongodb");
 function useSiteUnitBillingRepo() {
   const db = import_node_server_utils154.useAtlas.getDb();
   if (!db) {
@@ -35663,7 +35925,7 @@ function useSiteUnitBillingRepo() {
       const res = await collection.insertOne(value, { session });
       const acronym = createAcronym(value.billName || "NA");
       const dateFormatted = formatDateString(/* @__PURE__ */ new Date());
-      const newId = new import_mongodb89.ObjectId(res.insertedId).toString().slice(-6);
+      const newId = new import_mongodb90.ObjectId(res.insertedId).toString().slice(-6);
       const referenceNumber = `${acronym}${newId}${dateFormatted}`;
       await collection.updateOne(
         { _id: res.insertedId },
@@ -35741,7 +36003,7 @@ function useSiteUnitBillingRepo() {
           }
         ]
       },
-      ...import_mongodb89.ObjectId.isValid(site) && { site: new import_mongodb89.ObjectId(site) },
+      ...import_mongodb90.ObjectId.isValid(site) && { site: new import_mongodb90.ObjectId(site) },
       ...dateExpr
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
@@ -35807,7 +36069,7 @@ function useSiteUnitBillingRepo() {
   }
   async function getById(_id) {
     try {
-      _id = new import_mongodb89.ObjectId(_id);
+      _id = new import_mongodb90.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils154.BadRequestError("Invalid ID.");
     }
@@ -35866,8 +36128,8 @@ function useSiteUnitBillingRepo() {
     }
     const query = {
       status,
-      ...unitId && import_mongodb89.ObjectId.isValid(unitId) && { unitId: new import_mongodb89.ObjectId(unitId) },
-      ...site && import_mongodb89.ObjectId.isValid(site) && { site: new import_mongodb89.ObjectId(site) },
+      ...unitId && import_mongodb90.ObjectId.isValid(unitId) && { unitId: new import_mongodb90.ObjectId(unitId) },
+      ...site && import_mongodb90.ObjectId.isValid(site) && { site: new import_mongodb90.ObjectId(site) },
       ...dateExpr
     };
     try {
@@ -35905,43 +36167,43 @@ function useSiteUnitBillingRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new import_mongodb89.ObjectId(_id);
+      _id = new import_mongodb90.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils154.BadRequestError(
         "Invalid site unit billing transaction ID format."
       );
     }
-    if (value.site && import_mongodb89.ObjectId.isValid(value.site.toString())) {
+    if (value.site && import_mongodb90.ObjectId.isValid(value.site.toString())) {
       try {
-        value.site = new import_mongodb89.ObjectId(value.site.toString());
+        value.site = new import_mongodb90.ObjectId(value.site.toString());
       } catch {
         throw new import_node_server_utils154.BadRequestError("Invalid _id format");
       }
     }
-    if (value.org && import_mongodb89.ObjectId.isValid(value.org.toString())) {
+    if (value.org && import_mongodb90.ObjectId.isValid(value.org.toString())) {
       try {
-        value.org = new import_mongodb89.ObjectId(value.org.toString());
+        value.org = new import_mongodb90.ObjectId(value.org.toString());
       } catch {
         throw new import_node_server_utils154.BadRequestError("Invalid _id format");
       }
     }
-    if (value.paidBy && import_mongodb89.ObjectId.isValid(value.paidBy.toString())) {
+    if (value.paidBy && import_mongodb90.ObjectId.isValid(value.paidBy.toString())) {
       try {
-        value.org = new import_mongodb89.ObjectId(value.paidBy.toString());
+        value.org = new import_mongodb90.ObjectId(value.paidBy.toString());
       } catch {
         throw new import_node_server_utils154.BadRequestError("Invalid _id format");
       }
     }
-    if (value.billItem && import_mongodb89.ObjectId.isValid(value.billItem.toString())) {
+    if (value.billItem && import_mongodb90.ObjectId.isValid(value.billItem.toString())) {
       try {
-        value.billItem = new import_mongodb89.ObjectId(value.billItem.toString());
+        value.billItem = new import_mongodb90.ObjectId(value.billItem.toString());
       } catch {
         throw new import_node_server_utils154.BadRequestError("Invalid _id format");
       }
     }
-    if (value.unitId && import_mongodb89.ObjectId.isValid(value.unitId.toString())) {
+    if (value.unitId && import_mongodb90.ObjectId.isValid(value.unitId.toString())) {
       try {
-        value.unitId = new import_mongodb89.ObjectId(value.unitId.toString());
+        value.unitId = new import_mongodb90.ObjectId(value.unitId.toString());
       } catch {
         throw new import_node_server_utils154.BadRequestError("Invalid _id format");
       }
@@ -35961,7 +36223,7 @@ function useSiteUnitBillingRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new import_mongodb89.ObjectId(_id);
+      _id = new import_mongodb90.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils154.BadRequestError(
         "Invalid site unit billing transaction ID format."
@@ -36027,9 +36289,9 @@ function useSiteUnitBillingRepo() {
           }
         ]
       },
-      ...import_mongodb89.ObjectId.isValid(site) && { site: new import_mongodb89.ObjectId(site) },
+      ...import_mongodb90.ObjectId.isValid(site) && { site: new import_mongodb90.ObjectId(site) },
       ...dateExpr,
-      ...import_mongodb89.ObjectId.isValid(unitId) && { unitId: new import_mongodb89.ObjectId(unitId) }
+      ...import_mongodb90.ObjectId.isValid(unitId) && { unitId: new import_mongodb90.ObjectId(unitId) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     try {
@@ -36116,9 +36378,9 @@ function useSiteUnitBillingRepo() {
           }
         ]
       },
-      ...import_mongodb89.ObjectId.isValid(site) && { site: new import_mongodb89.ObjectId(site) },
+      ...import_mongodb90.ObjectId.isValid(site) && { site: new import_mongodb90.ObjectId(site) },
       ...dateExpr,
-      ...import_mongodb89.ObjectId.isValid(unitId) && { unitId: new import_mongodb89.ObjectId(unitId) }
+      ...import_mongodb90.ObjectId.isValid(unitId) && { unitId: new import_mongodb90.ObjectId(unitId) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     try {
@@ -36201,7 +36463,7 @@ function useSiteUnitBillingRepo() {
 
 // src/services/site-unit-billing.service.ts
 var import_node_server_utils155 = require("@7365admin1/node-server-utils");
-var import_mongodb90 = require("mongodb");
+var import_mongodb91 = require("mongodb");
 function useSiteUnitBillingService() {
   const {
     add: _add,
@@ -36358,7 +36620,7 @@ function useSiteUnitBillingService() {
       return unitsWithOwner || [];
     } else {
       if (units && units.length > 0) {
-        const unitIds = units.map((unit) => new import_mongodb90.ObjectId(unit._id));
+        const unitIds = units.map((unit) => new import_mongodb91.ObjectId(unit._id));
         const specificUnitsWithOwner = await _getBuildingUnitsWithOwner(
           site || "",
           unitIds
@@ -36639,7 +36901,7 @@ function useSiteUnitBillingController() {
 }
 
 // src/models/access-management.model.ts
-var import_mongodb91 = require("mongodb");
+var import_mongodb92 = require("mongodb");
 var EAccessCardTypes = /* @__PURE__ */ ((EAccessCardTypes2) => {
   EAccessCardTypes2["NFC"] = "NFC";
   EAccessCardTypes2["QR"] = "QRCODE";
@@ -36661,7 +36923,7 @@ var AccessTypeProps = /* @__PURE__ */ ((AccessTypeProps2) => {
 })(AccessTypeProps || {});
 var MAccessCardTransaction = class {
   constructor({
-    _id = new import_mongodb91.ObjectId(),
+    _id = new import_mongodb92.ObjectId(),
     index,
     site,
     cardNo,
@@ -36688,7 +36950,7 @@ var MAccessCardTransaction = class {
 };
 var MAccessCard = class {
   constructor({
-    _id = new import_mongodb91.ObjectId(),
+    _id = new import_mongodb92.ObjectId(),
     userId,
     site,
     staffNo = null,
@@ -36746,7 +37008,7 @@ var MAccessCard = class {
 
 // src/repositories/access-management.repo.ts
 var import_node_server_utils157 = require("@7365admin1/node-server-utils");
-var import_mongodb92 = require("mongodb");
+var import_mongodb93 = require("mongodb");
 
 // src/utils/access-management.ts
 var import_fs4 = __toESM(require("fs"));
@@ -37056,12 +37318,12 @@ function UseAccessManagementRepo() {
     payload
   }) {
     try {
-      payload.site = new import_mongodb92.ObjectId(payload.site);
+      payload.site = new import_mongodb93.ObjectId(payload.site);
       payload.startDate = new Date(payload.startDate);
       payload.endDate = new Date(payload.endDate);
       payload.createdAt = new Date(payload.createdAt);
       payload.updatedAt = new Date(payload.updatedAt);
-      payload.assignedUnit = payload.unit?.map((id) => new import_mongodb92.ObjectId(id));
+      payload.assignedUnit = payload.unit?.map((id) => new import_mongodb93.ObjectId(id));
       delete payload.unit;
       const accessCardObj = new MAccessCard(payload);
       const result = await collection().insertOne(accessCardObj);
@@ -37100,7 +37362,7 @@ function UseAccessManagementRepo() {
   async function addNonPhysicalCardRepo(params) {
     try {
       const MAX_RETRIES = 3;
-      const site = new import_mongodb92.ObjectId(params.site);
+      const site = new import_mongodb93.ObjectId(params.site);
       const date = /* @__PURE__ */ new Date();
       const endDate = new Date(date.setFullYear(date.getFullYear() + 10));
       const countPerUnit = params.quantity;
@@ -37132,7 +37394,7 @@ function UseAccessManagementRepo() {
                 userType: params.userType,
                 doorName: params.doorName,
                 liftName: params.liftName,
-                assignedUnit: new import_mongodb92.ObjectId(units[i]),
+                assignedUnit: new import_mongodb93.ObjectId(units[i]),
                 createdAt: new Date(params.createdAt),
                 updatedAt: new Date(params.updatedAt),
                 isWinsland: params.isWinsland
@@ -37218,7 +37480,7 @@ function UseAccessManagementRepo() {
   }
   async function accessManagementSettingsRepo(params) {
     try {
-      params.site = new import_mongodb92.ObjectId(params.site);
+      params.site = new import_mongodb93.ObjectId(params.site);
       const result = collectionName("entrypass-settings").updateOne(
         { site: params.site },
         {
@@ -37240,7 +37502,7 @@ function UseAccessManagementRepo() {
   }
   async function allAccessCardsCountsRepo(params) {
     try {
-      const site = new import_mongodb92.ObjectId(params.site);
+      const site = new import_mongodb93.ObjectId(params.site);
       const userType = params.userType;
       const result = await collection().aggregate([
         {
@@ -37300,7 +37562,7 @@ function UseAccessManagementRepo() {
   }
   async function availableAccessCardsRepo(params) {
     try {
-      const site = new import_mongodb92.ObjectId(params.site);
+      const site = new import_mongodb93.ObjectId(params.site);
       const userType = params.userType;
       const type = params.type;
       const query = {
@@ -37415,7 +37677,7 @@ function UseAccessManagementRepo() {
   }
   async function userTypeAccessCardsRepo(params) {
     try {
-      const site = new import_mongodb92.ObjectId(params.site);
+      const site = new import_mongodb93.ObjectId(params.site);
       const userType = params.userType;
       const page = params.page ? Number(params.page) - 1 : 0;
       const limit = Number(params.limit) || 10;
@@ -37814,7 +38076,7 @@ function UseAccessManagementRepo() {
   }
   async function assignedAccessCardsRepo(params) {
     try {
-      const site = new import_mongodb92.ObjectId(params.site);
+      const site = new import_mongodb93.ObjectId(params.site);
       const userType = params.userType;
       const type = params.type;
       const search = params.search;
@@ -37989,12 +38251,12 @@ function UseAccessManagementRepo() {
       session?.startTransaction();
       const { userId, cardId, site } = params;
       const allUserId = await Promise.all(
-        userId.map(async (id) => new import_mongodb92.ObjectId(id))
+        userId.map(async (id) => new import_mongodb93.ObjectId(id))
       );
       const allCardId = await Promise.all(
-        cardId.map(async (id) => new import_mongodb92.ObjectId(id))
+        cardId.map(async (id) => new import_mongodb93.ObjectId(id))
       );
-      const siteId = new import_mongodb92.ObjectId(site);
+      const siteId = new import_mongodb93.ObjectId(site);
       const result = await collection().updateMany(
         {
           $or: [
@@ -38025,7 +38287,7 @@ function UseAccessManagementRepo() {
   async function accessandLiftCardsRepo(params) {
     try {
       const { accessLevel, liftAccessLevel, site, userType, type } = params;
-      const siteId = new import_mongodb92.ObjectId(site);
+      const siteId = new import_mongodb93.ObjectId(site);
       const query = {
         site: { $in: [siteId] },
         userType,
@@ -38058,9 +38320,9 @@ function UseAccessManagementRepo() {
     const session = import_node_server_utils157.useAtlas.getClient()?.startSession();
     try {
       session?.startTransaction();
-      const siteId = new import_mongodb92.ObjectId(params.site);
-      const userId = new import_mongodb92.ObjectId(params.userId);
-      const cardId = new import_mongodb92.ObjectId(params.cardId);
+      const siteId = new import_mongodb93.ObjectId(params.site);
+      const userId = new import_mongodb93.ObjectId(params.userId);
+      const cardId = new import_mongodb93.ObjectId(params.cardId);
       const quantity = 1;
       const cardCredentials = await collection().findOneAndUpdate(
         { _id: cardId },
@@ -38086,7 +38348,7 @@ function UseAccessManagementRepo() {
         (no) => no.toString().padStart(10, "0")
       );
       const accessCards = [];
-      const convertedUnits = unit.map((obj) => new import_mongodb92.ObjectId(obj));
+      const convertedUnits = unit.map((obj) => new import_mongodb93.ObjectId(obj));
       for (let j = 0; j < (unit.length > 0 ? unit.length : quantity); j++) {
         accessCards.push(
           new MAccessCard({
@@ -38175,7 +38437,7 @@ function UseAccessManagementRepo() {
       session?.startTransaction();
       const results = [];
       for (let nfc of params.nfcList) {
-        nfc._id = new import_mongodb92.ObjectId(nfc._id);
+        nfc._id = new import_mongodb93.ObjectId(nfc._id);
         const card = await collection().findOne({ _id: nfc._id }, { session });
         if (card) {
           const updateFields = {
@@ -38209,7 +38471,7 @@ function UseAccessManagementRepo() {
   async function doorAndLiftDropdownRepo(params) {
     try {
       const { site, type, userType } = params;
-      const id = new import_mongodb92.ObjectId(site);
+      const id = new import_mongodb93.ObjectId(site);
       const res = collection().aggregate([
         {
           $match: {
@@ -38296,10 +38558,10 @@ function UseAccessManagementRepo() {
     const session = import_node_server_utils157.useAtlas.getClient()?.startSession();
     try {
       const { cardId, remarks, issuedCardId, unitId, userId } = params;
-      const id = new import_mongodb92.ObjectId(cardId);
-      const newCardId = new import_mongodb92.ObjectId(issuedCardId);
-      const unit = new import_mongodb92.ObjectId(unitId);
-      const user = new import_mongodb92.ObjectId(userId);
+      const id = new import_mongodb93.ObjectId(cardId);
+      const newCardId = new import_mongodb93.ObjectId(issuedCardId);
+      const unit = new import_mongodb93.ObjectId(unitId);
+      const user = new import_mongodb93.ObjectId(userId);
       session?.startTransaction();
       const sessionResult = await Promise.all([
         await collection().findOneAndUpdate(
@@ -38332,7 +38594,7 @@ function UseAccessManagementRepo() {
   async function visitorAccessCardsRepo(params) {
     try {
       const page = params.page ? params.page - 1 : 0;
-      const siteId = new import_mongodb92.ObjectId(params.site);
+      const siteId = new import_mongodb93.ObjectId(params.site);
       const search = params.search;
       const type = params.type;
       const limit = Number(params.limit);
@@ -38400,7 +38662,7 @@ function UseAccessManagementRepo() {
   }
   async function getCardReplacementRepo(params) {
     try {
-      const site = new import_mongodb92.ObjectId(params.site);
+      const site = new import_mongodb93.ObjectId(params.site);
       const search = params.search;
       const statusFilter = params.statusFilter;
       const dateFrom = params.dateFrom;
@@ -38572,7 +38834,7 @@ function UseAccessManagementRepo() {
   async function getAccessManagementSettingsRepo(params) {
     try {
       const { site } = params;
-      const siteId = new import_mongodb92.ObjectId(site);
+      const siteId = new import_mongodb93.ObjectId(site);
       const res = await collectionName("entrypass-settings").findOne(
         { site: siteId },
         { allowDiskUse: true }
@@ -38606,7 +38868,7 @@ function UseAccessManagementRepo() {
           const rawAccessGroup = item["accessGroup (value ex. Full Access, No Access)"];
           const accessGroup = typeof rawAccessGroup === "string" ? rawAccessGroup.split(",").map((v) => v.trim()).filter((v) => v !== "") : [];
           return new MAccessCard({
-            site: new import_mongodb92.ObjectId(site),
+            site: new import_mongodb93.ObjectId(site),
             type: "NFC" /* NFC */,
             staffNo: null,
             accessLevel,
@@ -38657,8 +38919,8 @@ function UseAccessManagementRepo() {
         liftAccessLevel
       } = params;
       const [convertedUnits, convertedSite] = await Promise.all([
-        Promise.all(units.map((id) => new import_mongodb92.ObjectId(id))),
-        new import_mongodb92.ObjectId(site)
+        Promise.all(units.map((id) => new import_mongodb93.ObjectId(id))),
+        new import_mongodb93.ObjectId(site)
       ]);
       const totalRequired = quantity * convertedUnits.length;
       const availableCards = await collection().find({
@@ -38710,7 +38972,7 @@ function UseAccessManagementRepo() {
   async function deleteCardRepo(params) {
     try {
       const { cardId, remarks } = params;
-      const id = new import_mongodb92.ObjectId(cardId);
+      const id = new import_mongodb93.ObjectId(cardId);
       const result = await collection().findOneAndUpdate(
         { _id: id },
         {
@@ -38731,8 +38993,8 @@ function UseAccessManagementRepo() {
   async function getCardDetailsRepo(params) {
     try {
       const { siteId, cardId } = params;
-      const convertedSiteId = new import_mongodb92.ObjectId(siteId);
-      const convertedCardId = new import_mongodb92.ObjectId(cardId);
+      const convertedSiteId = new import_mongodb93.ObjectId(siteId);
+      const convertedCardId = new import_mongodb93.ObjectId(cardId);
       const card = await collection().findOne(
         {
           _id: convertedCardId,
@@ -38781,7 +39043,7 @@ function UseAccessManagementRepo() {
   async function addQrTagRepo(params) {
     try {
       const { site, payload } = params;
-      const id = new import_mongodb92.ObjectId(site);
+      const id = new import_mongodb93.ObjectId(site);
       const highestCardNo = await collection().aggregate([
         {
           $match: {
@@ -38815,7 +39077,7 @@ function UseAccessManagementRepo() {
       );
       const bulkOps = await Promise.all(
         payload.map(async (doc, index) => {
-          const id2 = new import_mongodb92.ObjectId(doc._id);
+          const id2 = new import_mongodb93.ObjectId(doc._id);
           return {
             updateOne: {
               filter: { _id: id2 },
@@ -38838,7 +39100,7 @@ function UseAccessManagementRepo() {
   async function allQrTagRepo(params) {
     try {
       const { site } = params;
-      const siteId = new import_mongodb92.ObjectId(site);
+      const siteId = new import_mongodb93.ObjectId(site);
       const query = {
         site: siteId,
         assignedUnit: { $ne: null },
@@ -38887,8 +39149,8 @@ function UseAccessManagementRepo() {
   }
   async function availableCardContractorsRepo(params) {
     try {
-      const siteId = new import_mongodb92.ObjectId(params.siteId);
-      const unitId = new import_mongodb92.ObjectId(params.unitId);
+      const siteId = new import_mongodb93.ObjectId(params.siteId);
+      const unitId = new import_mongodb93.ObjectId(params.unitId);
       const page = Number(params.page) - 1;
       const limit = Number(params.limit) || 10;
       const type = params.type;
@@ -38989,8 +39251,8 @@ function UseAccessManagementRepo() {
   }
   async function vmsgenerateQrCodesRepo(params) {
     try {
-      const site = new import_mongodb92.ObjectId(params.site);
-      const unitId = new import_mongodb92.ObjectId(params.unitId);
+      const site = new import_mongodb93.ObjectId(params.site);
+      const unitId = new import_mongodb93.ObjectId(params.unitId);
       const quantity = Number(params.quantity);
       const normalizedUnitId = params.normalizedUnitId;
       const date = /* @__PURE__ */ new Date();
@@ -39045,11 +39307,11 @@ function UseAccessManagementRepo() {
     let isAborted = false;
     try {
       await session?.startTransaction();
-      const siteId = new import_mongodb92.ObjectId(params.site);
-      const unitId = new import_mongodb92.ObjectId(params.unitId);
+      const siteId = new import_mongodb93.ObjectId(params.site);
+      const unitId = new import_mongodb93.ObjectId(params.unitId);
       const quantity = params.quantity;
       const type = params.type;
-      const visitorId = new import_mongodb92.ObjectId(params.visitorId);
+      const visitorId = new import_mongodb93.ObjectId(params.visitorId);
       const nfcCards = params.nfcCards;
       const acm_url = params.acm_url;
       let cards = [];
@@ -39071,7 +39333,7 @@ function UseAccessManagementRepo() {
       } else if (type === "NFC" /* NFC */) {
         if (nfcCards && nfcCards.length > 0) {
           const objectIds = nfcCards.map(
-            (card) => new import_mongodb92.ObjectId(card._id)
+            (card) => new import_mongodb93.ObjectId(card._id)
           );
           cards = await collection().find({ _id: { $in: objectIds } }).toArray();
           const nfcList = objectIds.map((card) => ({
@@ -39178,7 +39440,7 @@ function UseAccessManagementRepo() {
   }
   async function signQrCodeRepo(params) {
     try {
-      const cardId = new import_mongodb92.ObjectId(params.cardId);
+      const cardId = new import_mongodb93.ObjectId(params.cardId);
       const purpose = params.purpose;
       let validity = 5;
       const card = await collection().findOne({ _id: cardId });
@@ -39203,7 +39465,7 @@ function UseAccessManagementRepo() {
     const session = import_node_server_utils157.useAtlas.getClient()?.startSession();
     try {
       await session?.startTransaction();
-      const userId = new import_mongodb92.ObjectId(params.userId);
+      const userId = new import_mongodb93.ObjectId(params.userId);
       const result = await collection().updateMany(
         { userId },
         { $set: { userId: null, status: "Available", updatedAt: /* @__PURE__ */ new Date() } }
@@ -39218,7 +39480,7 @@ function UseAccessManagementRepo() {
     }
   }
   async function getBlockLevelAndUnitListRepo(params) {
-    const site = new import_mongodb92.ObjectId(params.site);
+    const site = new import_mongodb93.ObjectId(params.site);
     try {
       const blocks = await collectionName("buildings").aggregate([
         {
@@ -39288,7 +39550,7 @@ function UseAccessManagementRepo() {
     url
   }) {
     page = page ? page - 1 : 0;
-    site = new import_mongodb92.ObjectId(site);
+    site = new import_mongodb93.ObjectId(site);
     try {
       let index = await collectionName("access-card-transactions").findOne(
         {},
@@ -39423,9 +39685,9 @@ function UseAccessManagementRepo() {
         throw new Error("No user to Assign.");
       }
       assignees = assignees.map(
-        (data) => new import_mongodb92.ObjectId(data)
+        (data) => new import_mongodb93.ObjectId(data)
       );
-      unit = new import_mongodb92.ObjectId(unit);
+      unit = new import_mongodb93.ObjectId(unit);
       let availableCards = [];
       let update = [];
       let cards = [];
@@ -39458,13 +39720,13 @@ function UseAccessManagementRepo() {
         throw new Error(`Not enough ${type} cards available.`);
       }
       cards = availableCards?.slice(0, assignees.length).map((card, index) => {
-        const userId = new import_mongodb92.ObjectId(assignees[index].toString());
+        const userId = new import_mongodb93.ObjectId(assignees[index].toString());
         card.staffNo = userId.toString().slice(-10);
         return card;
       });
       update = availableCards.slice(0, assignees.length).map((card, index) => ({
         _id: card._id,
-        userId: new import_mongodb92.ObjectId(assignees[index])
+        userId: new import_mongodb93.ObjectId(assignees[index])
       }));
       const commands = cards.map((item, index) => {
         let ag = null;
@@ -39530,7 +39792,7 @@ function UseAccessManagementRepo() {
     const session = import_node_server_utils157.useAtlas.getClient()?.startSession();
     try {
       session?.startTransaction();
-      const id = new import_mongodb92.ObjectId(userId);
+      const id = new import_mongodb93.ObjectId(userId);
       await collection().updateMany(
         { userId: id },
         { $set: { userId: null, status: "Available" } },
@@ -39550,8 +39812,8 @@ function UseAccessManagementRepo() {
     id,
     name
   }) {
-    site = new import_mongodb92.ObjectId(site);
-    id = new import_mongodb92.ObjectId(id);
+    site = new import_mongodb93.ObjectId(site);
+    id = new import_mongodb93.ObjectId(id);
     try {
       const result = await collectionName("sites").updateOne(
         { _id: site },
@@ -39568,9 +39830,9 @@ function UseAccessManagementRepo() {
     unitId
   }) {
     try {
-      orgId = new import_mongodb92.ObjectId(orgId);
-      siteId = new import_mongodb92.ObjectId(siteId);
-      unitId = new import_mongodb92.ObjectId(unitId);
+      orgId = new import_mongodb93.ObjectId(orgId);
+      siteId = new import_mongodb93.ObjectId(siteId);
+      unitId = new import_mongodb93.ObjectId(unitId);
       const result = await collectionName("users").aggregate([
         {
           $match: {
@@ -39608,8 +39870,8 @@ function UseAccessManagementRepo() {
     isLiftCard
   }) {
     try {
-      siteId = new import_mongodb92.ObjectId(siteId);
-      userId = new import_mongodb92.ObjectId(userId);
+      siteId = new import_mongodb93.ObjectId(siteId);
+      userId = new import_mongodb93.ObjectId(userId);
       const query = {
         site: siteId,
         userId,
@@ -39630,7 +39892,7 @@ function UseAccessManagementRepo() {
     }
   }
   async function removeTemplateRepo({ site }) {
-    site = new import_mongodb92.ObjectId(site);
+    site = new import_mongodb93.ObjectId(site);
     try {
       const result = await collectionName("entrypass-settings").updateOne({ _id: site }, { $set: { "settings.template": {} } });
       return result;
@@ -39643,8 +39905,8 @@ function UseAccessManagementRepo() {
       page = page ? page - 1 : 0;
       let defaultQuery = {};
       let searchQuery = {};
-      site = new import_mongodb92.ObjectId(site);
-      userId = new import_mongodb92.ObjectId(userId);
+      site = new import_mongodb93.ObjectId(site);
+      userId = new import_mongodb93.ObjectId(userId);
       if (search) {
         searchQuery = {
           $or: [{ fullName: { $regex: search, $options: "i" } }, { cardNo: { $regex: search, $options: "i" } }]
@@ -41390,7 +41652,7 @@ function useAccessManagementController() {
 }
 
 // src/models/nfc-patrol-tag.model.ts
-var import_mongodb93 = require("mongodb");
+var import_mongodb94 = require("mongodb");
 var import_joi88 = __toESM(require("joi"));
 var import_node_server_utils158 = require("@7365admin1/node-server-utils");
 var DEVICE_STATUS = {
@@ -41417,27 +41679,27 @@ var schemaNfcPatrolTag = import_joi88.default.object({
 function MNfcPatrolTag(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb93.ObjectId(value._id);
+      value._id = new import_mongodb94.ObjectId(value._id);
     } catch {
       throw new import_node_server_utils158.BadRequestError("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb93.ObjectId(value.site);
+      value.site = new import_mongodb94.ObjectId(value.site);
     } catch {
       throw new import_node_server_utils158.BadRequestError("Invalid site ID.");
     }
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new import_mongodb93.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb94.ObjectId(value.createdBy);
     } catch {
       throw new import_node_server_utils158.BadRequestError("Invalid Created By ID.");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb93.ObjectId(),
+    _id: value._id ?? new import_mongodb94.ObjectId(),
     site: value.site,
     tagID: value.tagID,
     name: value.name,
@@ -41449,7 +41711,7 @@ function MNfcPatrolTag(value) {
 
 // src/repositories/nfc-patrol-tag.repository.ts
 var import_node_server_utils159 = require("@7365admin1/node-server-utils");
-var import_mongodb94 = require("mongodb");
+var import_mongodb95 = require("mongodb");
 function useNfcPatrolTagRepo() {
   const db = import_node_server_utils159.useAtlas.getDb();
   if (!db) {
@@ -41503,7 +41765,7 @@ function useNfcPatrolTagRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new import_mongodb94.ObjectId(site);
+      site = new import_mongodb95.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils159.BadRequestError("Invalid site ID format.");
     }
@@ -41547,19 +41809,19 @@ function useNfcPatrolTagRepo() {
     const [updateType, findObject, setData, session] = args;
     if (findObject?.site && typeof findObject.site === "string") {
       try {
-        findObject.site = new import_mongodb94.ObjectId(findObject.site);
+        findObject.site = new import_mongodb95.ObjectId(findObject.site);
       } catch {
         throw new import_node_server_utils159.BadRequestError("Invalid site ID.");
       }
     }
     if (updateType == "Edit" && findObject?._id && typeof findObject._id === "string") {
       try {
-        findObject._id = new import_mongodb94.ObjectId(findObject._id);
+        findObject._id = new import_mongodb95.ObjectId(findObject._id);
       } catch {
         throw new import_node_server_utils159.BadRequestError("Invalid nfc patrol tag document ID.");
       }
       try {
-        setData.updatedBy = new import_mongodb94.ObjectId(setData.updatedBy);
+        setData.updatedBy = new import_mongodb95.ObjectId(setData.updatedBy);
       } catch {
         throw new import_node_server_utils159.BadRequestError("Invalid updatedBy ID.");
       }
@@ -41850,7 +42112,7 @@ function useNfcPatrolTagController() {
 }
 
 // src/models/occurrence-book.model.ts
-var import_mongodb95 = require("mongodb");
+var import_mongodb96 = require("mongodb");
 var import_joi90 = __toESM(require("joi"));
 var DOBStatus = /* @__PURE__ */ ((DOBStatus3) => {
   DOBStatus3["OPEN"] = "open";
@@ -41876,20 +42138,20 @@ var schemaUpdateOccurrenceBook = import_joi90.default.object({
 function MOccurrenceBook(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb95.ObjectId(value._id);
+      value._id = new import_mongodb96.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb95.ObjectId(value.site);
+      value.site = new import_mongodb96.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb95.ObjectId(),
+    _id: value._id ?? new import_mongodb96.ObjectId(),
     site: value.site,
     date: value.date ?? "",
     totalInput: value.totalInput ?? 0,
@@ -41904,7 +42166,7 @@ function MOccurrenceBook(value) {
 
 // src/repositories/occurrence-book.repo.ts
 var import_node_server_utils162 = require("@7365admin1/node-server-utils");
-var import_mongodb96 = require("mongodb");
+var import_mongodb97 = require("mongodb");
 var occurrence_book_namespace_collection = "occurrence-books";
 function useOccurrenceBookRepo() {
   const db = import_node_server_utils162.useAtlas.getDb();
@@ -42048,7 +42310,7 @@ function useOccurrenceBookRepo() {
   }
   async function getOccurrenceBookById(_id, session) {
     try {
-      _id = new import_mongodb96.ObjectId(_id);
+      _id = new import_mongodb97.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils162.BadRequestError("Invalid occurrence book ID format.");
     }
@@ -42078,7 +42340,7 @@ function useOccurrenceBookRepo() {
   async function updateOccurrenceBookById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new import_mongodb96.ObjectId(_id);
+      _id = new import_mongodb97.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils162.BadRequestError("Invalid ID format.");
     }
@@ -42110,7 +42372,7 @@ function useOccurrenceBookRepo() {
   }
   async function deleteOccurrenceBookById(_id) {
     try {
-      _id = new import_mongodb96.ObjectId(_id);
+      _id = new import_mongodb97.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils162.BadRequestError("Invalid occurrence book ID format.");
     }
@@ -42495,7 +42757,7 @@ function useOccurrenceBookController() {
 }
 
 // src/models/bulletin-video.model.ts
-var import_mongodb97 = require("mongodb");
+var import_mongodb98 = require("mongodb");
 var import_joi92 = __toESM(require("joi"));
 var BulletinVideoSort = /* @__PURE__ */ ((BulletinVideoSort2) => {
   BulletinVideoSort2["CREATED_AT"] = "createdAt";
@@ -42523,27 +42785,27 @@ var schemaUpdateBulletinVideo = import_joi92.default.object({
 function MBulletinVideo(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb97.ObjectId(value._id);
+      value._id = new import_mongodb98.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb97.ObjectId(value.site);
+      value.site = new import_mongodb98.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.file && typeof value.file === "string") {
     try {
-      value.file = new import_mongodb97.ObjectId(value.file);
+      value.file = new import_mongodb98.ObjectId(value.file);
     } catch {
       throw new Error("Invalid file ID.");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb97.ObjectId(),
+    _id: value._id ?? new import_mongodb98.ObjectId(),
     site: value.site,
     title: value.title ?? "",
     description: value.description ?? "",
@@ -42556,7 +42818,7 @@ function MBulletinVideo(value) {
 
 // src/repositories/bulletin-video.repo.ts
 var import_node_server_utils165 = require("@7365admin1/node-server-utils");
-var import_mongodb98 = require("mongodb");
+var import_mongodb99 = require("mongodb");
 function useBulletinVideoRepo() {
   const db = import_node_server_utils165.useAtlas.getDb();
   if (!db) {
@@ -42618,7 +42880,7 @@ function useBulletinVideoRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new import_mongodb98.ObjectId(site);
+      site = new import_mongodb99.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils165.BadRequestError("Invalid site ID format.");
     }
@@ -42698,7 +42960,7 @@ function useBulletinVideoRepo() {
   }
   async function getBulletinVideoById(_id, session) {
     try {
-      _id = new import_mongodb98.ObjectId(_id);
+      _id = new import_mongodb99.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils165.BadRequestError("Invalid bulletin video ID format.");
     }
@@ -42729,13 +42991,13 @@ function useBulletinVideoRepo() {
   async function updateBulletinVideoById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new import_mongodb98.ObjectId(_id);
+      _id = new import_mongodb99.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils165.BadRequestError("Invalid ID format.");
     }
     if (value.file && typeof value.file === "string") {
       try {
-        value.file = new import_mongodb98.ObjectId(value.file);
+        value.file = new import_mongodb99.ObjectId(value.file);
       } catch {
         throw new Error("Invalid file ID.");
       }
@@ -42764,7 +43026,7 @@ function useBulletinVideoRepo() {
   }
   async function deleteBulletinVideoById(_id, session) {
     try {
-      _id = new import_mongodb98.ObjectId(_id);
+      _id = new import_mongodb99.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils165.BadRequestError("Invalid bulletin video ID format.");
     }
@@ -43028,7 +43290,7 @@ function useBulletinVideoController() {
 
 // src/models/site-soa.model.ts
 var import_node_server_utils168 = require("@7365admin1/node-server-utils");
-var import_mongodb99 = require("mongodb");
+var import_mongodb100 = require("mongodb");
 var import_joi94 = __toESM(require("joi"));
 var schemaSOABillingItem = import_joi94.default.object({
   _id: import_joi94.default.string().required(),
@@ -43096,28 +43358,28 @@ function MStatementOfAccount(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb99.ObjectId(value._id);
+      value._id = new import_mongodb100.ObjectId(value._id);
     } catch {
       throw new import_node_server_utils168.BadRequestError("Invalid _id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb99.ObjectId(value.site);
+      value.site = new import_mongodb100.ObjectId(value.site);
     } catch {
       throw new import_node_server_utils168.BadRequestError("Invalid site format");
     }
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new import_mongodb99.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb100.ObjectId(value.createdBy);
     } catch {
       throw new import_node_server_utils168.BadRequestError("Invalid createBy format");
     }
   }
   if (value.unitId && typeof value.unitId === "string") {
     try {
-      value.unitId = new import_mongodb99.ObjectId(value.unitId);
+      value.unitId = new import_mongodb100.ObjectId(value.unitId);
     } catch {
       throw new import_node_server_utils168.BadRequestError("Invalid unitId format");
     }
@@ -43126,7 +43388,7 @@ function MStatementOfAccount(value) {
     value.billing = value.billing.map((bill) => {
       if (bill._id && typeof bill._id === "string") {
         try {
-          bill._id = new import_mongodb99.ObjectId(bill._id);
+          bill._id = new import_mongodb100.ObjectId(bill._id);
         } catch {
           throw new import_node_server_utils168.BadRequestError("Invalid billing id format");
         }
@@ -43135,7 +43397,7 @@ function MStatementOfAccount(value) {
     });
   }
   return {
-    _id: value._id ?? new import_mongodb99.ObjectId(),
+    _id: value._id ?? new import_mongodb100.ObjectId(),
     site: value.site,
     unitId: value.unitId ?? "",
     unit: value.unit ?? "",
@@ -43158,7 +43420,7 @@ function MStatementOfAccount(value) {
 
 // src/repositories/site-soa.repo.ts
 var import_node_server_utils169 = require("@7365admin1/node-server-utils");
-var import_mongodb100 = require("mongodb");
+var import_mongodb101 = require("mongodb");
 function useStatementOfAccountRepo() {
   const db = import_node_server_utils169.useAtlas.getDb();
   if (!db) {
@@ -43256,7 +43518,7 @@ function useStatementOfAccountRepo() {
           { category: { $regex: search, $options: "i" } }
         ]
       },
-      ...import_mongodb100.ObjectId.isValid(site) && { site: new import_mongodb100.ObjectId(site) },
+      ...import_mongodb101.ObjectId.isValid(site) && { site: new import_mongodb101.ObjectId(site) },
       ...dateExpr
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
@@ -43311,7 +43573,7 @@ function useStatementOfAccountRepo() {
   }
   async function getById(_id) {
     try {
-      _id = new import_mongodb100.ObjectId(_id);
+      _id = new import_mongodb101.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils169.BadRequestError("Invalid ID.");
     }
@@ -43350,7 +43612,7 @@ function useStatementOfAccountRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new import_mongodb100.ObjectId(_id);
+      _id = new import_mongodb101.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils169.BadRequestError("Invalid site SOA transaction ID format.");
     }
@@ -43369,7 +43631,7 @@ function useStatementOfAccountRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new import_mongodb100.ObjectId(_id);
+      _id = new import_mongodb101.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils169.BadRequestError("Invalid site SOA transaction ID format.");
     }
@@ -43391,7 +43653,7 @@ function useStatementOfAccountRepo() {
   }
   async function updateStatusById(_id, value, session) {
     try {
-      _id = new import_mongodb100.ObjectId(_id);
+      _id = new import_mongodb101.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils169.BadRequestError("Invalid file ID format.");
     }
@@ -43446,9 +43708,9 @@ function useStatementOfAccountRepo() {
           { category: { $regex: search, $options: "i" } }
         ]
       },
-      ...import_mongodb100.ObjectId.isValid(site) && { site: new import_mongodb100.ObjectId(site) },
+      ...import_mongodb101.ObjectId.isValid(site) && { site: new import_mongodb101.ObjectId(site) },
       ...dateExpr,
-      ...import_mongodb100.ObjectId.isValid(unitId) && { unitId: new import_mongodb100.ObjectId(unitId) },
+      ...import_mongodb101.ObjectId.isValid(unitId) && { unitId: new import_mongodb101.ObjectId(unitId) },
       ...category && { category }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
@@ -43498,7 +43760,7 @@ function useStatementOfAccountRepo() {
   async function reviewSOA(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new import_mongodb100.ObjectId(_id);
+      _id = new import_mongodb101.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils169.BadRequestError("Invalid ID format.");
     }
@@ -43543,7 +43805,7 @@ var import_node_server_utils171 = require("@7365admin1/node-server-utils");
 
 // src/services/site-soa.service.ts
 var import_node_server_utils170 = require("@7365admin1/node-server-utils");
-var import_mongodb101 = require("mongodb");
+var import_mongodb102 = require("mongodb");
 var import_puppeteer = require("puppeteer");
 function useStatementOfAccountService() {
   const { add: _add, reviewSOA: _reviewSOA } = useStatementOfAccountRepo();
@@ -43680,7 +43942,7 @@ function useStatementOfAccountService() {
         if (!approvedBy || !approvedBy.name)
           throw new import_node_server_utils170.BadRequestError("Created by not found.");
         value.approvedBy.name = approvedBy.name;
-        value.approvedBy._id = new import_mongodb101.ObjectId(approvedBy._id);
+        value.approvedBy._id = new import_mongodb102.ObjectId(approvedBy._id);
       }
       await _reviewSOA(id, value, session);
       await session?.commitTransaction();
@@ -44062,7 +44324,7 @@ function useStatementOfAccountController() {
 
 // src/models/site-entrypass-settings.model.ts
 var import_node_server_utils172 = require("@7365admin1/node-server-utils");
-var import_mongodb102 = require("mongodb");
+var import_mongodb103 = require("mongodb");
 var import_joi96 = __toESM(require("joi"));
 var schemaEntryPassSettings = import_joi96.default.object({
   _id: import_joi96.default.string().hex().optional().allow("", null),
@@ -44110,21 +44372,21 @@ function MEntryPassSettings(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb102.ObjectId(value._id);
+      value._id = new import_mongodb103.ObjectId(value._id);
     } catch {
       throw new import_node_server_utils172.BadRequestError("Invalid _id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb102.ObjectId(value.site);
+      value.site = new import_mongodb103.ObjectId(value.site);
     } catch {
       throw new import_node_server_utils172.BadRequestError("Invalid site format");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new import_mongodb102.ObjectId(value.org);
+      value.org = new import_mongodb103.ObjectId(value.org);
     } catch {
       throw new import_node_server_utils172.BadRequestError("Invalid org format");
     }
@@ -44154,7 +44416,7 @@ function MEntryPassSettings(value) {
 
 // src/repositories/site-entrypass-settings.repo.ts
 var import_node_server_utils173 = require("@7365admin1/node-server-utils");
-var import_mongodb103 = require("mongodb");
+var import_mongodb104 = require("mongodb");
 function useEntryPassSettingsRepo() {
   const db = import_node_server_utils173.useAtlas.getDb();
   if (!db) {
@@ -44264,7 +44526,7 @@ function useEntryPassSettingsRepo() {
   }
   async function getEntryPassSettingsById(_id) {
     try {
-      _id = new import_mongodb103.ObjectId(_id);
+      _id = new import_mongodb104.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils173.BadRequestError("Invalid entry pass settings ID format.");
     }
@@ -44331,7 +44593,7 @@ function useEntryPassSettingsRepo() {
   }
   async function updateEntryPassSettingsById(_id, value) {
     try {
-      _id = new import_mongodb103.ObjectId(_id);
+      _id = new import_mongodb104.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils173.BadRequestError("Invalid entry pass settings ID format.");
     }
@@ -44359,7 +44621,7 @@ function useEntryPassSettingsRepo() {
   }
   async function deleteEntryPassSettingsById(_id, session) {
     try {
-      _id = new import_mongodb103.ObjectId(_id);
+      _id = new import_mongodb104.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils173.BadRequestError("Invalid card ID format.");
     }
@@ -44392,7 +44654,7 @@ function useEntryPassSettingsRepo() {
   }
   async function getEntryPassSettingsBySiteId(site) {
     try {
-      site = new import_mongodb103.ObjectId(site);
+      site = new import_mongodb104.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils173.BadRequestError("Invalid entry pass settings ID format.");
     }
@@ -44459,7 +44721,7 @@ function useEntryPassSettingsRepo() {
   }
   async function updateEntryPassSettingsBySiteId(site, value) {
     try {
-      site = new import_mongodb103.ObjectId(site);
+      site = new import_mongodb104.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils173.BadRequestError("Invalid entry pass settings ID format.");
     }
@@ -44818,7 +45080,7 @@ function useDashboardController() {
 }
 
 // src/models/nfc-patrol-route.model.ts
-var import_mongodb104 = require("mongodb");
+var import_mongodb105 = require("mongodb");
 var import_joi99 = __toESM(require("joi"));
 var import_node_server_utils177 = require("@7365admin1/node-server-utils");
 var schemaNfcPatrolRoute = import_joi99.default.object({
@@ -44854,23 +45116,23 @@ function MNfcPatrolRoute(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb104.ObjectId(value._id);
+      value._id = new import_mongodb105.ObjectId(value._id);
     } catch (error2) {
       throw new import_node_server_utils177.BadRequestError("Invalid _id format");
     }
   }
   try {
-    value.site = new import_mongodb104.ObjectId(value.site);
+    value.site = new import_mongodb105.ObjectId(value.site);
   } catch (error2) {
     throw new import_node_server_utils177.BadRequestError("Invalid site format");
   }
   try {
-    value.createdBy = new import_mongodb104.ObjectId(value.createdBy);
+    value.createdBy = new import_mongodb105.ObjectId(value.createdBy);
   } catch (error2) {
     throw new import_node_server_utils177.BadRequestError("Invalid createdBy format");
   }
   return {
-    _id: value._id ?? new import_mongodb104.ObjectId(),
+    _id: value._id ?? new import_mongodb105.ObjectId(),
     site: value.site,
     name: value.name,
     checkPointNumber: value.checkPointNumber,
@@ -44886,7 +45148,7 @@ function MNfcPatrolRoute(value) {
 
 // src/repositories/nfc-patrol-route.repository.ts
 var import_node_server_utils178 = require("@7365admin1/node-server-utils");
-var import_mongodb105 = require("mongodb");
+var import_mongodb106 = require("mongodb");
 function useNfcPatrolRouteRepo() {
   const db = import_node_server_utils178.useAtlas.getDb();
   if (!db) {
@@ -44930,7 +45192,7 @@ function useNfcPatrolRouteRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new import_mongodb105.ObjectId(site);
+      site = new import_mongodb106.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils178.BadRequestError("Invalid site ID format.");
     }
@@ -45001,7 +45263,7 @@ function useNfcPatrolRouteRepo() {
   }
   async function getById(_id, isStart) {
     try {
-      _id = new import_mongodb105.ObjectId(_id);
+      _id = new import_mongodb106.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils178.BadRequestError("Invalid ID.");
     }
@@ -45111,18 +45373,18 @@ function useNfcPatrolRouteRepo() {
       throw new import_node_server_utils178.BadRequestError(error.message);
     }
     try {
-      _id = new import_mongodb105.ObjectId(_id);
+      _id = new import_mongodb106.ObjectId(_id);
     } catch (error2) {
       throw new import_node_server_utils178.BadRequestError("Invalid ID.");
     }
     try {
-      value.site = new import_mongodb105.ObjectId(value.site);
+      value.site = new import_mongodb106.ObjectId(value.site);
     } catch (error2) {
       throw new import_node_server_utils178.BadRequestError("Invalid site format");
     }
     if (value.updatedBy) {
       try {
-        value.updatedBy = new import_mongodb105.ObjectId(value.updatedBy);
+        value.updatedBy = new import_mongodb106.ObjectId(value.updatedBy);
       } catch (error2) {
         throw new import_node_server_utils178.BadRequestError("Invalid createdBy format");
       }
@@ -45347,7 +45609,7 @@ function useNfcPatrolRouteController() {
 }
 
 // src/models/incident-report.model.ts
-var import_mongodb106 = require("mongodb");
+var import_mongodb107 = require("mongodb");
 var import_joi101 = __toESM(require("joi"));
 var residentSchema = import_joi101.default.object({
   _id: import_joi101.default.string().hex().optional().allow(null, ""),
@@ -45553,28 +45815,28 @@ var schemaUpdateIncidentReport = import_joi101.default.object({
 function MIncidentReport(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb106.ObjectId(value._id);
+      value._id = new import_mongodb107.ObjectId(value._id);
     } catch {
       throw new Error("Invalid incident report ID.");
     }
   }
   if (value.organization && typeof value.organization === "string") {
     try {
-      value.organization = new import_mongodb106.ObjectId(value.organization);
+      value.organization = new import_mongodb107.ObjectId(value.organization);
     } catch {
       throw new Error("Invalid organization ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb106.ObjectId(value.site);
+      value.site = new import_mongodb107.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.approvedBy && typeof value.approvedBy === "string") {
     try {
-      value.approvedBy = new import_mongodb106.ObjectId(value.approvedBy);
+      value.approvedBy = new import_mongodb107.ObjectId(value.approvedBy);
     } catch {
       throw new Error("Invalid approvedBy ID.");
     }
@@ -45582,7 +45844,7 @@ function MIncidentReport(value) {
   const { incidentInformation } = value;
   if (incidentInformation?.siteInfo?.site && typeof incidentInformation.siteInfo.site === "string") {
     try {
-      incidentInformation.siteInfo.site = new import_mongodb106.ObjectId(
+      incidentInformation.siteInfo.site = new import_mongodb107.ObjectId(
         incidentInformation.siteInfo.site
       );
     } catch {
@@ -45596,7 +45858,7 @@ function MIncidentReport(value) {
     incidentInformation.submissionForm.dateOfReport = incidentInformation.submissionForm.dateOfReport.toISOString();
   }
   return {
-    _id: value._id ?? new import_mongodb106.ObjectId(),
+    _id: value._id ?? new import_mongodb107.ObjectId(),
     reportId: value.reportId,
     incidentInformation: value.incidentInformation,
     affectedEntities: value.affectedEntities,
@@ -45621,7 +45883,7 @@ var import_node_server_utils182 = require("@7365admin1/node-server-utils");
 
 // src/repositories/incident-report.repo.ts
 var import_node_server_utils181 = require("@7365admin1/node-server-utils");
-var import_mongodb107 = require("mongodb");
+var import_mongodb108 = require("mongodb");
 var incidents_namespace_collection = "incident-reports";
 function useIncidentReportRepo() {
   const db = import_node_server_utils181.useAtlas.getDb();
@@ -45688,7 +45950,7 @@ function useIncidentReportRepo() {
     page = page > 0 ? page - 1 : 0;
     let dateExpr = {};
     try {
-      site = new import_mongodb107.ObjectId(site);
+      site = new import_mongodb108.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils181.BadRequestError("Invalid site ID format.");
     }
@@ -45789,7 +46051,7 @@ function useIncidentReportRepo() {
     page = page > 0 ? page - 1 : 0;
     let dateExpr = {};
     try {
-      site = new import_mongodb107.ObjectId(site);
+      site = new import_mongodb108.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils181.BadRequestError("Invalid site ID format.");
     }
@@ -45858,7 +46120,7 @@ function useIncidentReportRepo() {
   }
   async function getIncidentReportById(_id, session) {
     try {
-      _id = new import_mongodb107.ObjectId(_id);
+      _id = new import_mongodb108.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils181.BadRequestError("Invalid incident report ID format.");
     }
@@ -45889,27 +46151,27 @@ function useIncidentReportRepo() {
   async function updateIncidentReportById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new import_mongodb107.ObjectId(_id);
+      _id = new import_mongodb108.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils181.BadRequestError("Invalid ID format.");
     }
     if (value.organization && typeof value.organization === "string") {
       try {
-        value.organization = new import_mongodb107.ObjectId(value.organization);
+        value.organization = new import_mongodb108.ObjectId(value.organization);
       } catch {
         throw new Error("Invalid organization ID.");
       }
     }
     if (value.site && typeof value.site === "string") {
       try {
-        value.site = new import_mongodb107.ObjectId(value.site);
+        value.site = new import_mongodb108.ObjectId(value.site);
       } catch {
         throw new Error("Invalid site ID.");
       }
     }
     if (value.approvedBy && typeof value.approvedBy === "string") {
       try {
-        value.approvedBy = new import_mongodb107.ObjectId(value.approvedBy);
+        value.approvedBy = new import_mongodb108.ObjectId(value.approvedBy);
       } catch {
         throw new Error("Invalid approvedBy ID.");
       }
@@ -45917,7 +46179,7 @@ function useIncidentReportRepo() {
     const { incidentInformation } = value;
     if (incidentInformation?.siteInfo?.site && typeof incidentInformation.siteInfo.site === "string") {
       try {
-        incidentInformation.siteInfo.site = new import_mongodb107.ObjectId(
+        incidentInformation.siteInfo.site = new import_mongodb108.ObjectId(
           incidentInformation.siteInfo.site
         );
       } catch {
@@ -45952,7 +46214,7 @@ function useIncidentReportRepo() {
   }
   async function deleteIncidentReportById(_id) {
     try {
-      _id = new import_mongodb107.ObjectId(_id);
+      _id = new import_mongodb108.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils181.BadRequestError("Invalid occurrence subject ID format.");
     }
@@ -45984,7 +46246,7 @@ function useIncidentReportRepo() {
   async function reviewIncidentReport(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new import_mongodb107.ObjectId(_id);
+      _id = new import_mongodb108.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils181.BadRequestError("Invalid ID format.");
     }
@@ -46477,7 +46739,7 @@ function useIncidentReportController() {
 }
 
 // src/models/nfc-patrol-settings.model.ts
-var import_mongodb108 = require("mongodb");
+var import_mongodb109 = require("mongodb");
 var import_joi103 = __toESM(require("joi"));
 var import_node_server_utils184 = require("@7365admin1/node-server-utils");
 var objectId = import_joi103.default.string().hex().length(24);
@@ -46503,7 +46765,7 @@ function MNfcPatrolSettings(value) {
   }
   if (value.site) {
     try {
-      value.site = new import_mongodb108.ObjectId(value.site);
+      value.site = new import_mongodb109.ObjectId(value.site);
     } catch (error2) {
       throw new import_node_server_utils184.BadRequestError("Invalid site ID format.");
     }
@@ -46523,7 +46785,7 @@ function MNfcPatrolSettingsUpdate(value) {
   }
   if (value.updatedBy) {
     try {
-      value.updatedBy = new import_mongodb108.ObjectId(value.updatedBy);
+      value.updatedBy = new import_mongodb109.ObjectId(value.updatedBy);
     } catch (error2) {
       throw new import_node_server_utils184.BadRequestError("Invalid updatedBy ID format.");
     }
@@ -46537,7 +46799,7 @@ function MNfcPatrolSettingsUpdate(value) {
 
 // src/repositories/nfc-patrol-settings.repository.ts
 var import_node_server_utils185 = require("@7365admin1/node-server-utils");
-var import_mongodb109 = require("mongodb");
+var import_mongodb110 = require("mongodb");
 function useNfcPatrolSettingsRepository() {
   const db = import_node_server_utils185.useAtlas.getDb();
   if (!db) {
@@ -46567,7 +46829,7 @@ function useNfcPatrolSettingsRepository() {
   }
   async function getNfcPatrolSettingsBySite(site, session) {
     try {
-      site = new import_mongodb109.ObjectId(site);
+      site = new import_mongodb110.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils185.BadRequestError("Invalid nfc patrol settings site ID format.");
     }
@@ -46611,7 +46873,7 @@ function useNfcPatrolSettingsRepository() {
   }
   async function updateNfcPatrolSettings(site, value, session) {
     try {
-      site = new import_mongodb109.ObjectId(site);
+      site = new import_mongodb110.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils185.BadRequestError("Invalid attendance settings ID format.");
     }
@@ -46776,13 +47038,13 @@ function useNfcPatrolSettingsController() {
 
 // src/services/occurrence-entry.service.ts
 var import_node_server_utils189 = require("@7365admin1/node-server-utils");
-var import_mongodb112 = require("mongodb");
+var import_mongodb113 = require("mongodb");
 
 // src/repositories/occurrence-subject.repo.ts
 var import_node_server_utils188 = require("@7365admin1/node-server-utils");
 
 // src/models/occurrence-subject.model.ts
-var import_mongodb110 = require("mongodb");
+var import_mongodb111 = require("mongodb");
 var import_joi105 = __toESM(require("joi"));
 var SubjectSort = /* @__PURE__ */ ((SubjectSort2) => {
   SubjectSort2["CREATED_AT"] = "createdAt";
@@ -46807,27 +47069,27 @@ var schemaUpdateOccurrenceSubject = import_joi105.default.object({
 function MOccurrenceSubject(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb110.ObjectId(value._id);
+      value._id = new import_mongodb111.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb110.ObjectId(value.site);
+      value.site = new import_mongodb111.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.addedBy && typeof value.addedBy === "string") {
     try {
-      value.addedBy = new import_mongodb110.ObjectId(value.addedBy);
+      value.addedBy = new import_mongodb111.ObjectId(value.addedBy);
     } catch {
       throw new Error("Invalid addedBy ID.");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb110.ObjectId(),
+    _id: value._id ?? new import_mongodb111.ObjectId(),
     site: value.site,
     subject: value.subject,
     addedBy: value.addedBy ?? "",
@@ -46838,7 +47100,7 @@ function MOccurrenceSubject(value) {
 }
 
 // src/repositories/occurrence-subject.repo.ts
-var import_mongodb111 = require("mongodb");
+var import_mongodb112 = require("mongodb");
 function useOccurrenceSubjectRepo() {
   const db = import_node_server_utils188.useAtlas.getDb();
   if (!db) {
@@ -46897,7 +47159,7 @@ function useOccurrenceSubjectRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new import_mongodb111.ObjectId(site);
+      site = new import_mongodb112.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils188.BadRequestError("Invalid site ID format.");
     }
@@ -46990,7 +47252,7 @@ function useOccurrenceSubjectRepo() {
   }
   async function getOccurrenceSubjectById(_id, session) {
     try {
-      _id = new import_mongodb111.ObjectId(_id);
+      _id = new import_mongodb112.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils188.BadRequestError("Invalid occurrence subject ID format.");
     }
@@ -47018,7 +47280,7 @@ function useOccurrenceSubjectRepo() {
   async function updateOccurrenceSubjectById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new import_mongodb111.ObjectId(_id);
+      _id = new import_mongodb112.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils188.BadRequestError("Invalid ID format.");
     }
@@ -47048,7 +47310,7 @@ function useOccurrenceSubjectRepo() {
   }
   async function deleteOccurrenceSubjectById(_id) {
     try {
-      _id = new import_mongodb111.ObjectId(_id);
+      _id = new import_mongodb112.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils188.BadRequestError("Invalid occurrence subject ID format.");
     }
@@ -47179,8 +47441,8 @@ function useOccurrenceEntryService() {
       value.dailyOccurrenceBookId = occurrenceEntry.dailyOccurrenceBookId;
       value.bookEntryCount = value.bookEntryCount ? value.bookEntryCount : occurrenceEntry.bookEntryCount;
       value.occurrence = value.occurrence ? value.occurrence : occurrenceEntry.occurrence;
-      value.signature = value.signature ? new import_mongodb112.ObjectId(value.signature) : occurrenceEntry.signature._id;
-      value.eSignature = value.eSignature ? new import_mongodb112.ObjectId(value.eSignature) : occurrenceEntry.eSignature;
+      value.signature = value.signature ? new import_mongodb113.ObjectId(value.signature) : occurrenceEntry.signature._id;
+      value.eSignature = value.eSignature ? new import_mongodb113.ObjectId(value.eSignature) : occurrenceEntry.eSignature;
       value.createdAt = /* @__PURE__ */ new Date();
       value.date = value.date ? value.date : occurrenceEntry.date;
       value.userName = value.userName ? value.userName : occurrenceEntry.signature.name;
@@ -47372,7 +47634,7 @@ function useOccurrenceEntryController() {
 
 // src/models/online-form.model.ts
 var import_joi107 = __toESM(require("joi"));
-var import_mongodb113 = require("mongodb");
+var import_mongodb114 = require("mongodb");
 var schemaOnlineForm = import_joi107.default.object({
   _id: import_joi107.default.string().hex().optional().allow("", null),
   name: import_joi107.default.string().required(),
@@ -47420,21 +47682,21 @@ function MOnlineForm(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb113.ObjectId(value._id);
+      value._id = new import_mongodb114.ObjectId(value._id);
     } catch (error2) {
       throw new Error("Invalid ID.");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new import_mongodb113.ObjectId(value.org);
+      value.org = new import_mongodb114.ObjectId(value.org);
     } catch (error2) {
       throw new Error("Invalid org ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb113.ObjectId(value.site);
+      value.site = new import_mongodb114.ObjectId(value.site);
     } catch (error2) {
       throw new Error("Invalid site ID.");
     }
@@ -47457,7 +47719,7 @@ function MOnlineForm(value) {
 
 // src/repositories/online-form.repo.ts
 var import_node_server_utils191 = require("@7365admin1/node-server-utils");
-var import_mongodb114 = require("mongodb");
+var import_mongodb115 = require("mongodb");
 function useOnlineFormRepo() {
   const db = import_node_server_utils191.useAtlas.getDb();
   if (!db) {
@@ -47509,7 +47771,7 @@ function useOnlineFormRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new import_mongodb114.ObjectId(site);
+      site = new import_mongodb115.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils191.BadRequestError("Invalid site ID format.");
     }
@@ -47569,7 +47831,7 @@ function useOnlineFormRepo() {
   }
   async function getOnlineFormById(_id) {
     try {
-      _id = new import_mongodb114.ObjectId(_id);
+      _id = new import_mongodb115.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils191.BadRequestError("Invalid online form ID format.");
     }
@@ -47612,7 +47874,7 @@ function useOnlineFormRepo() {
   }
   async function updateOnlineFormById(_id, value) {
     try {
-      _id = new import_mongodb114.ObjectId(_id);
+      _id = new import_mongodb115.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils191.BadRequestError("Invalid online form ID format.");
     }
@@ -47640,7 +47902,7 @@ function useOnlineFormRepo() {
   }
   async function deleteOnlineFormById(_id, session) {
     try {
-      _id = new import_mongodb114.ObjectId(_id);
+      _id = new import_mongodb115.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils191.BadRequestError("Invalid online form ID format.");
     }
@@ -47673,7 +47935,7 @@ function useOnlineFormRepo() {
   }
   async function getOnlineFormsBySiteId(site, { search = "", page = 1, limit = 10, status = "active" }) {
     try {
-      site = new import_mongodb114.ObjectId(site);
+      site = new import_mongodb115.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils191.BadRequestError(
         "Invalid online form configuration site ID format."
@@ -48105,7 +48367,7 @@ function useOccurrenceSubjectController() {
 }
 
 // src/models/nfc-patrol-log.model.ts
-var import_mongodb115 = require("mongodb");
+var import_mongodb116 = require("mongodb");
 var import_joi110 = __toESM(require("joi"));
 var import_node_server_utils195 = require("@7365admin1/node-server-utils");
 var schemaNfcPatrolLog = import_joi110.default.object({
@@ -48157,32 +48419,32 @@ function MNfcPatrolLog(valueArg) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb115.ObjectId(value._id);
+      value._id = new import_mongodb116.ObjectId(value._id);
     } catch (error2) {
       throw new import_node_server_utils195.BadRequestError("Invalid _id format");
     }
   }
   try {
-    value.site = new import_mongodb115.ObjectId(value.site);
+    value.site = new import_mongodb116.ObjectId(value.site);
   } catch (error2) {
     throw new import_node_server_utils195.BadRequestError("Invalid site format");
   }
   if (value?.createdBy) {
     try {
-      value.createdBy = new import_mongodb115.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb116.ObjectId(value.createdBy);
     } catch (error2) {
       throw new import_node_server_utils195.BadRequestError("Invalid createdBy format");
     }
   }
   if (value?.route?._id) {
     try {
-      value.route._id = new import_mongodb115.ObjectId(value.route._id);
+      value.route._id = new import_mongodb116.ObjectId(value.route._id);
     } catch (error2) {
       throw new import_node_server_utils195.BadRequestError("Invalid route _id format");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb115.ObjectId(),
+    _id: value._id ?? new import_mongodb116.ObjectId(),
     site: value.site,
     route: value.route,
     date: value.date,
@@ -48196,7 +48458,7 @@ function MNfcPatrolLog(valueArg) {
 
 // src/repositories/nfc-patrol-log.repository.ts
 var import_node_server_utils196 = require("@7365admin1/node-server-utils");
-var import_mongodb116 = require("mongodb");
+var import_mongodb117 = require("mongodb");
 function useNfcPatrolLogRepo() {
   const db = import_node_server_utils196.useAtlas.getDb();
   if (!db) {
@@ -48249,7 +48511,7 @@ function useNfcPatrolLogRepo() {
     const pageIndex = page > 0 ? page - 1 : 0;
     let siteId;
     try {
-      siteId = typeof site === "string" ? new import_mongodb116.ObjectId(site) : site;
+      siteId = typeof site === "string" ? new import_mongodb117.ObjectId(site) : site;
     } catch {
       throw new import_node_server_utils196.BadRequestError("Invalid site ID format.");
     }
@@ -48260,7 +48522,7 @@ function useNfcPatrolLogRepo() {
       query.date = date;
     }
     if (route?._id) {
-      query["route._id"] = typeof route._id === "string" ? new import_mongodb116.ObjectId(route._id) : route._id;
+      query["route._id"] = typeof route._id === "string" ? new import_mongodb117.ObjectId(route._id) : route._id;
     }
     if (route?.startTime) {
       query["route.startTime"] = route.startTime;
@@ -49119,7 +49381,7 @@ function useNewDashboardController() {
 
 // src/models/manpower-monitoring.model.ts
 var import_joi113 = __toESM(require("joi"));
-var import_mongodb117 = require("mongodb");
+var import_mongodb118 = require("mongodb");
 var shiftSchema = import_joi113.default.object({
   name: import_joi113.default.string().required(),
   checkIn: import_joi113.default.string().optional().allow("", null),
@@ -49144,7 +49406,7 @@ var manpowerMonitoringSchema = import_joi113.default.object({
 });
 var MManpowerMonitoring = class {
   constructor(data) {
-    this._id = new import_mongodb117.ObjectId();
+    this._id = new import_mongodb118.ObjectId();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName;
@@ -49392,7 +49654,7 @@ function filterByStatus(attendance, shiftData, timezone, format2, status) {
     }
   });
 }
-function sleep(ms) {
+function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function fetchSites({ siteUrl, token }) {
@@ -49419,7 +49681,7 @@ async function fetchSites({ siteUrl, token }) {
       }
       if (attempt < maxRetries) {
         const delay = 1e3 * attempt;
-        await sleep(delay);
+        await sleep2(delay);
       }
     }
   } while (attempt < maxRetries);
@@ -49611,7 +49873,7 @@ var hrmlabs_attendance_util_default = {
 };
 
 // src/repositories/manpower-monitoring.repo.ts
-var import_mongodb118 = require("mongodb");
+var import_mongodb119 = require("mongodb");
 var { hrmLabsAuthentication: hrmLabsAuthentication2, fetchSites: fetchSites2 } = hrmlabs_attendance_util_default;
 function useManpowerMonitoringRepo() {
   const db = import_node_server_utils201.useAtlas.getDb();
@@ -49646,11 +49908,11 @@ function useManpowerMonitoringRepo() {
     try {
       value = new MManpowerMonitoring(value);
       if (value.createdBy)
-        value.createdBy = new import_mongodb118.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb119.ObjectId(value.createdBy);
       if (value.siteId)
-        value.siteId = new import_mongodb118.ObjectId(value.siteId);
+        value.siteId = new import_mongodb119.ObjectId(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new import_mongodb118.ObjectId(value.serviceProviderId);
+        value.serviceProviderId = new import_mongodb119.ObjectId(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -49691,8 +49953,8 @@ function useManpowerMonitoringRepo() {
   }
   async function getManpowerSettingsBySiteId(_id, serviceProviderId) {
     try {
-      _id = new import_mongodb118.ObjectId(_id);
-      serviceProviderId = new import_mongodb118.ObjectId(serviceProviderId);
+      _id = new import_mongodb119.ObjectId(_id);
+      serviceProviderId = new import_mongodb119.ObjectId(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -49708,7 +49970,7 @@ function useManpowerMonitoringRepo() {
   }
   async function updateManpowerMonitoringSettings(_id, value) {
     try {
-      _id = new import_mongodb118.ObjectId(_id);
+      _id = new import_mongodb119.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils201.BadRequestError("Invalid ID format.");
     }
@@ -49735,7 +49997,7 @@ function useManpowerMonitoringRepo() {
       for (let item of value) {
         item = new MManpowerMonitoring(item);
         const data = await collection.findOne({
-          siteId: new import_mongodb118.ObjectId(item.siteId)
+          siteId: new import_mongodb119.ObjectId(item.siteId)
         });
         if (data) {
           let updateValue;
@@ -49760,11 +50022,11 @@ function useManpowerMonitoringRepo() {
           }
         } else {
           if (item.createdBy)
-            item.createdBy = new import_mongodb118.ObjectId(item.createdBy);
+            item.createdBy = new import_mongodb119.ObjectId(item.createdBy);
           if (item.siteId)
-            item.siteId = new import_mongodb118.ObjectId(item.siteId);
+            item.siteId = new import_mongodb119.ObjectId(item.siteId);
           if (item.serviceProviderId)
-            item.serviceProviderId = new import_mongodb118.ObjectId(item.serviceProviderId);
+            item.serviceProviderId = new import_mongodb119.ObjectId(item.serviceProviderId);
           const result = await collection.insertOne(item);
           if (result.insertedId) {
             results.inserted++;
@@ -49788,7 +50050,7 @@ function useManpowerMonitoringRepo() {
     const siteUrl = process.env.HRMLABS_SITE_URL;
     try {
       const serviceProvider = await serviceProviderCollection.findOne({
-        _id: new import_mongodb118.ObjectId(serviceProviderId)
+        _id: new import_mongodb119.ObjectId(serviceProviderId)
       });
       if (!serviceProvider) {
         throw new Error("Service Provider not found.");
@@ -49831,7 +50093,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_mongodb119 = require("mongodb");
+var import_mongodb120 = require("mongodb");
 var remarksSchema = import_joi114.default.object({
   name: import_joi114.default.string().required(),
   remark: import_joi114.default.object({
@@ -49855,7 +50117,7 @@ var manpowerRemarksSchema = import_joi114.default.object({
 });
 var MManpowerRemarks = class {
   constructor(data) {
-    this._id = new import_mongodb119.ObjectId();
+    this._id = new import_mongodb120.ObjectId();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
@@ -49873,7 +50135,7 @@ var MManpowerRemarks = class {
 };
 
 // src/repositories/manpower-remarks.repo.ts
-var import_mongodb120 = require("mongodb");
+var import_mongodb121 = require("mongodb");
 var import_moment_timezone2 = __toESM(require("moment-timezone"));
 function useManpowerRemarksRepo() {
   const db = import_node_server_utils202.useAtlas.getDb();
@@ -49907,9 +50169,9 @@ function useManpowerRemarksRepo() {
     try {
       value = new MManpowerRemarks(value);
       if (value.siteId)
-        value.siteId = new import_mongodb120.ObjectId(value.siteId);
+        value.siteId = new import_mongodb121.ObjectId(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new import_mongodb120.ObjectId(value.serviceProviderId);
+        value.serviceProviderId = new import_mongodb121.ObjectId(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -49929,7 +50191,7 @@ function useManpowerRemarksRepo() {
       limit = limit || 10;
       const searchQuery = {};
       const nowSGT = (0, import_moment_timezone2.default)().tz("Asia/Singapore");
-      searchQuery.serviceProviderId = new import_mongodb120.ObjectId(serviceProviderId);
+      searchQuery.serviceProviderId = new import_mongodb121.ObjectId(serviceProviderId);
       if (search != "") {
         searchQuery.siteName = { $regex: search, $options: "i" };
       }
@@ -49961,8 +50223,8 @@ function useManpowerRemarksRepo() {
   }
   async function getManpowerRemarksBySiteId(_id, date, serviceProviderId) {
     try {
-      _id = new import_mongodb120.ObjectId(_id);
-      serviceProviderId = new import_mongodb120.ObjectId(serviceProviderId);
+      _id = new import_mongodb121.ObjectId(_id);
+      serviceProviderId = new import_mongodb121.ObjectId(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -49979,13 +50241,13 @@ function useManpowerRemarksRepo() {
   }
   async function updateManpowerRemarks(_id, value) {
     try {
-      _id = new import_mongodb120.ObjectId(_id);
+      _id = new import_mongodb121.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils202.BadRequestError("Invalid ID format.");
     }
     try {
       if (value.createdBy) {
-        value.createdBy = new import_mongodb120.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb121.ObjectId(value.createdBy);
       }
       const updateValue = {
         ...value,
@@ -50002,7 +50264,7 @@ function useManpowerRemarksRepo() {
   }
   async function updateRemarksStatus(_id, value) {
     try {
-      _id = new import_mongodb120.ObjectId(_id);
+      _id = new import_mongodb121.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils202.BadRequestError("Invalid ID format.");
     }
@@ -50272,7 +50534,7 @@ function useManpowerMonitoringCtrl() {
 
 // src/models/manpower-designations.model.ts
 var import_joi116 = __toESM(require("joi"));
-var import_mongodb121 = require("mongodb");
+var import_mongodb122 = require("mongodb");
 var designationsSchema = import_joi116.default.object({
   title: import_joi116.default.string().required(),
   shifts: import_joi116.default.object({
@@ -50291,7 +50553,7 @@ var manpowerDesignationsSchema = import_joi116.default.object({
 });
 var MManpowerDesignations = class {
   constructor(data) {
-    this._id = new import_mongodb121.ObjectId();
+    this._id = new import_mongodb122.ObjectId();
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
     this.serviceProviderId = data.serviceProviderId || "";
@@ -50305,7 +50567,7 @@ var MManpowerDesignations = class {
 
 // src/repositories/manpower-designations.repo.ts
 var import_node_server_utils205 = require("@7365admin1/node-server-utils");
-var import_mongodb122 = require("mongodb");
+var import_mongodb123 = require("mongodb");
 function useManpowerDesignationRepo() {
   const db = import_node_server_utils205.useAtlas.getDb();
   if (!db) {
@@ -50337,11 +50599,11 @@ function useManpowerDesignationRepo() {
     try {
       value = new MManpowerDesignations(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);
       return result;
     } catch (error) {
@@ -50350,8 +50612,8 @@ function useManpowerDesignationRepo() {
   }
   async function getManpowerDesignationsBySiteId(_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.");
     }
@@ -50367,7 +50629,7 @@ function useManpowerDesignationRepo() {
   }
   async function updateManpowerDesignations(_id, value) {
     try {
-      _id = new import_mongodb122.ObjectId(_id);
+      _id = new import_mongodb123.ObjectId(_id);
     } catch (error) {
       throw new Error("Invalid ID format.");
     }
@@ -50471,7 +50733,7 @@ function useManpowerDesignationCtrl() {
 
 // src/models/overnight-parking.model.ts
 var import_joi118 = __toESM(require("joi"));
-var import_mongodb123 = require("mongodb");
+var import_mongodb124 = 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({
@@ -50513,7 +50775,7 @@ function MOvernightParkingApprovalHours(value) {
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb123.ObjectId(value.site);
+      value.site = new import_mongodb124.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
@@ -52118,7 +52380,7 @@ function useManpowerRemarkCtrl() {
 
 // src/models/manpower-sites.model.ts
 var import_joi124 = __toESM(require("joi"));
-var import_mongodb124 = require("mongodb");
+var import_mongodb125 = require("mongodb");
 var manpowerSitesSchema = import_joi124.default.object({
   id: import_joi124.default.string().hex().required(),
   text: import_joi124.default.string().hex().optional().allow("", null),
@@ -52129,7 +52391,7 @@ var manpowerSitesSchema = import_joi124.default.object({
 });
 var MManpowerSites = class {
   constructor(data) {
-    this._id = new import_mongodb124.ObjectId();
+    this._id = new import_mongodb125.ObjectId();
     this.id = data.id || "";
     this.text = data.text || "";
     this.contractID = data.contractID || "";
@@ -52339,7 +52601,7 @@ function useManpowerSitesCtrl() {
 
 // src/utils/cron.util.ts
 var import_node_server_utils219 = require("@7365admin1/node-server-utils");
-var import_mongodb125 = require("mongodb");
+var import_mongodb126 = require("mongodb");
 var import_moment_timezone4 = __toESM(require("moment-timezone"));
 var createManpowerRemarksDaily = async () => {
   const db = import_node_server_utils219.useAtlas.getDb();
@@ -52499,7 +52761,7 @@ var updateRemarksisAcknowledged = async () => {
     for (const id of updatedIds) {
       const doc = await remarks.findOne({ _id: id });
       const setting = await settings.findOne(
-        { siteId: new import_mongodb125.ObjectId(doc?.siteId) },
+        { siteId: new import_mongodb126.ObjectId(doc?.siteId) },
         { projection: { emails: 1 } }
       );
       const payload = {
@@ -52585,7 +52847,7 @@ var updateRemarksStatusEod = async () => {
   for (const doc of docs) {
     let shiftsToCheck = [];
     const endShiftTime = await settings.findOne(
-      { siteId: new import_mongodb125.ObjectId(doc.siteId) },
+      { siteId: new import_mongodb126.ObjectId(doc.siteId) },
       { projection: { shifts: 1, shiftType: 1 } }
     );
     if (doc.createdAtSGT === nowSGT) {
@@ -52691,7 +52953,7 @@ var isWithinHour = (alertTime, timeNow) => {
 
 // src/events/manpower.event.ts
 var import_node_server_utils220 = require("@7365admin1/node-server-utils");
-var import_mongodb126 = require("mongodb");
+var import_mongodb127 = require("mongodb");
 var import_moment_timezone5 = __toESM(require("moment-timezone"));
 async function manpowerEvents(io) {
   let intervalId = null;
@@ -52717,7 +52979,7 @@ async function manpowerEvents(io) {
     }).toArray();
     for (const doc of docs) {
       const siteSettings = await settings.findOne(
-        { siteId: new import_mongodb126.ObjectId(doc.siteId), enabled: true },
+        { siteId: new import_mongodb127.ObjectId(doc.siteId), enabled: true },
         { projection: { shifts: 1, shiftType: 1 } }
       );
       const shiftType = siteSettings?.shiftType || "2-shifts";
@@ -52836,11 +53098,11 @@ function genericSignature(params, secretKey) {
 }
 
 // src/repositories/reddot-payment.repository.ts
-var import_mongodb128 = require("mongodb");
+var import_mongodb129 = require("mongodb");
 
 // src/models/billing-payments.model.ts
 var import_node_server_utils221 = require("@7365admin1/node-server-utils");
-var import_mongodb127 = require("mongodb");
+var import_mongodb128 = require("mongodb");
 var import_joi126 = __toESM(require("joi"));
 var schemaBillingItems = import_joi126.default.object({
   _id: import_joi126.default.string().hex().optional(),
@@ -52874,21 +53136,21 @@ function MBillingItems(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb127.ObjectId(value._id);
+      value._id = new import_mongodb128.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_mongodb127.ObjectId(value.unitId);
+      value.unitId = new import_mongodb128.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_mongodb127.ObjectId(value.paidBy);
+      value.paidBy = new import_mongodb128.ObjectId(value.paidBy);
     } catch {
       throw new import_node_server_utils221.BadRequestError("Invalid paidBy id format");
     }
@@ -52898,7 +53160,7 @@ function MBillingItems(value) {
       value.unitBillingItems = value.unitBillingItems.map((unitBillingItem) => {
         if (typeof unitBillingItem._id === "string") {
           try {
-            unitBillingItem._id = new import_mongodb127.ObjectId(unitBillingItem._id);
+            unitBillingItem._id = new import_mongodb128.ObjectId(unitBillingItem._id);
           } catch {
             throw new import_node_server_utils221.BadRequestError("Invalid unit billing id format");
           }
@@ -52910,7 +53172,7 @@ function MBillingItems(value) {
     }
   }
   return {
-    _id: value._id ?? new import_mongodb127.ObjectId(),
+    _id: value._id ?? new import_mongodb128.ObjectId(),
     unitBillingItems: value.unitBillingItems ?? [],
     unitId: value.unitId ?? "",
     unitOwner: value.unitOwner ?? "",
@@ -52978,7 +53240,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_mongodb128.ObjectId(res.insertedId).toString().slice(-6);
+        const newId = new import_mongodb129.ObjectId(res.insertedId).toString().slice(-6);
         const referenceNumber = `${unit}${newId}${dateFormatted}`;
         await paymentCollection().updateOne(
           { _id: res.insertedId },
@@ -54078,7 +54340,7 @@ var import_node_server_utils228 = require("@7365admin1/node-server-utils");
 var import_uuid2 = require("uuid");
 
 // src/repositories/user-v2.repo.ts
-var import_mongodb129 = require("mongodb");
+var import_mongodb130 = require("mongodb");
 var import_node_server_utils227 = require("@7365admin1/node-server-utils");
 function useUserRepoV2() {
   const { updateFeedbackCreatedByName } = useFeedbackRepo();
@@ -54279,7 +54541,7 @@ function useUserRepoV2() {
     }
     if (organization) {
       try {
-        query.defaultOrg = new import_mongodb129.ObjectId(organization);
+        query.defaultOrg = new import_mongodb130.ObjectId(organization);
         cacheOptions.organization = organization.toString();
       } catch (error) {
         throw new import_node_server_utils227.BadRequestError("Invalid organization ID format.");
@@ -54418,13 +54680,13 @@ function useUserRepoV2() {
       );
     }
     try {
-      _id = new import_mongodb129.ObjectId(_id);
+      _id = new import_mongodb130.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils227.BadRequestError("Invalid ID.");
     }
     if (field === "defaultOrg") {
       try {
-        value = new import_mongodb129.ObjectId(value);
+        value = new import_mongodb130.ObjectId(value);
       } catch (error) {
         throw new import_node_server_utils227.BadRequestError("Invalid organization ID.");
       }
@@ -54465,7 +54727,7 @@ function useUserRepoV2() {
     year
   }, session) {
     try {
-      _id = new import_mongodb129.ObjectId(_id);
+      _id = new import_mongodb130.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils227.BadRequestError("Invalid user ID format.");
     }
@@ -54495,7 +54757,7 @@ function useUserRepoV2() {
   }
   async function updatePassword({ _id, password }, session) {
     try {
-      _id = new import_mongodb129.ObjectId(_id);
+      _id = new import_mongodb130.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils227.BadRequestError("Invalid user ID format.");
     }
@@ -55250,38 +55512,38 @@ function useUserControllerV2() {
 
 // src/models/role-v2.model.ts
 var import_node_server_utils232 = require("@7365admin1/node-server-utils");
-var import_mongodb130 = require("mongodb");
+var import_mongodb131 = require("mongodb");
 var MRoleV2 = class {
   constructor(value) {
     if (typeof value._id === "string") {
       try {
-        value._id = new import_mongodb130.ObjectId(value._id);
+        value._id = new import_mongodb131.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_mongodb130.ObjectId(value.site);
+        value.site = new import_mongodb131.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_mongodb130.ObjectId(value.org);
+        value.org = new import_mongodb131.ObjectId(value.org);
       } catch (error) {
         throw new import_node_server_utils232.BadRequestError("Invalid org ID format.");
       }
     }
     if (value.createdBy) {
       try {
-        value.createdBy = new import_mongodb130.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb131.ObjectId(value.createdBy);
       } catch (error) {
         throw new import_node_server_utils232.BadRequestError("Invalid created by ID format.");
       }
     }
-    this._id = value._id ?? new import_mongodb130.ObjectId();
+    this._id = value._id ?? new import_mongodb131.ObjectId();
     this.name = value.name ?? "";
     this.permissions = value.permissions ?? [];
     this.site = value.site ?? "";
@@ -55416,7 +55678,7 @@ function useRoleControllerV2() {
 
 // src/models/post-preloved.model.ts
 var import_joi133 = __toESM(require("joi"));
-var import_mongodb131 = require("mongodb");
+var import_mongodb132 = require("mongodb");
 var PostStatus = /* @__PURE__ */ ((PostStatus2) => {
   PostStatus2["PUBLISHED"] = "published";
   PostStatus2["RESERVED"] = "reserved";
@@ -55472,28 +55734,28 @@ function MPost(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 Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb131.ObjectId(value.site);
+      value.site = new import_mongodb132.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new import_mongodb131.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb132.ObjectId(value.createdBy);
     } catch {
       throw new Error("Invalid createdBy ID.");
     }
   }
   if (value.reserverId && typeof value.reserverId === "string") {
     try {
-      value.reserverId = new import_mongodb131.ObjectId(value.reserverId);
+      value.reserverId = new import_mongodb132.ObjectId(value.reserverId);
     } catch {
       throw new Error("Invalid reserver ID.");
     }
@@ -55502,7 +55764,7 @@ function MPost(value) {
     value.attachments = value.attachments.map((id) => {
       if (typeof id === "string") {
         try {
-          return new import_mongodb131.ObjectId(id);
+          return new import_mongodb132.ObjectId(id);
         } catch {
           throw new Error("Invalid attachment ID.");
         }
@@ -55512,20 +55774,20 @@ function MPost(value) {
   }
   if (value.category && typeof value.category === "string") {
     try {
-      value.category = new import_mongodb131.ObjectId(value.category);
+      value.category = new import_mongodb132.ObjectId(value.category);
     } catch {
       throw new Error("Invalid category ID.");
     }
   }
   if (value.subcategory && typeof value.subcategory === "string") {
     try {
-      value.subcategory = new import_mongodb131.ObjectId(value.subcategory);
+      value.subcategory = new import_mongodb132.ObjectId(value.subcategory);
     } catch {
       throw new Error("Invalid subcategory ID.");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb131.ObjectId(),
+    _id: value._id ?? new import_mongodb132.ObjectId(),
     title: value.title ?? "",
     description: value.description ?? "",
     attachments: value.attachments ?? [],
@@ -55545,7 +55807,7 @@ function MPost(value) {
 
 // src/repositories/post-preloved.repo.ts
 var import_node_server_utils235 = require("@7365admin1/node-server-utils");
-var import_mongodb132 = require("mongodb");
+var import_mongodb133 = require("mongodb");
 function usePostPrelovedRepo() {
   const db = import_node_server_utils235.useAtlas.getDb();
   if (!db) {
@@ -55609,7 +55871,7 @@ function usePostPrelovedRepo() {
   }
   async function getById(_id) {
     try {
-      _id = new import_mongodb132.ObjectId(_id);
+      _id = new import_mongodb133.ObjectId(_id);
     } catch {
       throw new import_node_server_utils235.BadRequestError("Invalid post ID format.");
     }
@@ -55642,7 +55904,7 @@ function usePostPrelovedRepo() {
     page = page > 0 ? page - 1 : 0;
     if (site) {
       try {
-        site = new import_mongodb132.ObjectId(site);
+        site = new import_mongodb133.ObjectId(site);
       } catch {
         throw new import_node_server_utils235.BadRequestError("Invalid site ID format.");
       }
@@ -55651,14 +55913,14 @@ function usePostPrelovedRepo() {
     let subcategoryIds = null;
     if (category && subcategory) {
       try {
-        categoryId = new import_mongodb132.ObjectId(category);
+        categoryId = new import_mongodb133.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_mongodb132.ObjectId(id);
+            return new import_mongodb133.ObjectId(id);
           } catch {
             throw new import_node_server_utils235.BadRequestError("Invalid subcategory ID format.");
           }
@@ -55683,7 +55945,7 @@ function usePostPrelovedRepo() {
     let userObjectId = null;
     if (userId) {
       try {
-        userObjectId = new import_mongodb132.ObjectId(userId);
+        userObjectId = new import_mongodb133.ObjectId(userId);
       } catch {
         throw new import_node_server_utils235.BadRequestError("Invalid user ID format.");
       }
@@ -55732,7 +55994,7 @@ function usePostPrelovedRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new import_mongodb132.ObjectId(_id);
+      _id = new import_mongodb133.ObjectId(_id);
     } catch {
       throw new import_node_server_utils235.BadRequestError("Invalid post ID format.");
     }
@@ -55753,7 +56015,7 @@ function usePostPrelovedRepo() {
   }
   async function deleteById(_id, session) {
     try {
-      _id = new import_mongodb132.ObjectId(_id);
+      _id = new import_mongodb133.ObjectId(_id);
     } catch {
       throw new import_node_server_utils235.BadRequestError("Invalid post ID format.");
     }
@@ -55779,7 +56041,7 @@ function usePostPrelovedRepo() {
   }
   async function updateStatus(_id, status, session) {
     try {
-      _id = new import_mongodb132.ObjectId(_id);
+      _id = new import_mongodb133.ObjectId(_id);
     } catch {
       throw new import_node_server_utils235.BadRequestError("Invalid post ID format.");
     }
@@ -55870,7 +56132,7 @@ function usePostPrelovedController() {
         import_joi134.default.string().valid(...Object.values(PostStatus))
       ).optional().allow(null),
       category: import_joi134.default.string().hex().length(24).optional().allow("", null),
-      subcategory: import_joi134.default.alternatives().try(import_joi134.default.array().items(import_joi134.default.string())).optional().allow(null, ""),
+      subcategory: import_joi134.default.array().items(import_joi134.default.string()).single().optional().allow(null),
       userId: import_joi134.default.string().optional().allow("", null)
     });
     const { error, value } = validation.validate(req.query, {
@@ -55991,7 +56253,7 @@ function usePostPrelovedController() {
 
 // src/models/post-favorite.model.ts
 var import_joi135 = __toESM(require("joi"));
-var import_mongodb133 = require("mongodb");
+var import_mongodb134 = require("mongodb");
 var schemaUpdatePostFavorite = import_joi135.default.object({
   userId: import_joi135.default.string().hex().length(24).required()
 });
@@ -56009,14 +56271,14 @@ function MPostFavorite(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb133.ObjectId(value._id);
+      value._id = new import_mongodb134.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.postId && typeof value.postId === "string") {
     try {
-      value.postId = new import_mongodb133.ObjectId(value.postId);
+      value.postId = new import_mongodb134.ObjectId(value.postId);
     } catch {
       throw new Error("Invalid post ID.");
     }
@@ -56025,7 +56287,7 @@ function MPostFavorite(value) {
     value.userIds = value.userIds.map((id) => {
       if (typeof id === "string") {
         try {
-          return new import_mongodb133.ObjectId(id);
+          return new import_mongodb134.ObjectId(id);
         } catch {
           throw new Error("Invalid user ID.");
         }
@@ -56034,7 +56296,7 @@ function MPostFavorite(value) {
     });
   }
   return {
-    _id: value._id ?? new import_mongodb133.ObjectId(),
+    _id: value._id ?? new import_mongodb134.ObjectId(),
     postId: value.postId ?? "",
     userIds: value.userIds ?? [],
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
@@ -56044,7 +56306,7 @@ function MPostFavorite(value) {
 
 // src/repositories/post-favorite.repo.ts
 var import_node_server_utils237 = require("@7365admin1/node-server-utils");
-var import_mongodb134 = require("mongodb");
+var import_mongodb135 = require("mongodb");
 function usePostFavoriteRepo() {
   const db = import_node_server_utils237.useAtlas.getDb();
   if (!db) {
@@ -56066,7 +56328,7 @@ function usePostFavoriteRepo() {
   }
   async function getById(_id) {
     try {
-      _id = new import_mongodb134.ObjectId(_id);
+      _id = new import_mongodb135.ObjectId(_id);
     } catch {
       throw new import_node_server_utils237.BadRequestError("Invalid favorite ID format.");
     }
@@ -56075,15 +56337,26 @@ function usePostFavoriteRepo() {
       throw new import_node_server_utils237.NotFoundError("Favorite not found.");
     return result;
   }
+  async function getByPostId(postId) {
+    try {
+      postId = new import_mongodb135.ObjectId(postId);
+    } catch {
+      throw new import_node_server_utils237.BadRequestError("Invalid post ID format.");
+    }
+    const result = await collection.findOne({ postId });
+    if (!result)
+      throw new import_node_server_utils237.NotFoundError("Favorite not found.");
+    return result;
+  }
   async function updateById(_id, userId, session) {
     try {
-      _id = new import_mongodb134.ObjectId(_id);
+      _id = new import_mongodb135.ObjectId(_id);
     } catch {
       throw new import_node_server_utils237.BadRequestError("Invalid favorite ID format.");
     }
     let userObjectId;
     try {
-      userObjectId = new import_mongodb134.ObjectId(userId);
+      userObjectId = new import_mongodb135.ObjectId(userId);
     } catch {
       throw new import_node_server_utils237.BadRequestError("Invalid user ID format.");
     }
@@ -56100,6 +56373,7 @@ function usePostFavoriteRepo() {
   return {
     addFavorite,
     getById,
+    getByPostId,
     updateById
   };
 }
@@ -56147,7 +56421,7 @@ var import_node_server_utils239 = require("@7365admin1/node-server-utils");
 var import_joi136 = __toESM(require("joi"));
 function usePostFavoriteController() {
   const { addFavorite: _addFavorite, toggleFavorite: _toggleFavorite } = usePostFavoriteService();
-  const { getById: _getById } = usePostFavoriteRepo();
+  const { getById: _getById, getByPostId: _getByPostId } = usePostFavoriteRepo();
   async function addFavorite(req, res, next) {
     const { error, value } = schemaPostFavorite.validate(req.body, {
       abortEarly: false
@@ -56188,6 +56462,26 @@ function usePostFavoriteController() {
       return;
     }
   }
+  async function getByPostId(req, res, next) {
+    const schema2 = import_joi136.default.object({
+      postId: import_joi136.default.string().hex().length(24).required()
+    });
+    const { error, value } = schema2.validate({ postId: req.params.postId });
+    if (error) {
+      import_node_server_utils239.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils239.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getByPostId(value.postId);
+      res.status(200).json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils239.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   async function updateById(req, res, next) {
     const paramsSchema = import_joi136.default.object({
       _id: import_joi136.default.string().hex().length(24).required()
@@ -56217,13 +56511,14 @@ function usePostFavoriteController() {
   return {
     addFavorite,
     getById,
+    getByPostId,
     updateById
   };
 }
 
 // src/models/category-preloved.model.ts
 var import_joi137 = __toESM(require("joi"));
-var import_mongodb135 = require("mongodb");
+var import_mongodb136 = require("mongodb");
 var schemaCategoryPreloved = import_joi137.default.object({
   name: import_joi137.default.string().required(),
   createdBy: import_joi137.default.string().hex().optional().allow("", null),
@@ -56240,14 +56535,14 @@ function MCategoryPreloved(value) {
   }
   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.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.");
     }
@@ -56263,7 +56558,7 @@ function MCategoryPreloved(value) {
 
 // src/repositories/category-preloved.repo.ts
 var import_node_server_utils240 = require("@7365admin1/node-server-utils");
-var import_mongodb136 = require("mongodb");
+var import_mongodb137 = require("mongodb");
 function useCategoryPrelovedRepo() {
   const db = import_node_server_utils240.useAtlas.getDb();
   if (!db) {
@@ -56277,7 +56572,7 @@ function useCategoryPrelovedRepo() {
   } = {}) {
     if (site) {
       try {
-        site = new import_mongodb136.ObjectId(site);
+        site = new import_mongodb137.ObjectId(site);
       } catch {
         throw new import_node_server_utils240.BadRequestError("Invalid site ID format.");
       }
@@ -56296,7 +56591,7 @@ function useCategoryPrelovedRepo() {
   async function getById(_id) {
     let objectId2;
     try {
-      objectId2 = new import_mongodb136.ObjectId(_id);
+      objectId2 = new import_mongodb137.ObjectId(_id);
     } catch {
       throw new import_node_server_utils240.BadRequestError("Invalid category-preloved ID format.");
     }
@@ -56396,7 +56691,7 @@ function useCategoryPrelovedController() {
 
 // src/models/subcategory-preloved.model.ts
 var import_joi139 = __toESM(require("joi"));
-var import_mongodb137 = require("mongodb");
+var import_mongodb138 = require("mongodb");
 var schemaSubcategoryPreloved = import_joi139.default.object({
   name: import_joi139.default.string().required(),
   createdBy: import_joi139.default.string().hex().optional().allow("", null),
@@ -56415,21 +56710,21 @@ function MSubcategoryPreloved(value) {
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new import_mongodb137.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb138.ObjectId(value.createdBy);
     } catch {
       throw new Error("Invalid createdBy ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb137.ObjectId(value.site);
+      value.site = new import_mongodb138.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_mongodb137.ObjectId(value.category_id);
+      value.category_id = new import_mongodb138.ObjectId(value.category_id);
     } catch {
       throw new Error("Invalid category ID.");
     }
@@ -56446,7 +56741,7 @@ function MSubcategoryPreloved(value) {
 
 // src/repositories/subcategory-preloved.repo.ts
 var import_node_server_utils242 = require("@7365admin1/node-server-utils");
-var import_mongodb138 = require("mongodb");
+var import_mongodb139 = require("mongodb");
 function useSubcategoryPrelovedRepo() {
   const db = import_node_server_utils242.useAtlas.getDb();
   if (!db) {
@@ -56461,14 +56756,14 @@ function useSubcategoryPrelovedRepo() {
   } = {}) {
     if (site) {
       try {
-        site = new import_mongodb138.ObjectId(site);
+        site = new import_mongodb139.ObjectId(site);
       } catch {
         throw new import_node_server_utils242.BadRequestError("Invalid site ID format.");
       }
     }
     if (category_id) {
       try {
-        category_id = new import_mongodb138.ObjectId(category_id);
+        category_id = new import_mongodb139.ObjectId(category_id);
       } catch {
         throw new import_node_server_utils242.BadRequestError("Invalid category ID format.");
       }
@@ -56487,7 +56782,7 @@ function useSubcategoryPrelovedRepo() {
   async function getById(_id) {
     let objectId2;
     try {
-      objectId2 = new import_mongodb138.ObjectId(_id);
+      objectId2 = new import_mongodb139.ObjectId(_id);
     } catch {
       throw new import_node_server_utils242.BadRequestError("Invalid subcategory-preloved ID format.");
     }
@@ -56501,14 +56796,75 @@ function useSubcategoryPrelovedRepo() {
       throw error;
     }
   }
-  return { getAll, getById };
+  async function addSubcategory(item, session) {
+    const doc = MSubcategoryPreloved(item);
+    try {
+      const res = await collection.insertOne(doc, { session });
+      return res.insertedId;
+    } catch (error) {
+      const isDuplicated = error.message?.includes("duplicate");
+      if (isDuplicated)
+        throw new import_node_server_utils242.BadRequestError("Subcategory already exists.");
+      throw error;
+    }
+  }
+  async function updateById(_id, value, session) {
+    let objectId2;
+    try {
+      objectId2 = new import_mongodb139.ObjectId(_id);
+    } catch {
+      throw new import_node_server_utils242.BadRequestError("Invalid subcategory ID format.");
+    }
+    if (value.category_id && typeof value.category_id === "string") {
+      try {
+        value.category_id = new import_mongodb139.ObjectId(value.category_id);
+      } catch {
+        throw new import_node_server_utils242.BadRequestError("Invalid category ID format.");
+      }
+    }
+    if (value.site && typeof value.site === "string") {
+      try {
+        value.site = new import_mongodb139.ObjectId(value.site);
+      } catch {
+        throw new import_node_server_utils242.BadRequestError("Invalid site ID format.");
+      }
+    }
+    value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const res = await collection.updateOne(
+      { _id: objectId2 },
+      { $set: value },
+      { session }
+    );
+    if (res.modifiedCount === 0)
+      throw new import_node_server_utils242.InternalServerError("Unable to update subcategory.");
+    return res;
+  }
+  async function deleteById(_id, session) {
+    let objectId2;
+    try {
+      objectId2 = new import_mongodb139.ObjectId(_id);
+    } catch {
+      throw new import_node_server_utils242.BadRequestError("Invalid subcategory ID format.");
+    }
+    const res = await collection.deleteOne({ _id: objectId2 }, { session });
+    if (res.deletedCount === 0)
+      throw new import_node_server_utils242.InternalServerError("Unable to delete subcategory.");
+    return res.deletedCount;
+  }
+  return { getAll, getById, addSubcategory, updateById, deleteById };
 }
 
 // src/controllers/subcategory-preloved.controller.ts
 var import_node_server_utils243 = require("@7365admin1/node-server-utils");
 var import_joi140 = __toESM(require("joi"));
 function useSubcategoryPrelovedController() {
-  const { getAll: _getAll, getById: _getById } = useSubcategoryPrelovedRepo();
+  const {
+    getAll: _getAll,
+    getById: _getById,
+    addSubcategory: _addSubcategory,
+    updateById: _updateById,
+    deleteById: _deleteById
+  } = useSubcategoryPrelovedRepo();
   async function getAll(req, res, next) {
     const schema2 = import_joi140.default.object({
       search: import_joi140.default.string().optional().allow("", null),
@@ -56552,12 +56908,73 @@ function useSubcategoryPrelovedController() {
       return;
     }
   }
-  return { getAll, getById };
+  async function addSubcategory(req, res, next) {
+    const { error, value } = schemaSubcategoryPreloved.validate(req.body, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils243.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils243.BadRequestError(messages));
+      return;
+    }
+    try {
+      const data = await _addSubcategory(value);
+      res.status(201).json(data);
+    } catch (error2) {
+      import_node_server_utils243.logger.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
+  async function updateById(req, res, next) {
+    const paramsSchema = import_joi140.default.object({
+      _id: import_joi140.default.string().hex().length(24).required()
+    });
+    const { error: paramsError, value: paramsValue } = paramsSchema.validate({
+      _id: req.params.id
+    });
+    if (paramsError) {
+      next(new import_node_server_utils243.BadRequestError(paramsError.message));
+      return;
+    }
+    const { error: bodyError, value: bodyValue } = schemaUpdateSubcategoryPreloved.validate(req.body, { abortEarly: false });
+    if (bodyError) {
+      const messages = bodyError.details.map((d) => d.message).join(", ");
+      import_node_server_utils243.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils243.BadRequestError(messages));
+      return;
+    }
+    try {
+      const data = await _updateById(paramsValue._id, bodyValue);
+      res.status(200).json(data);
+    } catch (error) {
+      import_node_server_utils243.logger.log({ level: "error", message: error.message });
+      next(error);
+    }
+  }
+  async function deleteById(req, res, next) {
+    const schema2 = import_joi140.default.object({
+      _id: import_joi140.default.string().hex().length(24).required()
+    });
+    const { error, value } = schema2.validate({ _id: req.params.id });
+    if (error) {
+      next(new import_node_server_utils243.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _deleteById(value._id);
+      res.status(200).json(data);
+    } catch (error2) {
+      import_node_server_utils243.logger.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
+  return { getAll, getById, addSubcategory, updateById, deleteById };
 }
 
 // src/models/online-forms-v2.model.ts
 var import_joi141 = __toESM(require("joi"));
-var import_mongodb139 = require("mongodb");
+var import_mongodb140 = require("mongodb");
 var FormEntryStatus = /* @__PURE__ */ ((FormEntryStatus2) => {
   FormEntryStatus2["ACTIVE"] = "active";
   FormEntryStatus2["INACTIVE"] = "inactive";
@@ -56612,21 +57029,21 @@ function MFormEntry(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb139.ObjectId(value._id);
+      value._id = new import_mongodb140.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new import_mongodb139.ObjectId(value.org);
+      value.org = new import_mongodb140.ObjectId(value.org);
     } catch {
       throw new Error("Invalid org ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb139.ObjectId(value.site);
+      value.site = new import_mongodb140.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
@@ -56646,6 +57063,7 @@ function MFormEntry(value) {
 
 // src/repositories/online-forms-v2.repository.ts
 var import_node_server_utils244 = require("@7365admin1/node-server-utils");
+var import_mongodb141 = require("mongodb");
 var online_forms_namespace_collection = "online-forms";
 function useFormEntryRepo() {
   const db = import_node_server_utils244.useAtlas.getDb();
@@ -56690,18 +57108,105 @@ function useFormEntryRepo() {
       throw error;
     }
   }
+  async function getAll({
+    search = "",
+    page = 1,
+    limit = 10,
+    sort = {},
+    status = "active",
+    org = "",
+    site = ""
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    const cacheOptions = {
+      page,
+      limit,
+      status,
+      sort: JSON.stringify(sort),
+      ...site && { site },
+      ...search && { search }
+    };
+    const query = {
+      ...status ? { $and: [{ status }, { status: { $ne: "deleted" } }] } : { status: { $ne: "deleted" } },
+      ...site && { site: new import_mongodb141.ObjectId(site) },
+      ...search && { search: [{ name: { $regex: search, $options: "i" } }] }
+    };
+    const cacheKey = (0, import_node_server_utils244.makeCacheKey)(
+      online_forms_namespace_collection,
+      cacheOptions
+    );
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      import_node_server_utils244.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const items = await collection.aggregate([
+        { $match: query },
+        { $sort: sort },
+        { $skip: page * limit },
+        { $limit: limit }
+      ]).toArray();
+      const length = await collection.countDocuments(query);
+      const data = (0, import_node_server_utils244.paginate)(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        import_node_server_utils244.logger.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils244.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function getFormEntryById(_id) {
+    const cacheKey = (0, import_node_server_utils244.makeCacheKey)(online_forms_namespace_collection, { _id });
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      import_node_server_utils244.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      _id = new import_mongodb141.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils244.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_utils244.NotFoundError("Document not found.");
+      }
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        import_node_server_utils244.logger.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils244.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     add,
+    getAll,
+    getFormEntryById,
     createTextIndex
   };
 }
 
 // src/controllers/online-forms-v2.controller.ts
 var import_node_server_utils245 = require("@7365admin1/node-server-utils");
+var import_joi142 = __toESM(require("joi"));
 var import_exceljs3 = __toESM(require("exceljs"));
 var import_fs6 = __toESM(require("fs"));
 function useFormEntryController() {
-  const { add: _add } = useFormEntryRepo();
+  const {
+    add: _add,
+    getAll: _getAll,
+    getFormEntryById: _getFormEntryById
+  } = useFormEntryRepo();
   function toCamelCase(str) {
     return str.replace(/\s(.)/g, (_, char) => char.toUpperCase()).replace(/\s+/g, "").replace(/^(.)/, (_, char) => char.toLowerCase());
   }
@@ -56763,8 +57268,59 @@ function useFormEntryController() {
       next(error);
     }
   }
+  async function getAll(req, res, next) {
+    try {
+      const schema2 = import_joi142.default.object({
+        search: import_joi142.default.string().optional().allow("", null),
+        page: import_joi142.default.number().integer().min(1).allow("", null).default(1),
+        limit: import_joi142.default.number().integer().min(1).max(100).allow("", null).default(10),
+        status: import_joi142.default.string().optional().allow(null, ""),
+        org: import_joi142.default.string().hex().optional().allow("", null),
+        site: import_joi142.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_utils245.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils245.BadRequestError(messages));
+        return;
+      }
+      const { search, page, limit, status, org, site } = value;
+      const data = await _getAll({ search, page, limit, status, org, site });
+      res.json(data);
+      return;
+    } catch (error) {
+      import_node_server_utils245.logger.log({ level: "error", message: error.message });
+      next(error);
+      return;
+    }
+  }
+  async function getFormEntryById(req, res, next) {
+    try {
+      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) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils245.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils245.BadRequestError(messages));
+        return;
+      }
+      const { _id } = value;
+      const data = await _getFormEntryById(_id);
+      res.json(data);
+      return;
+    } catch (error) {
+      import_node_server_utils245.logger.log({ level: "error", message: error.message });
+      next(error);
+      return;
+    }
+  }
   return {
-    uploadFormEntrys
+    uploadFormEntrys,
+    getAll,
+    getFormEntryById
   };
 }
 
@@ -56808,7 +57364,7 @@ function useBuildingLevelService() {
 
 // src/controllers/building-level.controller.ts
 var import_node_server_utils247 = require("@7365admin1/node-server-utils");
-var import_joi142 = __toESM(require("joi"));
+var import_joi143 = __toESM(require("joi"));
 function useBuildingLevelController() {
   const { add: _add, updateLevelById: _updateLevelById } = useBuildingLevelService();
   const {
@@ -56835,12 +57391,12 @@ function useBuildingLevelController() {
   }
   async function getAll(req, res, next) {
     try {
-      const validation = import_joi142.default.object({
-        page: import_joi142.default.number().min(1).optional().default(1),
-        limit: import_joi142.default.number().min(1).optional().default(20),
-        search: import_joi142.default.string().optional().allow("", null),
-        site: import_joi142.default.string().hex().length(24).optional().allow("", null),
-        status: import_joi142.default.string().valid(...Object.values(BuildingLevelStatus)).default("active" /* ACTIVE */)
+      const validation = import_joi143.default.object({
+        page: import_joi143.default.number().min(1).optional().default(1),
+        limit: import_joi143.default.number().min(1).optional().default(20),
+        search: import_joi143.default.string().optional().allow("", null),
+        site: import_joi143.default.string().hex().length(24).optional().allow("", null),
+        status: import_joi143.default.string().valid(...Object.values(BuildingLevelStatus)).default("active" /* ACTIVE */)
       });
       const { error, value } = validation.validate(req.query, {
         abortEarly: false
@@ -56867,8 +57423,8 @@ function useBuildingLevelController() {
   }
   async function getById(req, res, next) {
     try {
-      const schema2 = import_joi142.default.object({
-        id: import_joi142.default.string().hex().length(24).required()
+      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) {
@@ -56906,8 +57462,8 @@ function useBuildingLevelController() {
   }
   async function deleteById(req, res, next) {
     try {
-      const schema2 = import_joi142.default.object({
-        id: import_joi142.default.string().hex().required()
+      const schema2 = import_joi143.default.object({
+        id: import_joi143.default.string().hex().required()
       });
       const { error, value } = schema2.validate({ id: req.params.id });
       if (error) {