@7365admin1/core 2.75.0 → 2.77.0

package/dist/index.mjs

@@ -2725,6 +2725,20 @@ function useUserRepo() {
       throw new InternalServerError5("Failed to update user.");
     }
   }
+  async function updateUserOrgById(id, org, session) {
+    const _id = toObjectId(id);
+    const orgId = 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 InternalServerError5("Failed to update user organization.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -2742,7 +2756,8 @@ function useUserRepo() {
     updateDefaultOrgByEmail,
     getUserByEmailStatus,
     updateUserSIDById,
-    resetPassword
+    resetPassword,
+    updateUserOrgById
   };
 }
 
@@ -3283,6 +3298,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",
@@ -3302,7 +3331,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"
+            }
           }
         },
         {
@@ -3310,15 +3348,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 = paginate5(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger8.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
+      setCache(cacheKey, data, 15 * 60).catch((err) => {
         logger8.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
@@ -4193,6 +4232,9 @@ var orgSchema = Joi8.object({
   busInst: Joi8.string().optional().allow("", null),
   status: Joi8.string().optional().allow("", null),
   defaultSite: Joi8.string().hex().optional().allow("", null),
+  onboardingRequired: Joi8.boolean().optional(),
+  onboardingCompleted: Joi8.boolean().optional(),
+  onboardingCompletedAt: Joi8.date().optional().allow(null),
   terms: Joi8.string().optional().allow("", null),
   policies: Joi8.string().optional().allow("", null),
   createdAt: Joi8.string().optional().allow("", null),
@@ -4222,6 +4264,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(),
@@ -7533,7 +7578,8 @@ function useUserController() {
         "dateOfBirth",
         "profile",
         "gender",
-        "defaultOrg"
+        "defaultOrg",
+        "status"
       ).required(),
       value: Joi13.when("field", {
         switch: [
@@ -8974,7 +9020,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.",
@@ -15377,10 +15423,10 @@ import {
 import { BadRequestError as BadRequestError68, logger as logger49 } from "@7365admin1/node-server-utils";
 import Joi38 from "joi";
 import { ObjectId as ObjectId41 } from "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";
@@ -16440,6 +16486,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();
@@ -17090,6 +17207,50 @@ function useDahuaService() {
       );
     }
   }
+  async function openBarrier(value) {
+    const validation = Joi40.object({
+      host: Joi40.string().required(),
+      username: Joi40.string().required(),
+      password: Joi40.string().required(),
+      plateNumber: Joi40.string().required(),
+      channel: Joi40.number().integer().min(1).default(1)
+    });
+    const { error, value: payload } = validation.validate(value, {
+      stripUnknown: true
+    });
+    if (error) {
+      throw new BadRequestError70(`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,
@@ -17097,7 +17258,8 @@ function useDahuaService() {
     removePlateNumber,
     updatePlateNumber,
     getPlateNumber,
-    bulkInsertPlateNumber
+    bulkInsertPlateNumber,
+    openBarrier
   };
 }
 
@@ -17304,6 +17466,43 @@ function useSiteCameraRepo() {
       throw new BadRequestError71("Failed to retrieve site cameras.");
     }
   }
+  async function getVisitorsInBySite(site) {
+    try {
+      const pipeline = [
+        { $match: { site: toObjectId9(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 BadRequestError71) {
+        throw error;
+      }
+      throw new BadRequestError71("Failed to retrieve site cameras.");
+    }
+  }
   async function getBySiteGuardPost(site, guardPost) {
     try {
       site = new ObjectId43(site);
@@ -17658,6 +17857,7 @@ function useSiteCameraRepo() {
     getAll,
     findSiteCameras,
     getBySite,
+    getVisitorsInBySite,
     getBySites,
     delCachedData,
     getBySiteGuardPost,
@@ -25953,13 +26153,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();
@@ -26035,28 +26236,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) {
+            logger80.warn(`No camera document found for site: ${value.site}`);
+          }
+        } catch (error) {
+          logger80.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);
@@ -26093,7 +26296,7 @@ function useVisitorTransactionService() {
           block,
           level,
           unit,
-          site: site2,
+          site,
           org,
           type,
           company,
@@ -26149,14 +26352,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 */
@@ -26167,11 +26370,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 = {
@@ -26187,74 +26392,6 @@ function useVisitorTransactionService() {
         const found = foundMatch ? Number(foundMatch[1]) : 0;
         if (found === 1)
           throw new BadRequestError100("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 BadRequestError100(
-              `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 BadRequestError100(
-              `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) {
@@ -26292,6 +26429,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 {
+          logger80.info(`Attempting to open barrier at host: ${host}`);
+          openBarrier = await _openBarrier({
+            host,
+            username,
+            password,
+            plateNumber: value?.plateNumber
+          });
+          logger80.info(`Barrier command sent successfully to ${host}`, { response: openBarrier });
+        } catch (error) {
+          logger80.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();
@@ -26304,6 +26462,43 @@ function useVisitorTransactionService() {
     const session = useAtlas50.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) {
+            logger80.warn(`No camera document found for site: ${value.site}`);
+          }
+        } catch (error) {
+          logger80.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 BadRequestError100("This plate number is blocklisted");
+      }
       if (Array.isArray(value.visitorPass) && value.visitorPass.length > 0) {
         const keptVisitorPass = [];
         for (const vp of value.visitorPass) {
@@ -26367,6 +26562,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 {
+          logger80.info(`Attempting to open barrier at host: ${host}`);
+          openBarrier = await _openBarrier({
+            host,
+            username,
+            password,
+            plateNumber: value?.plateNumber
+          });
+          logger80.info(`Barrier command sent successfully to ${host}`, { response: openBarrier });
+        } catch (error) {
+          logger80.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) {
@@ -27330,6 +27553,7 @@ import {
   compileHandlebar as compileHandlebar3,
   getDirectory as getDirectory3
 } from "@7365admin1/node-server-utils";
+import { ObjectId as ObjectId64 } from "mongodb";
 function usePersonService() {
   const MailerConfig = {
     host: MAILER_TRANSPORT_HOST,
@@ -27351,7 +27575,8 @@ function usePersonService() {
     createUser: addUser,
     getUserByEmail,
     updateUserFieldById: _updateUserFieldById,
-    getUserById
+    getUserById,
+    updateUserOrgById: _updateUserOrgById
   } = useUserRepo();
   const { add: addMember } = useMemberRepo();
   const { getById: _getUnitById, updateById: updateUnitById } = useBuildingUnitRepo();
@@ -27442,8 +27667,27 @@ function usePersonService() {
       }
       await _add(value, session);
       await session.commitTransaction();
+      if (value.email && isValidType && value.platform === "mobile") {
+        const emailContent = compileHandlebar3({
+          context: { name: value.name },
+          filePath: getDirectory3(
+            __dirname,
+            "./public/handlebars/registration-pending"
+          )
+        });
+        mailer.sendMail({
+          to: value.email,
+          subject: "Registration Received \u2013 Pending Review",
+          html: emailContent,
+          sender: "iService365"
+        }).catch((error) => {
+          logger84.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);
       logger84.error("Error in people service add:", error);
       await session.abortTransaction();
       throw error;
@@ -27464,7 +27708,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 ObjectId64(value.org);
+      }
+      if (value.site && typeof value.site === "string") {
+        value.site = new ObjectId64(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) {
@@ -27486,7 +27744,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
+            );
           }
         }
       }
@@ -27576,13 +27838,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");
@@ -28019,7 +28281,7 @@ function usePersonController() {
 // src/models/robot.model.ts
 import { BadRequestError as BadRequestError106, logger as logger86 } from "@7365admin1/node-server-utils";
 import Joi61 from "joi";
-import { ObjectId as ObjectId64 } from "mongodb";
+import { ObjectId as ObjectId65 } from "mongodb";
 var metadataSchema4 = {
   orgId: Joi61.string().hex().optional().allow("", null),
   siteId: Joi61.string().hex().optional().allow("", null),
@@ -28044,21 +28306,21 @@ function MRobot(value) {
   }
   if (value.metadata?.orgId) {
     try {
-      value.metadata.orgId = new ObjectId64(value.metadata.orgId);
+      value.metadata.orgId = new ObjectId65(value.metadata.orgId);
     } catch (error2) {
       throw new BadRequestError106("Invalid organization ID format.");
     }
   }
   if (value.metadata?.siteId) {
     try {
-      value.metadata.siteId = new ObjectId64(value.metadata.siteId);
+      value.metadata.siteId = new ObjectId65(value.metadata.siteId);
     } catch (error2) {
       throw new BadRequestError106("Invalid site ID format.");
     }
   }
   if (value.metadata?.administratorId) {
     try {
-      value.metadata.administratorId = new ObjectId64(
+      value.metadata.administratorId = new ObjectId65(
         value.metadata.administratorId
       );
     } catch (error2) {
@@ -28067,7 +28329,7 @@ function MRobot(value) {
   }
   if (value.createdBy) {
     try {
-      value.createdBy = new ObjectId64(value.createdBy);
+      value.createdBy = new ObjectId65(value.createdBy);
     } catch (error2) {
       throw new BadRequestError106("Invalid created by ID format.");
     }
@@ -28092,7 +28354,7 @@ function MRobot(value) {
 }
 
 // src/repositories/robot.repo.ts
-import { ObjectId as ObjectId65 } from "mongodb";
+import { ObjectId as ObjectId66 } from "mongodb";
 import {
   useAtlas as useAtlas54,
   InternalServerError as InternalServerError35,
@@ -28161,12 +28423,12 @@ function useRobotRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     try {
-      organization = new ObjectId65(organization);
+      organization = new ObjectId66(organization);
     } catch (error) {
       throw new BadRequestError107("Invalid organization ID format.");
     }
     try {
-      site = new ObjectId65(site);
+      site = new ObjectId66(site);
     } catch (error) {
       throw new BadRequestError107("Invalid site ID format.");
     }
@@ -28389,7 +28651,7 @@ function useRobotController() {
 
 // src/models/patrol-question.model.ts
 import { BadRequestError as BadRequestError110, logger as logger89 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId66 } from "mongodb";
+import { ObjectId as ObjectId67 } from "mongodb";
 import Joi63 from "joi";
 var schemaPatrolQuestion = Joi63.object({
   _id: Joi63.string().hex().optional(),
@@ -28415,14 +28677,14 @@ function MPatrolQuestion(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId66(value._id);
+      value._id = new ObjectId67(value._id);
     } catch {
       throw new BadRequestError110("Invalid _id format");
     }
   }
   return {
-    _id: value._id ?? new ObjectId66(),
-    site: new ObjectId66(value.site),
+    _id: value._id ?? new ObjectId67(),
+    site: new ObjectId67(value.site),
     question: value.question,
     answers: value.answers,
     status: value.status ?? "active",
@@ -28443,7 +28705,7 @@ import {
   useAtlas as useAtlas55,
   useCache as useCache35
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId67 } from "mongodb";
+import { ObjectId as ObjectId68 } from "mongodb";
 function usePatrolQuestionRepo() {
   const db = useAtlas55.getDb();
   if (!db) {
@@ -28522,7 +28784,7 @@ function usePatrolQuestionRepo() {
           { answers: { $regex: search, $options: "i" } }
         ]
       },
-      ...ObjectId67.isValid(site) && { site: new ObjectId67(site) }
+      ...ObjectId68.isValid(site) && { site: new ObjectId68(site) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
@@ -28562,7 +28824,7 @@ function usePatrolQuestionRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new ObjectId67(_id);
+      _id = new ObjectId68(_id);
     } catch (error) {
       throw new BadRequestError111(
         "Invalid patrol question transaction ID format."
@@ -28583,7 +28845,7 @@ function usePatrolQuestionRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new ObjectId67(_id);
+      _id = new ObjectId68(_id);
     } catch (error) {
       throw new BadRequestError111("Invalid customer ID format.");
     }
@@ -28605,7 +28867,7 @@ function usePatrolQuestionRepo() {
   }
   async function getById(_id, session) {
     try {
-      _id = new ObjectId67(_id);
+      _id = new ObjectId68(_id);
     } catch (error) {
       throw new BadRequestError111("Invalid patrol question ID format.");
     }
@@ -28780,7 +29042,7 @@ function usePatrolQuestionController() {
 
 // src/models/patrol-route.model.ts
 import { BadRequestError as BadRequestError113, logger as logger92 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId68 } from "mongodb";
+import { ObjectId as ObjectId69 } from "mongodb";
 import Joi65 from "joi";
 var schemeCamera = Joi65.object({
   camera: Joi65.string().hex().required(),
@@ -28828,14 +29090,14 @@ function MPatrolRoute(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId68(value._id);
+      value._id = new ObjectId69(value._id);
     } catch {
       throw new BadRequestError113("Invalid _id format");
     }
   }
   if (value.assignee && Array.isArray(value.assignee)) {
     try {
-      value.assignee = value.assignee.map((id) => new ObjectId68(id));
+      value.assignee = value.assignee.map((id) => new ObjectId69(id));
     } catch {
       throw new BadRequestError113("Invalid assignee id format");
     }
@@ -28844,7 +29106,7 @@ function MPatrolRoute(value) {
     value.cameras = value.cameras.map((camera) => {
       if (typeof camera.camera === "string") {
         try {
-          camera.camera = new ObjectId68(camera.camera);
+          camera.camera = new ObjectId69(camera.camera);
         } catch {
           throw new BadRequestError113("Invalid camera id format");
         }
@@ -28852,7 +29114,7 @@ function MPatrolRoute(value) {
       camera.questions = camera.questions.map((question) => {
         if (typeof question.questionId === "string") {
           try {
-            question.questionId = new ObjectId68(question.questionId);
+            question.questionId = new ObjectId69(question.questionId);
           } catch {
             throw new BadRequestError113("Invalid question id format");
           }
@@ -28863,8 +29125,8 @@ function MPatrolRoute(value) {
     });
   }
   return {
-    _id: value._id ?? new ObjectId68(),
-    site: new ObjectId68(value.site),
+    _id: value._id ?? new ObjectId69(),
+    site: new ObjectId69(value.site),
     name: value.name,
     assignee: value.assignee,
     start: value.start,
@@ -28890,7 +29152,7 @@ import {
   useAtlas as useAtlas56,
   useCache as useCache36
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId69 } from "mongodb";
+import { ObjectId as ObjectId70 } from "mongodb";
 function usePatrolRouteRepo() {
   const db = useAtlas56.getDb();
   if (!db) {
@@ -28966,7 +29228,7 @@ function usePatrolRouteRepo() {
     page = page > 0 ? page - 1 : 0;
     const query = {
       status,
-      ...ObjectId69.isValid(site) && { site: new ObjectId69(site) }
+      ...ObjectId70.isValid(site) && { site: new ObjectId70(site) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
@@ -29049,20 +29311,20 @@ function usePatrolRouteRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new ObjectId69(_id);
+      _id = new ObjectId70(_id);
     } catch (error) {
       throw new BadRequestError114("Invalid patrol route transaction ID format.");
     }
-    if (value.site && ObjectId69.isValid(value.site.toString())) {
+    if (value.site && ObjectId70.isValid(value.site.toString())) {
       try {
-        value.site = new ObjectId69(value.site.toString());
+        value.site = new ObjectId70(value.site.toString());
       } catch {
         throw new BadRequestError114("Invalid _id format");
       }
     }
     if (value.assignee && Array.isArray(value.assignee)) {
       try {
-        value.assignee = value.assignee.map((id) => new ObjectId69(id));
+        value.assignee = value.assignee.map((id) => new ObjectId70(id));
       } catch {
         throw new BadRequestError114("Invalid _id format");
       }
@@ -29082,7 +29344,7 @@ function usePatrolRouteRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new ObjectId69(_id);
+      _id = new ObjectId70(_id);
     } catch (error) {
       throw new BadRequestError114("Invalid patrol route transaction ID format.");
     }
@@ -29131,7 +29393,7 @@ function usePatrolRouteRepo() {
     const query = {
       status,
       ...search && { $text: { $search: search } },
-      ...ObjectId69.isValid(site) && { site: new ObjectId69(site) }
+      ...ObjectId70.isValid(site) && { site: new ObjectId70(site) }
     };
     if (day && start) {
       const [hour, minute] = start?.split(":") ?? ["0", "0"];
@@ -29214,7 +29476,7 @@ function usePatrolRouteRepo() {
               id: "$_id",
               start: startOfDay,
               end: endOfDay,
-              site: ObjectId69.isValid(site) ? new ObjectId69(site) : null
+              site: ObjectId70.isValid(site) ? new ObjectId70(site) : null
             },
             pipeline: [
               {
@@ -29260,7 +29522,7 @@ function usePatrolRouteRepo() {
   }
   async function getById(_id, session) {
     try {
-      _id = new ObjectId69(_id);
+      _id = new ObjectId70(_id);
     } catch (error) {
       throw new BadRequestError114("Invalid patrol log ID format.");
     }
@@ -29505,7 +29767,7 @@ function usePatrolRouteController() {
 
 // src/models/patrol-log.model.ts
 import { BadRequestError as BadRequestError116, logger as logger95 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId70 } from "mongodb";
+import { ObjectId as ObjectId71 } from "mongodb";
 import Joi67 from "joi";
 var schemeLogCamera = Joi67.object({
   camera: Joi67.string().hex().required(),
@@ -29566,41 +29828,41 @@ function MPatrolLog(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId70(value._id);
+      value._id = new ObjectId71(value._id);
     } catch {
       throw new BadRequestError116("Invalid _id format");
     }
   }
   if (value.route && typeof value.route === "string") {
     try {
-      value.route = new ObjectId70(value.route);
+      value.route = new ObjectId71(value.route);
     } catch {
       throw new BadRequestError116("Invalid route id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId70(value.site);
+      value.site = new ObjectId71(value.site);
     } catch {
       throw new BadRequestError116("Invalid site id format");
     }
   }
   const assignee = (value.assignee || []).map((id) => {
     try {
-      return new ObjectId70(id);
+      return new ObjectId71(id);
     } catch {
       throw new BadRequestError116("Invalid assignee id format");
     }
   });
   if (value.incidentReport && typeof value.incidentReport.id === "string") {
     try {
-      value.incidentReport.id = new ObjectId70(value.incidentReport.id);
+      value.incidentReport.id = new ObjectId71(value.incidentReport.id);
     } catch {
       throw new BadRequestError116("Invalid incident report id format");
     }
   }
   return {
-    _id: value._id ?? new ObjectId70(),
+    _id: value._id ?? new ObjectId71(),
     site: value.site,
     name: value.name,
     assignee,
@@ -29628,7 +29890,7 @@ import {
   useAtlas as useAtlas57,
   useCache as useCache37
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId71 } from "mongodb";
+import { ObjectId as ObjectId72 } from "mongodb";
 function usePatrolLogRepo() {
   const db = useAtlas57.getDb();
   if (!db) {
@@ -29719,7 +29981,7 @@ function usePatrolLogRepo() {
         };
       }
       const query = {
-        ...ObjectId71.isValid(site) && { site: new ObjectId71(site) },
+        ...ObjectId72.isValid(site) && { site: new ObjectId72(site) },
         ...dateExpr
       };
       sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
@@ -29859,7 +30121,7 @@ function usePatrolLogRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new ObjectId71(_id);
+      _id = new ObjectId72(_id);
     } catch (error) {
       throw new BadRequestError117("Invalid patrol log transaction ID format.");
     }
@@ -29878,7 +30140,7 @@ function usePatrolLogRepo() {
   }
   async function deleteById(_id, session) {
     try {
-      _id = new ObjectId71(_id);
+      _id = new ObjectId72(_id);
     } catch (error) {
       throw new BadRequestError117("Invalid patrol log ID format.");
     }
@@ -29892,7 +30154,7 @@ function usePatrolLogRepo() {
   }
   async function getById(_id, session) {
     try {
-      _id = new ObjectId71(_id);
+      _id = new ObjectId72(_id);
     } catch (error) {
       throw new BadRequestError117("Invalid patrol log ID format.");
     }
@@ -30145,7 +30407,7 @@ function usePatrolLogController() {
 
 // src/models/site-facility.model.ts
 import Joi69 from "joi";
-import { ObjectId as ObjectId72 } from "mongodb";
+import { ObjectId as ObjectId73 } from "mongodb";
 var timeSlotSchema = Joi69.array().items(
   Joi69.object({
     start: Joi69.string().optional().allow("", null),
@@ -30305,28 +30567,28 @@ function MSiteFacility(value) {
     throw new Error(error.details[0].message);
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId72(value._id);
+      value._id = new ObjectId73(value._id);
     } catch {
       throw new Error("Invalid _id.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId72(value.site);
+      value.site = new ObjectId73(value.site);
     } catch {
       throw new Error("Invalid _id.");
     }
   }
   if (value.featuredImage && typeof value.featuredImage === "string") {
     try {
-      value.featuredImage = new ObjectId72(value.featuredImage);
+      value.featuredImage = new ObjectId73(value.featuredImage);
     } catch {
       throw new Error("Invalid featuredImage ID.");
     }
   }
   if (Array.isArray(value.gallery)) {
     try {
-      value.gallery = value.gallery.map((id) => new ObjectId72(id));
+      value.gallery = value.gallery.map((id) => new ObjectId73(id));
     } catch {
       throw new Error("Invalid ID in gallery array.");
     }
@@ -30419,7 +30681,7 @@ import {
   useAtlas as useAtlas59,
   useCache as useCache38
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId73 } from "mongodb";
+import { ObjectId as ObjectId74 } from "mongodb";
 function useSiteFacilityRepo() {
   const db = useAtlas59.getDb();
   if (!db) {
@@ -30487,7 +30749,7 @@ function useSiteFacilityRepo() {
     };
     if (site) {
       try {
-        site = new ObjectId73(site);
+        site = new ObjectId74(site);
         query.site = site;
         cacheOptions.site = site.toString();
       } catch (error) {
@@ -30532,7 +30794,7 @@ function useSiteFacilityRepo() {
   }
   async function getSiteFacilityById(_id, session) {
     try {
-      _id = new ObjectId73(_id);
+      _id = new ObjectId74(_id);
     } catch (error) {
       throw new BadRequestError120("Invalid site facility ID format.");
     }
@@ -30560,20 +30822,20 @@ function useSiteFacilityRepo() {
   async function updateSiteFacilityById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new ObjectId73(_id);
+      _id = new ObjectId74(_id);
     } catch (error) {
       throw new BadRequestError120("Invalid ID format.");
     }
     if (value.featuredImage) {
       try {
-        value.featuredImage = new ObjectId73(value.featuredImage);
+        value.featuredImage = new ObjectId74(value.featuredImage);
       } catch (error) {
         throw new BadRequestError120("Invalid ID format for featured image.");
       }
     }
     if (Array.isArray(value.gallery)) {
       try {
-        value.gallery = value.gallery.map((id) => new ObjectId73(id));
+        value.gallery = value.gallery.map((id) => new ObjectId74(id));
       } catch {
         throw new Error("Invalid ID in gallery array.");
       }
@@ -30619,7 +30881,7 @@ function useSiteFacilityRepo() {
   }
   async function deleteSiteFacilityById(_id) {
     try {
-      _id = new ObjectId73(_id);
+      _id = new ObjectId74(_id);
     } catch (error) {
       throw new BadRequestError120("Invalid site facility ID format.");
     }
@@ -30648,12 +30910,12 @@ function useSiteFacilityRepo() {
   }
   async function getSiteFacilityTimeSlotById(_id, site, session) {
     try {
-      _id = new ObjectId73(_id);
+      _id = new ObjectId74(_id);
     } catch (error) {
       throw new BadRequestError120("Invalid facility ID format.");
     }
     try {
-      site = new ObjectId73(site);
+      site = new ObjectId74(site);
     } catch (error) {
       throw new BadRequestError120("Invalid site ID format.");
     }
@@ -30996,7 +31258,7 @@ function useSiteFacilityController() {
 
 // src/models/service-provider-billing.model.ts
 import Joi71 from "joi";
-import { ObjectId as ObjectId74 } from "mongodb";
+import { ObjectId as ObjectId75 } from "mongodb";
 var schemaServiceProviderBilling = Joi71.object({
   _id: Joi71.string().hex().optional().allow("", null),
   attachments: Joi71.array().items(Joi71.string().hex()).required(),
@@ -31030,7 +31292,7 @@ function MServiceProviderBilling(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId74(value._id);
+      value._id = new ObjectId75(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
@@ -31039,7 +31301,7 @@ function MServiceProviderBilling(value) {
     value.acknowledgedBy = value.acknowledgedBy.map((item) => {
       if (item.user && typeof item.user === "string") {
         try {
-          item.user = new ObjectId74(item.user);
+          item.user = new ObjectId75(item.user);
         } catch (error2) {
           throw new Error("Invalid ID format for acknowledgedBy.user.");
         }
@@ -31049,13 +31311,13 @@ function MServiceProviderBilling(value) {
   }
   if (value.orgId && typeof value.orgId === "string") {
     try {
-      value.orgId = new ObjectId74(value.orgId);
+      value.orgId = new ObjectId75(value.orgId);
     } catch {
       throw new Error("Invalid org ID.");
     }
   }
   return {
-    _id: value._id ?? new ObjectId74(),
+    _id: value._id ?? new ObjectId75(),
     attachments: value.attachments,
     acknowledgedBy: value.acknowledgedBy || [],
     status: value.status,
@@ -31077,7 +31339,7 @@ import {
   useAtlas as useAtlas61,
   useCache as useCache39
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId75 } from "mongodb";
+import { ObjectId as ObjectId76 } from "mongodb";
 function useServiceProviderBillingRepo() {
   const db = useAtlas61.getDb();
   if (!db) {
@@ -31124,7 +31386,7 @@ function useServiceProviderBillingRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      org = new ObjectId75(org);
+      org = new ObjectId76(org);
     } catch (error) {
       throw new BadRequestError122("Invalid org ID format.");
     }
@@ -31174,7 +31436,7 @@ function useServiceProviderBillingRepo() {
   }
   async function getSiteServiceProviderBillingById(_id, session) {
     try {
-      _id = new ObjectId75(_id);
+      _id = new ObjectId76(_id);
     } catch (error) {
       throw new BadRequestError122("Invalid service provider billing ID format.");
     }
@@ -31202,7 +31464,7 @@ function useServiceProviderBillingRepo() {
   async function updateServiceProviderBillingById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new ObjectId75(_id);
+      _id = new ObjectId76(_id);
     } catch (error) {
       throw new BadRequestError122("Invalid ID format.");
     }
@@ -31210,7 +31472,7 @@ function useServiceProviderBillingRepo() {
       value.acknowledgedBy = value.acknowledgedBy.map((item) => {
         if (item.user && typeof item.user === "string") {
           try {
-            item.user = new ObjectId75(item.user);
+            item.user = new ObjectId76(item.user);
           } catch (error) {
             throw new Error("Invalid ID format for acknowledgedBy.user.");
           }
@@ -31244,7 +31506,7 @@ function useServiceProviderBillingRepo() {
   }
   async function deleteServiceProviderBillingById(_id) {
     try {
-      _id = new ObjectId75(_id);
+      _id = new ObjectId76(_id);
     } catch (error) {
       throw new BadRequestError122("Invalid service provider billing ID format.");
     }
@@ -31482,7 +31744,7 @@ function useServiceProviderBillingController() {
 
 // src/models/site-facility-booking.model.ts
 import Joi73 from "joi";
-import { ObjectId as ObjectId76 } from "mongodb";
+import { ObjectId as ObjectId77 } from "mongodb";
 var FacilitySort = /* @__PURE__ */ ((FacilitySort2) => {
   FacilitySort2["CREATED_AT"] = "createdAt";
   FacilitySort2["NAME"] = "name";
@@ -31592,48 +31854,48 @@ function MSiteFacilityBooking(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId76(value._id);
+      value._id = new ObjectId77(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId76(value.site);
+      value.site = new ObjectId77(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.user && typeof value.user === "string") {
     try {
-      value.user = new ObjectId76(value.user);
+      value.user = new ObjectId77(value.user);
     } catch {
       throw new Error("Invalid user ID.");
     }
   }
   if (value.approvedBy && typeof value.approvedBy === "string") {
     try {
-      value.approvedBy = new ObjectId76(value.approvedBy);
+      value.approvedBy = new ObjectId77(value.approvedBy);
     } catch {
       throw new Error("Invalid approved by ID.");
     }
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new ObjectId76(value.createdBy);
+      value.createdBy = new ObjectId77(value.createdBy);
     } catch {
       throw new Error("Invalid created by ID.");
     }
   }
   if (value.updatedBy && typeof value.updatedBy === "string") {
     try {
-      value.updatedBy = new ObjectId76(value.updatedBy);
+      value.updatedBy = new ObjectId77(value.updatedBy);
     } catch {
       throw new Error("Invalid updated by ID.");
     }
   }
   return {
-    _id: value._id ?? new ObjectId76(),
+    _id: value._id ?? new ObjectId77(),
     facility: value.facility ?? "",
     slot: value.slot ?? "",
     slotName: value.slotName ?? "",
@@ -31729,7 +31991,7 @@ import {
   useAtlas as useAtlas63,
   useCache as useCache40
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId77 } from "mongodb";
+import { ObjectId as ObjectId78 } from "mongodb";
 var facility_bookings_namespace_collection = "site.facilty-booking";
 function useSiteFacilityBookingRepo() {
   const db = useAtlas63.getDb();
@@ -31892,7 +32154,7 @@ function useSiteFacilityBookingRepo() {
   }
   async function deleteSiteFacilityBookingById(_id) {
     try {
-      _id = new ObjectId77(_id);
+      _id = new ObjectId78(_id);
     } catch (error) {
       throw new BadRequestError124("Invalid site facility booking ID format.");
     }
@@ -32129,7 +32391,7 @@ function useSiteFacilityBookingController() {
 
 // src/models/document-management.model.ts
 import Joi75 from "joi";
-import { ObjectId as ObjectId78 } from "mongodb";
+import { ObjectId as ObjectId79 } from "mongodb";
 var schemaDocumentManagement = Joi75.object({
   _id: Joi75.string().hex().optional().allow("", null),
   name: Joi75.string().required(),
@@ -32167,28 +32429,28 @@ function MDocumentManagement(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId78(value._id);
+      value._id = new ObjectId79(value._id);
     } catch (error2) {
       throw new Error("Invalid ID.");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new ObjectId78(value.org);
+      value.org = new ObjectId79(value.org);
     } catch (error2) {
       throw new Error("Invalid org ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId78(value.site);
+      value.site = new ObjectId79(value.site);
     } catch (error2) {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.parentId && typeof value.parentId === "string") {
     try {
-      value.parentId = new ObjectId78(value.parentId);
+      value.parentId = new ObjectId79(value.parentId);
     } catch (error2) {
       throw new Error("Invalid parentId.");
     }
@@ -32222,7 +32484,7 @@ import {
   useAtlas as useAtlas65,
   useCache as useCache41
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId79 } from "mongodb";
+import { ObjectId as ObjectId80 } from "mongodb";
 function useDocumentManagementRepo() {
   const db = useAtlas65.getDb();
   if (!db) {
@@ -32284,7 +32546,7 @@ function useDocumentManagementRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId79(site);
+      site = new ObjectId80(site);
     } catch (error) {
       throw new BadRequestError126("Invalid site ID format.");
     }
@@ -32301,12 +32563,12 @@ function useDocumentManagementRepo() {
       cacheOptions.type = type;
     }
     if (org) {
-      query.org = new ObjectId79(org);
+      query.org = new ObjectId80(org);
       cacheOptions.org = org.toString();
     }
     if (parentId) {
       try {
-        query.parentId = new ObjectId79(parentId);
+        query.parentId = new ObjectId80(parentId);
         cacheOptions.parentId = parentId.toString();
       } catch (error) {
         throw new BadRequestError126("Invalid parentId format.");
@@ -32360,7 +32622,7 @@ function useDocumentManagementRepo() {
   }
   async function getDocumentById(_id) {
     try {
-      _id = new ObjectId79(_id);
+      _id = new ObjectId80(_id);
     } catch (error) {
       throw new BadRequestError126("Invalid document ID format.");
     }
@@ -32405,7 +32667,7 @@ function useDocumentManagementRepo() {
   }
   async function updateDocumentById(_id, value) {
     try {
-      _id = new ObjectId79(_id);
+      _id = new ObjectId80(_id);
     } catch (error) {
       throw new BadRequestError126("Invalid document ID format.");
     }
@@ -32433,7 +32695,7 @@ function useDocumentManagementRepo() {
   }
   async function deleteDocumentById(_id, session) {
     try {
-      _id = new ObjectId79(_id);
+      _id = new ObjectId80(_id);
     } catch (error) {
       throw new BadRequestError126("Invalid document ID format.");
     }
@@ -32466,7 +32728,7 @@ function useDocumentManagementRepo() {
   }
   async function getDocumentManagementBySiteId(site, type) {
     try {
-      site = new ObjectId79(site);
+      site = new ObjectId80(site);
     } catch (error) {
       throw new BadRequestError126("Invalid document management site ID format.");
     }
@@ -32796,7 +33058,7 @@ function useDocumentManagementController() {
 
 // src/models/bulletin-board.model.ts
 import Joi77 from "joi";
-import { ObjectId as ObjectId80 } from "mongodb";
+import { ObjectId as ObjectId81 } from "mongodb";
 var BulletinRecipient = /* @__PURE__ */ ((BulletinRecipient2) => {
   BulletinRecipient2["RESIDENT"] = "resident";
   BulletinRecipient2["SECURITY_AGENCY"] = "security_agency";
@@ -32876,21 +33138,21 @@ function MBulletinBoard(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId80(value._id);
+      value._id = new ObjectId81(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId80(value.site);
+      value.site = new ObjectId81(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.orgId && typeof value.orgId === "string") {
     try {
-      value.orgId = new ObjectId80(value.orgId);
+      value.orgId = new ObjectId81(value.orgId);
     } catch {
       throw new Error("Invalid org ID.");
     }
@@ -32899,7 +33161,7 @@ function MBulletinBoard(value) {
     value.file = value.file.map((f) => {
       if (f._id && typeof f._id === "string") {
         try {
-          return { ...f, _id: new ObjectId80(f._id) };
+          return { ...f, _id: new ObjectId81(f._id) };
         } catch {
           throw new Error("Invalid file ID.");
         }
@@ -32908,7 +33170,7 @@ function MBulletinBoard(value) {
     });
   }
   return {
-    _id: value._id ?? new ObjectId80(),
+    _id: value._id ?? new ObjectId81(),
     site: value.site ?? "",
     orgId: value.orgId ?? "",
     recipients: value.recipients ?? [],
@@ -32936,7 +33198,7 @@ import {
   useAtlas as useAtlas67,
   useCache as useCache42
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId81 } from "mongodb";
+import { ObjectId as ObjectId82 } from "mongodb";
 var bulletin_boards_namespace_collection = "bulletin-boards";
 function useBulletinBoardRepo() {
   const db = useAtlas67.getDb();
@@ -32989,7 +33251,7 @@ function useBulletinBoardRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId81(site);
+      site = new ObjectId82(site);
     } catch (error) {
       throw new BadRequestError129("Invalid site ID format.");
     }
@@ -33048,7 +33310,7 @@ function useBulletinBoardRepo() {
   }
   async function getBulletinBoardById(_id, session) {
     try {
-      _id = new ObjectId81(_id);
+      _id = new ObjectId82(_id);
     } catch (error) {
       throw new BadRequestError129("Invalid bulletin board ID format.");
     }
@@ -33078,13 +33340,13 @@ function useBulletinBoardRepo() {
   async function updateBulletinBoardById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new ObjectId81(_id);
+      _id = new ObjectId82(_id);
     } catch (error) {
       throw new BadRequestError129("Invalid ID format.");
     }
     if (value.site && typeof value.site === "string") {
       try {
-        value.site = new ObjectId81(value.site);
+        value.site = new ObjectId82(value.site);
       } catch {
         throw new Error("Invalid site ID.");
       }
@@ -33115,7 +33377,7 @@ function useBulletinBoardRepo() {
   }
   async function deleteBulletinBoardById(_id, session) {
     try {
-      _id = new ObjectId81(_id);
+      _id = new ObjectId82(_id);
     } catch (error) {
       throw new BadRequestError129("Invalid bulletin board ID format.");
     }
@@ -33549,7 +33811,7 @@ function useBulletinBoardController() {
 
 // src/models/site-billing-item.model.ts
 import { BadRequestError as BadRequestError131, logger as logger109 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId82 } from "mongodb";
+import { ObjectId as ObjectId83 } from "mongodb";
 import Joi79 from "joi";
 
 // src/types/enums/billing-frequency.enum.ts
@@ -33620,21 +33882,21 @@ function MBillingItem(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId82(value._id);
+      value._id = new ObjectId83(value._id);
     } catch {
       throw new BadRequestError131("Invalid _id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId82(value.site);
+      value.site = new ObjectId83(value.site);
     } catch {
       throw new BadRequestError131("Invalid site id format");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new ObjectId82(value.org);
+      value.org = new ObjectId83(value.org);
     } catch {
       throw new BadRequestError131("Invalid org id format");
     }
@@ -33643,7 +33905,7 @@ function MBillingItem(value) {
     value.units = value.units.map((unit) => {
       if (unit._id && typeof unit._id === "string") {
         try {
-          unit._id = new ObjectId82(unit._id);
+          unit._id = new ObjectId83(unit._id);
         } catch {
           throw new BadRequestError131("Invalid unit id format");
         }
@@ -33652,7 +33914,7 @@ function MBillingItem(value) {
     });
   }
   return {
-    _id: value._id ?? new ObjectId82(),
+    _id: value._id ?? new ObjectId83(),
     site: value.site,
     org: value.org,
     name: value.name,
@@ -33689,7 +33951,7 @@ import {
   paginate as paginate36,
   makeCacheKey as makeCacheKey41
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId83 } from "mongodb";
+import { ObjectId as ObjectId84 } from "mongodb";
 function useSiteBillingItemRepo() {
   const db = useAtlas69.getDb();
   if (!db) {
@@ -33776,7 +34038,7 @@ function useSiteBillingItemRepo() {
           }
         ]
       },
-      ...ObjectId83.isValid(site) && { site: new ObjectId83(site) }
+      ...ObjectId84.isValid(site) && { site: new ObjectId84(site) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
@@ -33816,7 +34078,7 @@ function useSiteBillingItemRepo() {
   }
   async function getById(_id, session) {
     try {
-      _id = new ObjectId83(_id);
+      _id = new ObjectId84(_id);
     } catch (error) {
       throw new BadRequestError132("Invalid ID.");
     }
@@ -33855,22 +34117,22 @@ function useSiteBillingItemRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new ObjectId83(_id);
+      _id = new ObjectId84(_id);
     } catch (error) {
       throw new BadRequestError132(
         "Invalid site billing item transaction ID format."
       );
     }
-    if (value.site && ObjectId83.isValid(value.site.toString())) {
+    if (value.site && ObjectId84.isValid(value.site.toString())) {
       try {
-        value.site = new ObjectId83(value.site.toString());
+        value.site = new ObjectId84(value.site.toString());
       } catch {
         throw new BadRequestError132("Invalid _id format");
       }
     }
-    if (value.org && ObjectId83.isValid(value.org.toString())) {
+    if (value.org && ObjectId84.isValid(value.org.toString())) {
       try {
-        value.org = new ObjectId83(value.org.toString());
+        value.org = new ObjectId84(value.org.toString());
       } catch {
         throw new BadRequestError132("Invalid _id format");
       }
@@ -33890,7 +34152,7 @@ function useSiteBillingItemRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new ObjectId83(_id);
+      _id = new ObjectId84(_id);
     } catch (error) {
       throw new BadRequestError132(
         "Invalid site billing item transaction ID format."
@@ -33960,7 +34222,7 @@ import {
 
 // src/models/site-billing-configuration.model.ts
 import { BadRequestError as BadRequestError133, logger as logger111 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId84 } from "mongodb";
+import { ObjectId as ObjectId85 } from "mongodb";
 import Joi80 from "joi";
 var schemaBillingConfiguration = Joi80.object({
   _id: Joi80.string().hex().optional(),
@@ -34021,34 +34283,34 @@ function MBillingConfiguration(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId84(value._id);
+      value._id = new ObjectId85(value._id);
     } catch {
       throw new BadRequestError133("Invalid _id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId84(value.site);
+      value.site = new ObjectId85(value.site);
     } catch {
       throw new BadRequestError133("Invalid site id format");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new ObjectId84(value.org);
+      value.org = new ObjectId85(value.org);
     } catch {
       throw new BadRequestError133("Invalid org id format");
     }
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new ObjectId84(value.createdBy);
+      value.createdBy = new ObjectId85(value.createdBy);
     } catch {
       throw new BadRequestError133("Invalid createdBy id format");
     }
   }
   return {
-    _id: value._id ?? new ObjectId84(),
+    _id: value._id ?? new ObjectId85(),
     site: value.site,
     org: value.org,
     siteName: value.siteName,
@@ -34077,7 +34339,7 @@ function MBillingConfiguration(value) {
 }
 
 // src/repositories/site-billing-configuration.repo.ts
-import { ObjectId as ObjectId85 } from "mongodb";
+import { ObjectId as ObjectId86 } from "mongodb";
 function useSiteBillingConfigurationRepo() {
   const db = useAtlas70.getDb();
   if (!db) {
@@ -34150,7 +34412,7 @@ function useSiteBillingConfigurationRepo() {
     const query = {
       status,
       ...search && { $text: { $search: search } },
-      ...ObjectId85.isValid(site) && { site: new ObjectId85(site) }
+      ...ObjectId86.isValid(site) && { site: new ObjectId86(site) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
@@ -34190,7 +34452,7 @@ function useSiteBillingConfigurationRepo() {
   }
   async function getById(_id) {
     try {
-      _id = new ObjectId85(_id);
+      _id = new ObjectId86(_id);
     } catch (error) {
       throw new BadRequestError134("Invalid ID.");
     }
@@ -34231,22 +34493,22 @@ function useSiteBillingConfigurationRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new ObjectId85(_id);
+      _id = new ObjectId86(_id);
     } catch (error) {
       throw new BadRequestError134(
         "Invalid site billing configuration transaction ID format."
       );
     }
-    if (value.site && ObjectId85.isValid(value.site.toString())) {
+    if (value.site && ObjectId86.isValid(value.site.toString())) {
       try {
-        value.site = new ObjectId85(value.site.toString());
+        value.site = new ObjectId86(value.site.toString());
       } catch {
         throw new BadRequestError134("Invalid _id format");
       }
     }
-    if (value.org && ObjectId85.isValid(value.org.toString())) {
+    if (value.org && ObjectId86.isValid(value.org.toString())) {
       try {
-        value.org = new ObjectId85(value.org.toString());
+        value.org = new ObjectId86(value.org.toString());
       } catch {
         throw new BadRequestError134("Invalid _id format");
       }
@@ -34266,7 +34528,7 @@ function useSiteBillingConfigurationRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new ObjectId85(_id);
+      _id = new ObjectId86(_id);
     } catch (error) {
       throw new BadRequestError134(
         "Invalid site billing configuration transaction ID format."
@@ -34848,7 +35110,7 @@ function useSiteBillingConfigurationController() {
 }
 
 // src/models/event-management.model.ts
-import { ObjectId as ObjectId86 } from "mongodb";
+import { ObjectId as ObjectId87 } from "mongodb";
 import Joi83 from "joi";
 var EventStatus = /* @__PURE__ */ ((EventStatus2) => {
   EventStatus2["PLANNED"] = "planned";
@@ -34892,20 +35154,20 @@ var schemaUpdateEventManagement = Joi83.object({
 function MEventManagement(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId86(value._id);
+      value._id = new ObjectId87(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId86(value.site);
+      value.site = new ObjectId87(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   return {
-    _id: value._id ?? new ObjectId86(),
+    _id: value._id ?? new ObjectId87(),
     site: value.site,
     title: value.title,
     description: value.description ?? "",
@@ -34929,7 +35191,7 @@ import {
   useAtlas as useAtlas73,
   useCache as useCache45
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId87 } from "mongodb";
+import { ObjectId as ObjectId88 } from "mongodb";
 var events_namespace_collection = "event-management";
 function useEventManagementRepo() {
   const db = useAtlas73.getDb();
@@ -34997,7 +35259,7 @@ function useEventManagementRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId87(site);
+      site = new ObjectId88(site);
     } catch (error) {
       throw new BadRequestError139("Invalid site ID format.");
     }
@@ -35085,7 +35347,7 @@ function useEventManagementRepo() {
   }
   async function getEventManagementById(_id, session) {
     try {
-      _id = new ObjectId87(_id);
+      _id = new ObjectId88(_id);
     } catch (error) {
       throw new BadRequestError139("Invalid event ID format.");
     }
@@ -35113,13 +35375,13 @@ function useEventManagementRepo() {
   async function updateEventManagementById(_id, value, session) {
     value.updatedAt = /* @__PURE__ */ new Date();
     try {
-      _id = new ObjectId87(_id);
+      _id = new ObjectId88(_id);
     } catch (error) {
       throw new BadRequestError139("Invalid ID format.");
     }
     if (value.site && typeof value.site === "string") {
       try {
-        value.site = new ObjectId87(value.site);
+        value.site = new ObjectId88(value.site);
       } catch {
         throw new Error("Invalid site ID.");
       }
@@ -35150,7 +35412,7 @@ function useEventManagementRepo() {
   }
   async function deleteEventManagementById(_id) {
     try {
-      _id = new ObjectId87(_id);
+      _id = new ObjectId88(_id);
     } catch (error) {
       throw new BadRequestError139("Invalid event ID format.");
     }
@@ -35438,7 +35700,7 @@ function useEventManagementController() {
 
 // src/models/site-unit-billing.model.ts
 import { BadRequestError as BadRequestError141, logger as logger119 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId88 } from "mongodb";
+import { ObjectId as ObjectId89 } from "mongodb";
 import Joi85 from "joi";
 var Status = /* @__PURE__ */ ((Status2) => {
   Status2["PENDING"] = "pending";
@@ -35533,48 +35795,48 @@ function MUnitBilling(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId88(value._id);
+      value._id = new ObjectId89(value._id);
     } catch {
       throw new BadRequestError141("Invalid _id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId88(value.site);
+      value.site = new ObjectId89(value.site);
     } catch {
       throw new BadRequestError141("Invalid site id format");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new ObjectId88(value.org);
+      value.org = new ObjectId89(value.org);
     } catch {
       throw new BadRequestError141("Invalid org id format");
     }
   }
   if (value.paidBy && typeof value.paidBy === "string") {
     try {
-      value.paidBy = new ObjectId88(value.paidBy);
+      value.paidBy = new ObjectId89(value.paidBy);
     } catch {
       throw new BadRequestError141("Invalid paidBy id format");
     }
   }
   if (value.billItem && typeof value.billItem === "string") {
     try {
-      value.billItem = new ObjectId88(value.billItem);
+      value.billItem = new ObjectId89(value.billItem);
     } catch {
       throw new BadRequestError141("Invalid billItem id format");
     }
   }
   if (value.unitId && typeof value.unitId === "string") {
     try {
-      value.unitId = new ObjectId88(value.unitId);
+      value.unitId = new ObjectId89(value.unitId);
     } catch {
       throw new BadRequestError141("Invalid unitId id format");
     }
   }
   return {
-    _id: value._id ?? new ObjectId88(),
+    _id: value._id ?? new ObjectId89(),
     site: value.site ?? "",
     org: value.org ?? "",
     billItem: value.billItem ?? "",
@@ -35619,7 +35881,7 @@ import {
   paginate as paginate39,
   makeCacheKey as makeCacheKey44
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId89 } from "mongodb";
+import { ObjectId as ObjectId90 } from "mongodb";
 function useSiteUnitBillingRepo() {
   const db = useAtlas75.getDb();
   if (!db) {
@@ -35669,7 +35931,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 ObjectId89(res.insertedId).toString().slice(-6);
+      const newId = new ObjectId90(res.insertedId).toString().slice(-6);
       const referenceNumber = `${acronym}${newId}${dateFormatted}`;
       await collection.updateOne(
         { _id: res.insertedId },
@@ -35747,7 +36009,7 @@ function useSiteUnitBillingRepo() {
           }
         ]
       },
-      ...ObjectId89.isValid(site) && { site: new ObjectId89(site) },
+      ...ObjectId90.isValid(site) && { site: new ObjectId90(site) },
       ...dateExpr
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
@@ -35813,7 +36075,7 @@ function useSiteUnitBillingRepo() {
   }
   async function getById(_id) {
     try {
-      _id = new ObjectId89(_id);
+      _id = new ObjectId90(_id);
     } catch (error) {
       throw new BadRequestError142("Invalid ID.");
     }
@@ -35872,8 +36134,8 @@ function useSiteUnitBillingRepo() {
     }
     const query = {
       status,
-      ...unitId && ObjectId89.isValid(unitId) && { unitId: new ObjectId89(unitId) },
-      ...site && ObjectId89.isValid(site) && { site: new ObjectId89(site) },
+      ...unitId && ObjectId90.isValid(unitId) && { unitId: new ObjectId90(unitId) },
+      ...site && ObjectId90.isValid(site) && { site: new ObjectId90(site) },
       ...dateExpr
     };
     try {
@@ -35911,43 +36173,43 @@ function useSiteUnitBillingRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new ObjectId89(_id);
+      _id = new ObjectId90(_id);
     } catch (error) {
       throw new BadRequestError142(
         "Invalid site unit billing transaction ID format."
       );
     }
-    if (value.site && ObjectId89.isValid(value.site.toString())) {
+    if (value.site && ObjectId90.isValid(value.site.toString())) {
       try {
-        value.site = new ObjectId89(value.site.toString());
+        value.site = new ObjectId90(value.site.toString());
       } catch {
         throw new BadRequestError142("Invalid _id format");
       }
     }
-    if (value.org && ObjectId89.isValid(value.org.toString())) {
+    if (value.org && ObjectId90.isValid(value.org.toString())) {
       try {
-        value.org = new ObjectId89(value.org.toString());
+        value.org = new ObjectId90(value.org.toString());
       } catch {
         throw new BadRequestError142("Invalid _id format");
       }
     }
-    if (value.paidBy && ObjectId89.isValid(value.paidBy.toString())) {
+    if (value.paidBy && ObjectId90.isValid(value.paidBy.toString())) {
       try {
-        value.org = new ObjectId89(value.paidBy.toString());
+        value.org = new ObjectId90(value.paidBy.toString());
       } catch {
         throw new BadRequestError142("Invalid _id format");
       }
     }
-    if (value.billItem && ObjectId89.isValid(value.billItem.toString())) {
+    if (value.billItem && ObjectId90.isValid(value.billItem.toString())) {
       try {
-        value.billItem = new ObjectId89(value.billItem.toString());
+        value.billItem = new ObjectId90(value.billItem.toString());
       } catch {
         throw new BadRequestError142("Invalid _id format");
       }
     }
-    if (value.unitId && ObjectId89.isValid(value.unitId.toString())) {
+    if (value.unitId && ObjectId90.isValid(value.unitId.toString())) {
       try {
-        value.unitId = new ObjectId89(value.unitId.toString());
+        value.unitId = new ObjectId90(value.unitId.toString());
       } catch {
         throw new BadRequestError142("Invalid _id format");
       }
@@ -35967,7 +36229,7 @@ function useSiteUnitBillingRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new ObjectId89(_id);
+      _id = new ObjectId90(_id);
     } catch (error) {
       throw new BadRequestError142(
         "Invalid site unit billing transaction ID format."
@@ -36033,9 +36295,9 @@ function useSiteUnitBillingRepo() {
           }
         ]
       },
-      ...ObjectId89.isValid(site) && { site: new ObjectId89(site) },
+      ...ObjectId90.isValid(site) && { site: new ObjectId90(site) },
       ...dateExpr,
-      ...ObjectId89.isValid(unitId) && { unitId: new ObjectId89(unitId) }
+      ...ObjectId90.isValid(unitId) && { unitId: new ObjectId90(unitId) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     try {
@@ -36122,9 +36384,9 @@ function useSiteUnitBillingRepo() {
           }
         ]
       },
-      ...ObjectId89.isValid(site) && { site: new ObjectId89(site) },
+      ...ObjectId90.isValid(site) && { site: new ObjectId90(site) },
       ...dateExpr,
-      ...ObjectId89.isValid(unitId) && { unitId: new ObjectId89(unitId) }
+      ...ObjectId90.isValid(unitId) && { unitId: new ObjectId90(unitId) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     try {
@@ -36211,7 +36473,7 @@ import {
   logger as logger121,
   useAtlas as useAtlas76
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId90 } from "mongodb";
+import { ObjectId as ObjectId91 } from "mongodb";
 function useSiteUnitBillingService() {
   const {
     add: _add,
@@ -36368,7 +36630,7 @@ function useSiteUnitBillingService() {
       return unitsWithOwner || [];
     } else {
       if (units && units.length > 0) {
-        const unitIds = units.map((unit) => new ObjectId90(unit._id));
+        const unitIds = units.map((unit) => new ObjectId91(unit._id));
         const specificUnitsWithOwner = await _getBuildingUnitsWithOwner(
           site || "",
           unitIds
@@ -36649,7 +36911,7 @@ function useSiteUnitBillingController() {
 }
 
 // src/models/access-management.model.ts
-import { ObjectId as ObjectId91 } from "mongodb";
+import { ObjectId as ObjectId92 } from "mongodb";
 var EAccessCardTypes = /* @__PURE__ */ ((EAccessCardTypes2) => {
   EAccessCardTypes2["NFC"] = "NFC";
   EAccessCardTypes2["QR"] = "QRCODE";
@@ -36671,7 +36933,7 @@ var AccessTypeProps = /* @__PURE__ */ ((AccessTypeProps2) => {
 })(AccessTypeProps || {});
 var MAccessCardTransaction = class {
   constructor({
-    _id = new ObjectId91(),
+    _id = new ObjectId92(),
     index,
     site,
     cardNo,
@@ -36698,7 +36960,7 @@ var MAccessCardTransaction = class {
 };
 var MAccessCard = class {
   constructor({
-    _id = new ObjectId91(),
+    _id = new ObjectId92(),
     userId,
     site,
     staffNo = null,
@@ -36760,7 +37022,7 @@ import {
   paginate as paginate40,
   useAtlas as useAtlas77
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId92 } from "mongodb";
+import { ObjectId as ObjectId93 } from "mongodb";
 
 // src/utils/access-management.ts
 import fs3 from "fs";
@@ -37070,12 +37332,12 @@ function UseAccessManagementRepo() {
     payload
   }) {
     try {
-      payload.site = new ObjectId92(payload.site);
+      payload.site = new ObjectId93(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 ObjectId92(id));
+      payload.assignedUnit = payload.unit?.map((id) => new ObjectId93(id));
       delete payload.unit;
       const accessCardObj = new MAccessCard(payload);
       const result = await collection().insertOne(accessCardObj);
@@ -37114,7 +37376,7 @@ function UseAccessManagementRepo() {
   async function addNonPhysicalCardRepo(params) {
     try {
       const MAX_RETRIES = 3;
-      const site = new ObjectId92(params.site);
+      const site = new ObjectId93(params.site);
       const date = /* @__PURE__ */ new Date();
       const endDate = new Date(date.setFullYear(date.getFullYear() + 10));
       const countPerUnit = params.quantity;
@@ -37146,7 +37408,7 @@ function UseAccessManagementRepo() {
                 userType: params.userType,
                 doorName: params.doorName,
                 liftName: params.liftName,
-                assignedUnit: new ObjectId92(units[i]),
+                assignedUnit: new ObjectId93(units[i]),
                 createdAt: new Date(params.createdAt),
                 updatedAt: new Date(params.updatedAt),
                 isWinsland: params.isWinsland
@@ -37232,7 +37494,7 @@ function UseAccessManagementRepo() {
   }
   async function accessManagementSettingsRepo(params) {
     try {
-      params.site = new ObjectId92(params.site);
+      params.site = new ObjectId93(params.site);
       const result = collectionName("entrypass-settings").updateOne(
         { site: params.site },
         {
@@ -37254,7 +37516,7 @@ function UseAccessManagementRepo() {
   }
   async function allAccessCardsCountsRepo(params) {
     try {
-      const site = new ObjectId92(params.site);
+      const site = new ObjectId93(params.site);
       const userType = params.userType;
       const result = await collection().aggregate([
         {
@@ -37314,7 +37576,7 @@ function UseAccessManagementRepo() {
   }
   async function availableAccessCardsRepo(params) {
     try {
-      const site = new ObjectId92(params.site);
+      const site = new ObjectId93(params.site);
       const userType = params.userType;
       const type = params.type;
       const query = {
@@ -37429,7 +37691,7 @@ function UseAccessManagementRepo() {
   }
   async function userTypeAccessCardsRepo(params) {
     try {
-      const site = new ObjectId92(params.site);
+      const site = new ObjectId93(params.site);
       const userType = params.userType;
       const page = params.page ? Number(params.page) - 1 : 0;
       const limit = Number(params.limit) || 10;
@@ -37828,7 +38090,7 @@ function UseAccessManagementRepo() {
   }
   async function assignedAccessCardsRepo(params) {
     try {
-      const site = new ObjectId92(params.site);
+      const site = new ObjectId93(params.site);
       const userType = params.userType;
       const type = params.type;
       const search = params.search;
@@ -38003,12 +38265,12 @@ function UseAccessManagementRepo() {
       session?.startTransaction();
       const { userId, cardId, site } = params;
       const allUserId = await Promise.all(
-        userId.map(async (id) => new ObjectId92(id))
+        userId.map(async (id) => new ObjectId93(id))
       );
       const allCardId = await Promise.all(
-        cardId.map(async (id) => new ObjectId92(id))
+        cardId.map(async (id) => new ObjectId93(id))
       );
-      const siteId = new ObjectId92(site);
+      const siteId = new ObjectId93(site);
       const result = await collection().updateMany(
         {
           $or: [
@@ -38039,7 +38301,7 @@ function UseAccessManagementRepo() {
   async function accessandLiftCardsRepo(params) {
     try {
       const { accessLevel, liftAccessLevel, site, userType, type } = params;
-      const siteId = new ObjectId92(site);
+      const siteId = new ObjectId93(site);
       const query = {
         site: { $in: [siteId] },
         userType,
@@ -38072,9 +38334,9 @@ function UseAccessManagementRepo() {
     const session = useAtlas77.getClient()?.startSession();
     try {
       session?.startTransaction();
-      const siteId = new ObjectId92(params.site);
-      const userId = new ObjectId92(params.userId);
-      const cardId = new ObjectId92(params.cardId);
+      const siteId = new ObjectId93(params.site);
+      const userId = new ObjectId93(params.userId);
+      const cardId = new ObjectId93(params.cardId);
       const quantity = 1;
       const cardCredentials = await collection().findOneAndUpdate(
         { _id: cardId },
@@ -38100,7 +38362,7 @@ function UseAccessManagementRepo() {
         (no) => no.toString().padStart(10, "0")
       );
       const accessCards = [];
-      const convertedUnits = unit.map((obj) => new ObjectId92(obj));
+      const convertedUnits = unit.map((obj) => new ObjectId93(obj));
       for (let j = 0; j < (unit.length > 0 ? unit.length : quantity); j++) {
         accessCards.push(
           new MAccessCard({
@@ -38189,7 +38451,7 @@ function UseAccessManagementRepo() {
       session?.startTransaction();
       const results = [];
       for (let nfc of params.nfcList) {
-        nfc._id = new ObjectId92(nfc._id);
+        nfc._id = new ObjectId93(nfc._id);
         const card = await collection().findOne({ _id: nfc._id }, { session });
         if (card) {
           const updateFields = {
@@ -38223,7 +38485,7 @@ function UseAccessManagementRepo() {
   async function doorAndLiftDropdownRepo(params) {
     try {
       const { site, type, userType } = params;
-      const id = new ObjectId92(site);
+      const id = new ObjectId93(site);
       const res = collection().aggregate([
         {
           $match: {
@@ -38310,10 +38572,10 @@ function UseAccessManagementRepo() {
     const session = useAtlas77.getClient()?.startSession();
     try {
       const { cardId, remarks, issuedCardId, unitId, userId } = params;
-      const id = new ObjectId92(cardId);
-      const newCardId = new ObjectId92(issuedCardId);
-      const unit = new ObjectId92(unitId);
-      const user = new ObjectId92(userId);
+      const id = new ObjectId93(cardId);
+      const newCardId = new ObjectId93(issuedCardId);
+      const unit = new ObjectId93(unitId);
+      const user = new ObjectId93(userId);
       session?.startTransaction();
       const sessionResult = await Promise.all([
         await collection().findOneAndUpdate(
@@ -38346,7 +38608,7 @@ function UseAccessManagementRepo() {
   async function visitorAccessCardsRepo(params) {
     try {
       const page = params.page ? params.page - 1 : 0;
-      const siteId = new ObjectId92(params.site);
+      const siteId = new ObjectId93(params.site);
       const search = params.search;
       const type = params.type;
       const limit = Number(params.limit);
@@ -38414,7 +38676,7 @@ function UseAccessManagementRepo() {
   }
   async function getCardReplacementRepo(params) {
     try {
-      const site = new ObjectId92(params.site);
+      const site = new ObjectId93(params.site);
       const search = params.search;
       const statusFilter = params.statusFilter;
       const dateFrom = params.dateFrom;
@@ -38586,7 +38848,7 @@ function UseAccessManagementRepo() {
   async function getAccessManagementSettingsRepo(params) {
     try {
       const { site } = params;
-      const siteId = new ObjectId92(site);
+      const siteId = new ObjectId93(site);
       const res = await collectionName("entrypass-settings").findOne(
         { site: siteId },
         { allowDiskUse: true }
@@ -38620,7 +38882,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 ObjectId92(site),
+            site: new ObjectId93(site),
             type: "NFC" /* NFC */,
             staffNo: null,
             accessLevel,
@@ -38671,8 +38933,8 @@ function UseAccessManagementRepo() {
         liftAccessLevel
       } = params;
       const [convertedUnits, convertedSite] = await Promise.all([
-        Promise.all(units.map((id) => new ObjectId92(id))),
-        new ObjectId92(site)
+        Promise.all(units.map((id) => new ObjectId93(id))),
+        new ObjectId93(site)
       ]);
       const totalRequired = quantity * convertedUnits.length;
       const availableCards = await collection().find({
@@ -38724,7 +38986,7 @@ function UseAccessManagementRepo() {
   async function deleteCardRepo(params) {
     try {
       const { cardId, remarks } = params;
-      const id = new ObjectId92(cardId);
+      const id = new ObjectId93(cardId);
       const result = await collection().findOneAndUpdate(
         { _id: id },
         {
@@ -38745,8 +39007,8 @@ function UseAccessManagementRepo() {
   async function getCardDetailsRepo(params) {
     try {
       const { siteId, cardId } = params;
-      const convertedSiteId = new ObjectId92(siteId);
-      const convertedCardId = new ObjectId92(cardId);
+      const convertedSiteId = new ObjectId93(siteId);
+      const convertedCardId = new ObjectId93(cardId);
       const card = await collection().findOne(
         {
           _id: convertedCardId,
@@ -38795,7 +39057,7 @@ function UseAccessManagementRepo() {
   async function addQrTagRepo(params) {
     try {
       const { site, payload } = params;
-      const id = new ObjectId92(site);
+      const id = new ObjectId93(site);
       const highestCardNo = await collection().aggregate([
         {
           $match: {
@@ -38829,7 +39091,7 @@ function UseAccessManagementRepo() {
       );
       const bulkOps = await Promise.all(
         payload.map(async (doc, index) => {
-          const id2 = new ObjectId92(doc._id);
+          const id2 = new ObjectId93(doc._id);
           return {
             updateOne: {
               filter: { _id: id2 },
@@ -38852,7 +39114,7 @@ function UseAccessManagementRepo() {
   async function allQrTagRepo(params) {
     try {
       const { site } = params;
-      const siteId = new ObjectId92(site);
+      const siteId = new ObjectId93(site);
       const query = {
         site: siteId,
         assignedUnit: { $ne: null },
@@ -38901,8 +39163,8 @@ function UseAccessManagementRepo() {
   }
   async function availableCardContractorsRepo(params) {
     try {
-      const siteId = new ObjectId92(params.siteId);
-      const unitId = new ObjectId92(params.unitId);
+      const siteId = new ObjectId93(params.siteId);
+      const unitId = new ObjectId93(params.unitId);
       const page = Number(params.page) - 1;
       const limit = Number(params.limit) || 10;
       const type = params.type;
@@ -39003,8 +39265,8 @@ function UseAccessManagementRepo() {
   }
   async function vmsgenerateQrCodesRepo(params) {
     try {
-      const site = new ObjectId92(params.site);
-      const unitId = new ObjectId92(params.unitId);
+      const site = new ObjectId93(params.site);
+      const unitId = new ObjectId93(params.unitId);
       const quantity = Number(params.quantity);
       const normalizedUnitId = params.normalizedUnitId;
       const date = /* @__PURE__ */ new Date();
@@ -39059,11 +39321,11 @@ function UseAccessManagementRepo() {
     let isAborted = false;
     try {
       await session?.startTransaction();
-      const siteId = new ObjectId92(params.site);
-      const unitId = new ObjectId92(params.unitId);
+      const siteId = new ObjectId93(params.site);
+      const unitId = new ObjectId93(params.unitId);
       const quantity = params.quantity;
       const type = params.type;
-      const visitorId = new ObjectId92(params.visitorId);
+      const visitorId = new ObjectId93(params.visitorId);
       const nfcCards = params.nfcCards;
       const acm_url = params.acm_url;
       let cards = [];
@@ -39085,7 +39347,7 @@ function UseAccessManagementRepo() {
       } else if (type === "NFC" /* NFC */) {
         if (nfcCards && nfcCards.length > 0) {
           const objectIds = nfcCards.map(
-            (card) => new ObjectId92(card._id)
+            (card) => new ObjectId93(card._id)
           );
           cards = await collection().find({ _id: { $in: objectIds } }).toArray();
           const nfcList = objectIds.map((card) => ({
@@ -39192,7 +39454,7 @@ function UseAccessManagementRepo() {
   }
   async function signQrCodeRepo(params) {
     try {
-      const cardId = new ObjectId92(params.cardId);
+      const cardId = new ObjectId93(params.cardId);
       const purpose = params.purpose;
       let validity = 5;
       const card = await collection().findOne({ _id: cardId });
@@ -39217,7 +39479,7 @@ function UseAccessManagementRepo() {
     const session = useAtlas77.getClient()?.startSession();
     try {
       await session?.startTransaction();
-      const userId = new ObjectId92(params.userId);
+      const userId = new ObjectId93(params.userId);
       const result = await collection().updateMany(
         { userId },
         { $set: { userId: null, status: "Available", updatedAt: /* @__PURE__ */ new Date() } }
@@ -39232,7 +39494,7 @@ function UseAccessManagementRepo() {
     }
   }
   async function getBlockLevelAndUnitListRepo(params) {
-    const site = new ObjectId92(params.site);
+    const site = new ObjectId93(params.site);
     try {
       const blocks = await collectionName("buildings").aggregate([
         {
@@ -39302,7 +39564,7 @@ function UseAccessManagementRepo() {
     url
   }) {
     page = page ? page - 1 : 0;
-    site = new ObjectId92(site);
+    site = new ObjectId93(site);
     try {
       let index = await collectionName("access-card-transactions").findOne(
         {},
@@ -39437,9 +39699,9 @@ function UseAccessManagementRepo() {
         throw new Error("No user to Assign.");
       }
       assignees = assignees.map(
-        (data) => new ObjectId92(data)
+        (data) => new ObjectId93(data)
       );
-      unit = new ObjectId92(unit);
+      unit = new ObjectId93(unit);
       let availableCards = [];
       let update = [];
       let cards = [];
@@ -39472,13 +39734,13 @@ function UseAccessManagementRepo() {
         throw new Error(`Not enough ${type} cards available.`);
       }
       cards = availableCards?.slice(0, assignees.length).map((card, index) => {
-        const userId = new ObjectId92(assignees[index].toString());
+        const userId = new ObjectId93(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 ObjectId92(assignees[index])
+        userId: new ObjectId93(assignees[index])
       }));
       const commands = cards.map((item, index) => {
         let ag = null;
@@ -39544,7 +39806,7 @@ function UseAccessManagementRepo() {
     const session = useAtlas77.getClient()?.startSession();
     try {
       session?.startTransaction();
-      const id = new ObjectId92(userId);
+      const id = new ObjectId93(userId);
       await collection().updateMany(
         { userId: id },
         { $set: { userId: null, status: "Available" } },
@@ -39564,8 +39826,8 @@ function UseAccessManagementRepo() {
     id,
     name
   }) {
-    site = new ObjectId92(site);
-    id = new ObjectId92(id);
+    site = new ObjectId93(site);
+    id = new ObjectId93(id);
     try {
       const result = await collectionName("sites").updateOne(
         { _id: site },
@@ -39582,9 +39844,9 @@ function UseAccessManagementRepo() {
     unitId
   }) {
     try {
-      orgId = new ObjectId92(orgId);
-      siteId = new ObjectId92(siteId);
-      unitId = new ObjectId92(unitId);
+      orgId = new ObjectId93(orgId);
+      siteId = new ObjectId93(siteId);
+      unitId = new ObjectId93(unitId);
       const result = await collectionName("users").aggregate([
         {
           $match: {
@@ -39622,8 +39884,8 @@ function UseAccessManagementRepo() {
     isLiftCard
   }) {
     try {
-      siteId = new ObjectId92(siteId);
-      userId = new ObjectId92(userId);
+      siteId = new ObjectId93(siteId);
+      userId = new ObjectId93(userId);
       const query = {
         site: siteId,
         userId,
@@ -39644,7 +39906,7 @@ function UseAccessManagementRepo() {
     }
   }
   async function removeTemplateRepo({ site }) {
-    site = new ObjectId92(site);
+    site = new ObjectId93(site);
     try {
       const result = await collectionName("entrypass-settings").updateOne({ _id: site }, { $set: { "settings.template": {} } });
       return result;
@@ -39657,8 +39919,8 @@ function UseAccessManagementRepo() {
       page = page ? page - 1 : 0;
       let defaultQuery = {};
       let searchQuery = {};
-      site = new ObjectId92(site);
-      userId = new ObjectId92(userId);
+      site = new ObjectId93(site);
+      userId = new ObjectId93(userId);
       if (search) {
         searchQuery = {
           $or: [{ fullName: { $regex: search, $options: "i" } }, { cardNo: { $regex: search, $options: "i" } }]
@@ -41404,7 +41666,7 @@ function useAccessManagementController() {
 }
 
 // src/models/nfc-patrol-tag.model.ts
-import { ObjectId as ObjectId93 } from "mongodb";
+import { ObjectId as ObjectId94 } from "mongodb";
 import Joi88 from "joi";
 import { BadRequestError as BadRequestError146 } from "@7365admin1/node-server-utils";
 var DEVICE_STATUS = {
@@ -41431,27 +41693,27 @@ var schemaNfcPatrolTag = Joi88.object({
 function MNfcPatrolTag(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId93(value._id);
+      value._id = new ObjectId94(value._id);
     } catch {
       throw new BadRequestError146("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId93(value.site);
+      value.site = new ObjectId94(value.site);
     } catch {
       throw new BadRequestError146("Invalid site ID.");
     }
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new ObjectId93(value.createdBy);
+      value.createdBy = new ObjectId94(value.createdBy);
     } catch {
       throw new BadRequestError146("Invalid Created By ID.");
     }
   }
   return {
-    _id: value._id ?? new ObjectId93(),
+    _id: value._id ?? new ObjectId94(),
     site: value.site,
     tagID: value.tagID,
     name: value.name,
@@ -41471,7 +41733,7 @@ import {
   useAtlas as useAtlas78,
   useCache as useCache48
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId94 } from "mongodb";
+import { ObjectId as ObjectId95 } from "mongodb";
 function useNfcPatrolTagRepo() {
   const db = useAtlas78.getDb();
   if (!db) {
@@ -41525,7 +41787,7 @@ function useNfcPatrolTagRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId94(site);
+      site = new ObjectId95(site);
     } catch (error) {
       throw new BadRequestError147("Invalid site ID format.");
     }
@@ -41569,19 +41831,19 @@ function useNfcPatrolTagRepo() {
     const [updateType, findObject, setData, session] = args;
     if (findObject?.site && typeof findObject.site === "string") {
       try {
-        findObject.site = new ObjectId94(findObject.site);
+        findObject.site = new ObjectId95(findObject.site);
       } catch {
         throw new BadRequestError147("Invalid site ID.");
       }
     }
     if (updateType == "Edit" && findObject?._id && typeof findObject._id === "string") {
       try {
-        findObject._id = new ObjectId94(findObject._id);
+        findObject._id = new ObjectId95(findObject._id);
       } catch {
         throw new BadRequestError147("Invalid nfc patrol tag document ID.");
       }
       try {
-        setData.updatedBy = new ObjectId94(setData.updatedBy);
+        setData.updatedBy = new ObjectId95(setData.updatedBy);
       } catch {
         throw new BadRequestError147("Invalid updatedBy ID.");
       }
@@ -41872,7 +42134,7 @@ function useNfcPatrolTagController() {
 }
 
 // src/models/occurrence-book.model.ts
-import { ObjectId as ObjectId95 } from "mongodb";
+import { ObjectId as ObjectId96 } from "mongodb";
 import Joi90 from "joi";
 var DOBStatus = /* @__PURE__ */ ((DOBStatus3) => {
   DOBStatus3["OPEN"] = "open";
@@ -41898,20 +42160,20 @@ var schemaUpdateOccurrenceBook = Joi90.object({
 function MOccurrenceBook(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId95(value._id);
+      value._id = new ObjectId96(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId95(value.site);
+      value.site = new ObjectId96(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   return {
-    _id: value._id ?? new ObjectId95(),
+    _id: value._id ?? new ObjectId96(),
     site: value.site,
     date: value.date ?? "",
     totalInput: value.totalInput ?? 0,
@@ -41936,7 +42198,7 @@ import {
   useAtlas as useAtlas80,
   useCache as useCache49
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId96 } from "mongodb";
+import { ObjectId as ObjectId97 } from "mongodb";
 var occurrence_book_namespace_collection = "occurrence-books";
 function useOccurrenceBookRepo() {
   const db = useAtlas80.getDb();
@@ -42080,7 +42342,7 @@ function useOccurrenceBookRepo() {
   }
   async function getOccurrenceBookById(_id, session) {
     try {
-      _id = new ObjectId96(_id);
+      _id = new ObjectId97(_id);
     } catch (error) {
       throw new BadRequestError150("Invalid occurrence book ID format.");
     }
@@ -42110,7 +42372,7 @@ function useOccurrenceBookRepo() {
   async function updateOccurrenceBookById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new ObjectId96(_id);
+      _id = new ObjectId97(_id);
     } catch (error) {
       throw new BadRequestError150("Invalid ID format.");
     }
@@ -42142,7 +42404,7 @@ function useOccurrenceBookRepo() {
   }
   async function deleteOccurrenceBookById(_id) {
     try {
-      _id = new ObjectId96(_id);
+      _id = new ObjectId97(_id);
     } catch (error) {
       throw new BadRequestError150("Invalid occurrence book ID format.");
     }
@@ -42527,7 +42789,7 @@ function useOccurrenceBookController() {
 }
 
 // src/models/bulletin-video.model.ts
-import { ObjectId as ObjectId97 } from "mongodb";
+import { ObjectId as ObjectId98 } from "mongodb";
 import Joi92 from "joi";
 var BulletinVideoSort = /* @__PURE__ */ ((BulletinVideoSort2) => {
   BulletinVideoSort2["CREATED_AT"] = "createdAt";
@@ -42555,27 +42817,27 @@ var schemaUpdateBulletinVideo = Joi92.object({
 function MBulletinVideo(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId97(value._id);
+      value._id = new ObjectId98(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId97(value.site);
+      value.site = new ObjectId98(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.file && typeof value.file === "string") {
     try {
-      value.file = new ObjectId97(value.file);
+      value.file = new ObjectId98(value.file);
     } catch {
       throw new Error("Invalid file ID.");
     }
   }
   return {
-    _id: value._id ?? new ObjectId97(),
+    _id: value._id ?? new ObjectId98(),
     site: value.site,
     title: value.title ?? "",
     description: value.description ?? "",
@@ -42597,7 +42859,7 @@ import {
   useAtlas as useAtlas82,
   useCache as useCache50
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId98 } from "mongodb";
+import { ObjectId as ObjectId99 } from "mongodb";
 function useBulletinVideoRepo() {
   const db = useAtlas82.getDb();
   if (!db) {
@@ -42659,7 +42921,7 @@ function useBulletinVideoRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId98(site);
+      site = new ObjectId99(site);
     } catch (error) {
       throw new BadRequestError152("Invalid site ID format.");
     }
@@ -42739,7 +43001,7 @@ function useBulletinVideoRepo() {
   }
   async function getBulletinVideoById(_id, session) {
     try {
-      _id = new ObjectId98(_id);
+      _id = new ObjectId99(_id);
     } catch (error) {
       throw new BadRequestError152("Invalid bulletin video ID format.");
     }
@@ -42770,13 +43032,13 @@ function useBulletinVideoRepo() {
   async function updateBulletinVideoById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new ObjectId98(_id);
+      _id = new ObjectId99(_id);
     } catch (error) {
       throw new BadRequestError152("Invalid ID format.");
     }
     if (value.file && typeof value.file === "string") {
       try {
-        value.file = new ObjectId98(value.file);
+        value.file = new ObjectId99(value.file);
       } catch {
         throw new Error("Invalid file ID.");
       }
@@ -42805,7 +43067,7 @@ function useBulletinVideoRepo() {
   }
   async function deleteBulletinVideoById(_id, session) {
     try {
-      _id = new ObjectId98(_id);
+      _id = new ObjectId99(_id);
     } catch (error) {
       throw new BadRequestError152("Invalid bulletin video ID format.");
     }
@@ -43069,7 +43331,7 @@ function useBulletinVideoController() {
 
 // src/models/site-soa.model.ts
 import { BadRequestError as BadRequestError154, logger as logger130 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId99 } from "mongodb";
+import { ObjectId as ObjectId100 } from "mongodb";
 import Joi94 from "joi";
 var schemaSOABillingItem = Joi94.object({
   _id: Joi94.string().required(),
@@ -43137,28 +43399,28 @@ function MStatementOfAccount(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId99(value._id);
+      value._id = new ObjectId100(value._id);
     } catch {
       throw new BadRequestError154("Invalid _id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId99(value.site);
+      value.site = new ObjectId100(value.site);
     } catch {
       throw new BadRequestError154("Invalid site format");
     }
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new ObjectId99(value.createdBy);
+      value.createdBy = new ObjectId100(value.createdBy);
     } catch {
       throw new BadRequestError154("Invalid createBy format");
     }
   }
   if (value.unitId && typeof value.unitId === "string") {
     try {
-      value.unitId = new ObjectId99(value.unitId);
+      value.unitId = new ObjectId100(value.unitId);
     } catch {
       throw new BadRequestError154("Invalid unitId format");
     }
@@ -43167,7 +43429,7 @@ function MStatementOfAccount(value) {
     value.billing = value.billing.map((bill) => {
       if (bill._id && typeof bill._id === "string") {
         try {
-          bill._id = new ObjectId99(bill._id);
+          bill._id = new ObjectId100(bill._id);
         } catch {
           throw new BadRequestError154("Invalid billing id format");
         }
@@ -43176,7 +43438,7 @@ function MStatementOfAccount(value) {
     });
   }
   return {
-    _id: value._id ?? new ObjectId99(),
+    _id: value._id ?? new ObjectId100(),
     site: value.site,
     unitId: value.unitId ?? "",
     unit: value.unit ?? "",
@@ -43208,7 +43470,7 @@ import {
   paginate as paginate44,
   makeCacheKey as makeCacheKey49
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId100 } from "mongodb";
+import { ObjectId as ObjectId101 } from "mongodb";
 function useStatementOfAccountRepo() {
   const db = useAtlas84.getDb();
   if (!db) {
@@ -43306,7 +43568,7 @@ function useStatementOfAccountRepo() {
           { category: { $regex: search, $options: "i" } }
         ]
       },
-      ...ObjectId100.isValid(site) && { site: new ObjectId100(site) },
+      ...ObjectId101.isValid(site) && { site: new ObjectId101(site) },
       ...dateExpr
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
@@ -43361,7 +43623,7 @@ function useStatementOfAccountRepo() {
   }
   async function getById(_id) {
     try {
-      _id = new ObjectId100(_id);
+      _id = new ObjectId101(_id);
     } catch (error) {
       throw new BadRequestError155("Invalid ID.");
     }
@@ -43400,7 +43662,7 @@ function useStatementOfAccountRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new ObjectId100(_id);
+      _id = new ObjectId101(_id);
     } catch (error) {
       throw new BadRequestError155("Invalid site SOA transaction ID format.");
     }
@@ -43419,7 +43681,7 @@ function useStatementOfAccountRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new ObjectId100(_id);
+      _id = new ObjectId101(_id);
     } catch (error) {
       throw new BadRequestError155("Invalid site SOA transaction ID format.");
     }
@@ -43441,7 +43703,7 @@ function useStatementOfAccountRepo() {
   }
   async function updateStatusById(_id, value, session) {
     try {
-      _id = new ObjectId100(_id);
+      _id = new ObjectId101(_id);
     } catch (error) {
       throw new BadRequestError155("Invalid file ID format.");
     }
@@ -43496,9 +43758,9 @@ function useStatementOfAccountRepo() {
           { category: { $regex: search, $options: "i" } }
         ]
       },
-      ...ObjectId100.isValid(site) && { site: new ObjectId100(site) },
+      ...ObjectId101.isValid(site) && { site: new ObjectId101(site) },
       ...dateExpr,
-      ...ObjectId100.isValid(unitId) && { unitId: new ObjectId100(unitId) },
+      ...ObjectId101.isValid(unitId) && { unitId: new ObjectId101(unitId) },
       ...category && { category }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
@@ -43548,7 +43810,7 @@ function useStatementOfAccountRepo() {
   async function reviewSOA(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new ObjectId100(_id);
+      _id = new ObjectId101(_id);
     } catch (error) {
       throw new BadRequestError155("Invalid ID format.");
     }
@@ -43597,7 +43859,7 @@ import {
   logger as logger132,
   useAtlas as useAtlas85
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId101 } from "mongodb";
+import { ObjectId as ObjectId102 } from "mongodb";
 import { launch } from "puppeteer";
 function useStatementOfAccountService() {
   const { add: _add, reviewSOA: _reviewSOA } = useStatementOfAccountRepo();
@@ -43734,7 +43996,7 @@ function useStatementOfAccountService() {
         if (!approvedBy || !approvedBy.name)
           throw new BadRequestError156("Created by not found.");
         value.approvedBy.name = approvedBy.name;
-        value.approvedBy._id = new ObjectId101(approvedBy._id);
+        value.approvedBy._id = new ObjectId102(approvedBy._id);
       }
       await _reviewSOA(id, value, session);
       await session?.commitTransaction();
@@ -44116,7 +44378,7 @@ function useStatementOfAccountController() {
 
 // src/models/site-entrypass-settings.model.ts
 import { BadRequestError as BadRequestError158, logger as logger134 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId102 } from "mongodb";
+import { ObjectId as ObjectId103 } from "mongodb";
 import Joi96 from "joi";
 var schemaEntryPassSettings = Joi96.object({
   _id: Joi96.string().hex().optional().allow("", null),
@@ -44164,21 +44426,21 @@ function MEntryPassSettings(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId102(value._id);
+      value._id = new ObjectId103(value._id);
     } catch {
       throw new BadRequestError158("Invalid _id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId102(value.site);
+      value.site = new ObjectId103(value.site);
     } catch {
       throw new BadRequestError158("Invalid site format");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new ObjectId102(value.org);
+      value.org = new ObjectId103(value.org);
     } catch {
       throw new BadRequestError158("Invalid org format");
     }
@@ -44217,7 +44479,7 @@ import {
   useAtlas as useAtlas86,
   useCache as useCache52
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId103 } from "mongodb";
+import { ObjectId as ObjectId104 } from "mongodb";
 function useEntryPassSettingsRepo() {
   const db = useAtlas86.getDb();
   if (!db) {
@@ -44327,7 +44589,7 @@ function useEntryPassSettingsRepo() {
   }
   async function getEntryPassSettingsById(_id) {
     try {
-      _id = new ObjectId103(_id);
+      _id = new ObjectId104(_id);
     } catch (error) {
       throw new BadRequestError159("Invalid entry pass settings ID format.");
     }
@@ -44394,7 +44656,7 @@ function useEntryPassSettingsRepo() {
   }
   async function updateEntryPassSettingsById(_id, value) {
     try {
-      _id = new ObjectId103(_id);
+      _id = new ObjectId104(_id);
     } catch (error) {
       throw new BadRequestError159("Invalid entry pass settings ID format.");
     }
@@ -44422,7 +44684,7 @@ function useEntryPassSettingsRepo() {
   }
   async function deleteEntryPassSettingsById(_id, session) {
     try {
-      _id = new ObjectId103(_id);
+      _id = new ObjectId104(_id);
     } catch (error) {
       throw new BadRequestError159("Invalid card ID format.");
     }
@@ -44455,7 +44717,7 @@ function useEntryPassSettingsRepo() {
   }
   async function getEntryPassSettingsBySiteId(site) {
     try {
-      site = new ObjectId103(site);
+      site = new ObjectId104(site);
     } catch (error) {
       throw new BadRequestError159("Invalid entry pass settings ID format.");
     }
@@ -44522,7 +44784,7 @@ function useEntryPassSettingsRepo() {
   }
   async function updateEntryPassSettingsBySiteId(site, value) {
     try {
-      site = new ObjectId103(site);
+      site = new ObjectId104(site);
     } catch (error) {
       throw new BadRequestError159("Invalid entry pass settings ID format.");
     }
@@ -44887,7 +45149,7 @@ function useDashboardController() {
 }
 
 // src/models/nfc-patrol-route.model.ts
-import { ObjectId as ObjectId104 } from "mongodb";
+import { ObjectId as ObjectId105 } from "mongodb";
 import Joi99 from "joi";
 import { BadRequestError as BadRequestError162, logger as logger139 } from "@7365admin1/node-server-utils";
 var schemaNfcPatrolRoute = Joi99.object({
@@ -44923,23 +45185,23 @@ function MNfcPatrolRoute(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId104(value._id);
+      value._id = new ObjectId105(value._id);
     } catch (error2) {
       throw new BadRequestError162("Invalid _id format");
     }
   }
   try {
-    value.site = new ObjectId104(value.site);
+    value.site = new ObjectId105(value.site);
   } catch (error2) {
     throw new BadRequestError162("Invalid site format");
   }
   try {
-    value.createdBy = new ObjectId104(value.createdBy);
+    value.createdBy = new ObjectId105(value.createdBy);
   } catch (error2) {
     throw new BadRequestError162("Invalid createdBy format");
   }
   return {
-    _id: value._id ?? new ObjectId104(),
+    _id: value._id ?? new ObjectId105(),
     site: value.site,
     name: value.name,
     checkPointNumber: value.checkPointNumber,
@@ -44964,7 +45226,7 @@ import {
   useAtlas as useAtlas88,
   useCache as useCache54
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId105 } from "mongodb";
+import { ObjectId as ObjectId106 } from "mongodb";
 function useNfcPatrolRouteRepo() {
   const db = useAtlas88.getDb();
   if (!db) {
@@ -45008,7 +45270,7 @@ function useNfcPatrolRouteRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId105(site);
+      site = new ObjectId106(site);
     } catch (error) {
       throw new BadRequestError163("Invalid site ID format.");
     }
@@ -45079,7 +45341,7 @@ function useNfcPatrolRouteRepo() {
   }
   async function getById(_id, isStart) {
     try {
-      _id = new ObjectId105(_id);
+      _id = new ObjectId106(_id);
     } catch (error) {
       throw new BadRequestError163("Invalid ID.");
     }
@@ -45189,18 +45451,18 @@ function useNfcPatrolRouteRepo() {
       throw new BadRequestError163(error.message);
     }
     try {
-      _id = new ObjectId105(_id);
+      _id = new ObjectId106(_id);
     } catch (error2) {
       throw new BadRequestError163("Invalid ID.");
     }
     try {
-      value.site = new ObjectId105(value.site);
+      value.site = new ObjectId106(value.site);
     } catch (error2) {
       throw new BadRequestError163("Invalid site format");
     }
     if (value.updatedBy) {
       try {
-        value.updatedBy = new ObjectId105(value.updatedBy);
+        value.updatedBy = new ObjectId106(value.updatedBy);
       } catch (error2) {
         throw new BadRequestError163("Invalid createdBy format");
       }
@@ -45433,7 +45695,7 @@ function useNfcPatrolRouteController() {
 }
 
 // src/models/incident-report.model.ts
-import { ObjectId as ObjectId106 } from "mongodb";
+import { ObjectId as ObjectId107 } from "mongodb";
 import Joi101 from "joi";
 var residentSchema = Joi101.object({
   _id: Joi101.string().hex().optional().allow(null, ""),
@@ -45639,28 +45901,28 @@ var schemaUpdateIncidentReport = Joi101.object({
 function MIncidentReport(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId106(value._id);
+      value._id = new ObjectId107(value._id);
     } catch {
       throw new Error("Invalid incident report ID.");
     }
   }
   if (value.organization && typeof value.organization === "string") {
     try {
-      value.organization = new ObjectId106(value.organization);
+      value.organization = new ObjectId107(value.organization);
     } catch {
       throw new Error("Invalid organization ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId106(value.site);
+      value.site = new ObjectId107(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.approvedBy && typeof value.approvedBy === "string") {
     try {
-      value.approvedBy = new ObjectId106(value.approvedBy);
+      value.approvedBy = new ObjectId107(value.approvedBy);
     } catch {
       throw new Error("Invalid approvedBy ID.");
     }
@@ -45668,7 +45930,7 @@ function MIncidentReport(value) {
   const { incidentInformation } = value;
   if (incidentInformation?.siteInfo?.site && typeof incidentInformation.siteInfo.site === "string") {
     try {
-      incidentInformation.siteInfo.site = new ObjectId106(
+      incidentInformation.siteInfo.site = new ObjectId107(
         incidentInformation.siteInfo.site
       );
     } catch {
@@ -45682,7 +45944,7 @@ function MIncidentReport(value) {
     incidentInformation.submissionForm.dateOfReport = incidentInformation.submissionForm.dateOfReport.toISOString();
   }
   return {
-    _id: value._id ?? new ObjectId106(),
+    _id: value._id ?? new ObjectId107(),
     reportId: value.reportId,
     incidentInformation: value.incidentInformation,
     affectedEntities: value.affectedEntities,
@@ -45720,7 +45982,7 @@ import {
   useAtlas as useAtlas90,
   useCache as useCache55
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId107 } from "mongodb";
+import { ObjectId as ObjectId108 } from "mongodb";
 var incidents_namespace_collection = "incident-reports";
 function useIncidentReportRepo() {
   const db = useAtlas90.getDb();
@@ -45787,7 +46049,7 @@ function useIncidentReportRepo() {
     page = page > 0 ? page - 1 : 0;
     let dateExpr = {};
     try {
-      site = new ObjectId107(site);
+      site = new ObjectId108(site);
     } catch (error) {
       throw new BadRequestError166("Invalid site ID format.");
     }
@@ -45888,7 +46150,7 @@ function useIncidentReportRepo() {
     page = page > 0 ? page - 1 : 0;
     let dateExpr = {};
     try {
-      site = new ObjectId107(site);
+      site = new ObjectId108(site);
     } catch (error) {
       throw new BadRequestError166("Invalid site ID format.");
     }
@@ -45957,7 +46219,7 @@ function useIncidentReportRepo() {
   }
   async function getIncidentReportById(_id, session) {
     try {
-      _id = new ObjectId107(_id);
+      _id = new ObjectId108(_id);
     } catch (error) {
       throw new BadRequestError166("Invalid incident report ID format.");
     }
@@ -45988,27 +46250,27 @@ function useIncidentReportRepo() {
   async function updateIncidentReportById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new ObjectId107(_id);
+      _id = new ObjectId108(_id);
     } catch (error) {
       throw new BadRequestError166("Invalid ID format.");
     }
     if (value.organization && typeof value.organization === "string") {
       try {
-        value.organization = new ObjectId107(value.organization);
+        value.organization = new ObjectId108(value.organization);
       } catch {
         throw new Error("Invalid organization ID.");
       }
     }
     if (value.site && typeof value.site === "string") {
       try {
-        value.site = new ObjectId107(value.site);
+        value.site = new ObjectId108(value.site);
       } catch {
         throw new Error("Invalid site ID.");
       }
     }
     if (value.approvedBy && typeof value.approvedBy === "string") {
       try {
-        value.approvedBy = new ObjectId107(value.approvedBy);
+        value.approvedBy = new ObjectId108(value.approvedBy);
       } catch {
         throw new Error("Invalid approvedBy ID.");
       }
@@ -46016,7 +46278,7 @@ function useIncidentReportRepo() {
     const { incidentInformation } = value;
     if (incidentInformation?.siteInfo?.site && typeof incidentInformation.siteInfo.site === "string") {
       try {
-        incidentInformation.siteInfo.site = new ObjectId107(
+        incidentInformation.siteInfo.site = new ObjectId108(
           incidentInformation.siteInfo.site
         );
       } catch {
@@ -46051,7 +46313,7 @@ function useIncidentReportRepo() {
   }
   async function deleteIncidentReportById(_id) {
     try {
-      _id = new ObjectId107(_id);
+      _id = new ObjectId108(_id);
     } catch (error) {
       throw new BadRequestError166("Invalid occurrence subject ID format.");
     }
@@ -46083,7 +46345,7 @@ function useIncidentReportRepo() {
   async function reviewIncidentReport(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new ObjectId107(_id);
+      _id = new ObjectId108(_id);
     } catch (error) {
       throw new BadRequestError166("Invalid ID format.");
     }
@@ -46576,7 +46838,7 @@ function useIncidentReportController() {
 }
 
 // src/models/nfc-patrol-settings.model.ts
-import { ObjectId as ObjectId108 } from "mongodb";
+import { ObjectId as ObjectId109 } from "mongodb";
 import Joi103 from "joi";
 import { BadRequestError as BadRequestError169, logger as logger145 } from "@7365admin1/node-server-utils";
 var objectId = Joi103.string().hex().length(24);
@@ -46602,7 +46864,7 @@ function MNfcPatrolSettings(value) {
   }
   if (value.site) {
     try {
-      value.site = new ObjectId108(value.site);
+      value.site = new ObjectId109(value.site);
     } catch (error2) {
       throw new BadRequestError169("Invalid site ID format.");
     }
@@ -46622,7 +46884,7 @@ function MNfcPatrolSettingsUpdate(value) {
   }
   if (value.updatedBy) {
     try {
-      value.updatedBy = new ObjectId108(value.updatedBy);
+      value.updatedBy = new ObjectId109(value.updatedBy);
     } catch (error2) {
       throw new BadRequestError169("Invalid updatedBy ID format.");
     }
@@ -46644,7 +46906,7 @@ import {
   useAtlas as useAtlas92,
   useCache as useCache56
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId109 } from "mongodb";
+import { ObjectId as ObjectId110 } from "mongodb";
 function useNfcPatrolSettingsRepository() {
   const db = useAtlas92.getDb();
   if (!db) {
@@ -46674,7 +46936,7 @@ function useNfcPatrolSettingsRepository() {
   }
   async function getNfcPatrolSettingsBySite(site, session) {
     try {
-      site = new ObjectId109(site);
+      site = new ObjectId110(site);
     } catch (error) {
       throw new BadRequestError170("Invalid nfc patrol settings site ID format.");
     }
@@ -46718,7 +46980,7 @@ function useNfcPatrolSettingsRepository() {
   }
   async function updateNfcPatrolSettings(site, value, session) {
     try {
-      site = new ObjectId109(site);
+      site = new ObjectId110(site);
     } catch (error) {
       throw new BadRequestError170("Invalid attendance settings ID format.");
     }
@@ -46887,7 +47149,7 @@ function useNfcPatrolSettingsController() {
 
 // src/services/occurrence-entry.service.ts
 import { useAtlas as useAtlas95 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId112 } from "mongodb";
+import { ObjectId as ObjectId113 } from "mongodb";
 
 // src/repositories/occurrence-subject.repo.ts
 import {
@@ -46902,7 +47164,7 @@ import {
 } from "@7365admin1/node-server-utils";
 
 // src/models/occurrence-subject.model.ts
-import { ObjectId as ObjectId110 } from "mongodb";
+import { ObjectId as ObjectId111 } from "mongodb";
 import Joi105 from "joi";
 var SubjectSort = /* @__PURE__ */ ((SubjectSort2) => {
   SubjectSort2["CREATED_AT"] = "createdAt";
@@ -46927,27 +47189,27 @@ var schemaUpdateOccurrenceSubject = Joi105.object({
 function MOccurrenceSubject(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId110(value._id);
+      value._id = new ObjectId111(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId110(value.site);
+      value.site = new ObjectId111(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.addedBy && typeof value.addedBy === "string") {
     try {
-      value.addedBy = new ObjectId110(value.addedBy);
+      value.addedBy = new ObjectId111(value.addedBy);
     } catch {
       throw new Error("Invalid addedBy ID.");
     }
   }
   return {
-    _id: value._id ?? new ObjectId110(),
+    _id: value._id ?? new ObjectId111(),
     site: value.site,
     subject: value.subject,
     addedBy: value.addedBy ?? "",
@@ -46958,7 +47220,7 @@ function MOccurrenceSubject(value) {
 }
 
 // src/repositories/occurrence-subject.repo.ts
-import { ObjectId as ObjectId111 } from "mongodb";
+import { ObjectId as ObjectId112 } from "mongodb";
 function useOccurrenceSubjectRepo() {
   const db = useAtlas94.getDb();
   if (!db) {
@@ -47017,7 +47279,7 @@ function useOccurrenceSubjectRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId111(site);
+      site = new ObjectId112(site);
     } catch (error) {
       throw new BadRequestError173("Invalid site ID format.");
     }
@@ -47110,7 +47372,7 @@ function useOccurrenceSubjectRepo() {
   }
   async function getOccurrenceSubjectById(_id, session) {
     try {
-      _id = new ObjectId111(_id);
+      _id = new ObjectId112(_id);
     } catch (error) {
       throw new BadRequestError173("Invalid occurrence subject ID format.");
     }
@@ -47138,7 +47400,7 @@ function useOccurrenceSubjectRepo() {
   async function updateOccurrenceSubjectById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new ObjectId111(_id);
+      _id = new ObjectId112(_id);
     } catch (error) {
       throw new BadRequestError173("Invalid ID format.");
     }
@@ -47168,7 +47430,7 @@ function useOccurrenceSubjectRepo() {
   }
   async function deleteOccurrenceSubjectById(_id) {
     try {
-      _id = new ObjectId111(_id);
+      _id = new ObjectId112(_id);
     } catch (error) {
       throw new BadRequestError173("Invalid occurrence subject ID format.");
     }
@@ -47299,8 +47561,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 ObjectId112(value.signature) : occurrenceEntry.signature._id;
-      value.eSignature = value.eSignature ? new ObjectId112(value.eSignature) : occurrenceEntry.eSignature;
+      value.signature = value.signature ? new ObjectId113(value.signature) : occurrenceEntry.signature._id;
+      value.eSignature = value.eSignature ? new ObjectId113(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;
@@ -47492,7 +47754,7 @@ function useOccurrenceEntryController() {
 
 // src/models/online-form.model.ts
 import Joi107 from "joi";
-import { ObjectId as ObjectId113 } from "mongodb";
+import { ObjectId as ObjectId114 } from "mongodb";
 var schemaOnlineForm = Joi107.object({
   _id: Joi107.string().hex().optional().allow("", null),
   name: Joi107.string().required(),
@@ -47540,21 +47802,21 @@ function MOnlineForm(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId113(value._id);
+      value._id = new ObjectId114(value._id);
     } catch (error2) {
       throw new Error("Invalid ID.");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new ObjectId113(value.org);
+      value.org = new ObjectId114(value.org);
     } catch (error2) {
       throw new Error("Invalid org ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId113(value.site);
+      value.site = new ObjectId114(value.site);
     } catch (error2) {
       throw new Error("Invalid site ID.");
     }
@@ -47586,7 +47848,7 @@ import {
   useAtlas as useAtlas96,
   useCache as useCache58
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId114 } from "mongodb";
+import { ObjectId as ObjectId115 } from "mongodb";
 function useOnlineFormRepo() {
   const db = useAtlas96.getDb();
   if (!db) {
@@ -47638,7 +47900,7 @@ function useOnlineFormRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId114(site);
+      site = new ObjectId115(site);
     } catch (error) {
       throw new BadRequestError175("Invalid site ID format.");
     }
@@ -47698,7 +47960,7 @@ function useOnlineFormRepo() {
   }
   async function getOnlineFormById(_id) {
     try {
-      _id = new ObjectId114(_id);
+      _id = new ObjectId115(_id);
     } catch (error) {
       throw new BadRequestError175("Invalid online form ID format.");
     }
@@ -47741,7 +48003,7 @@ function useOnlineFormRepo() {
   }
   async function updateOnlineFormById(_id, value) {
     try {
-      _id = new ObjectId114(_id);
+      _id = new ObjectId115(_id);
     } catch (error) {
       throw new BadRequestError175("Invalid online form ID format.");
     }
@@ -47769,7 +48031,7 @@ function useOnlineFormRepo() {
   }
   async function deleteOnlineFormById(_id, session) {
     try {
-      _id = new ObjectId114(_id);
+      _id = new ObjectId115(_id);
     } catch (error) {
       throw new BadRequestError175("Invalid online form ID format.");
     }
@@ -47802,7 +48064,7 @@ function useOnlineFormRepo() {
   }
   async function getOnlineFormsBySiteId(site, { search = "", page = 1, limit = 10, status = "active" }) {
     try {
-      site = new ObjectId114(site);
+      site = new ObjectId115(site);
     } catch (error) {
       throw new BadRequestError175(
         "Invalid online form configuration site ID format."
@@ -48234,7 +48496,7 @@ function useOccurrenceSubjectController() {
 }
 
 // src/models/nfc-patrol-log.model.ts
-import { ObjectId as ObjectId115 } from "mongodb";
+import { ObjectId as ObjectId116 } from "mongodb";
 import Joi110 from "joi";
 import { BadRequestError as BadRequestError178, logger as logger154 } from "@7365admin1/node-server-utils";
 var schemaNfcPatrolLog = Joi110.object({
@@ -48286,32 +48548,32 @@ function MNfcPatrolLog(valueArg) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId115(value._id);
+      value._id = new ObjectId116(value._id);
     } catch (error2) {
       throw new BadRequestError178("Invalid _id format");
     }
   }
   try {
-    value.site = new ObjectId115(value.site);
+    value.site = new ObjectId116(value.site);
   } catch (error2) {
     throw new BadRequestError178("Invalid site format");
   }
   if (value?.createdBy) {
     try {
-      value.createdBy = new ObjectId115(value.createdBy);
+      value.createdBy = new ObjectId116(value.createdBy);
     } catch (error2) {
       throw new BadRequestError178("Invalid createdBy format");
     }
   }
   if (value?.route?._id) {
     try {
-      value.route._id = new ObjectId115(value.route._id);
+      value.route._id = new ObjectId116(value.route._id);
     } catch (error2) {
       throw new BadRequestError178("Invalid route _id format");
     }
   }
   return {
-    _id: value._id ?? new ObjectId115(),
+    _id: value._id ?? new ObjectId116(),
     site: value.site,
     route: value.route,
     date: value.date,
@@ -48333,7 +48595,7 @@ import {
   useAtlas as useAtlas98,
   useCache as useCache59
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId116 } from "mongodb";
+import { ObjectId as ObjectId117 } from "mongodb";
 function useNfcPatrolLogRepo() {
   const db = useAtlas98.getDb();
   if (!db) {
@@ -48386,7 +48648,7 @@ function useNfcPatrolLogRepo() {
     const pageIndex = page > 0 ? page - 1 : 0;
     let siteId;
     try {
-      siteId = typeof site === "string" ? new ObjectId116(site) : site;
+      siteId = typeof site === "string" ? new ObjectId117(site) : site;
     } catch {
       throw new BadRequestError179("Invalid site ID format.");
     }
@@ -48397,7 +48659,7 @@ function useNfcPatrolLogRepo() {
       query.date = date;
     }
     if (route?._id) {
-      query["route._id"] = typeof route._id === "string" ? new ObjectId116(route._id) : route._id;
+      query["route._id"] = typeof route._id === "string" ? new ObjectId117(route._id) : route._id;
     }
     if (route?.startTime) {
       query["route.startTime"] = route.startTime;
@@ -49269,7 +49531,7 @@ function useNewDashboardController() {
 
 // src/models/manpower-monitoring.model.ts
 import Joi113 from "joi";
-import { ObjectId as ObjectId117 } from "mongodb";
+import { ObjectId as ObjectId118 } from "mongodb";
 var shiftSchema = Joi113.object({
   name: Joi113.string().required(),
   checkIn: Joi113.string().optional().allow("", null),
@@ -49294,7 +49556,7 @@ var manpowerMonitoringSchema = Joi113.object({
 });
 var MManpowerMonitoring = class {
   constructor(data) {
-    this._id = new ObjectId117();
+    this._id = new ObjectId118();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName;
@@ -49548,7 +49810,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 }) {
@@ -49575,7 +49837,7 @@ async function fetchSites({ siteUrl, token }) {
       }
       if (attempt < maxRetries) {
         const delay = 1e3 * attempt;
-        await sleep(delay);
+        await sleep2(delay);
       }
     }
   } while (attempt < maxRetries);
@@ -49767,7 +50029,7 @@ var hrmlabs_attendance_util_default = {
 };
 
 // src/repositories/manpower-monitoring.repo.ts
-import { ObjectId as ObjectId118 } from "mongodb";
+import { ObjectId as ObjectId119 } from "mongodb";
 var { hrmLabsAuthentication: hrmLabsAuthentication2, fetchSites: fetchSites2 } = hrmlabs_attendance_util_default;
 function useManpowerMonitoringRepo() {
   const db = useAtlas101.getDb();
@@ -49802,11 +50064,11 @@ function useManpowerMonitoringRepo() {
     try {
       value = new MManpowerMonitoring(value);
       if (value.createdBy)
-        value.createdBy = new ObjectId118(value.createdBy);
+        value.createdBy = new ObjectId119(value.createdBy);
       if (value.siteId)
-        value.siteId = new ObjectId118(value.siteId);
+        value.siteId = new ObjectId119(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new ObjectId118(value.serviceProviderId);
+        value.serviceProviderId = new ObjectId119(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -49847,8 +50109,8 @@ function useManpowerMonitoringRepo() {
   }
   async function getManpowerSettingsBySiteId(_id, serviceProviderId) {
     try {
-      _id = new ObjectId118(_id);
-      serviceProviderId = new ObjectId118(serviceProviderId);
+      _id = new ObjectId119(_id);
+      serviceProviderId = new ObjectId119(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -49864,7 +50126,7 @@ function useManpowerMonitoringRepo() {
   }
   async function updateManpowerMonitoringSettings(_id, value) {
     try {
-      _id = new ObjectId118(_id);
+      _id = new ObjectId119(_id);
     } catch (error) {
       throw new BadRequestError184("Invalid ID format.");
     }
@@ -49891,7 +50153,7 @@ function useManpowerMonitoringRepo() {
       for (let item of value) {
         item = new MManpowerMonitoring(item);
         const data = await collection.findOne({
-          siteId: new ObjectId118(item.siteId)
+          siteId: new ObjectId119(item.siteId)
         });
         if (data) {
           let updateValue;
@@ -49916,11 +50178,11 @@ function useManpowerMonitoringRepo() {
           }
         } else {
           if (item.createdBy)
-            item.createdBy = new ObjectId118(item.createdBy);
+            item.createdBy = new ObjectId119(item.createdBy);
           if (item.siteId)
-            item.siteId = new ObjectId118(item.siteId);
+            item.siteId = new ObjectId119(item.siteId);
           if (item.serviceProviderId)
-            item.serviceProviderId = new ObjectId118(item.serviceProviderId);
+            item.serviceProviderId = new ObjectId119(item.serviceProviderId);
           const result = await collection.insertOne(item);
           if (result.insertedId) {
             results.inserted++;
@@ -49944,7 +50206,7 @@ function useManpowerMonitoringRepo() {
     const siteUrl = process.env.HRMLABS_SITE_URL;
     try {
       const serviceProvider = await serviceProviderCollection.findOne({
-        _id: new ObjectId118(serviceProviderId)
+        _id: new ObjectId119(serviceProviderId)
       });
       if (!serviceProvider) {
         throw new Error("Service Provider not found.");
@@ -49997,7 +50259,7 @@ import {
 
 // src/models/manpower-remarks.model.ts
 import Joi114 from "joi";
-import { ObjectId as ObjectId119 } from "mongodb";
+import { ObjectId as ObjectId120 } from "mongodb";
 var remarksSchema = Joi114.object({
   name: Joi114.string().required(),
   remark: Joi114.object({
@@ -50021,7 +50283,7 @@ var manpowerRemarksSchema = Joi114.object({
 });
 var MManpowerRemarks = class {
   constructor(data) {
-    this._id = new ObjectId119();
+    this._id = new ObjectId120();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
@@ -50039,7 +50301,7 @@ var MManpowerRemarks = class {
 };
 
 // src/repositories/manpower-remarks.repo.ts
-import { ObjectId as ObjectId120 } from "mongodb";
+import { ObjectId as ObjectId121 } from "mongodb";
 import moment2 from "moment-timezone";
 function useManpowerRemarksRepo() {
   const db = useAtlas102.getDb();
@@ -50073,9 +50335,9 @@ function useManpowerRemarksRepo() {
     try {
       value = new MManpowerRemarks(value);
       if (value.siteId)
-        value.siteId = new ObjectId120(value.siteId);
+        value.siteId = new ObjectId121(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new ObjectId120(value.serviceProviderId);
+        value.serviceProviderId = new ObjectId121(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -50095,7 +50357,7 @@ function useManpowerRemarksRepo() {
       limit = limit || 10;
       const searchQuery = {};
       const nowSGT = moment2().tz("Asia/Singapore");
-      searchQuery.serviceProviderId = new ObjectId120(serviceProviderId);
+      searchQuery.serviceProviderId = new ObjectId121(serviceProviderId);
       if (search != "") {
         searchQuery.siteName = { $regex: search, $options: "i" };
       }
@@ -50127,8 +50389,8 @@ function useManpowerRemarksRepo() {
   }
   async function getManpowerRemarksBySiteId(_id, date, serviceProviderId) {
     try {
-      _id = new ObjectId120(_id);
-      serviceProviderId = new ObjectId120(serviceProviderId);
+      _id = new ObjectId121(_id);
+      serviceProviderId = new ObjectId121(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -50145,13 +50407,13 @@ function useManpowerRemarksRepo() {
   }
   async function updateManpowerRemarks(_id, value) {
     try {
-      _id = new ObjectId120(_id);
+      _id = new ObjectId121(_id);
     } catch (error) {
       throw new BadRequestError185("Invalid ID format.");
     }
     try {
       if (value.createdBy) {
-        value.createdBy = new ObjectId120(value.createdBy);
+        value.createdBy = new ObjectId121(value.createdBy);
       }
       const updateValue = {
         ...value,
@@ -50168,7 +50430,7 @@ function useManpowerRemarksRepo() {
   }
   async function updateRemarksStatus(_id, value) {
     try {
-      _id = new ObjectId120(_id);
+      _id = new ObjectId121(_id);
     } catch (error) {
       throw new BadRequestError185("Invalid ID format.");
     }
@@ -50438,7 +50700,7 @@ function useManpowerMonitoringCtrl() {
 
 // src/models/manpower-designations.model.ts
 import Joi116 from "joi";
-import { ObjectId as ObjectId121 } from "mongodb";
+import { ObjectId as ObjectId122 } from "mongodb";
 var designationsSchema = Joi116.object({
   title: Joi116.string().required(),
   shifts: Joi116.object({
@@ -50457,7 +50719,7 @@ var manpowerDesignationsSchema = Joi116.object({
 });
 var MManpowerDesignations = class {
   constructor(data) {
-    this._id = new ObjectId121();
+    this._id = new ObjectId122();
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
     this.serviceProviderId = data.serviceProviderId || "";
@@ -50475,7 +50737,7 @@ import {
   logger as logger164,
   useAtlas as useAtlas104
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId122 } from "mongodb";
+import { ObjectId as ObjectId123 } from "mongodb";
 function useManpowerDesignationRepo() {
   const db = useAtlas104.getDb();
   if (!db) {
@@ -50507,11 +50769,11 @@ function useManpowerDesignationRepo() {
     try {
       value = new MManpowerDesignations(value);
       if (value.createdBy)
-        value.createdBy = new ObjectId122(value.createdBy);
+        value.createdBy = new ObjectId123(value.createdBy);
       if (value.siteId)
-        value.siteId = new ObjectId122(value.siteId);
+        value.siteId = new ObjectId123(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new ObjectId122(value.serviceProviderId);
+        value.serviceProviderId = new ObjectId123(value.serviceProviderId);
       const result = await collection.insertOne(value);
       return result;
     } catch (error) {
@@ -50520,8 +50782,8 @@ function useManpowerDesignationRepo() {
   }
   async function getManpowerDesignationsBySiteId(_id, serviceProviderId) {
     try {
-      _id = new ObjectId122(_id);
-      serviceProviderId = new ObjectId122(serviceProviderId);
+      _id = new ObjectId123(_id);
+      serviceProviderId = new ObjectId123(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -50537,7 +50799,7 @@ function useManpowerDesignationRepo() {
   }
   async function updateManpowerDesignations(_id, value) {
     try {
-      _id = new ObjectId122(_id);
+      _id = new ObjectId123(_id);
     } catch (error) {
       throw new Error("Invalid ID format.");
     }
@@ -50641,7 +50903,7 @@ function useManpowerDesignationCtrl() {
 
 // src/models/overnight-parking.model.ts
 import Joi118 from "joi";
-import { ObjectId as ObjectId123 } from "mongodb";
+import { ObjectId as ObjectId124 } from "mongodb";
 var dayScheduleSchema = Joi118.object({
   isEnabled: Joi118.boolean().required(),
   startTime: Joi118.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().allow(null, "").messages({
@@ -50683,7 +50945,7 @@ function MOvernightParkingApprovalHours(value) {
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId123(value.site);
+      value.site = new ObjectId124(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
@@ -52307,7 +52569,7 @@ function useManpowerRemarkCtrl() {
 
 // src/models/manpower-sites.model.ts
 import Joi124 from "joi";
-import { ObjectId as ObjectId124 } from "mongodb";
+import { ObjectId as ObjectId125 } from "mongodb";
 var manpowerSitesSchema = Joi124.object({
   id: Joi124.string().hex().required(),
   text: Joi124.string().hex().optional().allow("", null),
@@ -52318,7 +52580,7 @@ var manpowerSitesSchema = Joi124.object({
 });
 var MManpowerSites = class {
   constructor(data) {
-    this._id = new ObjectId124();
+    this._id = new ObjectId125();
     this.id = data.id || "";
     this.text = data.text || "";
     this.contractID = data.contractID || "";
@@ -52540,7 +52802,7 @@ import {
   getDirectory as getDirectory4,
   logger as logger177
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId125 } from "mongodb";
+import { ObjectId as ObjectId126 } from "mongodb";
 import moment4 from "moment-timezone";
 var createManpowerRemarksDaily = async () => {
   const db = useAtlas110.getDb();
@@ -52700,7 +52962,7 @@ var updateRemarksisAcknowledged = async () => {
     for (const id of updatedIds) {
       const doc = await remarks.findOne({ _id: id });
       const setting = await settings.findOne(
-        { siteId: new ObjectId125(doc?.siteId) },
+        { siteId: new ObjectId126(doc?.siteId) },
         { projection: { emails: 1 } }
       );
       const payload = {
@@ -52786,7 +53048,7 @@ var updateRemarksStatusEod = async () => {
   for (const doc of docs) {
     let shiftsToCheck = [];
     const endShiftTime = await settings.findOne(
-      { siteId: new ObjectId125(doc.siteId) },
+      { siteId: new ObjectId126(doc.siteId) },
       { projection: { shifts: 1, shiftType: 1 } }
     );
     if (doc.createdAtSGT === nowSGT) {
@@ -52892,7 +53154,7 @@ var isWithinHour = (alertTime, timeNow) => {
 
 // src/events/manpower.event.ts
 import { useAtlas as useAtlas111 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId126 } from "mongodb";
+import { ObjectId as ObjectId127 } from "mongodb";
 import moment5 from "moment-timezone";
 async function manpowerEvents(io) {
   let intervalId = null;
@@ -52918,7 +53180,7 @@ async function manpowerEvents(io) {
     }).toArray();
     for (const doc of docs) {
       const siteSettings = await settings.findOne(
-        { siteId: new ObjectId126(doc.siteId), enabled: true },
+        { siteId: new ObjectId127(doc.siteId), enabled: true },
         { projection: { shifts: 1, shiftType: 1 } }
       );
       const shiftType = siteSettings?.shiftType || "2-shifts";
@@ -53037,11 +53299,11 @@ function genericSignature(params, secretKey) {
 }
 
 // src/repositories/reddot-payment.repository.ts
-import { ObjectId as ObjectId128 } from "mongodb";
+import { ObjectId as ObjectId129 } from "mongodb";
 
 // src/models/billing-payments.model.ts
 import { BadRequestError as BadRequestError199, logger as logger178 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId127 } from "mongodb";
+import { ObjectId as ObjectId128 } from "mongodb";
 import Joi126 from "joi";
 var schemaBillingItems = Joi126.object({
   _id: Joi126.string().hex().optional(),
@@ -53075,21 +53337,21 @@ function MBillingItems(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId127(value._id);
+      value._id = new ObjectId128(value._id);
     } catch {
       throw new BadRequestError199("Invalid _id format");
     }
   }
   if (value.unitId && typeof value.unitId === "string") {
     try {
-      value.unitId = new ObjectId127(value.unitId);
+      value.unitId = new ObjectId128(value.unitId);
     } catch {
       throw new BadRequestError199("Invalid unitId id format");
     }
   }
   if (value.paidBy && typeof value.paidBy === "string") {
     try {
-      value.paidBy = new ObjectId127(value.paidBy);
+      value.paidBy = new ObjectId128(value.paidBy);
     } catch {
       throw new BadRequestError199("Invalid paidBy id format");
     }
@@ -53099,7 +53361,7 @@ function MBillingItems(value) {
       value.unitBillingItems = value.unitBillingItems.map((unitBillingItem) => {
         if (typeof unitBillingItem._id === "string") {
           try {
-            unitBillingItem._id = new ObjectId127(unitBillingItem._id);
+            unitBillingItem._id = new ObjectId128(unitBillingItem._id);
           } catch {
             throw new BadRequestError199("Invalid unit billing id format");
           }
@@ -53111,7 +53373,7 @@ function MBillingItems(value) {
     }
   }
   return {
-    _id: value._id ?? new ObjectId127(),
+    _id: value._id ?? new ObjectId128(),
     unitBillingItems: value.unitBillingItems ?? [],
     unitId: value.unitId ?? "",
     unitOwner: value.unitOwner ?? "",
@@ -53185,7 +53447,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 ObjectId128(res.insertedId).toString().slice(-6);
+        const newId = new ObjectId129(res.insertedId).toString().slice(-6);
         const referenceNumber = `${unit}${newId}${dateFormatted}`;
         await paymentCollection().updateOne(
           { _id: res.insertedId },
@@ -54301,7 +54563,7 @@ import {
 import { v4 as uuidv42 } from "uuid";
 
 // src/repositories/user-v2.repo.ts
-import { ObjectId as ObjectId129 } from "mongodb";
+import { ObjectId as ObjectId130 } from "mongodb";
 import {
   useAtlas as useAtlas115,
   InternalServerError as InternalServerError71,
@@ -54513,7 +54775,7 @@ function useUserRepoV2() {
     }
     if (organization) {
       try {
-        query.defaultOrg = new ObjectId129(organization);
+        query.defaultOrg = new ObjectId130(organization);
         cacheOptions.organization = organization.toString();
       } catch (error) {
         throw new BadRequestError204("Invalid organization ID format.");
@@ -54652,13 +54914,13 @@ function useUserRepoV2() {
       );
     }
     try {
-      _id = new ObjectId129(_id);
+      _id = new ObjectId130(_id);
     } catch (error) {
       throw new BadRequestError204("Invalid ID.");
     }
     if (field === "defaultOrg") {
       try {
-        value = new ObjectId129(value);
+        value = new ObjectId130(value);
       } catch (error) {
         throw new BadRequestError204("Invalid organization ID.");
       }
@@ -54699,7 +54961,7 @@ function useUserRepoV2() {
     year
   }, session) {
     try {
-      _id = new ObjectId129(_id);
+      _id = new ObjectId130(_id);
     } catch (error) {
       throw new BadRequestError204("Invalid user ID format.");
     }
@@ -54729,7 +54991,7 @@ function useUserRepoV2() {
   }
   async function updatePassword({ _id, password }, session) {
     try {
-      _id = new ObjectId129(_id);
+      _id = new ObjectId130(_id);
     } catch (error) {
       throw new BadRequestError204("Invalid user ID format.");
     }
@@ -55492,38 +55754,38 @@ function useUserControllerV2() {
 
 // src/models/role-v2.model.ts
 import { BadRequestError as BadRequestError209 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId130 } from "mongodb";
+import { ObjectId as ObjectId131 } from "mongodb";
 var MRoleV2 = class {
   constructor(value) {
     if (typeof value._id === "string") {
       try {
-        value._id = new ObjectId130(value._id);
+        value._id = new ObjectId131(value._id);
       } catch (error) {
         throw new BadRequestError209("Invalid role-v2 ID format.");
       }
     }
     if (typeof value.site === "string" && value.site.length === 24) {
       try {
-        value.site = new ObjectId130(value.site);
+        value.site = new ObjectId131(value.site);
       } catch (error) {
         throw new BadRequestError209("Invalid site ID format.");
       }
     }
     if (typeof value.org === "string" && value.org.length === 24) {
       try {
-        value.org = new ObjectId130(value.org);
+        value.org = new ObjectId131(value.org);
       } catch (error) {
         throw new BadRequestError209("Invalid org ID format.");
       }
     }
     if (value.createdBy) {
       try {
-        value.createdBy = new ObjectId130(value.createdBy);
+        value.createdBy = new ObjectId131(value.createdBy);
       } catch (error) {
         throw new BadRequestError209("Invalid created by ID format.");
       }
     }
-    this._id = value._id ?? new ObjectId130();
+    this._id = value._id ?? new ObjectId131();
     this.name = value.name ?? "";
     this.permissions = value.permissions ?? [];
     this.site = value.site ?? "";
@@ -55664,7 +55926,7 @@ function useRoleControllerV2() {
 
 // src/models/post-preloved.model.ts
 import Joi133 from "joi";
-import { ObjectId as ObjectId131 } from "mongodb";
+import { ObjectId as ObjectId132 } from "mongodb";
 var PostStatus = /* @__PURE__ */ ((PostStatus2) => {
   PostStatus2["PUBLISHED"] = "published";
   PostStatus2["RESERVED"] = "reserved";
@@ -55720,28 +55982,28 @@ function MPost(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId131(value._id);
+      value._id = new ObjectId132(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId131(value.site);
+      value.site = new ObjectId132(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new ObjectId131(value.createdBy);
+      value.createdBy = new ObjectId132(value.createdBy);
     } catch {
       throw new Error("Invalid createdBy ID.");
     }
   }
   if (value.reserverId && typeof value.reserverId === "string") {
     try {
-      value.reserverId = new ObjectId131(value.reserverId);
+      value.reserverId = new ObjectId132(value.reserverId);
     } catch {
       throw new Error("Invalid reserver ID.");
     }
@@ -55750,7 +56012,7 @@ function MPost(value) {
     value.attachments = value.attachments.map((id) => {
       if (typeof id === "string") {
         try {
-          return new ObjectId131(id);
+          return new ObjectId132(id);
         } catch {
           throw new Error("Invalid attachment ID.");
         }
@@ -55760,20 +56022,20 @@ function MPost(value) {
   }
   if (value.category && typeof value.category === "string") {
     try {
-      value.category = new ObjectId131(value.category);
+      value.category = new ObjectId132(value.category);
     } catch {
       throw new Error("Invalid category ID.");
     }
   }
   if (value.subcategory && typeof value.subcategory === "string") {
     try {
-      value.subcategory = new ObjectId131(value.subcategory);
+      value.subcategory = new ObjectId132(value.subcategory);
     } catch {
       throw new Error("Invalid subcategory ID.");
     }
   }
   return {
-    _id: value._id ?? new ObjectId131(),
+    _id: value._id ?? new ObjectId132(),
     title: value.title ?? "",
     description: value.description ?? "",
     attachments: value.attachments ?? [],
@@ -55799,7 +56061,7 @@ import {
   paginate as paginate60,
   useAtlas as useAtlas118
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId132 } from "mongodb";
+import { ObjectId as ObjectId133 } from "mongodb";
 function usePostPrelovedRepo() {
   const db = useAtlas118.getDb();
   if (!db) {
@@ -55863,7 +56125,7 @@ function usePostPrelovedRepo() {
   }
   async function getById(_id) {
     try {
-      _id = new ObjectId132(_id);
+      _id = new ObjectId133(_id);
     } catch {
       throw new BadRequestError212("Invalid post ID format.");
     }
@@ -55896,7 +56158,7 @@ function usePostPrelovedRepo() {
     page = page > 0 ? page - 1 : 0;
     if (site) {
       try {
-        site = new ObjectId132(site);
+        site = new ObjectId133(site);
       } catch {
         throw new BadRequestError212("Invalid site ID format.");
       }
@@ -55905,14 +56167,14 @@ function usePostPrelovedRepo() {
     let subcategoryIds = null;
     if (category && subcategory) {
       try {
-        categoryId = new ObjectId132(category);
+        categoryId = new ObjectId133(category);
       } catch {
         throw new BadRequestError212("Invalid category ID format.");
       }
       if (subcategory.length > 0) {
         subcategoryIds = subcategory.map((id) => {
           try {
-            return new ObjectId132(id);
+            return new ObjectId133(id);
           } catch {
             throw new BadRequestError212("Invalid subcategory ID format.");
           }
@@ -55937,7 +56199,7 @@ function usePostPrelovedRepo() {
     let userObjectId = null;
     if (userId) {
       try {
-        userObjectId = new ObjectId132(userId);
+        userObjectId = new ObjectId133(userId);
       } catch {
         throw new BadRequestError212("Invalid user ID format.");
       }
@@ -55986,7 +56248,7 @@ function usePostPrelovedRepo() {
   }
   async function updateById(_id, value, session) {
     try {
-      _id = new ObjectId132(_id);
+      _id = new ObjectId133(_id);
     } catch {
       throw new BadRequestError212("Invalid post ID format.");
     }
@@ -56007,7 +56269,7 @@ function usePostPrelovedRepo() {
   }
   async function deleteById(_id, session) {
     try {
-      _id = new ObjectId132(_id);
+      _id = new ObjectId133(_id);
     } catch {
       throw new BadRequestError212("Invalid post ID format.");
     }
@@ -56033,7 +56295,7 @@ function usePostPrelovedRepo() {
   }
   async function updateStatus(_id, status, session) {
     try {
-      _id = new ObjectId132(_id);
+      _id = new ObjectId133(_id);
     } catch {
       throw new BadRequestError212("Invalid post ID format.");
     }
@@ -56124,7 +56386,7 @@ function usePostPrelovedController() {
         Joi134.string().valid(...Object.values(PostStatus))
       ).optional().allow(null),
       category: Joi134.string().hex().length(24).optional().allow("", null),
-      subcategory: Joi134.alternatives().try(Joi134.array().items(Joi134.string())).optional().allow(null, ""),
+      subcategory: Joi134.array().items(Joi134.string()).single().optional().allow(null),
       userId: Joi134.string().optional().allow("", null)
     });
     const { error, value } = validation.validate(req.query, {
@@ -56245,7 +56507,7 @@ function usePostPrelovedController() {
 
 // src/models/post-favorite.model.ts
 import Joi135 from "joi";
-import { ObjectId as ObjectId133 } from "mongodb";
+import { ObjectId as ObjectId134 } from "mongodb";
 var schemaUpdatePostFavorite = Joi135.object({
   userId: Joi135.string().hex().length(24).required()
 });
@@ -56263,14 +56525,14 @@ function MPostFavorite(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId133(value._id);
+      value._id = new ObjectId134(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.postId && typeof value.postId === "string") {
     try {
-      value.postId = new ObjectId133(value.postId);
+      value.postId = new ObjectId134(value.postId);
     } catch {
       throw new Error("Invalid post ID.");
     }
@@ -56279,7 +56541,7 @@ function MPostFavorite(value) {
     value.userIds = value.userIds.map((id) => {
       if (typeof id === "string") {
         try {
-          return new ObjectId133(id);
+          return new ObjectId134(id);
         } catch {
           throw new Error("Invalid user ID.");
         }
@@ -56288,7 +56550,7 @@ function MPostFavorite(value) {
     });
   }
   return {
-    _id: value._id ?? new ObjectId133(),
+    _id: value._id ?? new ObjectId134(),
     postId: value.postId ?? "",
     userIds: value.userIds ?? [],
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
@@ -56303,7 +56565,7 @@ import {
   NotFoundError as NotFoundError58,
   useAtlas as useAtlas119
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId134 } from "mongodb";
+import { ObjectId as ObjectId135 } from "mongodb";
 function usePostFavoriteRepo() {
   const db = useAtlas119.getDb();
   if (!db) {
@@ -56325,7 +56587,7 @@ function usePostFavoriteRepo() {
   }
   async function getById(_id) {
     try {
-      _id = new ObjectId134(_id);
+      _id = new ObjectId135(_id);
     } catch {
       throw new BadRequestError214("Invalid favorite ID format.");
     }
@@ -56334,15 +56596,26 @@ function usePostFavoriteRepo() {
       throw new NotFoundError58("Favorite not found.");
     return result;
   }
+  async function getByPostId(postId) {
+    try {
+      postId = new ObjectId135(postId);
+    } catch {
+      throw new BadRequestError214("Invalid post ID format.");
+    }
+    const result = await collection.findOne({ postId });
+    if (!result)
+      throw new NotFoundError58("Favorite not found.");
+    return result;
+  }
   async function updateById(_id, userId, session) {
     try {
-      _id = new ObjectId134(_id);
+      _id = new ObjectId135(_id);
     } catch {
       throw new BadRequestError214("Invalid favorite ID format.");
     }
     let userObjectId;
     try {
-      userObjectId = new ObjectId134(userId);
+      userObjectId = new ObjectId135(userId);
     } catch {
       throw new BadRequestError214("Invalid user ID format.");
     }
@@ -56359,6 +56632,7 @@ function usePostFavoriteRepo() {
   return {
     addFavorite,
     getById,
+    getByPostId,
     updateById
   };
 }
@@ -56406,7 +56680,7 @@ import { BadRequestError as BadRequestError215, logger as logger189 } from "@736
 import Joi136 from "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
@@ -56447,6 +56721,26 @@ function usePostFavoriteController() {
       return;
     }
   }
+  async function getByPostId(req, res, next) {
+    const schema2 = Joi136.object({
+      postId: Joi136.string().hex().length(24).required()
+    });
+    const { error, value } = schema2.validate({ postId: req.params.postId });
+    if (error) {
+      logger189.log({ level: "error", message: error.message });
+      next(new BadRequestError215(error.message));
+      return;
+    }
+    try {
+      const data = await _getByPostId(value.postId);
+      res.status(200).json(data);
+      return;
+    } catch (error2) {
+      logger189.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   async function updateById(req, res, next) {
     const paramsSchema = Joi136.object({
       _id: Joi136.string().hex().length(24).required()
@@ -56476,13 +56770,14 @@ function usePostFavoriteController() {
   return {
     addFavorite,
     getById,
+    getByPostId,
     updateById
   };
 }
 
 // src/models/category-preloved.model.ts
 import Joi137 from "joi";
-import { ObjectId as ObjectId135 } from "mongodb";
+import { ObjectId as ObjectId136 } from "mongodb";
 var schemaCategoryPreloved = Joi137.object({
   name: Joi137.string().required(),
   createdBy: Joi137.string().hex().optional().allow("", null),
@@ -56499,14 +56794,14 @@ function MCategoryPreloved(value) {
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new ObjectId135(value.createdBy);
+      value.createdBy = new ObjectId136(value.createdBy);
     } catch {
       throw new Error("Invalid createdBy ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId135(value.site);
+      value.site = new ObjectId136(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
@@ -56527,7 +56822,7 @@ import {
   NotFoundError as NotFoundError59,
   useAtlas as useAtlas121
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId136 } from "mongodb";
+import { ObjectId as ObjectId137 } from "mongodb";
 function useCategoryPrelovedRepo() {
   const db = useAtlas121.getDb();
   if (!db) {
@@ -56541,7 +56836,7 @@ function useCategoryPrelovedRepo() {
   } = {}) {
     if (site) {
       try {
-        site = new ObjectId136(site);
+        site = new ObjectId137(site);
       } catch {
         throw new BadRequestError216("Invalid site ID format.");
       }
@@ -56560,7 +56855,7 @@ function useCategoryPrelovedRepo() {
   async function getById(_id) {
     let objectId2;
     try {
-      objectId2 = new ObjectId136(_id);
+      objectId2 = new ObjectId137(_id);
     } catch {
       throw new BadRequestError216("Invalid category-preloved ID format.");
     }
@@ -56660,7 +56955,7 @@ function useCategoryPrelovedController() {
 
 // src/models/subcategory-preloved.model.ts
 import Joi139 from "joi";
-import { ObjectId as ObjectId137 } from "mongodb";
+import { ObjectId as ObjectId138 } from "mongodb";
 var schemaSubcategoryPreloved = Joi139.object({
   name: Joi139.string().required(),
   createdBy: Joi139.string().hex().optional().allow("", null),
@@ -56679,21 +56974,21 @@ function MSubcategoryPreloved(value) {
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
-      value.createdBy = new ObjectId137(value.createdBy);
+      value.createdBy = new ObjectId138(value.createdBy);
     } catch {
       throw new Error("Invalid createdBy ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId137(value.site);
+      value.site = new ObjectId138(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.category_id && typeof value.category_id === "string") {
     try {
-      value.category_id = new ObjectId137(value.category_id);
+      value.category_id = new ObjectId138(value.category_id);
     } catch {
       throw new Error("Invalid category ID.");
     }
@@ -56715,7 +57010,7 @@ import {
   NotFoundError as NotFoundError60,
   useAtlas as useAtlas122
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId138 } from "mongodb";
+import { ObjectId as ObjectId139 } from "mongodb";
 function useSubcategoryPrelovedRepo() {
   const db = useAtlas122.getDb();
   if (!db) {
@@ -56730,14 +57025,14 @@ function useSubcategoryPrelovedRepo() {
   } = {}) {
     if (site) {
       try {
-        site = new ObjectId138(site);
+        site = new ObjectId139(site);
       } catch {
         throw new BadRequestError218("Invalid site ID format.");
       }
     }
     if (category_id) {
       try {
-        category_id = new ObjectId138(category_id);
+        category_id = new ObjectId139(category_id);
       } catch {
         throw new BadRequestError218("Invalid category ID format.");
       }
@@ -56756,7 +57051,7 @@ function useSubcategoryPrelovedRepo() {
   async function getById(_id) {
     let objectId2;
     try {
-      objectId2 = new ObjectId138(_id);
+      objectId2 = new ObjectId139(_id);
     } catch {
       throw new BadRequestError218("Invalid subcategory-preloved ID format.");
     }
@@ -56770,14 +57065,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 BadRequestError218("Subcategory already exists.");
+      throw error;
+    }
+  }
+  async function updateById(_id, value, session) {
+    let objectId2;
+    try {
+      objectId2 = new ObjectId139(_id);
+    } catch {
+      throw new BadRequestError218("Invalid subcategory ID format.");
+    }
+    if (value.category_id && typeof value.category_id === "string") {
+      try {
+        value.category_id = new ObjectId139(value.category_id);
+      } catch {
+        throw new BadRequestError218("Invalid category ID format.");
+      }
+    }
+    if (value.site && typeof value.site === "string") {
+      try {
+        value.site = new ObjectId139(value.site);
+      } catch {
+        throw new BadRequestError218("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 InternalServerError78("Unable to update subcategory.");
+    return res;
+  }
+  async function deleteById(_id, session) {
+    let objectId2;
+    try {
+      objectId2 = new ObjectId139(_id);
+    } catch {
+      throw new BadRequestError218("Invalid subcategory ID format.");
+    }
+    const res = await collection.deleteOne({ _id: objectId2 }, { session });
+    if (res.deletedCount === 0)
+      throw new InternalServerError78("Unable to delete subcategory.");
+    return res.deletedCount;
+  }
+  return { getAll, getById, addSubcategory, updateById, deleteById };
 }
 
 // src/controllers/subcategory-preloved.controller.ts
 import { BadRequestError as BadRequestError219, logger as logger191 } from "@7365admin1/node-server-utils";
 import Joi140 from "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 = Joi140.object({
       search: Joi140.string().optional().allow("", null),
@@ -56821,12 +57177,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(", ");
+      logger191.log({ level: "error", message: messages });
+      next(new BadRequestError219(messages));
+      return;
+    }
+    try {
+      const data = await _addSubcategory(value);
+      res.status(201).json(data);
+    } catch (error2) {
+      logger191.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
+  async function updateById(req, res, next) {
+    const paramsSchema = Joi140.object({
+      _id: Joi140.string().hex().length(24).required()
+    });
+    const { error: paramsError, value: paramsValue } = paramsSchema.validate({
+      _id: req.params.id
+    });
+    if (paramsError) {
+      next(new BadRequestError219(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(", ");
+      logger191.log({ level: "error", message: messages });
+      next(new BadRequestError219(messages));
+      return;
+    }
+    try {
+      const data = await _updateById(paramsValue._id, bodyValue);
+      res.status(200).json(data);
+    } catch (error) {
+      logger191.log({ level: "error", message: error.message });
+      next(error);
+    }
+  }
+  async function deleteById(req, res, next) {
+    const schema2 = Joi140.object({
+      _id: Joi140.string().hex().length(24).required()
+    });
+    const { error, value } = schema2.validate({ _id: req.params.id });
+    if (error) {
+      next(new BadRequestError219(error.message));
+      return;
+    }
+    try {
+      const data = await _deleteById(value._id);
+      res.status(200).json(data);
+    } catch (error2) {
+      logger191.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
+  return { getAll, getById, addSubcategory, updateById, deleteById };
 }
 
 // src/models/online-forms-v2.model.ts
 import Joi141 from "joi";
-import { ObjectId as ObjectId139 } from "mongodb";
+import { ObjectId as ObjectId140 } from "mongodb";
 var FormEntryStatus = /* @__PURE__ */ ((FormEntryStatus2) => {
   FormEntryStatus2["ACTIVE"] = "active";
   FormEntryStatus2["INACTIVE"] = "inactive";
@@ -56881,21 +57298,21 @@ function MFormEntry(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId139(value._id);
+      value._id = new ObjectId140(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new ObjectId139(value.org);
+      value.org = new ObjectId140(value.org);
     } catch {
       throw new Error("Invalid org ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId139(value.site);
+      value.site = new ObjectId140(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
@@ -56918,9 +57335,13 @@ import {
   BadRequestError as BadRequestError220,
   InternalServerError as InternalServerError79,
   logger as logger192,
+  makeCacheKey as makeCacheKey66,
+  NotFoundError as NotFoundError61,
+  paginate as paginate62,
   useAtlas as useAtlas123,
   useCache as useCache70
 } from "@7365admin1/node-server-utils";
+import { ObjectId as ObjectId141 } from "mongodb";
 var online_forms_namespace_collection = "online-forms";
 function useFormEntryRepo() {
   const db = useAtlas123.getDb();
@@ -56965,18 +57386,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 ObjectId141(site) },
+      ...search && { search: [{ name: { $regex: search, $options: "i" } }] }
+    };
+    const cacheKey = makeCacheKey66(
+      online_forms_namespace_collection,
+      cacheOptions
+    );
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger192.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 = paginate62(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        logger192.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger192.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function getFormEntryById(_id) {
+    const cacheKey = makeCacheKey66(online_forms_namespace_collection, { _id });
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger192.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      _id = new ObjectId141(_id);
+    } catch (error) {
+      throw new BadRequestError220("Invalid online form ID format.");
+    }
+    const query = { _id, status: { $ne: "deleted" } };
+    try {
+      const [data] = await collection.aggregate([{ $match: query }]).toArray();
+      if (!data) {
+        throw new NotFoundError61("Document not found.");
+      }
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        logger192.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger192.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
 import { BadRequestError as BadRequestError221, logger as logger193 } from "@7365admin1/node-server-utils";
+import Joi142 from "joi";
 import ExcelJS3 from "exceljs";
 import fs5 from "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());
   }
@@ -57038,8 +57546,59 @@ function useFormEntryController() {
       next(error);
     }
   }
+  async function getAll(req, res, next) {
+    try {
+      const schema2 = Joi142.object({
+        search: Joi142.string().optional().allow("", null),
+        page: Joi142.number().integer().min(1).allow("", null).default(1),
+        limit: Joi142.number().integer().min(1).max(100).allow("", null).default(10),
+        status: Joi142.string().optional().allow(null, ""),
+        org: Joi142.string().hex().optional().allow("", null),
+        site: Joi142.string().hex().optional().allow("", null)
+      });
+      const { error, value } = schema2.validate(req.query);
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        logger193.log({ level: "error", message: messages });
+        next(new BadRequestError221(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) {
+      logger193.log({ level: "error", message: error.message });
+      next(error);
+      return;
+    }
+  }
+  async function getFormEntryById(req, res, next) {
+    try {
+      const schema2 = Joi142.object({
+        _id: Joi142.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(", ");
+        logger193.log({ level: "error", message: messages });
+        next(new BadRequestError221(messages));
+        return;
+      }
+      const { _id } = value;
+      const data = await _getFormEntryById(_id);
+      res.json(data);
+      return;
+    } catch (error) {
+      logger193.log({ level: "error", message: error.message });
+      next(error);
+      return;
+    }
+  }
   return {
-    uploadFormEntrys
+    uploadFormEntrys,
+    getAll,
+    getFormEntryById
   };
 }
 
@@ -57083,7 +57642,7 @@ function useBuildingLevelService() {
 
 // src/controllers/building-level.controller.ts
 import { BadRequestError as BadRequestError222, logger as logger194 } from "@7365admin1/node-server-utils";
-import Joi142 from "joi";
+import Joi143 from "joi";
 function useBuildingLevelController() {
   const { add: _add, updateLevelById: _updateLevelById } = useBuildingLevelService();
   const {
@@ -57110,12 +57669,12 @@ function useBuildingLevelController() {
   }
   async function getAll(req, res, next) {
     try {
-      const validation = Joi142.object({
-        page: Joi142.number().min(1).optional().default(1),
-        limit: Joi142.number().min(1).optional().default(20),
-        search: Joi142.string().optional().allow("", null),
-        site: Joi142.string().hex().length(24).optional().allow("", null),
-        status: Joi142.string().valid(...Object.values(BuildingLevelStatus)).default("active" /* ACTIVE */)
+      const validation = Joi143.object({
+        page: Joi143.number().min(1).optional().default(1),
+        limit: Joi143.number().min(1).optional().default(20),
+        search: Joi143.string().optional().allow("", null),
+        site: Joi143.string().hex().length(24).optional().allow("", null),
+        status: Joi143.string().valid(...Object.values(BuildingLevelStatus)).default("active" /* ACTIVE */)
       });
       const { error, value } = validation.validate(req.query, {
         abortEarly: false
@@ -57142,8 +57701,8 @@ function useBuildingLevelController() {
   }
   async function getById(req, res, next) {
     try {
-      const schema2 = Joi142.object({
-        id: Joi142.string().hex().length(24).required()
+      const schema2 = Joi143.object({
+        id: Joi143.string().hex().length(24).required()
       });
       const { error, value } = schema2.validate({ id: req.params.id });
       if (error) {
@@ -57181,8 +57740,8 @@ function useBuildingLevelController() {
   }
   async function deleteById(req, res, next) {
     try {
-      const schema2 = Joi142.object({
-        id: Joi142.string().hex().required()
+      const schema2 = Joi143.object({
+        id: Joi143.string().hex().required()
       });
       const { error, value } = schema2.validate({ id: req.params.id });
       if (error) {