@7365admin1/core 2.33.0 → 2.35.0

package/dist/index.js

@@ -175,6 +175,7 @@ __export(src_exports, {
   remarksSchema: () => remarksSchema,
   robotSchema: () => robotSchema,
   schema: () => schema,
+  schemaApprovedBy: () => schemaApprovedBy,
   schemaBilling: () => schemaBilling,
   schemaBillingConfiguration: () => schemaBillingConfiguration,
   schemaBillingItem: () => schemaBillingItem,
@@ -2604,20 +2605,9 @@ function useUserRepo() {
   }
   async function getUserByEmail(email) {
     try {
-      const cacheKey = (0, import_node_server_utils10.makeCacheKey)(namespace_collection, { email });
-      const cachedData = await getCache(cacheKey);
-      if (cachedData) {
-        import_node_server_utils10.logger.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
-      }
       const data = await collection.findOne({
         email: { $regex: `^${email}$`, $options: "i" }
       });
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils10.logger.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        import_node_server_utils10.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error) {
       throw new import_node_server_utils10.InternalServerError("Failed to get user by email.");
@@ -2924,6 +2914,39 @@ function useUserRepo() {
       throw new import_node_server_utils10.InternalServerError("Failed to update user password.");
     }
   }
+  async function resetPassword({
+    _id,
+    password,
+    sid
+  }, session) {
+    try {
+      _id = new import_mongodb9.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils10.BadRequestError("Invalid user ID format.");
+    }
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        { $set: { password, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      const cacheKey = (0, import_node_server_utils10.makeCacheKey)(namespace_collection, { _id });
+      delCache(cacheKey).then(() => {
+        import_node_server_utils10.logger.info(`Cache deleted for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils10.logger.error(`Failed to delete cache for key: ${cacheKey}`, err);
+      });
+      const authCacheKey = `sid:${sid}`;
+      delCache(authCacheKey).then(() => {
+        import_node_server_utils10.logger.info(`Cache deleted for key: ${authCacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils10.logger.error(`Failed to delete cache for key: ${authCacheKey}`, err);
+      });
+      return result;
+    } catch (error) {
+      throw new import_node_server_utils10.InternalServerError("Failed to update user password.");
+    }
+  }
   async function updateBirthday({
     _id,
     month,
@@ -3016,6 +3039,19 @@ function useUserRepo() {
       throw new import_node_server_utils10.InternalServerError(`Failed to update user ${field}.`);
     }
   }
+  async function updateUserSIDById(id, sid, session) {
+    const _id = (0, import_node_server_utils10.toObjectId)(id);
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        { $set: { sid, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      return result;
+    } catch (error) {
+      throw new import_node_server_utils10.InternalServerError("Failed to update user.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -3031,7 +3067,9 @@ function useUserRepo() {
     updateBirthday,
     updateUserFieldById,
     updateDefaultOrgByEmail,
-    getUserByEmailStatus
+    getUserByEmailStatus,
+    updateUserSIDById,
+    resetPassword
   };
 }
 
@@ -3859,7 +3897,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 } = (0, import_node_server_utils13.useCache)("sessions");
@@ -3897,7 +3939,9 @@ function useAuthService() {
       }
       const sid = (0, import_uuid.v4)();
       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);
@@ -5866,6 +5910,7 @@ function useRoleRepo() {
       }).catch((err) => {
         import_node_server_utils22.logger.error(`Failed to clear cache for namespace: dashboard`, err);
       });
+      return "Successfully deleted role permission.";
     } catch (error) {
       throw new import_node_server_utils22.InternalServerError("Failed to delete role.");
     }
@@ -6061,7 +6106,8 @@ function useUserService() {
     getUserById,
     getUserByEmail,
     updatePassword,
-    updateUserFieldById: _updateUserFieldById
+    updateUserFieldById: _updateUserFieldById,
+    resetPassword: _resetPassword
   } = useUserRepo();
   const { getRoleByName, addRole } = useRoleRepo();
   const { add: addMember } = useMemberRepo();
@@ -6237,8 +6283,12 @@ function useUserService() {
         throw new import_node_server_utils24.InternalServerError("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();
@@ -8922,7 +8972,7 @@ var import_node_server_utils42 = require("@7365admin1/node-server-utils");
 var import_zod = require("zod");
 var import_mongodb26 = require("mongodb");
 var import_node_server_utils41 = require("@7365admin1/node-server-utils");
-function toObjectId3(value) {
+function toObjectId4(value) {
   if (typeof value === "string") {
     if (!/^[a-fA-F0-9]{24}$/.test(value)) {
       throw new import_node_server_utils41.BadRequestError(`Invalid ObjectId format: ${value}`);
@@ -8974,7 +9024,7 @@ var TInvoice = import_zod.z.object({
       message: "Invalid ObjectId: Must be a 24-character hex string."
     }),
     import_zod.z.instanceof(import_mongodb26.ObjectId, { message: "Invalid ObjectId instance." })
-  ]).optional().transform((val) => val ? toObjectId3(val) : void 0),
+  ]).optional().transform((val) => val ? toObjectId4(val) : void 0),
   invoiceNumber: import_zod.z.string({ required_error: "Invoice number is required." }),
   type: TInvoiceType.default("other"),
   amount: import_zod.z.number().min(0, { message: "Invoice amount must be at least 0." }),
@@ -19418,16 +19468,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 = (0, import_node_server_utils89.paginate)(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
         import_node_server_utils89.logger.info(`Cache set for key: ${cacheKey}`);
@@ -21512,7 +21576,8 @@ var KeyRepo = class {
             location: 1,
             prefix: 1,
             keyNo: 1,
-            parentId: 1
+            parentId: 1,
+            status: 1
           }
         }
       ]).toArray();
@@ -21755,7 +21820,8 @@ function useVisitorTransactionService() {
     add: _add,
     updateById: _updateVisitorTansactionById,
     getExpiredCheckedOutTransactionsBySite: _getExpiredCheckedOutTransactionsBySite,
-    updateManyDahuaSyncStatus: _updateManyDahuaSyncStatus
+    updateManyDahuaSyncStatus: _updateManyDahuaSyncStatus,
+    getVisitorTransactionById: _getVisitorTransactionById
   } = useVisitorTransactionRepo();
   const { getById } = useBuildingUnitRepo();
   const {
@@ -21774,6 +21840,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 import_mongodb58.ObjectId.isValid(item) ? item : null;
+    }
+    if (typeof item === "object" && item !== null) {
+      if ("keyId" in item) {
+        const keyId = String(item.keyId);
+        return import_mongodb58.ObjectId.isValid(keyId) ? keyId : null;
+      }
+      const value = String(item);
+      return import_mongodb58.ObjectId.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 import_mongodb58.ObjectId(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 = import_node_server_utils101.useAtlas.getClient()?.startSession();
     const allowedPersonTypes = [
@@ -22018,7 +22148,7 @@ function useVisitorTransactionService() {
       session?.endSession();
     }
   }
-  async function updateById(id, value) {
+  async function updateVisitorTransactionById(id, value) {
     const session = import_node_server_utils101.useAtlas.getClient()?.startSession();
     session?.startTransaction();
     try {
@@ -22194,18 +22324,70 @@ function useVisitorTransactionService() {
       await session?.commitTransaction();
       return result;
     } catch (error) {
-      import_node_server_utils101.logger.error("Error in people service invite visitor:", error);
+      import_node_server_utils101.logger.error("Error in visitor transaction invite visitor:", error);
       await session.abortTransaction();
       throw error;
     } finally {
       session?.endSession();
     }
   }
+  async function changeVisitorTransactionKeysById(id, visitorPass, passKeys) {
+    const session = import_node_server_utils101.useAtlas.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();
+      import_node_server_utils101.logger.error("Error in visitor transaction change keys by id:", error);
+      throw error;
+    } finally {
+      session.endSession();
+    }
+  }
   return {
     add,
-    updateById,
+    updateVisitorTransactionById,
     processTransactionDahuaStatus,
-    inviteVisitor
+    inviteVisitor,
+    changeVisitorTransactionKeysById
   };
 }
 
@@ -22215,8 +22397,9 @@ var import_node_server_utils102 = require("@7365admin1/node-server-utils");
 function useVisitorTransactionController() {
   const {
     add: _add,
-    updateById: _updateVisitorTansactionById,
-    inviteVisitor: _inviteVisitor
+    updateVisitorTransactionById: _updateVisitorTransactionById,
+    inviteVisitor: _inviteVisitor,
+    changeVisitorTransactionKeysById: _changeVisitorTransactionKeysById
   } = useVisitorTransactionService();
   const {
     getAll: _getAll,
@@ -22358,7 +22541,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) {
@@ -22412,8 +22595,31 @@ function useVisitorTransactionController() {
       next(new import_node_server_utils102.BadRequestError(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 });
@@ -22424,13 +22630,61 @@ function useVisitorTransactionController() {
       return;
     }
   }
+  async function changeVisitorTransactionKeysById(req, res, next) {
+    const idValidation = import_joi55.default.string().hex().length(24).required();
+    const bodyValidation = import_joi55.default.object({
+      visitorPass: import_joi55.default.array().items(
+        import_joi55.default.object({
+          keyId: import_joi55.default.string().hex().length(24).required()
+        })
+      ).optional(),
+      passKeys: import_joi55.default.array().items(
+        import_joi55.default.object({
+          keyId: import_joi55.default.string().hex().length(24).required()
+        })
+      ).optional()
+    }).or("visitorPass", "passKeys");
+    const _id = req.params.id;
+    const { error: idError } = idValidation.validate(_id);
+    if (idError) {
+      import_node_server_utils102.logger.log({ level: "error", message: idError.message });
+      next(new import_node_server_utils102.BadRequestError(idError.message));
+      return;
+    }
+    const { error, value } = bodyValidation.validate(req.body, {
+      abortEarly: false
+    });
+    if (error) {
+      const message = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils102.logger.log({ level: "error", message });
+      next(new import_node_server_utils102.BadRequestError(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) {
+      import_node_server_utils102.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
     updateVisitorTansactionById,
     deleteVisitorTransaction,
     inviteVisitor,
-    getVisitorTransactionById
+    getVisitorTransactionById,
+    changeVisitorTransactionKeysById
   };
 }
 
@@ -36444,6 +36698,10 @@ var schemaSOABillingItem = import_joi92.default.object({
   taxPercentage: import_joi92.default.number().optional().allow(null),
   taxAmount: import_joi92.default.number().optional().allow(null)
 });
+var schemaApprovedBy = import_joi92.default.object({
+  _id: import_joi92.default.string().hex().optional().allow(null, ""),
+  name: import_joi92.default.string().optional().allow(null, "")
+});
 var schemaStatementOfAccount = import_joi92.default.object({
   _id: import_joi92.default.string().hex().optional(),
   site: import_joi92.default.string().hex().required(),
@@ -36457,6 +36715,7 @@ var schemaStatementOfAccount = import_joi92.default.object({
   category: import_joi92.default.string().optional().allow(null, ""),
   status: import_joi92.default.string().valid("pending", "approved", "rejected", "deleted").optional().allow(null, ""),
   billing: import_joi92.default.array().items(schemaSOABillingItem).optional().allow(null, ""),
+  approvedBy: schemaApprovedBy.optional().allow(null, ""),
   createdBy: import_joi92.default.string().hex().required(),
   createdByName: import_joi92.default.string().optional().allow(null, ""),
   createdAt: import_joi92.default.date().optional(),
@@ -36476,6 +36735,7 @@ var schemaUpdateStatementOfAccount = import_joi92.default.object({
   category: import_joi92.default.string().optional().allow(null, ""),
   status: import_joi92.default.string().valid("pending", "approved", "rejected", "deleted").optional().allow(null, ""),
   billing: import_joi92.default.array().items(schemaSOABillingItem).optional().allow(null, ""),
+  approvedBy: schemaApprovedBy.optional().allow(null, ""),
   createdBy: import_joi92.default.string().optional().allow(null, ""),
   createdByName: import_joi92.default.string().optional().allow(null, "")
 });
@@ -36540,6 +36800,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 ?? ""
@@ -36869,6 +37130,35 @@ function useStatementOfAccountRepo() {
       });
     });
   }
+  async function reviewSOA(_id, value, session) {
+    value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    try {
+      _id = new import_mongodb97.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils164.BadRequestError("Invalid ID format.");
+    }
+    try {
+      const res = await collection.updateOne(
+        { _id },
+        { $set: value },
+        { session }
+      );
+      if (res.modifiedCount === 0) {
+        throw new import_node_server_utils164.InternalServerError(`Unable to ${value.status}  soa.`);
+      }
+      delNamespace().then(() => {
+        import_node_server_utils164.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        import_node_server_utils164.logger.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createTextIndex,
     add,
@@ -36877,7 +37167,8 @@ function useStatementOfAccountRepo() {
     updateById,
     deleteById,
     updateStatusById,
-    getResidentUserSoa
+    getResidentUserSoa,
+    reviewSOA
   };
 }
 
@@ -36886,9 +37177,10 @@ var import_node_server_utils166 = require("@7365admin1/node-server-utils");
 
 // src/services/site-soa.service.ts
 var import_node_server_utils165 = require("@7365admin1/node-server-utils");
+var import_mongodb98 = require("mongodb");
 var import_puppeteer = require("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) {
@@ -37016,9 +37308,31 @@ function useStatementOfAccountService() {
       throw error;
     }
   }
+  async function reviewSOA(id, value) {
+    const session = import_node_server_utils165.useAtlas.getClient()?.startSession();
+    session?.startTransaction();
+    try {
+      if (value?.approvedBy?._id) {
+        const approvedBy = await getUserById(value?.approvedBy?._id);
+        if (!approvedBy || !approvedBy.name)
+          throw new import_node_server_utils165.BadRequestError("Created by not found.");
+        value.approvedBy.name = approvedBy.name;
+        value.approvedBy._id = new import_mongodb98.ObjectId(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
   };
 }
 
@@ -37033,7 +37347,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 }),
@@ -37333,6 +37651,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 = import_joi93.default.object({
+      _id: import_joi93.default.string().hex().required(),
+      status: import_joi93.default.string().valid("approved", "rejected").required(),
+      approvedBy: schemaApprovedBy
+    });
+    const { error } = schema2.validate(payload);
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils166.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils166.BadRequestError(messages));
+      return;
+    }
+    try {
+      const result = await _reviewSOA(_id, req.body);
+      res.status(200).json({ message: result });
+      return;
+    } catch (error2) {
+      import_node_server_utils166.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
@@ -37341,13 +37693,14 @@ function useStatementOfAccountController() {
     deleteById,
     generatePDF,
     updateStatusById,
-    getResidentUserSoa
+    getResidentUserSoa,
+    reviewSOA
   };
 }
 
 // src/models/site-entrypass-settings.model.ts
 var import_node_server_utils167 = require("@7365admin1/node-server-utils");
-var import_mongodb98 = require("mongodb");
+var import_mongodb99 = require("mongodb");
 var import_joi94 = __toESM(require("joi"));
 var schemaEntryPassSettings = import_joi94.default.object({
   _id: import_joi94.default.string().hex().optional().allow("", null),
@@ -37395,21 +37748,21 @@ function MEntryPassSettings(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb98.ObjectId(value._id);
+      value._id = new import_mongodb99.ObjectId(value._id);
     } catch {
       throw new import_node_server_utils167.BadRequestError("Invalid _id format");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb98.ObjectId(value.site);
+      value.site = new import_mongodb99.ObjectId(value.site);
     } catch {
       throw new import_node_server_utils167.BadRequestError("Invalid site format");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new import_mongodb98.ObjectId(value.org);
+      value.org = new import_mongodb99.ObjectId(value.org);
     } catch {
       throw new import_node_server_utils167.BadRequestError("Invalid org format");
     }
@@ -37439,7 +37792,7 @@ function MEntryPassSettings(value) {
 
 // src/repositories/site-entrypass-settings.repo.ts
 var import_node_server_utils168 = require("@7365admin1/node-server-utils");
-var import_mongodb99 = require("mongodb");
+var import_mongodb100 = require("mongodb");
 function useEntryPassSettingsRepo() {
   const db = import_node_server_utils168.useAtlas.getDb();
   if (!db) {
@@ -37549,7 +37902,7 @@ function useEntryPassSettingsRepo() {
   }
   async function getEntryPassSettingsById(_id) {
     try {
-      _id = new import_mongodb99.ObjectId(_id);
+      _id = new import_mongodb100.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils168.BadRequestError("Invalid entry pass settings ID format.");
     }
@@ -37616,7 +37969,7 @@ function useEntryPassSettingsRepo() {
   }
   async function updateEntryPassSettingsById(_id, value) {
     try {
-      _id = new import_mongodb99.ObjectId(_id);
+      _id = new import_mongodb100.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils168.BadRequestError("Invalid entry pass settings ID format.");
     }
@@ -37644,7 +37997,7 @@ function useEntryPassSettingsRepo() {
   }
   async function deleteEntryPassSettingsById(_id, session) {
     try {
-      _id = new import_mongodb99.ObjectId(_id);
+      _id = new import_mongodb100.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils168.BadRequestError("Invalid card ID format.");
     }
@@ -37677,7 +38030,7 @@ function useEntryPassSettingsRepo() {
   }
   async function getEntryPassSettingsBySiteId(site) {
     try {
-      site = new import_mongodb99.ObjectId(site);
+      site = new import_mongodb100.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils168.BadRequestError("Invalid entry pass settings ID format.");
     }
@@ -37744,7 +38097,7 @@ function useEntryPassSettingsRepo() {
   }
   async function updateEntryPassSettingsBySiteId(site, value) {
     try {
-      site = new import_mongodb99.ObjectId(site);
+      site = new import_mongodb100.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils168.BadRequestError("Invalid entry pass settings ID format.");
     }
@@ -38103,7 +38456,7 @@ function useDashboardController() {
 }
 
 // src/models/nfc-patrol-route.model.ts
-var import_mongodb100 = require("mongodb");
+var import_mongodb101 = require("mongodb");
 var import_joi97 = __toESM(require("joi"));
 var import_node_server_utils172 = require("@7365admin1/node-server-utils");
 var schemaNfcPatrolRoute = import_joi97.default.object({
@@ -38139,23 +38492,23 @@ function MNfcPatrolRoute(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb100.ObjectId(value._id);
+      value._id = new import_mongodb101.ObjectId(value._id);
     } catch (error2) {
       throw new import_node_server_utils172.BadRequestError("Invalid _id format");
     }
   }
   try {
-    value.site = new import_mongodb100.ObjectId(value.site);
+    value.site = new import_mongodb101.ObjectId(value.site);
   } catch (error2) {
     throw new import_node_server_utils172.BadRequestError("Invalid site format");
   }
   try {
-    value.createdBy = new import_mongodb100.ObjectId(value.createdBy);
+    value.createdBy = new import_mongodb101.ObjectId(value.createdBy);
   } catch (error2) {
     throw new import_node_server_utils172.BadRequestError("Invalid createdBy format");
   }
   return {
-    _id: value._id ?? new import_mongodb100.ObjectId(),
+    _id: value._id ?? new import_mongodb101.ObjectId(),
     site: value.site,
     name: value.name,
     checkPointNumber: value.checkPointNumber,
@@ -38171,7 +38524,7 @@ function MNfcPatrolRoute(value) {
 
 // src/repositories/nfc-patrol-route.repository.ts
 var import_node_server_utils173 = require("@7365admin1/node-server-utils");
-var import_mongodb101 = require("mongodb");
+var import_mongodb102 = require("mongodb");
 function useNfcPatrolRouteRepo() {
   const db = import_node_server_utils173.useAtlas.getDb();
   if (!db) {
@@ -38215,7 +38568,7 @@ function useNfcPatrolRouteRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new import_mongodb101.ObjectId(site);
+      site = new import_mongodb102.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils173.BadRequestError("Invalid site ID format.");
     }
@@ -38286,7 +38639,7 @@ function useNfcPatrolRouteRepo() {
   }
   async function getById(_id, isStart) {
     try {
-      _id = new import_mongodb101.ObjectId(_id);
+      _id = new import_mongodb102.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils173.BadRequestError("Invalid ID.");
     }
@@ -38396,18 +38749,18 @@ function useNfcPatrolRouteRepo() {
       throw new import_node_server_utils173.BadRequestError(error.message);
     }
     try {
-      _id = new import_mongodb101.ObjectId(_id);
+      _id = new import_mongodb102.ObjectId(_id);
     } catch (error2) {
       throw new import_node_server_utils173.BadRequestError("Invalid ID.");
     }
     try {
-      value.site = new import_mongodb101.ObjectId(value.site);
+      value.site = new import_mongodb102.ObjectId(value.site);
     } catch (error2) {
       throw new import_node_server_utils173.BadRequestError("Invalid site format");
     }
     if (value.updatedBy) {
       try {
-        value.updatedBy = new import_mongodb101.ObjectId(value.updatedBy);
+        value.updatedBy = new import_mongodb102.ObjectId(value.updatedBy);
       } catch (error2) {
         throw new import_node_server_utils173.BadRequestError("Invalid createdBy format");
       }
@@ -38632,7 +38985,7 @@ function useNfcPatrolRouteController() {
 }
 
 // src/models/incident-report.model.ts
-var import_mongodb102 = require("mongodb");
+var import_mongodb103 = require("mongodb");
 var import_joi99 = __toESM(require("joi"));
 var residentSchema = import_joi99.default.object({
   _id: import_joi99.default.string().hex().optional().allow(null, ""),
@@ -38836,28 +39189,28 @@ var schemaUpdateIncidentReport = import_joi99.default.object({
 function MIncidentReport(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb102.ObjectId(value._id);
+      value._id = new import_mongodb103.ObjectId(value._id);
     } catch {
       throw new Error("Invalid incident report ID.");
     }
   }
   if (value.organization && typeof value.organization === "string") {
     try {
-      value.organization = new import_mongodb102.ObjectId(value.organization);
+      value.organization = new import_mongodb103.ObjectId(value.organization);
     } catch {
       throw new Error("Invalid organization ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb102.ObjectId(value.site);
+      value.site = new import_mongodb103.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.approvedBy && typeof value.approvedBy === "string") {
     try {
-      value.approvedBy = new import_mongodb102.ObjectId(value.approvedBy);
+      value.approvedBy = new import_mongodb103.ObjectId(value.approvedBy);
     } catch {
       throw new Error("Invalid approvedBy ID.");
     }
@@ -38865,7 +39218,7 @@ function MIncidentReport(value) {
   const { incidentInformation } = value;
   if (incidentInformation?.siteInfo?.site && typeof incidentInformation.siteInfo.site === "string") {
     try {
-      incidentInformation.siteInfo.site = new import_mongodb102.ObjectId(
+      incidentInformation.siteInfo.site = new import_mongodb103.ObjectId(
         incidentInformation.siteInfo.site
       );
     } catch {
@@ -38879,7 +39232,7 @@ function MIncidentReport(value) {
     incidentInformation.submissionForm.dateOfReport = incidentInformation.submissionForm.dateOfReport.toISOString();
   }
   return {
-    _id: value._id ?? new import_mongodb102.ObjectId(),
+    _id: value._id ?? new import_mongodb103.ObjectId(),
     reportId: value.reportId,
     incidentInformation: value.incidentInformation,
     affectedEntities: value.affectedEntities,
@@ -38903,7 +39256,7 @@ var import_node_server_utils177 = require("@7365admin1/node-server-utils");
 
 // src/repositories/incident-report.repo.ts
 var import_node_server_utils176 = require("@7365admin1/node-server-utils");
-var import_mongodb103 = require("mongodb");
+var import_mongodb104 = require("mongodb");
 var incidents_namespace_collection = "incident-reports";
 function useIncidentReportRepo() {
   const db = import_node_server_utils176.useAtlas.getDb();
@@ -38970,7 +39323,7 @@ function useIncidentReportRepo() {
     page = page > 0 ? page - 1 : 0;
     let dateExpr = {};
     try {
-      site = new import_mongodb103.ObjectId(site);
+      site = new import_mongodb104.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils176.BadRequestError("Invalid site ID format.");
     }
@@ -39071,7 +39424,7 @@ function useIncidentReportRepo() {
     page = page > 0 ? page - 1 : 0;
     let dateExpr = {};
     try {
-      site = new import_mongodb103.ObjectId(site);
+      site = new import_mongodb104.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils176.BadRequestError("Invalid site ID format.");
     }
@@ -39140,7 +39493,7 @@ function useIncidentReportRepo() {
   }
   async function getIncidentReportById(_id, session) {
     try {
-      _id = new import_mongodb103.ObjectId(_id);
+      _id = new import_mongodb104.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils176.BadRequestError("Invalid incident report ID format.");
     }
@@ -39171,27 +39524,27 @@ function useIncidentReportRepo() {
   async function updateIncidentReportById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new import_mongodb103.ObjectId(_id);
+      _id = new import_mongodb104.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils176.BadRequestError("Invalid ID format.");
     }
     if (value.organization && typeof value.organization === "string") {
       try {
-        value.organization = new import_mongodb103.ObjectId(value.organization);
+        value.organization = new import_mongodb104.ObjectId(value.organization);
       } catch {
         throw new Error("Invalid organization ID.");
       }
     }
     if (value.site && typeof value.site === "string") {
       try {
-        value.site = new import_mongodb103.ObjectId(value.site);
+        value.site = new import_mongodb104.ObjectId(value.site);
       } catch {
         throw new Error("Invalid site ID.");
       }
     }
     if (value.approvedBy && typeof value.approvedBy === "string") {
       try {
-        value.approvedBy = new import_mongodb103.ObjectId(value.approvedBy);
+        value.approvedBy = new import_mongodb104.ObjectId(value.approvedBy);
       } catch {
         throw new Error("Invalid approvedBy ID.");
       }
@@ -39199,7 +39552,7 @@ function useIncidentReportRepo() {
     const { incidentInformation } = value;
     if (incidentInformation?.siteInfo?.site && typeof incidentInformation.siteInfo.site === "string") {
       try {
-        incidentInformation.siteInfo.site = new import_mongodb103.ObjectId(
+        incidentInformation.siteInfo.site = new import_mongodb104.ObjectId(
           incidentInformation.siteInfo.site
         );
       } catch {
@@ -39234,7 +39587,7 @@ function useIncidentReportRepo() {
   }
   async function deleteIncidentReportById(_id) {
     try {
-      _id = new import_mongodb103.ObjectId(_id);
+      _id = new import_mongodb104.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils176.BadRequestError("Invalid occurrence subject ID format.");
     }
@@ -39266,7 +39619,7 @@ function useIncidentReportRepo() {
   async function reviewIncidentReport(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new import_mongodb103.ObjectId(_id);
+      _id = new import_mongodb104.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils176.BadRequestError("Invalid ID format.");
     }
@@ -39758,7 +40111,7 @@ function useIncidentReportController() {
 }
 
 // src/models/nfc-patrol-settings.model.ts
-var import_mongodb104 = require("mongodb");
+var import_mongodb105 = require("mongodb");
 var import_joi101 = __toESM(require("joi"));
 var import_node_server_utils179 = require("@7365admin1/node-server-utils");
 var objectId = import_joi101.default.string().hex().length(24);
@@ -39784,7 +40137,7 @@ function MNfcPatrolSettings(value) {
   }
   if (value.site) {
     try {
-      value.site = new import_mongodb104.ObjectId(value.site);
+      value.site = new import_mongodb105.ObjectId(value.site);
     } catch (error2) {
       throw new import_node_server_utils179.BadRequestError("Invalid site ID format.");
     }
@@ -39804,7 +40157,7 @@ function MNfcPatrolSettingsUpdate(value) {
   }
   if (value.updatedBy) {
     try {
-      value.updatedBy = new import_mongodb104.ObjectId(value.updatedBy);
+      value.updatedBy = new import_mongodb105.ObjectId(value.updatedBy);
     } catch (error2) {
       throw new import_node_server_utils179.BadRequestError("Invalid updatedBy ID format.");
     }
@@ -39818,7 +40171,7 @@ function MNfcPatrolSettingsUpdate(value) {
 
 // src/repositories/nfc-patrol-settings.repository.ts
 var import_node_server_utils180 = require("@7365admin1/node-server-utils");
-var import_mongodb105 = require("mongodb");
+var import_mongodb106 = require("mongodb");
 function useNfcPatrolSettingsRepository() {
   const db = import_node_server_utils180.useAtlas.getDb();
   if (!db) {
@@ -39848,7 +40201,7 @@ function useNfcPatrolSettingsRepository() {
   }
   async function getNfcPatrolSettingsBySite(site, session) {
     try {
-      site = new import_mongodb105.ObjectId(site);
+      site = new import_mongodb106.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils180.BadRequestError("Invalid nfc patrol settings site ID format.");
     }
@@ -39892,7 +40245,7 @@ function useNfcPatrolSettingsRepository() {
   }
   async function updateNfcPatrolSettings(site, value, session) {
     try {
-      site = new import_mongodb105.ObjectId(site);
+      site = new import_mongodb106.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils180.BadRequestError("Invalid attendance settings ID format.");
     }
@@ -40057,13 +40410,13 @@ function useNfcPatrolSettingsController() {
 
 // src/services/occurrence-entry.service.ts
 var import_node_server_utils184 = require("@7365admin1/node-server-utils");
-var import_mongodb108 = require("mongodb");
+var import_mongodb109 = require("mongodb");
 
 // src/repositories/occurrence-subject.repo.ts
 var import_node_server_utils183 = require("@7365admin1/node-server-utils");
 
 // src/models/occurrence-subject.model.ts
-var import_mongodb106 = require("mongodb");
+var import_mongodb107 = require("mongodb");
 var import_joi103 = __toESM(require("joi"));
 var schemaOccurrenceSubject = import_joi103.default.object({
   site: import_joi103.default.string().hex().required(),
@@ -40077,27 +40430,27 @@ var schemaUpdateOccurrenceSubject = import_joi103.default.object({
 function MOccurrenceSubject(value) {
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb106.ObjectId(value._id);
+      value._id = new import_mongodb107.ObjectId(value._id);
     } catch {
       throw new Error("Invalid ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb106.ObjectId(value.site);
+      value.site = new import_mongodb107.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
   }
   if (value.addedBy && typeof value.addedBy === "string") {
     try {
-      value.addedBy = new import_mongodb106.ObjectId(value.addedBy);
+      value.addedBy = new import_mongodb107.ObjectId(value.addedBy);
     } catch {
       throw new Error("Invalid addedBy ID.");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb106.ObjectId(),
+    _id: value._id ?? new import_mongodb107.ObjectId(),
     site: value.site,
     subject: value.subject,
     addedBy: value.addedBy ?? "",
@@ -40108,7 +40461,7 @@ function MOccurrenceSubject(value) {
 }
 
 // src/repositories/occurrence-subject.repo.ts
-var import_mongodb107 = require("mongodb");
+var import_mongodb108 = require("mongodb");
 function useOccurrenceSubjectRepo() {
   const db = import_node_server_utils183.useAtlas.getDb();
   if (!db) {
@@ -40167,7 +40520,7 @@ function useOccurrenceSubjectRepo() {
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new import_mongodb107.ObjectId(site);
+      site = new import_mongodb108.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils183.BadRequestError("Invalid site ID format.");
     }
@@ -40262,7 +40615,7 @@ function useOccurrenceSubjectRepo() {
   }
   async function getOccurrenceSubjectById(_id, session) {
     try {
-      _id = new import_mongodb107.ObjectId(_id);
+      _id = new import_mongodb108.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils183.BadRequestError("Invalid occurrence subject ID format.");
     }
@@ -40279,7 +40632,7 @@ function useOccurrenceSubjectRepo() {
   async function updateOccurrenceSubjectById(_id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
-      _id = new import_mongodb107.ObjectId(_id);
+      _id = new import_mongodb108.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils183.BadRequestError("Invalid ID format.");
     }
@@ -40309,7 +40662,7 @@ function useOccurrenceSubjectRepo() {
   }
   async function deleteOccurrenceSubjectById(_id) {
     try {
-      _id = new import_mongodb107.ObjectId(_id);
+      _id = new import_mongodb108.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils183.BadRequestError("Invalid occurrence subject ID format.");
     }
@@ -40421,8 +40774,8 @@ function useOccurrenceEntryService() {
       value.dailyOccurrenceBookId = occurrenceEntry.dailyOccurrenceBookId;
       value.bookEntryCount = value.bookEntryCount ? value.bookEntryCount : occurrenceEntry.bookEntryCount;
       value.occurrence = value.occurrence ? value.occurrence : occurrenceEntry.occurrence;
-      value.signature = value.signature ? new import_mongodb108.ObjectId(value.signature) : occurrenceEntry.signature._id;
-      value.eSignature = value.eSignature ? new import_mongodb108.ObjectId(value.eSignature) : occurrenceEntry.eSignature;
+      value.signature = value.signature ? new import_mongodb109.ObjectId(value.signature) : occurrenceEntry.signature._id;
+      value.eSignature = value.eSignature ? new import_mongodb109.ObjectId(value.eSignature) : occurrenceEntry.eSignature;
       value.createdAt = /* @__PURE__ */ new Date();
       value.date = value.date ? value.date : occurrenceEntry.date;
       value.userName = value.userName ? value.userName : occurrenceEntry.signature.name;
@@ -40622,7 +40975,7 @@ function useOccurrenceEntryController() {
 
 // src/models/online-form.model.ts
 var import_joi105 = __toESM(require("joi"));
-var import_mongodb109 = require("mongodb");
+var import_mongodb110 = require("mongodb");
 var schemaOnlineForm = import_joi105.default.object({
   _id: import_joi105.default.string().hex().optional().allow("", null),
   name: import_joi105.default.string().required(),
@@ -40670,21 +41023,21 @@ function MOnlineForm(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb109.ObjectId(value._id);
+      value._id = new import_mongodb110.ObjectId(value._id);
     } catch (error2) {
       throw new Error("Invalid ID.");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new import_mongodb109.ObjectId(value.org);
+      value.org = new import_mongodb110.ObjectId(value.org);
     } catch (error2) {
       throw new Error("Invalid org ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb109.ObjectId(value.site);
+      value.site = new import_mongodb110.ObjectId(value.site);
     } catch (error2) {
       throw new Error("Invalid site ID.");
     }
@@ -40707,7 +41060,7 @@ function MOnlineForm(value) {
 
 // src/repositories/online-form.repo.ts
 var import_node_server_utils186 = require("@7365admin1/node-server-utils");
-var import_mongodb110 = require("mongodb");
+var import_mongodb111 = require("mongodb");
 function useOnlineFormRepo() {
   const db = import_node_server_utils186.useAtlas.getDb();
   if (!db) {
@@ -40759,7 +41112,7 @@ function useOnlineFormRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new import_mongodb110.ObjectId(site);
+      site = new import_mongodb111.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils186.BadRequestError("Invalid site ID format.");
     }
@@ -40819,7 +41172,7 @@ function useOnlineFormRepo() {
   }
   async function getOnlineFormById(_id) {
     try {
-      _id = new import_mongodb110.ObjectId(_id);
+      _id = new import_mongodb111.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils186.BadRequestError("Invalid online form ID format.");
     }
@@ -40862,7 +41215,7 @@ function useOnlineFormRepo() {
   }
   async function updateOnlineFormById(_id, value) {
     try {
-      _id = new import_mongodb110.ObjectId(_id);
+      _id = new import_mongodb111.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils186.BadRequestError("Invalid online form ID format.");
     }
@@ -40890,7 +41243,7 @@ function useOnlineFormRepo() {
   }
   async function deleteOnlineFormById(_id, session) {
     try {
-      _id = new import_mongodb110.ObjectId(_id);
+      _id = new import_mongodb111.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils186.BadRequestError("Invalid online form ID format.");
     }
@@ -40923,7 +41276,7 @@ function useOnlineFormRepo() {
   }
   async function getOnlineFormsBySiteId(site, { search = "", page = 1, limit = 10, status = "active" }) {
     try {
-      site = new import_mongodb110.ObjectId(site);
+      site = new import_mongodb111.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils186.BadRequestError(
         "Invalid online form configuration site ID format."
@@ -41364,7 +41717,7 @@ function useOccurrenceSubjectController() {
 }
 
 // src/models/nfc-patrol-log.model.ts
-var import_mongodb111 = require("mongodb");
+var import_mongodb112 = require("mongodb");
 var import_joi108 = __toESM(require("joi"));
 var import_node_server_utils190 = require("@7365admin1/node-server-utils");
 var schemaNfcPatrolLog = import_joi108.default.object({
@@ -41416,32 +41769,32 @@ function MNfcPatrolLog(valueArg) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb111.ObjectId(value._id);
+      value._id = new import_mongodb112.ObjectId(value._id);
     } catch (error2) {
       throw new import_node_server_utils190.BadRequestError("Invalid _id format");
     }
   }
   try {
-    value.site = new import_mongodb111.ObjectId(value.site);
+    value.site = new import_mongodb112.ObjectId(value.site);
   } catch (error2) {
     throw new import_node_server_utils190.BadRequestError("Invalid site format");
   }
   if (value?.createdBy) {
     try {
-      value.createdBy = new import_mongodb111.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb112.ObjectId(value.createdBy);
     } catch (error2) {
       throw new import_node_server_utils190.BadRequestError("Invalid createdBy format");
     }
   }
   if (value?.route?._id) {
     try {
-      value.route._id = new import_mongodb111.ObjectId(value.route._id);
+      value.route._id = new import_mongodb112.ObjectId(value.route._id);
     } catch (error2) {
       throw new import_node_server_utils190.BadRequestError("Invalid route _id format");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb111.ObjectId(),
+    _id: value._id ?? new import_mongodb112.ObjectId(),
     site: value.site,
     route: value.route,
     date: value.date,
@@ -41455,7 +41808,7 @@ function MNfcPatrolLog(valueArg) {
 
 // src/repositories/nfc-patrol-log.repository.ts
 var import_node_server_utils191 = require("@7365admin1/node-server-utils");
-var import_mongodb112 = require("mongodb");
+var import_mongodb113 = require("mongodb");
 function useNfcPatrolLogRepo() {
   const db = import_node_server_utils191.useAtlas.getDb();
   if (!db) {
@@ -41508,7 +41861,7 @@ function useNfcPatrolLogRepo() {
     const pageIndex = page > 0 ? page - 1 : 0;
     let siteId;
     try {
-      siteId = typeof site === "string" ? new import_mongodb112.ObjectId(site) : site;
+      siteId = typeof site === "string" ? new import_mongodb113.ObjectId(site) : site;
     } catch {
       throw new import_node_server_utils191.BadRequestError("Invalid site ID format.");
     }
@@ -41519,7 +41872,7 @@ function useNfcPatrolLogRepo() {
       query.date = date;
     }
     if (route?._id) {
-      query["route._id"] = typeof route._id === "string" ? new import_mongodb112.ObjectId(route._id) : route._id;
+      query["route._id"] = typeof route._id === "string" ? new import_mongodb113.ObjectId(route._id) : route._id;
     }
     if (route?.startTime) {
       query["route.startTime"] = route.startTime;
@@ -42378,7 +42731,7 @@ function useNewDashboardController() {
 
 // src/models/manpower-monitoring.model.ts
 var import_joi111 = __toESM(require("joi"));
-var import_mongodb113 = require("mongodb");
+var import_mongodb114 = require("mongodb");
 var shiftSchema = import_joi111.default.object({
   name: import_joi111.default.string().required(),
   checkIn: import_joi111.default.string().optional().allow("", null),
@@ -42403,7 +42756,7 @@ var manpowerMonitoringSchema = import_joi111.default.object({
 });
 var MManpowerMonitoring = class {
   constructor(data) {
-    this._id = new import_mongodb113.ObjectId();
+    this._id = new import_mongodb114.ObjectId();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName;
@@ -42869,7 +43222,7 @@ var hrmlabs_attendance_util_default = {
 };
 
 // src/repositories/manpower-monitoring.repo.ts
-var import_mongodb114 = require("mongodb");
+var import_mongodb115 = require("mongodb");
 var { hrmLabsAuthentication: hrmLabsAuthentication2, fetchSites: fetchSites2 } = hrmlabs_attendance_util_default;
 function useManpowerMonitoringRepo() {
   const db = import_node_server_utils196.useAtlas.getDb();
@@ -42883,11 +43236,11 @@ function useManpowerMonitoringRepo() {
     try {
       value = new MManpowerMonitoring(value);
       if (value.createdBy)
-        value.createdBy = new import_mongodb114.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb115.ObjectId(value.createdBy);
       if (value.siteId)
-        value.siteId = new import_mongodb114.ObjectId(value.siteId);
+        value.siteId = new import_mongodb115.ObjectId(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new import_mongodb114.ObjectId(value.serviceProviderId);
+        value.serviceProviderId = new import_mongodb115.ObjectId(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -42928,8 +43281,8 @@ function useManpowerMonitoringRepo() {
   }
   async function getManpowerSettingsBySiteId(_id, serviceProviderId) {
     try {
-      _id = new import_mongodb114.ObjectId(_id);
-      serviceProviderId = new import_mongodb114.ObjectId(serviceProviderId);
+      _id = new import_mongodb115.ObjectId(_id);
+      serviceProviderId = new import_mongodb115.ObjectId(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -42945,7 +43298,7 @@ function useManpowerMonitoringRepo() {
   }
   async function updateManpowerMonitoringSettings(_id, value) {
     try {
-      _id = new import_mongodb114.ObjectId(_id);
+      _id = new import_mongodb115.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils196.BadRequestError("Invalid ID format.");
     }
@@ -42972,7 +43325,7 @@ function useManpowerMonitoringRepo() {
       for (let item of value) {
         item = new MManpowerMonitoring(item);
         const data = await collection.findOne({
-          siteId: new import_mongodb114.ObjectId(item.siteId)
+          siteId: new import_mongodb115.ObjectId(item.siteId)
         });
         if (data) {
           let updateValue;
@@ -42997,11 +43350,11 @@ function useManpowerMonitoringRepo() {
           }
         } else {
           if (item.createdBy)
-            item.createdBy = new import_mongodb114.ObjectId(item.createdBy);
+            item.createdBy = new import_mongodb115.ObjectId(item.createdBy);
           if (item.siteId)
-            item.siteId = new import_mongodb114.ObjectId(item.siteId);
+            item.siteId = new import_mongodb115.ObjectId(item.siteId);
           if (item.serviceProviderId)
-            item.serviceProviderId = new import_mongodb114.ObjectId(item.serviceProviderId);
+            item.serviceProviderId = new import_mongodb115.ObjectId(item.serviceProviderId);
           const result = await collection.insertOne(item);
           if (result.insertedId) {
             results.inserted++;
@@ -43025,7 +43378,7 @@ function useManpowerMonitoringRepo() {
     const siteUrl = process.env.HRMLABS_SITE_URL;
     try {
       const serviceProvider = await serviceProviderCollection.findOne({
-        _id: new import_mongodb114.ObjectId(serviceProviderId)
+        _id: new import_mongodb115.ObjectId(serviceProviderId)
       });
       if (!serviceProvider) {
         throw new Error("Service Provider not found.");
@@ -43067,7 +43420,7 @@ var import_node_server_utils197 = require("@7365admin1/node-server-utils");
 
 // src/models/manpower-remarks.model.ts
 var import_joi112 = __toESM(require("joi"));
-var import_mongodb115 = require("mongodb");
+var import_mongodb116 = require("mongodb");
 var remarksSchema = import_joi112.default.object({
   name: import_joi112.default.string().required(),
   remark: import_joi112.default.object({
@@ -43091,7 +43444,7 @@ var manpowerRemarksSchema = import_joi112.default.object({
 });
 var MManpowerRemarks = class {
   constructor(data) {
-    this._id = new import_mongodb115.ObjectId();
+    this._id = new import_mongodb116.ObjectId();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
@@ -43109,7 +43462,7 @@ var MManpowerRemarks = class {
 };
 
 // src/repositories/manpower-remarks.repo.ts
-var import_mongodb116 = require("mongodb");
+var import_mongodb117 = require("mongodb");
 var import_moment_timezone2 = __toESM(require("moment-timezone"));
 function useManpowerRemarksRepo() {
   const db = import_node_server_utils197.useAtlas.getDb();
@@ -43122,9 +43475,9 @@ function useManpowerRemarksRepo() {
     try {
       value = new MManpowerRemarks(value);
       if (value.siteId)
-        value.siteId = new import_mongodb116.ObjectId(value.siteId);
+        value.siteId = new import_mongodb117.ObjectId(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new import_mongodb116.ObjectId(value.serviceProviderId);
+        value.serviceProviderId = new import_mongodb117.ObjectId(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -43144,7 +43497,7 @@ function useManpowerRemarksRepo() {
       limit = limit || 10;
       const searchQuery = {};
       const nowSGT = (0, import_moment_timezone2.default)().tz("Asia/Singapore");
-      searchQuery.serviceProviderId = new import_mongodb116.ObjectId(serviceProviderId);
+      searchQuery.serviceProviderId = new import_mongodb117.ObjectId(serviceProviderId);
       if (search != "") {
         searchQuery.siteName = { $regex: search, $options: "i" };
       }
@@ -43176,8 +43529,8 @@ function useManpowerRemarksRepo() {
   }
   async function getManpowerRemarksBySiteId(_id, date, serviceProviderId) {
     try {
-      _id = new import_mongodb116.ObjectId(_id);
-      serviceProviderId = new import_mongodb116.ObjectId(serviceProviderId);
+      _id = new import_mongodb117.ObjectId(_id);
+      serviceProviderId = new import_mongodb117.ObjectId(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -43194,13 +43547,13 @@ function useManpowerRemarksRepo() {
   }
   async function updateManpowerRemarks(_id, value) {
     try {
-      _id = new import_mongodb116.ObjectId(_id);
+      _id = new import_mongodb117.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils197.BadRequestError("Invalid ID format.");
     }
     try {
       if (value.createdBy) {
-        value.createdBy = new import_mongodb116.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb117.ObjectId(value.createdBy);
       }
       const updateValue = {
         ...value,
@@ -43217,7 +43570,7 @@ function useManpowerRemarksRepo() {
   }
   async function updateRemarksStatus(_id, value) {
     try {
-      _id = new import_mongodb116.ObjectId(_id);
+      _id = new import_mongodb117.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils197.BadRequestError("Invalid ID format.");
     }
@@ -43489,7 +43842,7 @@ function useManpowerMonitoringCtrl() {
 
 // src/models/manpower-designations.model.ts
 var import_joi114 = __toESM(require("joi"));
-var import_mongodb117 = require("mongodb");
+var import_mongodb118 = require("mongodb");
 var designationsSchema = import_joi114.default.object({
   title: import_joi114.default.string().required(),
   shifts: import_joi114.default.object({
@@ -43508,7 +43861,7 @@ var manpowerDesignationsSchema = import_joi114.default.object({
 });
 var MManpowerDesignations = class {
   constructor(data) {
-    this._id = new import_mongodb117.ObjectId();
+    this._id = new import_mongodb118.ObjectId();
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
     this.serviceProviderId = data.serviceProviderId || "";
@@ -43522,7 +43875,7 @@ var MManpowerDesignations = class {
 
 // src/repositories/manpower-designations.repo.ts
 var import_node_server_utils200 = require("@7365admin1/node-server-utils");
-var import_mongodb118 = require("mongodb");
+var import_mongodb119 = require("mongodb");
 function useManpowerDesignationRepo() {
   const db = import_node_server_utils200.useAtlas.getDb();
   if (!db) {
@@ -43534,11 +43887,11 @@ function useManpowerDesignationRepo() {
     try {
       value = new MManpowerDesignations(value);
       if (value.createdBy)
-        value.createdBy = new import_mongodb118.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb119.ObjectId(value.createdBy);
       if (value.siteId)
-        value.siteId = new import_mongodb118.ObjectId(value.siteId);
+        value.siteId = new import_mongodb119.ObjectId(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new import_mongodb118.ObjectId(value.serviceProviderId);
+        value.serviceProviderId = new import_mongodb119.ObjectId(value.serviceProviderId);
       const result = await collection.insertOne(value);
       return result;
     } catch (error) {
@@ -43547,8 +43900,8 @@ function useManpowerDesignationRepo() {
   }
   async function getManpowerDesignationsBySiteId(_id, serviceProviderId) {
     try {
-      _id = new import_mongodb118.ObjectId(_id);
-      serviceProviderId = new import_mongodb118.ObjectId(serviceProviderId);
+      _id = new import_mongodb119.ObjectId(_id);
+      serviceProviderId = new import_mongodb119.ObjectId(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -43564,7 +43917,7 @@ function useManpowerDesignationRepo() {
   }
   async function updateManpowerDesignations(_id, value) {
     try {
-      _id = new import_mongodb118.ObjectId(_id);
+      _id = new import_mongodb119.ObjectId(_id);
     } catch (error) {
       throw new Error("Invalid ID format.");
     }
@@ -43667,7 +44020,7 @@ function useManpowerDesignationCtrl() {
 
 // src/models/overnight-parking.model.ts
 var import_joi116 = __toESM(require("joi"));
-var import_mongodb119 = require("mongodb");
+var import_mongodb120 = require("mongodb");
 var dayScheduleSchema = import_joi116.default.object({
   isEnabled: import_joi116.default.boolean().required(),
   startTime: import_joi116.default.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().allow(null, "").messages({
@@ -43709,7 +44062,7 @@ function MOvernightParkingApprovalHours(value) {
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb119.ObjectId(value.site);
+      value.site = new import_mongodb120.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
@@ -45314,7 +45667,7 @@ function useManpowerRemarkCtrl() {
 
 // src/models/manpower-sites.model.ts
 var import_joi122 = __toESM(require("joi"));
-var import_mongodb120 = require("mongodb");
+var import_mongodb121 = require("mongodb");
 var manpowerSitesSchema = import_joi122.default.object({
   id: import_joi122.default.string().hex().required(),
   text: import_joi122.default.string().hex().optional().allow("", null),
@@ -45325,7 +45678,7 @@ var manpowerSitesSchema = import_joi122.default.object({
 });
 var MManpowerSites = class {
   constructor(data) {
-    this._id = new import_mongodb120.ObjectId();
+    this._id = new import_mongodb121.ObjectId();
     this.id = data.id || "";
     this.text = data.text || "";
     this.contractID = data.contractID || "";
@@ -45535,7 +45888,7 @@ function useManpowerSitesCtrl() {
 
 // src/utils/cron.util.ts
 var import_node_server_utils214 = require("@7365admin1/node-server-utils");
-var import_mongodb121 = require("mongodb");
+var import_mongodb122 = require("mongodb");
 var import_moment_timezone4 = __toESM(require("moment-timezone"));
 var createManpowerRemarksDaily = async () => {
   const db = import_node_server_utils214.useAtlas.getDb();
@@ -45695,7 +46048,7 @@ var updateRemarksisAcknowledged = async () => {
     for (const id of updatedIds) {
       const doc = await remarks.findOne({ _id: id });
       const setting = await settings.findOne(
-        { siteId: new import_mongodb121.ObjectId(doc?.siteId) },
+        { siteId: new import_mongodb122.ObjectId(doc?.siteId) },
         { projection: { emails: 1 } }
       );
       const payload = {
@@ -45781,7 +46134,7 @@ var updateRemarksStatusEod = async () => {
   for (const doc of docs) {
     let shiftsToCheck = [];
     const endShiftTime = await settings.findOne(
-      { siteId: new import_mongodb121.ObjectId(doc.siteId) },
+      { siteId: new import_mongodb122.ObjectId(doc.siteId) },
       { projection: { shifts: 1, shiftType: 1 } }
     );
     if (doc.createdAtSGT === nowSGT) {
@@ -45887,7 +46240,7 @@ var isWithinHour = (alertTime, timeNow) => {
 
 // src/events/manpower.event.ts
 var import_node_server_utils215 = require("@7365admin1/node-server-utils");
-var import_mongodb122 = require("mongodb");
+var import_mongodb123 = require("mongodb");
 var import_moment_timezone5 = __toESM(require("moment-timezone"));
 async function manpowerEvents(io) {
   let intervalId = null;
@@ -45913,7 +46266,7 @@ async function manpowerEvents(io) {
     }).toArray();
     for (const doc of docs) {
       const siteSettings = await settings.findOne(
-        { siteId: new import_mongodb122.ObjectId(doc.siteId), enabled: true },
+        { siteId: new import_mongodb123.ObjectId(doc.siteId), enabled: true },
         { projection: { shifts: 1, shiftType: 1 } }
       );
       const shiftType = siteSettings?.shiftType || "2-shifts";
@@ -46032,7 +46385,7 @@ function genericSignature(params, secretKey) {
 }
 
 // src/repositories/reddot-payment.repository.ts
-var import_mongodb126 = require("mongodb");
+var import_mongodb127 = require("mongodb");
 
 // src/utils/date-format.util.ts
 var import_moment_timezone6 = __toESM(require("moment-timezone"));
@@ -46057,11 +46410,11 @@ function formatDateString(today, format, dateRange) {
 }
 
 // src/models/credit-card.model.ts
-var import_mongodb123 = require("mongodb");
+var import_mongodb124 = require("mongodb");
 var MCardInfo = class {
   // this is coming from RDP transaction
   constructor({
-    _id = new import_mongodb123.ObjectId(),
+    _id = new import_mongodb124.ObjectId(),
     userId,
     cardType,
     cardNumber,
@@ -46096,11 +46449,11 @@ var MCardInfo = class {
 };
 
 // src/models/cart.model.ts
-var import_mongodb124 = require("mongodb");
+var import_mongodb125 = require("mongodb");
 var MUnitBillings = class {
   // transaction response messages
   constructor({
-    _id = new import_mongodb124.ObjectId(),
+    _id = new import_mongodb125.ObjectId(),
     unit,
     unitId,
     unitBill,
@@ -46141,7 +46494,7 @@ var MUnitBillings = class {
 };
 
 // src/repositories/payment.repository.ts
-var import_mongodb125 = require("mongodb");
+var import_mongodb126 = require("mongodb");
 var import_node_server_utils216 = require("@7365admin1/node-server-utils");
 var PaymentBillRepo = () => {
   const getDB2 = () => {
@@ -46175,7 +46528,7 @@ var PaymentBillRepo = () => {
       if (unitBillInfo?.status === "Inactive" /* inactive */) {
         throw new Error("This Bill is Inactive!");
       }
-      const billId = new import_mongodb125.ObjectId(unitBillInfo?.billId);
+      const billId = new import_mongodb126.ObjectId(unitBillInfo?.billId);
       const billInfo = await billCollection().findOne({ _id: billId });
       if (!billInfo) {
         throw new Error("Bill info not found");
@@ -46214,13 +46567,13 @@ var PaymentBillRepo = () => {
   const saveCreditCardInfo = async (payload) => {
     try {
       if (payload.userId)
-        payload.userId = new import_mongodb125.ObjectId(payload.userId);
+        payload.userId = new import_mongodb126.ObjectId(payload.userId);
       if (payload.site)
-        payload.site = new import_mongodb125.ObjectId(payload.site);
+        payload.site = new import_mongodb126.ObjectId(payload.site);
       if (payload.organization)
-        payload.organization = new import_mongodb125.ObjectId(payload.organization);
+        payload.organization = new import_mongodb126.ObjectId(payload.organization);
       if (payload.createdBy)
-        payload.createdBy = new import_mongodb125.ObjectId(payload.createdBy);
+        payload.createdBy = new import_mongodb126.ObjectId(payload.createdBy);
       const createdAt = formatDateString(/* @__PURE__ */ new Date(), "mm-dd-yyyy");
       payload.createdAt = createdAt;
       const result = await creditCollection().insertOne(new MCardInfo(payload));
@@ -46232,19 +46585,19 @@ var PaymentBillRepo = () => {
   const checkOutUnitBills = async (payload) => {
     try {
       if (payload.unitId)
-        payload.unitId = new import_mongodb125.ObjectId(payload.unitId);
+        payload.unitId = new import_mongodb126.ObjectId(payload.unitId);
       if (payload.site)
-        payload.site = new import_mongodb125.ObjectId(payload.site);
+        payload.site = new import_mongodb126.ObjectId(payload.site);
       if (payload.organization)
-        payload.organization = new import_mongodb125.ObjectId(payload.organization);
+        payload.organization = new import_mongodb126.ObjectId(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 import_mongodb125.ObjectId(addToCart?.insertedId).toString().slice(-4);
+      const newId = new import_mongodb126.ObjectId(addToCart?.insertedId).toString().slice(-4);
       const referenceNumber = `CRT${unit}${newId}${dateFormatted}`;
-      const result = await cartCollection().findOneAndUpdate({ _id: new import_mongodb125.ObjectId(addToCart.insertedId) }, { $set: { referenceNumber } }, { returnDocument: "after" });
+      const result = await cartCollection().findOneAndUpdate({ _id: new import_mongodb126.ObjectId(addToCart.insertedId) }, { $set: { referenceNumber } }, { returnDocument: "after" });
       return result;
     } catch (error) {
       throw new Error(error.message || error || "Server Internal Error");
@@ -46275,7 +46628,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 import_mongodb125.ObjectId(billId) });
+          const billInfo = await billCollection().findOne({ _id: new import_mongodb126.ObjectId(billId) });
           const billAmount = billInfo?.price;
           payload.updatedAt = updatedAt;
           payload.amountPaid = billAmount;
@@ -46426,7 +46779,7 @@ var useRedDotPaymentRepo = () => {
         throw new Error("Failed to Add Merchant Details");
       }
       const merchantId = merchant?.insertedId;
-      const orgId = new import_mongodb126.ObjectId(_id);
+      const orgId = new import_mongodb127.ObjectId(_id);
       const result = await orgCollection().findOneAndUpdate({ _id: orgId }, { $push: { merchant: merchantId } }, {
         returnDocument: "after"
       });
@@ -46455,7 +46808,7 @@ var useRedDotPaymentRepo = () => {
   const getMerchantDetailsById = async (_id) => {
     try {
       if (_id)
-        _id = new import_mongodb126.ObjectId(_id);
+        _id = new import_mongodb127.ObjectId(_id);
       const result = await redDotMerchantCollection().aggregate([
         {
           $match: {
@@ -46710,7 +47063,7 @@ function useRedDotPaymentController() {
 
 // src/repositories/verification-v2.repo.ts
 var import_node_server_utils218 = require("@7365admin1/node-server-utils");
-var import_mongodb127 = require("mongodb");
+var import_mongodb128 = require("mongodb");
 function useVerificationRepoV2() {
   const db = import_node_server_utils218.useAtlas.getDb();
   if (!db) {
@@ -46763,7 +47116,7 @@ function useVerificationRepoV2() {
   }
   async function updateVerificationStatusById(_id, status, session) {
     try {
-      _id = new import_mongodb127.ObjectId(_id);
+      _id = new import_mongodb128.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils218.BadRequestError("Invalid verification ID format.");
     }
@@ -46906,7 +47259,7 @@ function useVerificationRepoV2() {
   }
   async function updateStatusById(_id, status, session) {
     try {
-      _id = new import_mongodb127.ObjectId(_id);
+      _id = new import_mongodb128.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils218.BadRequestError("Invalid verification ID format.");
     }
@@ -47492,7 +47845,7 @@ var import_node_server_utils222 = require("@7365admin1/node-server-utils");
 var import_uuid2 = require("uuid");
 
 // src/repositories/user-v2.repo.ts
-var import_mongodb128 = require("mongodb");
+var import_mongodb129 = require("mongodb");
 var import_node_server_utils221 = require("@7365admin1/node-server-utils");
 function useUserRepoV2() {
   const { updateFeedbackCreatedByName } = useFeedbackRepo();
@@ -47693,7 +48046,7 @@ function useUserRepoV2() {
     }
     if (organization) {
       try {
-        query.defaultOrg = new import_mongodb128.ObjectId(organization);
+        query.defaultOrg = new import_mongodb129.ObjectId(organization);
         cacheOptions.organization = organization.toString();
       } catch (error) {
         throw new import_node_server_utils221.BadRequestError("Invalid organization ID format.");
@@ -47832,13 +48185,13 @@ function useUserRepoV2() {
       );
     }
     try {
-      _id = new import_mongodb128.ObjectId(_id);
+      _id = new import_mongodb129.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils221.BadRequestError("Invalid ID.");
     }
     if (field === "defaultOrg") {
       try {
-        value = new import_mongodb128.ObjectId(value);
+        value = new import_mongodb129.ObjectId(value);
       } catch (error) {
         throw new import_node_server_utils221.BadRequestError("Invalid organization ID.");
       }
@@ -47879,7 +48232,7 @@ function useUserRepoV2() {
     year
   }, session) {
     try {
-      _id = new import_mongodb128.ObjectId(_id);
+      _id = new import_mongodb129.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils221.BadRequestError("Invalid user ID format.");
     }
@@ -47909,7 +48262,7 @@ function useUserRepoV2() {
   }
   async function updatePassword({ _id, password }, session) {
     try {
-      _id = new import_mongodb128.ObjectId(_id);
+      _id = new import_mongodb129.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils221.BadRequestError("Invalid user ID format.");
     }
@@ -48004,9 +48357,25 @@ function useAuthServiceV2() {
       throw new import_node_server_utils222.InternalServerError("Error deleting token");
     }
   }
+  async function verifyPassword(_id, password) {
+    try {
+      const user = await _getUserById(_id);
+      const isPasswordMatch = await (0, import_node_server_utils222.comparePassword)(password, user.password);
+      if (!isPasswordMatch) {
+        throw new import_node_server_utils222.BadRequestError("Invalid credentials");
+      }
+      return "Verification successful.";
+    } catch (error) {
+      if (error instanceof import_node_server_utils222.BadRequestError) {
+        throw error;
+      }
+      throw new import_node_server_utils222.InternalServerError("Error during password verification");
+    }
+  }
   return {
     login,
-    logout
+    logout,
+    verifyPassword
   };
 }
 
@@ -48214,7 +48583,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 {
@@ -48328,11 +48701,38 @@ function useAuthControllerV2() {
       return;
     }
   }
+  async function verifyPassword(req, res, next) {
+    const schema2 = import_joi127.default.object({
+      _id: import_joi127.default.string().hex().required(),
+      password: import_joi127.default.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);
+      import_node_server_utils224.logger.log({ level: "error", message: messages.join(", ") });
+      next(new import_node_server_utils224.BadRequestError(messages.join(", ")));
+      return;
+    }
+    const { _id, password } = value;
+    try {
+      const message = await _verifyPassword(_id, password);
+      res.json({ message });
+      return;
+    } catch (error2) {
+      import_node_server_utils224.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     signUp,
     login,
     logout,
-    resetPassword
+    resetPassword,
+    verifyPassword
   };
 }
 
@@ -48756,6 +49156,7 @@ function useUserControllerV2() {
   remarksSchema,
   robotSchema,
   schema,
+  schemaApprovedBy,
   schemaBilling,
   schemaBillingConfiguration,
   schemaBillingItem,