@7365admin1/core 2.33.0 → 2.35.0

package/dist/index.mjs

@@ -148,7 +148,8 @@ import {
   NotFoundError as NotFoundError4,
   AppError,
   useCache as useCache5,
-  makeCacheKey as makeCacheKey5
+  makeCacheKey as makeCacheKey5,
+  toObjectId
 } from "@7365admin1/node-server-utils";
 
 // src/repositories/feedback.repo.ts
@@ -2210,20 +2211,9 @@ function useUserRepo() {
   }
   async function getUserByEmail(email) {
     try {
-      const cacheKey = makeCacheKey5(namespace_collection, { email });
-      const cachedData = await getCache(cacheKey);
-      if (cachedData) {
-        logger7.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
-      }
       const data = await collection.findOne({
         email: { $regex: `^${email}$`, $options: "i" }
       });
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger7.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger7.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error) {
       throw new InternalServerError5("Failed to get user by email.");
@@ -2530,6 +2520,39 @@ function useUserRepo() {
       throw new InternalServerError5("Failed to update user password.");
     }
   }
+  async function resetPassword({
+    _id,
+    password,
+    sid
+  }, session) {
+    try {
+      _id = new ObjectId9(_id);
+    } catch (error) {
+      throw new BadRequestError9("Invalid user ID format.");
+    }
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        { $set: { password, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      const cacheKey = makeCacheKey5(namespace_collection, { _id });
+      delCache(cacheKey).then(() => {
+        logger7.info(`Cache deleted for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger7.error(`Failed to delete cache for key: ${cacheKey}`, err);
+      });
+      const authCacheKey = `sid:${sid}`;
+      delCache(authCacheKey).then(() => {
+        logger7.info(`Cache deleted for key: ${authCacheKey}`);
+      }).catch((err) => {
+        logger7.error(`Failed to delete cache for key: ${authCacheKey}`, err);
+      });
+      return result;
+    } catch (error) {
+      throw new InternalServerError5("Failed to update user password.");
+    }
+  }
   async function updateBirthday({
     _id,
     month,
@@ -2622,6 +2645,19 @@ function useUserRepo() {
       throw new InternalServerError5(`Failed to update user ${field}.`);
     }
   }
+  async function updateUserSIDById(id, sid, session) {
+    const _id = toObjectId(id);
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        { $set: { sid, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      return result;
+    } catch (error) {
+      throw new InternalServerError5("Failed to update user.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -2637,7 +2673,9 @@ function useUserRepo() {
     updateBirthday,
     updateUserFieldById,
     updateDefaultOrgByEmail,
-    getUserByEmailStatus
+    getUserByEmailStatus,
+    updateUserSIDById,
+    resetPassword
   };
 }
 
@@ -3482,7 +3520,11 @@ function useMemberRepo() {
 
 // src/services/auth.service.ts
 function useAuthService() {
-  const { getUserByEmail, getUserById: _getUserById } = useUserRepo();
+  const {
+    getUserByEmail,
+    getUserById: _getUserById,
+    updateUserSIDById: _updateUserSIDById
+  } = useUserRepo();
   const { getByToken, deleteByToken } = useSessionRepo();
   const expiresIn = "15m";
   const { setCache, delCache } = useCache7("sessions");
@@ -3520,7 +3562,9 @@ function useAuthService() {
       }
       const sid = uuidv4();
       const cacheKey = `sid:${sid}`;
-      setCache(cacheKey, user, 14400).then(() => {
+      await _updateUserSIDById(user._id, sid);
+      const updatedUser = await _getUserById(user._id);
+      setCache(cacheKey, updatedUser, 14400).then(() => {
         console.log("Session ID cached successfully");
       }).catch((error) => {
         console.error("Error caching session ID:", error);
@@ -4351,7 +4395,7 @@ import {
   logger as logger12,
   makeCacheKey as makeCacheKey9,
   AppError as AppError4,
-  toObjectId as toObjectId2
+  toObjectId as toObjectId3
 } from "@7365admin1/node-server-utils";
 import Joi10 from "joi";
 function useSiteRepo() {
@@ -4737,7 +4781,7 @@ function useSiteRepo() {
     }
   }
   async function updateSiteById(id, payload, session) {
-    const _id = toObjectId2(id);
+    const _id = toObjectId3(id);
     payload.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
       const res = await collection.updateOne(
@@ -5547,6 +5591,7 @@ function useRoleRepo() {
       }).catch((err) => {
         logger14.error(`Failed to clear cache for namespace: dashboard`, err);
       });
+      return "Successfully deleted role permission.";
     } catch (error) {
       throw new InternalServerError12("Failed to delete role.");
     }
@@ -5750,7 +5795,8 @@ function useUserService() {
     getUserById,
     getUserByEmail,
     updatePassword,
-    updateUserFieldById: _updateUserFieldById
+    updateUserFieldById: _updateUserFieldById,
+    resetPassword: _resetPassword
   } = useUserRepo();
   const { getRoleByName, addRole } = useRoleRepo();
   const { add: addMember } = useMemberRepo();
@@ -5926,8 +5972,12 @@ function useUserService() {
         throw new InternalServerError14("Invalid user ID.");
       }
       await updateStatusById(id, "complete", session);
-      await updatePassword(
-        { _id: user._id.toString(), password: hashedPassword },
+      await _resetPassword(
+        {
+          _id: user._id.toString(),
+          password: hashedPassword,
+          sid: user.sid
+        },
         session
       );
       await session?.commitTransaction();
@@ -8651,7 +8701,7 @@ import {
 import { z } from "zod";
 import { ObjectId as ObjectId26 } from "mongodb";
 import { BadRequestError as BadRequestError39 } from "@7365admin1/node-server-utils";
-function toObjectId3(value) {
+function toObjectId4(value) {
   if (typeof value === "string") {
     if (!/^[a-fA-F0-9]{24}$/.test(value)) {
       throw new BadRequestError39(`Invalid ObjectId format: ${value}`);
@@ -8703,7 +8753,7 @@ var TInvoice = z.object({
       message: "Invalid ObjectId: Must be a 24-character hex string."
     }),
     z.instanceof(ObjectId26, { message: "Invalid ObjectId instance." })
-  ]).optional().transform((val) => val ? toObjectId3(val) : void 0),
+  ]).optional().transform((val) => val ? toObjectId4(val) : void 0),
   invoiceNumber: z.string({ required_error: "Invoice number is required." }),
   type: TInvoiceType.default("other"),
   amount: z.number().min(0, { message: "Invoice amount must be at least 0." }),
@@ -12456,7 +12506,7 @@ import {
   logger as logger46,
   makeCacheKey as makeCacheKey21,
   paginate as paginate16,
-  toObjectId as toObjectId5,
+  toObjectId as toObjectId6,
   useAtlas as useAtlas29,
   useCache as useCache22
 } from "@7365admin1/node-server-utils";
@@ -12684,7 +12734,7 @@ function useSiteCameraRepo() {
     });
   }
   async function getBySite(site, options = {}) {
-    const _site = toObjectId5(site);
+    const _site = toObjectId6(site);
     const cacheKeyOptions = {
       site,
       tag: "get-by-site",
@@ -12918,7 +12968,7 @@ import {
   BadRequestError as BadRequestError66,
   InternalServerError as InternalServerError23,
   paginate as paginate17,
-  toObjectId as toObjectId6,
+  toObjectId as toObjectId7,
   useAtlas as useAtlas30
 } from "@7365admin1/node-server-utils";
 
@@ -13560,7 +13610,7 @@ function useVisitorTransactionRepo() {
     }
   }
   async function getVisitorTransactionById(id) {
-    const _id = toObjectId6(id);
+    const _id = toObjectId7(id);
     try {
       const basePipeline = [{ $match: { _id } }];
       const [result] = await collection.aggregate([
@@ -13602,7 +13652,7 @@ function useVisitorTransactionRepo() {
     }
   }
   async function getOpenByPlateNumber(plateNumber, site) {
-    const _site = typeof site === "string" ? toObjectId6(site) : site;
+    const _site = typeof site === "string" ? toObjectId7(site) : site;
     const query = {
       plateNumber,
       site: _site,
@@ -13686,7 +13736,7 @@ function useVisitorTransactionRepo() {
     }
   }
   async function getExpiredCheckedOutTransactionsBySite(siteId) {
-    const site = toObjectId6(siteId);
+    const site = toObjectId7(siteId);
     try {
       const now = (/* @__PURE__ */ new Date()).toISOString();
       const expiredTransactions = await collection.find({
@@ -13935,7 +13985,7 @@ import {
   logger as logger49,
   NotFoundError as NotFoundError17,
   paginate as paginate18,
-  toObjectId as toObjectId7,
+  toObjectId as toObjectId8,
   useAtlas as useAtlas31
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId42 } from "mongodb";
@@ -14534,7 +14584,7 @@ function useVehicleRepo() {
     page = page > 0 ? page - 1 : 0;
     const skip = page * limit;
     try {
-      const unit = toObjectId7(unitId);
+      const unit = toObjectId8(unitId);
       const query = {
         unit
       };
@@ -14603,7 +14653,7 @@ import {
   useAtlas as useAtlas32,
   useCache as useCache25,
   AppError as AppError10,
-  toObjectId as toObjectId8
+  toObjectId as toObjectId9
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId43 } from "mongodb";
 var site_people_namespace_collection = "site.people";
@@ -15084,7 +15134,7 @@ function usePersonRepo() {
   async function pushVehicleById(id, plate, session) {
     const { plateNumber, recNo } = plate;
     const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const _id = toObjectId8(id);
+    const _id = toObjectId9(id);
     try {
       const updateExisting = await collection.updateOne(
         {
@@ -15142,7 +15192,7 @@ function usePersonRepo() {
     }
   }
   async function getByUserId(userId) {
-    const user = toObjectId8(userId);
+    const user = toObjectId9(userId);
     const cacheKey = makeCacheKey24(site_people_namespace_collection, {
       user: userId
     });
@@ -17414,7 +17464,7 @@ import {
   logger as logger60,
   makeCacheKey as makeCacheKey26,
   paginate as paginate21,
-  toObjectId as toObjectId10,
+  toObjectId as toObjectId11,
   useAtlas as useAtlas37,
   useCache as useCache28
 } from "@7365admin1/node-server-utils";
@@ -17579,8 +17629,8 @@ function useBuildingUnitRepo() {
     const query = {
       status,
       ...search && { $text: { $search: search } },
-      ...site && { site: toObjectId10(site) },
-      ...building && { building: toObjectId10(building) }
+      ...site && { site: toObjectId11(site) },
+      ...building && { building: toObjectId11(building) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheParams = {
@@ -19284,16 +19334,30 @@ function useCustomerSiteRepo() {
       return cachedData;
     }
     try {
+      const distinctPipeline = [
+        { $match: query },
+        { $sort: sort },
+        { $group: { _id: { name: "$name", site: "$site" }, doc: { $first: "$$ROOT" } } },
+        { $replaceRoot: { newRoot: "$doc" } },
+        { $sort: sort }
+      ];
       const items = await collection.aggregate(
         [
-          { $match: query },
-          { $sort: sort },
+          ...distinctPipeline,
           { $skip: page * limit },
           { $limit: limit }
         ],
         { session }
       ).toArray();
-      const length = await collection.countDocuments(query, { session });
+      const countResult = await collection.aggregate(
+        [
+          { $match: query },
+          { $group: { _id: { name: "$name", site: "$site" } } },
+          { $count: "total" }
+        ],
+        { session }
+      ).toArray();
+      const length = countResult[0]?.total ?? 0;
       const data = paginate22(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
         logger67.info(`Cache set for key: ${cacheKey}`);
@@ -21410,7 +21474,8 @@ var KeyRepo = class {
             location: 1,
             prefix: 1,
             keyNo: 1,
-            parentId: 1
+            parentId: 1,
+            status: 1
           }
         }
       ]).toArray();
@@ -21653,7 +21718,8 @@ function useVisitorTransactionService() {
     add: _add,
     updateById: _updateVisitorTansactionById,
     getExpiredCheckedOutTransactionsBySite: _getExpiredCheckedOutTransactionsBySite,
-    updateManyDahuaSyncStatus: _updateManyDahuaSyncStatus
+    updateManyDahuaSyncStatus: _updateManyDahuaSyncStatus,
+    getVisitorTransactionById: _getVisitorTransactionById
   } = useVisitorTransactionRepo();
   const { getById } = useBuildingUnitRepo();
   const {
@@ -21672,6 +21738,70 @@ function useVisitorTransactionService() {
   const { getAllSites: _getAllSites } = useSiteRepo();
   const { getByUserId: _getByUserId } = usePersonRepo();
   const { add: addVehicle } = useVehicleRepo();
+  function extractKeyId(item) {
+    if (!item)
+      return null;
+    if (typeof item === "string") {
+      return ObjectId58.isValid(item) ? item : null;
+    }
+    if (typeof item === "object" && item !== null) {
+      if ("keyId" in item) {
+        const keyId = String(item.keyId);
+        return ObjectId58.isValid(keyId) ? keyId : null;
+      }
+      const value = String(item);
+      return ObjectId58.isValid(value) ? value : null;
+    }
+    return null;
+  }
+  function normalizeKeyRefs(items) {
+    if (!Array.isArray(items))
+      return [];
+    const seen = /* @__PURE__ */ new Set();
+    const normalized = [];
+    for (const item of items) {
+      const keyId = extractKeyId(item);
+      if (!keyId || seen.has(keyId))
+        continue;
+      seen.add(keyId);
+      normalized.push({ keyId: new ObjectId58(keyId) });
+    }
+    return normalized;
+  }
+  async function syncTransactionKeys({
+    current,
+    incoming,
+    site,
+    session
+  }) {
+    const currentIds = current.map((item) => item.keyId.toString());
+    const incomingIds = incoming.map((item) => item.keyId.toString());
+    const currentSet = new Set(currentIds);
+    const incomingSet = new Set(incomingIds);
+    const removedIds = currentIds.filter((id) => !incomingSet.has(id));
+    const addedIds = incomingIds.filter((id) => !currentSet.has(id));
+    for (const keyId of removedIds) {
+      const existingKey = await KeyRepo.getById(keyId);
+      if (!existingKey)
+        continue;
+      if (existingKey.status === "In Use" /* IN_USE */) {
+        await KeyRepo.updateKeyById(
+          keyId,
+          { status: "Available" /* AVAILABLE */ },
+          site,
+          session
+        );
+      }
+    }
+    for (const keyId of addedIds) {
+      await KeyRepo.updateKeyById(
+        keyId,
+        { status: "In Use" /* IN_USE */ },
+        site,
+        session
+      );
+    }
+  }
   async function add(value) {
     const session = useAtlas48.getClient()?.startSession();
     const allowedPersonTypes = [
@@ -21916,7 +22046,7 @@ function useVisitorTransactionService() {
       session?.endSession();
     }
   }
-  async function updateById(id, value) {
+  async function updateVisitorTransactionById(id, value) {
     const session = useAtlas48.getClient()?.startSession();
     session?.startTransaction();
     try {
@@ -22092,18 +22222,70 @@ function useVisitorTransactionService() {
       await session?.commitTransaction();
       return result;
     } catch (error) {
-      logger77.error("Error in people service invite visitor:", error);
+      logger77.error("Error in visitor transaction invite visitor:", error);
       await session.abortTransaction();
       throw error;
     } finally {
       session?.endSession();
     }
   }
+  async function changeVisitorTransactionKeysById(id, visitorPass, passKeys) {
+    const session = useAtlas48.getClient()?.startSession();
+    if (!session) {
+      throw new Error(
+        "Unable to start session for visitor transaction service."
+      );
+    }
+    try {
+      session.startTransaction();
+      const visitorTransaction = await _getVisitorTransactionById(id);
+      if (!visitorTransaction) {
+        throw new Error("Visitor transaction not found.");
+      }
+      const updatePayload = {};
+      if (visitorPass !== void 0) {
+        const currentVisitorPass = normalizeKeyRefs(
+          visitorTransaction.visitorPass
+        );
+        const incomingVisitorPass = normalizeKeyRefs(visitorPass);
+        await syncTransactionKeys({
+          current: currentVisitorPass,
+          incoming: incomingVisitorPass,
+          site: visitorTransaction.site,
+          session
+        });
+        updatePayload.visitorPass = incomingVisitorPass;
+      }
+      if (passKeys !== void 0) {
+        const currentPassKeys = normalizeKeyRefs(visitorTransaction.passKeys);
+        const incomingPassKeys = normalizeKeyRefs(passKeys);
+        await syncTransactionKeys({
+          current: currentPassKeys,
+          incoming: incomingPassKeys,
+          site: visitorTransaction.site,
+          session
+        });
+        updatePayload.passKeys = incomingPassKeys;
+      }
+      if (Object.keys(updatePayload).length > 0) {
+        await _updateVisitorTansactionById(id, updatePayload, session);
+      }
+      await session.commitTransaction();
+      return "Successfully changed visitor transaction keys.";
+    } catch (error) {
+      await session.abortTransaction();
+      logger77.error("Error in visitor transaction change keys by id:", error);
+      throw error;
+    } finally {
+      session.endSession();
+    }
+  }
   return {
     add,
-    updateById,
+    updateVisitorTransactionById,
     processTransactionDahuaStatus,
-    inviteVisitor
+    inviteVisitor,
+    changeVisitorTransactionKeysById
   };
 }
 
@@ -22113,8 +22295,9 @@ import { BadRequestError as BadRequestError97, logger as logger78 } from "@7365a
 function useVisitorTransactionController() {
   const {
     add: _add,
-    updateById: _updateVisitorTansactionById,
-    inviteVisitor: _inviteVisitor
+    updateVisitorTransactionById: _updateVisitorTransactionById,
+    inviteVisitor: _inviteVisitor,
+    changeVisitorTransactionKeysById: _changeVisitorTransactionKeysById
   } = useVisitorTransactionService();
   const {
     getAll: _getAll,
@@ -22256,7 +22439,7 @@ function useVisitorTransactionController() {
       return;
     }
     try {
-      await _updateVisitorTansactionById(_id, req.body);
+      await _updateVisitorTransactionById(_id, req.body);
       res.status(200).json({ message: "Successfully updated visitor transaction." });
       return;
     } catch (error2) {
@@ -22310,8 +22493,31 @@ function useVisitorTransactionController() {
       next(new BadRequestError97(messages));
       return;
     }
-    const { expectedCheckIn, arrivalTime, duration, name, contact, email, plateNumber, isOvernightParking, numberOfPassengers, purpose, inviterUserId } = value;
-    const rest = { expectedCheckIn, arrivalTime, duration, name, contact, email, plateNumber, isOvernightParking, numberOfPassengers, purpose };
+    const {
+      expectedCheckIn,
+      arrivalTime,
+      duration,
+      name,
+      contact,
+      email,
+      plateNumber,
+      isOvernightParking,
+      numberOfPassengers,
+      purpose,
+      inviterUserId
+    } = value;
+    const rest = {
+      expectedCheckIn,
+      arrivalTime,
+      duration,
+      name,
+      contact,
+      email,
+      plateNumber,
+      isOvernightParking,
+      numberOfPassengers,
+      purpose
+    };
     try {
       const result = await _inviteVisitor(rest, inviterUserId);
       res.status(200).json({ insertedId: result });
@@ -22322,13 +22528,61 @@ function useVisitorTransactionController() {
       return;
     }
   }
+  async function changeVisitorTransactionKeysById(req, res, next) {
+    const idValidation = Joi55.string().hex().length(24).required();
+    const bodyValidation = Joi55.object({
+      visitorPass: Joi55.array().items(
+        Joi55.object({
+          keyId: Joi55.string().hex().length(24).required()
+        })
+      ).optional(),
+      passKeys: Joi55.array().items(
+        Joi55.object({
+          keyId: Joi55.string().hex().length(24).required()
+        })
+      ).optional()
+    }).or("visitorPass", "passKeys");
+    const _id = req.params.id;
+    const { error: idError } = idValidation.validate(_id);
+    if (idError) {
+      logger78.log({ level: "error", message: idError.message });
+      next(new BadRequestError97(idError.message));
+      return;
+    }
+    const { error, value } = bodyValidation.validate(req.body, {
+      abortEarly: false
+    });
+    if (error) {
+      const message = error.details.map((d) => d.message).join(", ");
+      logger78.log({ level: "error", message });
+      next(new BadRequestError97(message));
+      return;
+    }
+    try {
+      const { visitorPass, passKeys } = value;
+      const result = await _changeVisitorTransactionKeysById(
+        _id,
+        visitorPass,
+        passKeys
+      );
+      res.status(200).json({
+        message: result || "Successfully changed visitor transaction keys."
+      });
+      return;
+    } catch (error2) {
+      logger78.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
     updateVisitorTansactionById,
     deleteVisitorTransaction,
     inviteVisitor,
-    getVisitorTransactionById
+    getVisitorTransactionById,
+    changeVisitorTransactionKeysById
   };
 }
 
@@ -27010,7 +27264,7 @@ import {
   makeCacheKey as makeCacheKey37,
   NotFoundError as NotFoundError27,
   paginate as paginate31,
-  toObjectId as toObjectId11,
+  toObjectId as toObjectId12,
   useAtlas as useAtlas61,
   useCache as useCache39
 } from "@7365admin1/node-server-utils";
@@ -27066,7 +27320,7 @@ function useSiteFacilityBookingRepo() {
     page = page > 0 ? page - 1 : 0;
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const skip = page * limit;
-    const siteId = toObjectId11(site);
+    const siteId = toObjectId12(site);
     const query = {
       site: siteId,
       status,
@@ -27112,7 +27366,7 @@ function useSiteFacilityBookingRepo() {
     }
   }
   async function getSiteFacilityBookingById(id, session) {
-    const _id = toObjectId11(id);
+    const _id = toObjectId12(id);
     const cacheKey = makeCacheKey37(facility_bookings_namespace_collection, {
       id
     });
@@ -27138,17 +27392,17 @@ function useSiteFacilityBookingRepo() {
   }
   async function updateSiteFacilityBookingById(id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const _id = toObjectId11(id);
+    const _id = toObjectId12(id);
     if (value.site)
-      value.site = typeof value.site === "string" ? toObjectId11(value.site) : value.site;
+      value.site = typeof value.site === "string" ? toObjectId12(value.site) : value.site;
     if (value.user)
-      value.user = typeof value.user === "string" ? toObjectId11(value.user) : value.user;
+      value.user = typeof value.user === "string" ? toObjectId12(value.user) : value.user;
     if (value.date)
       value.date = value.date ? new Date(value.date).toISOString() : value.date;
     if (value.approvedBy)
-      value.approvedBy = typeof value.approvedBy === "string" ? toObjectId11(value.approvedBy) : value.approvedBy;
+      value.approvedBy = typeof value.approvedBy === "string" ? toObjectId12(value.approvedBy) : value.approvedBy;
     if (value.createdBy)
-      value.createdBy = typeof value.createdBy === "string" ? toObjectId11(value.createdBy) : value.createdBy;
+      value.createdBy = typeof value.createdBy === "string" ? toObjectId12(value.createdBy) : value.createdBy;
     try {
       const res = await collection.updateOne(
         { _id },
@@ -35431,7 +35685,7 @@ import {
   makeCacheKey as makeCacheKey46,
   NotFoundError as NotFoundError37,
   paginate as paginate40,
-  toObjectId as toObjectId12,
+  toObjectId as toObjectId13,
   useAtlas as useAtlas78,
   useCache as useCache48
 } from "@7365admin1/node-server-utils";
@@ -35506,7 +35760,7 @@ function useOccurrenceBookRepo() {
     status = ""
   }, session) {
     page = page > 0 && !date ? page - 1 : 0;
-    const _site = toObjectId12(site);
+    const _site = toObjectId13(site);
     const query = {
       site: _site,
       ...status && { status },
@@ -36525,6 +36779,10 @@ var schemaSOABillingItem = Joi92.object({
   taxPercentage: Joi92.number().optional().allow(null),
   taxAmount: Joi92.number().optional().allow(null)
 });
+var schemaApprovedBy = Joi92.object({
+  _id: Joi92.string().hex().optional().allow(null, ""),
+  name: Joi92.string().optional().allow(null, "")
+});
 var schemaStatementOfAccount = Joi92.object({
   _id: Joi92.string().hex().optional(),
   site: Joi92.string().hex().required(),
@@ -36538,6 +36796,7 @@ var schemaStatementOfAccount = Joi92.object({
   category: Joi92.string().optional().allow(null, ""),
   status: Joi92.string().valid("pending", "approved", "rejected", "deleted").optional().allow(null, ""),
   billing: Joi92.array().items(schemaSOABillingItem).optional().allow(null, ""),
+  approvedBy: schemaApprovedBy.optional().allow(null, ""),
   createdBy: Joi92.string().hex().required(),
   createdByName: Joi92.string().optional().allow(null, ""),
   createdAt: Joi92.date().optional(),
@@ -36557,6 +36816,7 @@ var schemaUpdateStatementOfAccount = Joi92.object({
   category: Joi92.string().optional().allow(null, ""),
   status: Joi92.string().valid("pending", "approved", "rejected", "deleted").optional().allow(null, ""),
   billing: Joi92.array().items(schemaSOABillingItem).optional().allow(null, ""),
+  approvedBy: schemaApprovedBy.optional().allow(null, ""),
   createdBy: Joi92.string().optional().allow(null, ""),
   createdByName: Joi92.string().optional().allow(null, "")
 });
@@ -36621,6 +36881,7 @@ function MStatementOfAccount(value) {
     status: value.status ?? "pending",
     createdBy: value.createdBy,
     createdByName: value.createdByName ?? "",
+    approvedBy: value.approvedBy,
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt ?? "",
     deletedAt: value.deletedAt ?? ""
@@ -36959,6 +37220,35 @@ function useStatementOfAccountRepo() {
       });
     });
   }
+  async function reviewSOA(_id, value, session) {
+    value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    try {
+      _id = new ObjectId97(_id);
+    } catch (error) {
+      throw new BadRequestError151("Invalid ID format.");
+    }
+    try {
+      const res = await collection.updateOne(
+        { _id },
+        { $set: value },
+        { session }
+      );
+      if (res.modifiedCount === 0) {
+        throw new InternalServerError50(`Unable to ${value.status}  soa.`);
+      }
+      delNamespace().then(() => {
+        logger128.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger128.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createTextIndex,
     add,
@@ -36967,7 +37257,8 @@ function useStatementOfAccountRepo() {
     updateById,
     deleteById,
     updateStatusById,
-    getResidentUserSoa
+    getResidentUserSoa,
+    reviewSOA
   };
 }
 
@@ -36980,9 +37271,10 @@ import {
   logger as logger129,
   useAtlas as useAtlas83
 } from "@7365admin1/node-server-utils";
+import { ObjectId as ObjectId98 } from "mongodb";
 import { launch } from "puppeteer";
 function useStatementOfAccountService() {
-  const { add: _add } = useStatementOfAccountRepo();
+  const { add: _add, reviewSOA: _reviewSOA } = useStatementOfAccountRepo();
   const { getUnitBillingBySite } = useSiteUnitBillingRepo();
   const { getUserById } = useUserRepo();
   async function add(value, dateFrom, dateTo) {
@@ -37110,9 +37402,31 @@ function useStatementOfAccountService() {
       throw error;
     }
   }
+  async function reviewSOA(id, value) {
+    const session = useAtlas83.getClient()?.startSession();
+    session?.startTransaction();
+    try {
+      if (value?.approvedBy?._id) {
+        const approvedBy = await getUserById(value?.approvedBy?._id);
+        if (!approvedBy || !approvedBy.name)
+          throw new BadRequestError152("Created by not found.");
+        value.approvedBy.name = approvedBy.name;
+        value.approvedBy._id = new ObjectId98(approvedBy._id);
+      }
+      await _reviewSOA(id, value, session);
+      await session?.commitTransaction();
+      return `Successfully ${value.status} soa.`;
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
   return {
     add,
-    generatePDF
+    generatePDF,
+    reviewSOA
   };
 }
 
@@ -37127,7 +37441,11 @@ function useStatementOfAccountController() {
     updateStatusById: _updateStatusById,
     getResidentUserSoa: _getResidentUserSoa
   } = useStatementOfAccountRepo();
-  const { add: _add, generatePDF: _generatePDF } = useStatementOfAccountService();
+  const {
+    add: _add,
+    generatePDF: _generatePDF,
+    reviewSOA: _reviewSOA
+  } = useStatementOfAccountService();
   async function add(req, res, next) {
     const cookies = req.headers.cookie?.split(";").map((cookie) => cookie.trim().split("=")).reduce(
       (acc, [key, value]) => ({ ...acc, [key]: value }),
@@ -37427,6 +37745,40 @@ function useStatementOfAccountController() {
       return;
     }
   }
+  async function reviewSOA(req, res, next) {
+    const cookies = req.headers.cookie?.split(";").map((cookie) => cookie.trim().split("=")).reduce(
+      (acc, [key, value]) => ({ ...acc, [key]: value }),
+      {}
+    );
+    req.body.approvedBy = {
+      _id: "",
+      name: ""
+    };
+    req.body.approvedBy._id = cookies?.["user"] ? cookies["user"].toString() : req.body.approvedBy._id;
+    const _id = req.params.id;
+    const payload = { _id, ...req.body };
+    const schema2 = Joi93.object({
+      _id: Joi93.string().hex().required(),
+      status: Joi93.string().valid("approved", "rejected").required(),
+      approvedBy: schemaApprovedBy
+    });
+    const { error } = schema2.validate(payload);
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      logger130.log({ level: "error", message: messages });
+      next(new BadRequestError153(messages));
+      return;
+    }
+    try {
+      const result = await _reviewSOA(_id, req.body);
+      res.status(200).json({ message: result });
+      return;
+    } catch (error2) {
+      logger130.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
@@ -37435,13 +37787,14 @@ function useStatementOfAccountController() {
     deleteById,
     generatePDF,
     updateStatusById,
-    getResidentUserSoa
+    getResidentUserSoa,
+    reviewSOA
   };
 }
 
 // src/models/site-entrypass-settings.model.ts
 import { BadRequestError as BadRequestError154, logger as logger131 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId98 } from "mongodb";
+import { ObjectId as ObjectId99 } from "mongodb";
 import Joi94 from "joi";
 var schemaEntryPassSettings = Joi94.object({
   _id: Joi94.string().hex().optional().allow("", null),
@@ -37489,21 +37842,21 @@ function MEntryPassSettings(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId98(value._id);
+      value._id = new ObjectId99(value._id);
     } catch {
       throw new BadRequestError154("Invalid _id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId98(value.site);
+      value.site = new ObjectId99(value.site);
     } catch {
       throw new BadRequestError154("Invalid site format");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new ObjectId98(value.org);
+      value.org = new ObjectId99(value.org);
     } catch {
       throw new BadRequestError154("Invalid org format");
     }
@@ -37542,7 +37895,7 @@ import {
   useAtlas as useAtlas84,
   useCache as useCache51
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId99 } from "mongodb";
+import { ObjectId as ObjectId100 } from "mongodb";
 function useEntryPassSettingsRepo() {
   const db = useAtlas84.getDb();
   if (!db) {
@@ -37652,7 +38005,7 @@ function useEntryPassSettingsRepo() {
   }
   async function getEntryPassSettingsById(_id) {
     try {
-      _id = new ObjectId99(_id);
+      _id = new ObjectId100(_id);
     } catch (error) {
       throw new BadRequestError155("Invalid entry pass settings ID format.");
     }
@@ -37719,7 +38072,7 @@ function useEntryPassSettingsRepo() {
   }
   async function updateEntryPassSettingsById(_id, value) {
     try {
-      _id = new ObjectId99(_id);
+      _id = new ObjectId100(_id);
     } catch (error) {
       throw new BadRequestError155("Invalid entry pass settings ID format.");
     }
@@ -37747,7 +38100,7 @@ function useEntryPassSettingsRepo() {
   }
   async function deleteEntryPassSettingsById(_id, session) {
     try {
-      _id = new ObjectId99(_id);
+      _id = new ObjectId100(_id);
     } catch (error) {
       throw new BadRequestError155("Invalid card ID format.");
     }
@@ -37780,7 +38133,7 @@ function useEntryPassSettingsRepo() {
   }
   async function getEntryPassSettingsBySiteId(site) {
     try {
-      site = new ObjectId99(site);
+      site = new ObjectId100(site);
     } catch (error) {
       throw new BadRequestError155("Invalid entry pass settings ID format.");
     }
@@ -37847,7 +38200,7 @@ function useEntryPassSettingsRepo() {
   }
   async function updateEntryPassSettingsBySiteId(site, value) {
     try {
-      site = new ObjectId99(site);
+      site = new ObjectId100(site);
     } catch (error) {
       throw new BadRequestError155("Invalid entry pass settings ID format.");
     }
@@ -38212,7 +38565,7 @@ function useDashboardController() {
 }
 
 // src/models/nfc-patrol-route.model.ts
-import { ObjectId as ObjectId100 } from "mongodb";
+import { ObjectId as ObjectId101 } from "mongodb";
 import Joi97 from "joi";
 import { BadRequestError as BadRequestError158, logger as logger136 } from "@7365admin1/node-server-utils";
 var schemaNfcPatrolRoute = Joi97.object({
@@ -38248,23 +38601,23 @@ function MNfcPatrolRoute(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId100(value._id);
+      value._id = new ObjectId101(value._id);
     } catch (error2) {
       throw new BadRequestError158("Invalid _id format");
     }
   }
   try {
-    value.site = new ObjectId100(value.site);
+    value.site = new ObjectId101(value.site);
   } catch (error2) {
     throw new BadRequestError158("Invalid site format");
   }
   try {
-    value.createdBy = new ObjectId100(value.createdBy);
+    value.createdBy = new ObjectId101(value.createdBy);
   } catch (error2) {
     throw new BadRequestError158("Invalid createdBy format");
   }
   return {
-    _id: value._id ?? new ObjectId100(),
+    _id: value._id ?? new ObjectId101(),
     site: value.site,
     name: value.name,
     checkPointNumber: value.checkPointNumber,
@@ -38289,7 +38642,7 @@ import {
   useAtlas as useAtlas86,
   useCache as useCache53
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId101 } from "mongodb";
+import { ObjectId as ObjectId102 } from "mongodb";
 function useNfcPatrolRouteRepo() {
   const db = useAtlas86.getDb();
   if (!db) {
@@ -38333,7 +38686,7 @@ function useNfcPatrolRouteRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId101(site);
+      site = new ObjectId102(site);
     } catch (error) {
       throw new BadRequestError159("Invalid site ID format.");
     }
@@ -38404,7 +38757,7 @@ function useNfcPatrolRouteRepo() {
   }
   async function getById(_id, isStart) {
     try {
-      _id = new ObjectId101(_id);
+      _id = new ObjectId102(_id);
     } catch (error) {
       throw new BadRequestError159("Invalid ID.");
     }
@@ -38514,18 +38867,18 @@ function useNfcPatrolRouteRepo() {
       throw new BadRequestError159(error.message);
     }
     try {
-      _id = new ObjectId101(_id);
+      _id = new ObjectId102(_id);
     } catch (error2) {
       throw new BadRequestError159("Invalid ID.");
     }
     try {
-      value.site = new ObjectId101(value.site);
+      value.site = new ObjectId102(value.site);
     } catch (error2) {
       throw new BadRequestError159("Invalid site format");
     }
     if (value.updatedBy) {
       try {
-        value.updatedBy = new ObjectId101(value.updatedBy);
+        value.updatedBy = new ObjectId102(value.updatedBy);
       } catch (error2) {
         throw new BadRequestError159("Invalid createdBy format");
       }
@@ -38758,7 +39111,7 @@ function useNfcPatrolRouteController() {
 }
 
 // src/models/incident-report.model.ts
-import { ObjectId as ObjectId102 } from "mongodb";
+import { ObjectId as ObjectId103 } from "mongodb";
 import Joi99 from "joi";
 var residentSchema = Joi99.object({
   _id: Joi99.string().hex().optional().allow(null, ""),
@@ -38962,28 +39315,28 @@ var schemaUpdateIncidentReport = Joi99.object({
 function MIncidentReport(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId102(value._id);
+      value._id = new ObjectId103(value._id);
     } catch {
       throw new Error("Invalid incident report ID.");
     }
   }
   if (value.organization && typeof value.organization === "string") {
     try {
-      value.organization = new ObjectId102(value.organization);
+      value.organization = new ObjectId103(value.organization);
     } catch {
       throw new Error("Invalid organization ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId102(value.site);
+      value.site = new ObjectId103(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.approvedBy && typeof value.approvedBy === "string") {
     try {
-      value.approvedBy = new ObjectId102(value.approvedBy);
+      value.approvedBy = new ObjectId103(value.approvedBy);
     } catch {
       throw new Error("Invalid approvedBy ID.");
     }
@@ -38991,7 +39344,7 @@ function MIncidentReport(value) {
   const { incidentInformation } = value;
   if (incidentInformation?.siteInfo?.site && typeof incidentInformation.siteInfo.site === "string") {
     try {
-      incidentInformation.siteInfo.site = new ObjectId102(
+      incidentInformation.siteInfo.site = new ObjectId103(
         incidentInformation.siteInfo.site
       );
     } catch {
@@ -39005,7 +39358,7 @@ function MIncidentReport(value) {
     incidentInformation.submissionForm.dateOfReport = incidentInformation.submissionForm.dateOfReport.toISOString();
   }
   return {
-    _id: value._id ?? new ObjectId102(),
+    _id: value._id ?? new ObjectId103(),
     reportId: value.reportId,
     incidentInformation: value.incidentInformation,
     affectedEntities: value.affectedEntities,
@@ -39042,7 +39395,7 @@ import {
   useAtlas as useAtlas88,
   useCache as useCache54
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId103 } from "mongodb";
+import { ObjectId as ObjectId104 } from "mongodb";
 var incidents_namespace_collection = "incident-reports";
 function useIncidentReportRepo() {
   const db = useAtlas88.getDb();
@@ -39109,7 +39462,7 @@ function useIncidentReportRepo() {
     page = page > 0 ? page - 1 : 0;
     let dateExpr = {};
     try {
-      site = new ObjectId103(site);
+      site = new ObjectId104(site);
     } catch (error) {
       throw new BadRequestError162("Invalid site ID format.");
     }
@@ -39210,7 +39563,7 @@ function useIncidentReportRepo() {
     page = page > 0 ? page - 1 : 0;
     let dateExpr = {};
     try {
-      site = new ObjectId103(site);
+      site = new ObjectId104(site);
     } catch (error) {
       throw new BadRequestError162("Invalid site ID format.");
     }
@@ -39279,7 +39632,7 @@ function useIncidentReportRepo() {
   }
   async function getIncidentReportById(_id, session) {
     try {
-      _id = new ObjectId103(_id);
+      _id = new ObjectId104(_id);
     } catch (error) {
       throw new BadRequestError162("Invalid incident report ID format.");
     }
@@ -39310,27 +39663,27 @@ function useIncidentReportRepo() {
   async function updateIncidentReportById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new ObjectId103(_id);
+      _id = new ObjectId104(_id);
     } catch (error) {
       throw new BadRequestError162("Invalid ID format.");
     }
     if (value.organization && typeof value.organization === "string") {
       try {
-        value.organization = new ObjectId103(value.organization);
+        value.organization = new ObjectId104(value.organization);
       } catch {
         throw new Error("Invalid organization ID.");
       }
     }
     if (value.site && typeof value.site === "string") {
       try {
-        value.site = new ObjectId103(value.site);
+        value.site = new ObjectId104(value.site);
       } catch {
         throw new Error("Invalid site ID.");
       }
     }
     if (value.approvedBy && typeof value.approvedBy === "string") {
       try {
-        value.approvedBy = new ObjectId103(value.approvedBy);
+        value.approvedBy = new ObjectId104(value.approvedBy);
       } catch {
         throw new Error("Invalid approvedBy ID.");
       }
@@ -39338,7 +39691,7 @@ function useIncidentReportRepo() {
     const { incidentInformation } = value;
     if (incidentInformation?.siteInfo?.site && typeof incidentInformation.siteInfo.site === "string") {
       try {
-        incidentInformation.siteInfo.site = new ObjectId103(
+        incidentInformation.siteInfo.site = new ObjectId104(
           incidentInformation.siteInfo.site
         );
       } catch {
@@ -39373,7 +39726,7 @@ function useIncidentReportRepo() {
   }
   async function deleteIncidentReportById(_id) {
     try {
-      _id = new ObjectId103(_id);
+      _id = new ObjectId104(_id);
     } catch (error) {
       throw new BadRequestError162("Invalid occurrence subject ID format.");
     }
@@ -39405,7 +39758,7 @@ function useIncidentReportRepo() {
   async function reviewIncidentReport(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new ObjectId103(_id);
+      _id = new ObjectId104(_id);
     } catch (error) {
       throw new BadRequestError162("Invalid ID format.");
     }
@@ -39897,7 +40250,7 @@ function useIncidentReportController() {
 }
 
 // src/models/nfc-patrol-settings.model.ts
-import { ObjectId as ObjectId104 } from "mongodb";
+import { ObjectId as ObjectId105 } from "mongodb";
 import Joi101 from "joi";
 import { BadRequestError as BadRequestError165, logger as logger142 } from "@7365admin1/node-server-utils";
 var objectId = Joi101.string().hex().length(24);
@@ -39923,7 +40276,7 @@ function MNfcPatrolSettings(value) {
   }
   if (value.site) {
     try {
-      value.site = new ObjectId104(value.site);
+      value.site = new ObjectId105(value.site);
     } catch (error2) {
       throw new BadRequestError165("Invalid site ID format.");
     }
@@ -39943,7 +40296,7 @@ function MNfcPatrolSettingsUpdate(value) {
   }
   if (value.updatedBy) {
     try {
-      value.updatedBy = new ObjectId104(value.updatedBy);
+      value.updatedBy = new ObjectId105(value.updatedBy);
     } catch (error2) {
       throw new BadRequestError165("Invalid updatedBy ID format.");
     }
@@ -39965,7 +40318,7 @@ import {
   useAtlas as useAtlas90,
   useCache as useCache55
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId105 } from "mongodb";
+import { ObjectId as ObjectId106 } from "mongodb";
 function useNfcPatrolSettingsRepository() {
   const db = useAtlas90.getDb();
   if (!db) {
@@ -39995,7 +40348,7 @@ function useNfcPatrolSettingsRepository() {
   }
   async function getNfcPatrolSettingsBySite(site, session) {
     try {
-      site = new ObjectId105(site);
+      site = new ObjectId106(site);
     } catch (error) {
       throw new BadRequestError166("Invalid nfc patrol settings site ID format.");
     }
@@ -40039,7 +40392,7 @@ function useNfcPatrolSettingsRepository() {
   }
   async function updateNfcPatrolSettings(site, value, session) {
     try {
-      site = new ObjectId105(site);
+      site = new ObjectId106(site);
     } catch (error) {
       throw new BadRequestError166("Invalid attendance settings ID format.");
     }
@@ -40208,7 +40561,7 @@ function useNfcPatrolSettingsController() {
 
 // src/services/occurrence-entry.service.ts
 import { useAtlas as useAtlas93 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId108 } from "mongodb";
+import { ObjectId as ObjectId109 } from "mongodb";
 
 // src/repositories/occurrence-subject.repo.ts
 import {
@@ -40223,7 +40576,7 @@ import {
 } from "@7365admin1/node-server-utils";
 
 // src/models/occurrence-subject.model.ts
-import { ObjectId as ObjectId106 } from "mongodb";
+import { ObjectId as ObjectId107 } from "mongodb";
 import Joi103 from "joi";
 var schemaOccurrenceSubject = Joi103.object({
   site: Joi103.string().hex().required(),
@@ -40237,27 +40590,27 @@ var schemaUpdateOccurrenceSubject = Joi103.object({
 function MOccurrenceSubject(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 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.addedBy && typeof value.addedBy === "string") {
     try {
-      value.addedBy = new ObjectId106(value.addedBy);
+      value.addedBy = new ObjectId107(value.addedBy);
     } catch {
       throw new Error("Invalid addedBy ID.");
     }
   }
   return {
-    _id: value._id ?? new ObjectId106(),
+    _id: value._id ?? new ObjectId107(),
     site: value.site,
     subject: value.subject,
     addedBy: value.addedBy ?? "",
@@ -40268,7 +40621,7 @@ function MOccurrenceSubject(value) {
 }
 
 // src/repositories/occurrence-subject.repo.ts
-import { ObjectId as ObjectId107 } from "mongodb";
+import { ObjectId as ObjectId108 } from "mongodb";
 function useOccurrenceSubjectRepo() {
   const db = useAtlas92.getDb();
   if (!db) {
@@ -40327,7 +40680,7 @@ function useOccurrenceSubjectRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId107(site);
+      site = new ObjectId108(site);
     } catch (error) {
       throw new BadRequestError169("Invalid site ID format.");
     }
@@ -40422,7 +40775,7 @@ function useOccurrenceSubjectRepo() {
   }
   async function getOccurrenceSubjectById(_id, session) {
     try {
-      _id = new ObjectId107(_id);
+      _id = new ObjectId108(_id);
     } catch (error) {
       throw new BadRequestError169("Invalid occurrence subject ID format.");
     }
@@ -40439,7 +40792,7 @@ function useOccurrenceSubjectRepo() {
   async function updateOccurrenceSubjectById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new ObjectId107(_id);
+      _id = new ObjectId108(_id);
     } catch (error) {
       throw new BadRequestError169("Invalid ID format.");
     }
@@ -40469,7 +40822,7 @@ function useOccurrenceSubjectRepo() {
   }
   async function deleteOccurrenceSubjectById(_id) {
     try {
-      _id = new ObjectId107(_id);
+      _id = new ObjectId108(_id);
     } catch (error) {
       throw new BadRequestError169("Invalid occurrence subject ID format.");
     }
@@ -40581,8 +40934,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 ObjectId108(value.signature) : occurrenceEntry.signature._id;
-      value.eSignature = value.eSignature ? new ObjectId108(value.eSignature) : occurrenceEntry.eSignature;
+      value.signature = value.signature ? new ObjectId109(value.signature) : occurrenceEntry.signature._id;
+      value.eSignature = value.eSignature ? new ObjectId109(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;
@@ -40782,7 +41135,7 @@ function useOccurrenceEntryController() {
 
 // src/models/online-form.model.ts
 import Joi105 from "joi";
-import { ObjectId as ObjectId109 } from "mongodb";
+import { ObjectId as ObjectId110 } from "mongodb";
 var schemaOnlineForm = Joi105.object({
   _id: Joi105.string().hex().optional().allow("", null),
   name: Joi105.string().required(),
@@ -40830,21 +41183,21 @@ function MOnlineForm(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId109(value._id);
+      value._id = new ObjectId110(value._id);
     } catch (error2) {
       throw new Error("Invalid ID.");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new ObjectId109(value.org);
+      value.org = new ObjectId110(value.org);
     } catch (error2) {
       throw new Error("Invalid org ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId109(value.site);
+      value.site = new ObjectId110(value.site);
     } catch (error2) {
       throw new Error("Invalid site ID.");
     }
@@ -40876,7 +41229,7 @@ import {
   useAtlas as useAtlas94,
   useCache as useCache57
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId110 } from "mongodb";
+import { ObjectId as ObjectId111 } from "mongodb";
 function useOnlineFormRepo() {
   const db = useAtlas94.getDb();
   if (!db) {
@@ -40928,7 +41281,7 @@ function useOnlineFormRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId110(site);
+      site = new ObjectId111(site);
     } catch (error) {
       throw new BadRequestError171("Invalid site ID format.");
     }
@@ -40988,7 +41341,7 @@ function useOnlineFormRepo() {
   }
   async function getOnlineFormById(_id) {
     try {
-      _id = new ObjectId110(_id);
+      _id = new ObjectId111(_id);
     } catch (error) {
       throw new BadRequestError171("Invalid online form ID format.");
     }
@@ -41031,7 +41384,7 @@ function useOnlineFormRepo() {
   }
   async function updateOnlineFormById(_id, value) {
     try {
-      _id = new ObjectId110(_id);
+      _id = new ObjectId111(_id);
     } catch (error) {
       throw new BadRequestError171("Invalid online form ID format.");
     }
@@ -41059,7 +41412,7 @@ function useOnlineFormRepo() {
   }
   async function deleteOnlineFormById(_id, session) {
     try {
-      _id = new ObjectId110(_id);
+      _id = new ObjectId111(_id);
     } catch (error) {
       throw new BadRequestError171("Invalid online form ID format.");
     }
@@ -41092,7 +41445,7 @@ function useOnlineFormRepo() {
   }
   async function getOnlineFormsBySiteId(site, { search = "", page = 1, limit = 10, status = "active" }) {
     try {
-      site = new ObjectId110(site);
+      site = new ObjectId111(site);
     } catch (error) {
       throw new BadRequestError171(
         "Invalid online form configuration site ID format."
@@ -41533,7 +41886,7 @@ function useOccurrenceSubjectController() {
 }
 
 // src/models/nfc-patrol-log.model.ts
-import { ObjectId as ObjectId111 } from "mongodb";
+import { ObjectId as ObjectId112 } from "mongodb";
 import Joi108 from "joi";
 import { BadRequestError as BadRequestError174, logger as logger151 } from "@7365admin1/node-server-utils";
 var schemaNfcPatrolLog = Joi108.object({
@@ -41585,32 +41938,32 @@ function MNfcPatrolLog(valueArg) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId111(value._id);
+      value._id = new ObjectId112(value._id);
     } catch (error2) {
       throw new BadRequestError174("Invalid _id format");
     }
   }
   try {
-    value.site = new ObjectId111(value.site);
+    value.site = new ObjectId112(value.site);
   } catch (error2) {
     throw new BadRequestError174("Invalid site format");
   }
   if (value?.createdBy) {
     try {
-      value.createdBy = new ObjectId111(value.createdBy);
+      value.createdBy = new ObjectId112(value.createdBy);
     } catch (error2) {
       throw new BadRequestError174("Invalid createdBy format");
     }
   }
   if (value?.route?._id) {
     try {
-      value.route._id = new ObjectId111(value.route._id);
+      value.route._id = new ObjectId112(value.route._id);
     } catch (error2) {
       throw new BadRequestError174("Invalid route _id format");
     }
   }
   return {
-    _id: value._id ?? new ObjectId111(),
+    _id: value._id ?? new ObjectId112(),
     site: value.site,
     route: value.route,
     date: value.date,
@@ -41632,7 +41985,7 @@ import {
   useAtlas as useAtlas96,
   useCache as useCache58
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId112 } from "mongodb";
+import { ObjectId as ObjectId113 } from "mongodb";
 function useNfcPatrolLogRepo() {
   const db = useAtlas96.getDb();
   if (!db) {
@@ -41685,7 +42038,7 @@ function useNfcPatrolLogRepo() {
     const pageIndex = page > 0 ? page - 1 : 0;
     let siteId;
     try {
-      siteId = typeof site === "string" ? new ObjectId112(site) : site;
+      siteId = typeof site === "string" ? new ObjectId113(site) : site;
     } catch {
       throw new BadRequestError175("Invalid site ID format.");
     }
@@ -41696,7 +42049,7 @@ function useNfcPatrolLogRepo() {
       query.date = date;
     }
     if (route?._id) {
-      query["route._id"] = typeof route._id === "string" ? new ObjectId112(route._id) : route._id;
+      query["route._id"] = typeof route._id === "string" ? new ObjectId113(route._id) : route._id;
     }
     if (route?.startTime) {
       query["route.startTime"] = route.startTime;
@@ -41869,7 +42222,7 @@ import {
   InternalServerError as InternalServerError59,
   logger as logger155,
   makeCacheKey as makeCacheKey57,
-  toObjectId as toObjectId13,
+  toObjectId as toObjectId14,
   useAtlas as useAtlas98,
   useCache as useCache59
 } from "@7365admin1/node-server-utils";
@@ -41961,7 +42314,7 @@ function useNewDashboardRepo() {
     securityDashboardCollection
   );
   async function getMetric(collectionString, siteId, period) {
-    const site = toObjectId13(siteId);
+    const site = toObjectId14(siteId);
     const range = getPeriodRangeWithPrevious(period);
     const collection = db.collection(collectionString);
     const current = await collection.countDocuments({
@@ -42568,7 +42921,7 @@ function useNewDashboardController() {
 
 // src/models/manpower-monitoring.model.ts
 import Joi111 from "joi";
-import { ObjectId as ObjectId113 } from "mongodb";
+import { ObjectId as ObjectId114 } from "mongodb";
 var shiftSchema = Joi111.object({
   name: Joi111.string().required(),
   checkIn: Joi111.string().optional().allow("", null),
@@ -42593,7 +42946,7 @@ var manpowerMonitoringSchema = Joi111.object({
 });
 var MManpowerMonitoring = class {
   constructor(data) {
-    this._id = new ObjectId113();
+    this._id = new ObjectId114();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName;
@@ -43063,7 +43416,7 @@ var hrmlabs_attendance_util_default = {
 };
 
 // src/repositories/manpower-monitoring.repo.ts
-import { ObjectId as ObjectId114 } from "mongodb";
+import { ObjectId as ObjectId115 } from "mongodb";
 var { hrmLabsAuthentication: hrmLabsAuthentication2, fetchSites: fetchSites2 } = hrmlabs_attendance_util_default;
 function useManpowerMonitoringRepo() {
   const db = useAtlas99.getDb();
@@ -43077,11 +43430,11 @@ function useManpowerMonitoringRepo() {
     try {
       value = new MManpowerMonitoring(value);
       if (value.createdBy)
-        value.createdBy = new ObjectId114(value.createdBy);
+        value.createdBy = new ObjectId115(value.createdBy);
       if (value.siteId)
-        value.siteId = new ObjectId114(value.siteId);
+        value.siteId = new ObjectId115(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new ObjectId114(value.serviceProviderId);
+        value.serviceProviderId = new ObjectId115(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -43122,8 +43475,8 @@ function useManpowerMonitoringRepo() {
   }
   async function getManpowerSettingsBySiteId(_id, serviceProviderId) {
     try {
-      _id = new ObjectId114(_id);
-      serviceProviderId = new ObjectId114(serviceProviderId);
+      _id = new ObjectId115(_id);
+      serviceProviderId = new ObjectId115(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -43139,7 +43492,7 @@ function useManpowerMonitoringRepo() {
   }
   async function updateManpowerMonitoringSettings(_id, value) {
     try {
-      _id = new ObjectId114(_id);
+      _id = new ObjectId115(_id);
     } catch (error) {
       throw new BadRequestError180("Invalid ID format.");
     }
@@ -43166,7 +43519,7 @@ function useManpowerMonitoringRepo() {
       for (let item of value) {
         item = new MManpowerMonitoring(item);
         const data = await collection.findOne({
-          siteId: new ObjectId114(item.siteId)
+          siteId: new ObjectId115(item.siteId)
         });
         if (data) {
           let updateValue;
@@ -43191,11 +43544,11 @@ function useManpowerMonitoringRepo() {
           }
         } else {
           if (item.createdBy)
-            item.createdBy = new ObjectId114(item.createdBy);
+            item.createdBy = new ObjectId115(item.createdBy);
           if (item.siteId)
-            item.siteId = new ObjectId114(item.siteId);
+            item.siteId = new ObjectId115(item.siteId);
           if (item.serviceProviderId)
-            item.serviceProviderId = new ObjectId114(item.serviceProviderId);
+            item.serviceProviderId = new ObjectId115(item.serviceProviderId);
           const result = await collection.insertOne(item);
           if (result.insertedId) {
             results.inserted++;
@@ -43219,7 +43572,7 @@ function useManpowerMonitoringRepo() {
     const siteUrl = process.env.HRMLABS_SITE_URL;
     try {
       const serviceProvider = await serviceProviderCollection.findOne({
-        _id: new ObjectId114(serviceProviderId)
+        _id: new ObjectId115(serviceProviderId)
       });
       if (!serviceProvider) {
         throw new Error("Service Provider not found.");
@@ -43269,7 +43622,7 @@ import {
 
 // src/models/manpower-remarks.model.ts
 import Joi112 from "joi";
-import { ObjectId as ObjectId115 } from "mongodb";
+import { ObjectId as ObjectId116 } from "mongodb";
 var remarksSchema = Joi112.object({
   name: Joi112.string().required(),
   remark: Joi112.object({
@@ -43293,7 +43646,7 @@ var manpowerRemarksSchema = Joi112.object({
 });
 var MManpowerRemarks = class {
   constructor(data) {
-    this._id = new ObjectId115();
+    this._id = new ObjectId116();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
@@ -43311,7 +43664,7 @@ var MManpowerRemarks = class {
 };
 
 // src/repositories/manpower-remarks.repo.ts
-import { ObjectId as ObjectId116 } from "mongodb";
+import { ObjectId as ObjectId117 } from "mongodb";
 import moment2 from "moment-timezone";
 function useManpowerRemarksRepo() {
   const db = useAtlas100.getDb();
@@ -43324,9 +43677,9 @@ function useManpowerRemarksRepo() {
     try {
       value = new MManpowerRemarks(value);
       if (value.siteId)
-        value.siteId = new ObjectId116(value.siteId);
+        value.siteId = new ObjectId117(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new ObjectId116(value.serviceProviderId);
+        value.serviceProviderId = new ObjectId117(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -43346,7 +43699,7 @@ function useManpowerRemarksRepo() {
       limit = limit || 10;
       const searchQuery = {};
       const nowSGT = moment2().tz("Asia/Singapore");
-      searchQuery.serviceProviderId = new ObjectId116(serviceProviderId);
+      searchQuery.serviceProviderId = new ObjectId117(serviceProviderId);
       if (search != "") {
         searchQuery.siteName = { $regex: search, $options: "i" };
       }
@@ -43378,8 +43731,8 @@ function useManpowerRemarksRepo() {
   }
   async function getManpowerRemarksBySiteId(_id, date, serviceProviderId) {
     try {
-      _id = new ObjectId116(_id);
-      serviceProviderId = new ObjectId116(serviceProviderId);
+      _id = new ObjectId117(_id);
+      serviceProviderId = new ObjectId117(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -43396,13 +43749,13 @@ function useManpowerRemarksRepo() {
   }
   async function updateManpowerRemarks(_id, value) {
     try {
-      _id = new ObjectId116(_id);
+      _id = new ObjectId117(_id);
     } catch (error) {
       throw new BadRequestError181("Invalid ID format.");
     }
     try {
       if (value.createdBy) {
-        value.createdBy = new ObjectId116(value.createdBy);
+        value.createdBy = new ObjectId117(value.createdBy);
       }
       const updateValue = {
         ...value,
@@ -43419,7 +43772,7 @@ function useManpowerRemarksRepo() {
   }
   async function updateRemarksStatus(_id, value) {
     try {
-      _id = new ObjectId116(_id);
+      _id = new ObjectId117(_id);
     } catch (error) {
       throw new BadRequestError181("Invalid ID format.");
     }
@@ -43691,7 +44044,7 @@ function useManpowerMonitoringCtrl() {
 
 // src/models/manpower-designations.model.ts
 import Joi114 from "joi";
-import { ObjectId as ObjectId117 } from "mongodb";
+import { ObjectId as ObjectId118 } from "mongodb";
 var designationsSchema = Joi114.object({
   title: Joi114.string().required(),
   shifts: Joi114.object({
@@ -43710,7 +44063,7 @@ var manpowerDesignationsSchema = Joi114.object({
 });
 var MManpowerDesignations = class {
   constructor(data) {
-    this._id = new ObjectId117();
+    this._id = new ObjectId118();
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
     this.serviceProviderId = data.serviceProviderId || "";
@@ -43726,7 +44079,7 @@ var MManpowerDesignations = class {
 import {
   useAtlas as useAtlas102
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId118 } from "mongodb";
+import { ObjectId as ObjectId119 } from "mongodb";
 function useManpowerDesignationRepo() {
   const db = useAtlas102.getDb();
   if (!db) {
@@ -43738,11 +44091,11 @@ function useManpowerDesignationRepo() {
     try {
       value = new MManpowerDesignations(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);
       return result;
     } catch (error) {
@@ -43751,8 +44104,8 @@ function useManpowerDesignationRepo() {
   }
   async function getManpowerDesignationsBySiteId(_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.");
     }
@@ -43768,7 +44121,7 @@ function useManpowerDesignationRepo() {
   }
   async function updateManpowerDesignations(_id, value) {
     try {
-      _id = new ObjectId118(_id);
+      _id = new ObjectId119(_id);
     } catch (error) {
       throw new Error("Invalid ID format.");
     }
@@ -43871,7 +44224,7 @@ function useManpowerDesignationCtrl() {
 
 // src/models/overnight-parking.model.ts
 import Joi116 from "joi";
-import { ObjectId as ObjectId119 } from "mongodb";
+import { ObjectId as ObjectId120 } from "mongodb";
 var dayScheduleSchema = Joi116.object({
   isEnabled: Joi116.boolean().required(),
   startTime: Joi116.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().allow(null, "").messages({
@@ -43913,7 +44266,7 @@ function MOvernightParkingApprovalHours(value) {
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId119(value.site);
+      value.site = new ObjectId120(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
@@ -43939,7 +44292,7 @@ import {
   InternalServerError as InternalServerError63,
   logger as logger163,
   makeCacheKey as makeCacheKey61,
-  toObjectId as toObjectId14,
+  toObjectId as toObjectId15,
   useAtlas as useAtlas103,
   useCache as useCache63
 } from "@7365admin1/node-server-utils";
@@ -44018,7 +44371,7 @@ function useOvernightParkingRepo() {
     }
   }
   async function getSiteOvernightParking(site) {
-    const siteId = toObjectId14(site);
+    const siteId = toObjectId15(site);
     const cacheKey = makeCacheKey61(overnight_parking_namespace_collection, {
       site
     });
@@ -44114,7 +44467,7 @@ function useOvernightParkingController() {
 
 // src/models/overnight-parking-request.model.ts
 import Joi118 from "joi";
-import { toObjectId as toObjectId15 } from "@7365admin1/node-server-utils";
+import { toObjectId as toObjectId16 } from "@7365admin1/node-server-utils";
 var OvernightParkingRequestStatus = /* @__PURE__ */ ((OvernightParkingRequestStatus2) => {
   OvernightParkingRequestStatus2["PENDING"] = "pending";
   OvernightParkingRequestStatus2["APPROVED"] = "approved";
@@ -44151,7 +44504,7 @@ function MOvernightParkingRequest(value) {
     throw new Error(error.details[0].message);
   }
   if (value.site && typeof value.site === "string")
-    value.site = toObjectId15(value.site);
+    value.site = toObjectId16(value.site);
   const data = {
     ...value,
     createdAt: value.createdAt ? new Date(value.createdAt).toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
@@ -44168,7 +44521,7 @@ import {
   logger as logger165,
   makeCacheKey as makeCacheKey62,
   paginate as paginate54,
-  toObjectId as toObjectId16,
+  toObjectId as toObjectId17,
   useAtlas as useAtlas104,
   useCache as useCache64
 } from "@7365admin1/node-server-utils";
@@ -44236,7 +44589,7 @@ function useOvernightParkingRequestRepo() {
   }) {
     page = page ? page - 1 : 0;
     const skip = page * limit;
-    const siteId = toObjectId16(site);
+    const siteId = toObjectId17(site);
     const query = {
       site: siteId,
       ...status && { status }
@@ -44287,7 +44640,7 @@ function useOvernightParkingRequestRepo() {
         logger165.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
-      const _id = toObjectId16(id);
+      const _id = toObjectId17(id);
       const data = await collection.findOne({ _id });
       if (!data)
         throw new BadRequestError188("Overnight parking request not found.");
@@ -44303,7 +44656,7 @@ function useOvernightParkingRequestRepo() {
   }
   async function updateOvernightParkingRequestById(id, value, session) {
     try {
-      const _id = toObjectId16(id);
+      const _id = toObjectId17(id);
       value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       const data = await collection.updateOne(
         { _id },
@@ -44329,7 +44682,7 @@ function useOvernightParkingRequestRepo() {
   }
   async function deleteOvernightParkingRequestById(id, session) {
     try {
-      const _id = toObjectId16(id);
+      const _id = toObjectId17(id);
       const value = {
         deletedAt: (/* @__PURE__ */ new Date()).toISOString(),
         status: "deleted" /* DELETED */
@@ -44358,7 +44711,7 @@ function useOvernightParkingRequestRepo() {
   }
   async function updateExpiredRequests(site, session) {
     try {
-      const _site = toObjectId16(site);
+      const _site = toObjectId17(site);
       const value = {
         status: "expired" /* EXPIRED */
       };
@@ -45537,7 +45890,7 @@ function useManpowerRemarkCtrl() {
 
 // src/models/manpower-sites.model.ts
 import Joi122 from "joi";
-import { ObjectId as ObjectId120 } from "mongodb";
+import { ObjectId as ObjectId121 } from "mongodb";
 var manpowerSitesSchema = Joi122.object({
   id: Joi122.string().hex().required(),
   text: Joi122.string().hex().optional().allow("", null),
@@ -45548,7 +45901,7 @@ var manpowerSitesSchema = Joi122.object({
 });
 var MManpowerSites = class {
   constructor(data) {
-    this._id = new ObjectId120();
+    this._id = new ObjectId121();
     this.id = data.id || "";
     this.text = data.text || "";
     this.contractID = data.contractID || "";
@@ -45770,7 +46123,7 @@ import {
   getDirectory as getDirectory3,
   logger as logger174
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId121 } from "mongodb";
+import { ObjectId as ObjectId122 } from "mongodb";
 import moment4 from "moment-timezone";
 var createManpowerRemarksDaily = async () => {
   const db = useAtlas108.getDb();
@@ -45930,7 +46283,7 @@ var updateRemarksisAcknowledged = async () => {
     for (const id of updatedIds) {
       const doc = await remarks.findOne({ _id: id });
       const setting = await settings.findOne(
-        { siteId: new ObjectId121(doc?.siteId) },
+        { siteId: new ObjectId122(doc?.siteId) },
         { projection: { emails: 1 } }
       );
       const payload = {
@@ -46016,7 +46369,7 @@ var updateRemarksStatusEod = async () => {
   for (const doc of docs) {
     let shiftsToCheck = [];
     const endShiftTime = await settings.findOne(
-      { siteId: new ObjectId121(doc.siteId) },
+      { siteId: new ObjectId122(doc.siteId) },
       { projection: { shifts: 1, shiftType: 1 } }
     );
     if (doc.createdAtSGT === nowSGT) {
@@ -46122,7 +46475,7 @@ var isWithinHour = (alertTime, timeNow) => {
 
 // src/events/manpower.event.ts
 import { useAtlas as useAtlas109 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId122 } from "mongodb";
+import { ObjectId as ObjectId123 } from "mongodb";
 import moment5 from "moment-timezone";
 async function manpowerEvents(io) {
   let intervalId = null;
@@ -46148,7 +46501,7 @@ async function manpowerEvents(io) {
     }).toArray();
     for (const doc of docs) {
       const siteSettings = await settings.findOne(
-        { siteId: new ObjectId122(doc.siteId), enabled: true },
+        { siteId: new ObjectId123(doc.siteId), enabled: true },
         { projection: { shifts: 1, shiftType: 1 } }
       );
       const shiftType = siteSettings?.shiftType || "2-shifts";
@@ -46267,7 +46620,7 @@ function genericSignature(params, secretKey) {
 }
 
 // src/repositories/reddot-payment.repository.ts
-import { ObjectId as ObjectId126 } from "mongodb";
+import { ObjectId as ObjectId127 } from "mongodb";
 
 // src/utils/date-format.util.ts
 import moment6 from "moment-timezone";
@@ -46292,11 +46645,11 @@ function formatDateString(today, format, dateRange) {
 }
 
 // src/models/credit-card.model.ts
-import { ObjectId as ObjectId123 } from "mongodb";
+import { ObjectId as ObjectId124 } from "mongodb";
 var MCardInfo = class {
   // this is coming from RDP transaction
   constructor({
-    _id = new ObjectId123(),
+    _id = new ObjectId124(),
     userId,
     cardType,
     cardNumber,
@@ -46331,11 +46684,11 @@ var MCardInfo = class {
 };
 
 // src/models/cart.model.ts
-import { ObjectId as ObjectId124 } from "mongodb";
+import { ObjectId as ObjectId125 } from "mongodb";
 var MUnitBillings = class {
   // transaction response messages
   constructor({
-    _id = new ObjectId124(),
+    _id = new ObjectId125(),
     unit,
     unitId,
     unitBill,
@@ -46376,7 +46729,7 @@ var MUnitBillings = class {
 };
 
 // src/repositories/payment.repository.ts
-import { ObjectId as ObjectId125 } from "mongodb";
+import { ObjectId as ObjectId126 } from "mongodb";
 import {
   InternalServerError as InternalServerError66,
   useAtlas as useAtlas110
@@ -46413,7 +46766,7 @@ var PaymentBillRepo = () => {
       if (unitBillInfo?.status === "Inactive" /* inactive */) {
         throw new Error("This Bill is Inactive!");
       }
-      const billId = new ObjectId125(unitBillInfo?.billId);
+      const billId = new ObjectId126(unitBillInfo?.billId);
       const billInfo = await billCollection().findOne({ _id: billId });
       if (!billInfo) {
         throw new Error("Bill info not found");
@@ -46452,13 +46805,13 @@ var PaymentBillRepo = () => {
   const saveCreditCardInfo = async (payload) => {
     try {
       if (payload.userId)
-        payload.userId = new ObjectId125(payload.userId);
+        payload.userId = new ObjectId126(payload.userId);
       if (payload.site)
-        payload.site = new ObjectId125(payload.site);
+        payload.site = new ObjectId126(payload.site);
       if (payload.organization)
-        payload.organization = new ObjectId125(payload.organization);
+        payload.organization = new ObjectId126(payload.organization);
       if (payload.createdBy)
-        payload.createdBy = new ObjectId125(payload.createdBy);
+        payload.createdBy = new ObjectId126(payload.createdBy);
       const createdAt = formatDateString(/* @__PURE__ */ new Date(), "mm-dd-yyyy");
       payload.createdAt = createdAt;
       const result = await creditCollection().insertOne(new MCardInfo(payload));
@@ -46470,19 +46823,19 @@ var PaymentBillRepo = () => {
   const checkOutUnitBills = async (payload) => {
     try {
       if (payload.unitId)
-        payload.unitId = new ObjectId125(payload.unitId);
+        payload.unitId = new ObjectId126(payload.unitId);
       if (payload.site)
-        payload.site = new ObjectId125(payload.site);
+        payload.site = new ObjectId126(payload.site);
       if (payload.organization)
-        payload.organization = new ObjectId125(payload.organization);
+        payload.organization = new ObjectId126(payload.organization);
       payload.createdAt = await formatDateString(/* @__PURE__ */ new Date(), "mm-dd-yyyy");
       const addToCart = await cartCollection().insertOne(new MUnitBillings(payload));
       const unitId = payload.unitId;
       const dateFormatted = formatDateString(/* @__PURE__ */ new Date(), "for-ref");
       const unit = unitId?.toString().slice(-4);
-      const newId = new ObjectId125(addToCart?.insertedId).toString().slice(-4);
+      const newId = new ObjectId126(addToCart?.insertedId).toString().slice(-4);
       const referenceNumber = `CRT${unit}${newId}${dateFormatted}`;
-      const result = await cartCollection().findOneAndUpdate({ _id: new ObjectId125(addToCart.insertedId) }, { $set: { referenceNumber } }, { returnDocument: "after" });
+      const result = await cartCollection().findOneAndUpdate({ _id: new ObjectId126(addToCart.insertedId) }, { $set: { referenceNumber } }, { returnDocument: "after" });
       return result;
     } catch (error) {
       throw new Error(error.message || error || "Server Internal Error");
@@ -46513,7 +46866,7 @@ var PaymentBillRepo = () => {
         for (const ref of refNumber) {
           const unitBillInfo = await collection().findOne({ referenceNumber: ref });
           const billId = unitBillInfo?.billId;
-          const billInfo = await billCollection().findOne({ _id: new ObjectId125(billId) });
+          const billInfo = await billCollection().findOne({ _id: new ObjectId126(billId) });
           const billAmount = billInfo?.price;
           payload.updatedAt = updatedAt;
           payload.amountPaid = billAmount;
@@ -46667,7 +47020,7 @@ var useRedDotPaymentRepo = () => {
         throw new Error("Failed to Add Merchant Details");
       }
       const merchantId = merchant?.insertedId;
-      const orgId = new ObjectId126(_id);
+      const orgId = new ObjectId127(_id);
       const result = await orgCollection().findOneAndUpdate({ _id: orgId }, { $push: { merchant: merchantId } }, {
         returnDocument: "after"
       });
@@ -46696,7 +47049,7 @@ var useRedDotPaymentRepo = () => {
   const getMerchantDetailsById = async (_id) => {
     try {
       if (_id)
-        _id = new ObjectId126(_id);
+        _id = new ObjectId127(_id);
       const result = await redDotMerchantCollection().aggregate([
         {
           $match: {
@@ -46956,11 +47309,11 @@ import {
   logger as logger175,
   makeCacheKey as makeCacheKey64,
   paginate as paginate57,
-  toObjectId as toObjectId17,
+  toObjectId as toObjectId18,
   useAtlas as useAtlas112,
   useCache as useCache66
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId127 } from "mongodb";
+import { ObjectId as ObjectId128 } from "mongodb";
 function useVerificationRepoV2() {
   const db = useAtlas112.getDb();
   if (!db) {
@@ -47013,7 +47366,7 @@ function useVerificationRepoV2() {
   }
   async function updateVerificationStatusById(_id, status, session) {
     try {
-      _id = new ObjectId127(_id);
+      _id = new ObjectId128(_id);
     } catch (error) {
       throw new BadRequestError195("Invalid verification ID format.");
     }
@@ -47063,7 +47416,7 @@ function useVerificationRepoV2() {
   }
   async function getVerificationById(id) {
     try {
-      const _id = toObjectId17(id);
+      const _id = toObjectId18(id);
       const cacheKey = makeCacheKey64(namespace_collection, { id });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
@@ -47156,7 +47509,7 @@ function useVerificationRepoV2() {
   }
   async function updateStatusById(_id, status, session) {
     try {
-      _id = new ObjectId127(_id);
+      _id = new ObjectId128(_id);
     } catch (error) {
       throw new BadRequestError195("Invalid verification ID format.");
     }
@@ -47758,7 +48111,7 @@ import {
 import { v4 as uuidv42 } from "uuid";
 
 // src/repositories/user-v2.repo.ts
-import { ObjectId as ObjectId128 } from "mongodb";
+import { ObjectId as ObjectId129 } from "mongodb";
 import {
   useAtlas as useAtlas114,
   InternalServerError as InternalServerError70,
@@ -47769,7 +48122,7 @@ import {
   AppError as AppError27,
   useCache as useCache67,
   makeCacheKey as makeCacheKey65,
-  toObjectId as toObjectId18
+  toObjectId as toObjectId19
 } from "@7365admin1/node-server-utils";
 function useUserRepoV2() {
   const { updateFeedbackCreatedByName } = useFeedbackRepo();
@@ -47870,7 +48223,7 @@ function useUserRepoV2() {
     }
   }
   async function getUserById(id) {
-    const _id = toObjectId18(id);
+    const _id = toObjectId19(id);
     try {
       const cacheKey = makeCacheKey65(namespace_collection, { id });
       const cachedData = await getCache(cacheKey);
@@ -47970,7 +48323,7 @@ function useUserRepoV2() {
     }
     if (organization) {
       try {
-        query.defaultOrg = new ObjectId128(organization);
+        query.defaultOrg = new ObjectId129(organization);
         cacheOptions.organization = organization.toString();
       } catch (error) {
         throw new BadRequestError198("Invalid organization ID format.");
@@ -48075,7 +48428,7 @@ function useUserRepoV2() {
   }
   async function updatePasswordById({ _id, password }, session) {
     const cacheKey = makeCacheKey65(namespace_collection, { _id });
-    _id = toObjectId18(_id);
+    _id = toObjectId19(_id);
     try {
       const result = await collection.updateOne(
         { _id },
@@ -48109,13 +48462,13 @@ function useUserRepoV2() {
       );
     }
     try {
-      _id = new ObjectId128(_id);
+      _id = new ObjectId129(_id);
     } catch (error) {
       throw new BadRequestError198("Invalid ID.");
     }
     if (field === "defaultOrg") {
       try {
-        value = new ObjectId128(value);
+        value = new ObjectId129(value);
       } catch (error) {
         throw new BadRequestError198("Invalid organization ID.");
       }
@@ -48156,7 +48509,7 @@ function useUserRepoV2() {
     year
   }, session) {
     try {
-      _id = new ObjectId128(_id);
+      _id = new ObjectId129(_id);
     } catch (error) {
       throw new BadRequestError198("Invalid user ID format.");
     }
@@ -48186,7 +48539,7 @@ function useUserRepoV2() {
   }
   async function updatePassword({ _id, password }, session) {
     try {
-      _id = new ObjectId128(_id);
+      _id = new ObjectId129(_id);
     } catch (error) {
       throw new BadRequestError198("Invalid user ID format.");
     }
@@ -48281,9 +48634,25 @@ function useAuthServiceV2() {
       throw new InternalServerError71("Error deleting token");
     }
   }
+  async function verifyPassword(_id, password) {
+    try {
+      const user = await _getUserById(_id);
+      const isPasswordMatch = await comparePassword3(password, user.password);
+      if (!isPasswordMatch) {
+        throw new BadRequestError199("Invalid credentials");
+      }
+      return "Verification successful.";
+    } catch (error) {
+      if (error instanceof BadRequestError199) {
+        throw error;
+      }
+      throw new InternalServerError71("Error during password verification");
+    }
+  }
   return {
     login,
-    logout
+    logout,
+    verifyPassword
   };
 }
 
@@ -48499,7 +48868,11 @@ function useUserServiceV2() {
 // src/controllers/auth-v2.controller.ts
 function useAuthControllerV2() {
   const { signUp: _signUp } = useVerificationServiceV2();
-  const { login: _login, logout: _logout } = useAuthServiceV2();
+  const {
+    login: _login,
+    logout: _logout,
+    verifyPassword: _verifyPassword
+  } = useAuthServiceV2();
   const { resetPassword: _resetPassword } = useUserServiceV2();
   async function signUp(req, res, next) {
     try {
@@ -48613,11 +48986,38 @@ function useAuthControllerV2() {
       return;
     }
   }
+  async function verifyPassword(req, res, next) {
+    const schema2 = Joi127.object({
+      _id: Joi127.string().hex().required(),
+      password: Joi127.string().required().min(8)
+    });
+    const { error, value } = schema2.validate(
+      { _id: req.params.id, ...req.body },
+      { abortEarly: false }
+    );
+    if (error) {
+      const messages = error.details.map((d) => d.message);
+      logger180.log({ level: "error", message: messages.join(", ") });
+      next(new BadRequestError201(messages.join(", ")));
+      return;
+    }
+    const { _id, password } = value;
+    try {
+      const message = await _verifyPassword(_id, password);
+      res.json({ message });
+      return;
+    } catch (error2) {
+      logger180.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     signUp,
     login,
     logout,
-    resetPassword
+    resetPassword,
+    verifyPassword
   };
 }
 
@@ -49040,6 +49440,7 @@ export {
   remarksSchema,
   robotSchema,
   schema,
+  schemaApprovedBy,
   schemaBilling,
   schemaBillingConfiguration,
   schemaBillingItem,