@7365admin1/core 2.30.2 → 2.31.1

package/dist/index.mjs

@@ -13112,7 +13112,7 @@ var schemaVisitorTransaction = Joi36.object({
   arrivalTime: Joi36.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().allow(null, "").messages({
     "string.pattern.base": "arrivalTime must be in HH:mm format (e.g. 09:30, 18:45)"
   }),
-  duration: Joi36.number().integer().optional().allow(null),
+  duration: Joi36.number().integer().optional().allow(null, ""),
   isOvernightParking: Joi36.boolean().optional().default(false),
   email: Joi36.string().email().optional().allow(null, ""),
   numberOfPassengers: Joi36.number().integer().optional().allow(null, ""),
@@ -13129,7 +13129,8 @@ var schemaVisitorTransaction = Joi36.object({
   checkInRemarks: Joi36.string().optional().allow("", null),
   checkOutRemarks: Joi36.string().optional().allow("", null),
   expectedCheckIn: Joi36.string().isoDate().optional(),
-  purpose: Joi36.string().optional().allow(null, "")
+  purpose: Joi36.string().optional().allow(null, ""),
+  invitedId: Joi36.any().optional().allow(null, "")
 });
 var schemaUpdateVisTrans = Joi36.object({
   _id: Joi36.string().hex().length(24).required(),
@@ -13158,12 +13159,16 @@ var schemaUpdateVisTrans = Joi36.object({
   expiredAt: Joi36.date().iso().optional().allow(null, ""),
   visitorPass: Joi36.array().items(
     Joi36.object({
-      keyId: Joi36.string().hex().length(24).required()
+      keyId: Joi36.string().hex().length(24).required(),
+      status: Joi36.string().optional().allow(null, ""),
+      remarks: Joi36.string().optional().allow(null, "")
     })
   ).optional().allow(null),
   passKeys: Joi36.array().items(
     Joi36.object({
-      keyId: Joi36.string().hex().length(24).required()
+      keyId: Joi36.string().hex().length(24).required(),
+      status: Joi36.string().optional().allow(null, ""),
+      remarks: Joi36.string().optional().allow(null, "")
     })
   ).optional().allow(null),
   checkInRemarks: Joi36.string().optional().allow("", null),
@@ -13269,7 +13274,17 @@ function MVisitorTransaction(value) {
     expiredAt: value.expiredAt ?? null,
     createdAt: value.createdAt ?? newDate,
     updatedAt: value.updatedAt ?? "",
-    deletedAt: value.deletedAt ?? ""
+    deletedAt: value.deletedAt ?? "",
+    purpose: value.purpose,
+    numberOfPassengers: value.numberOfPassengers ?? null,
+    email: value.email,
+    isOvernightParking: value.isOvernightParking ?? false,
+    invitedId: new ObjectId39(String(value.invitedId)) ?? null,
+    overnightParking: value.isOvernightParking == true ? {
+      status: "pending approval",
+      remarks: "",
+      updatedBy: new ObjectId39(String(value.invitedId)) ?? null
+    } : null
   };
 }
 
@@ -13401,16 +13416,40 @@ function useVisitorTransactionRepo() {
               localField: "visitorPass.keyId",
               foreignField: "_id",
               pipeline: [
+                {
+                  $lookup: {
+                    from: "qr-code-templates",
+                    localField: "template",
+                    foreignField: "_id",
+                    pipeline: [
+                      {
+                        $project: {
+                          _id: 1,
+                          prefixPass: 1,
+                          name: 1
+                        }
+                      }
+                    ],
+                    as: "template"
+                  }
+                },
                 {
                   $project: {
                     _id: 0,
-                    // remove original _id
                     keyId: "$_id",
                     status: 1,
                     description: 1,
+                    templatePrefixPass: {
+                      $arrayElemAt: ["$template.prefixPass", 0]
+                    },
                     prefixAndName: {
                       $concat: [
-                        { $ifNull: ["$prefix", ""] },
+                        {
+                          $ifNull: [
+                            { $arrayElemAt: ["$template.prefixPass", 0] },
+                            ""
+                          ]
+                        },
                         { $ifNull: ["$name", ""] }
                       ]
                     }
@@ -13423,145 +13462,50 @@ function useVisitorTransactionRepo() {
           {
             $lookup: {
               from: "keys",
-              localField: "visitorPass.keyId",
+              localField: "passKeys.keyId",
               foreignField: "_id",
               pipeline: [
                 {
-                  $project: {
-                    _id: 1,
-                    prefix: 1,
-                    name: 1,
-                    description: 1,
-                    createdAt: 1,
-                    updatedAt: 1
-                  }
-                }
-              ],
-              as: "visitorPassDetails"
-            }
-          },
-          {
-            $addFields: {
-              visitorPass: {
-                $map: {
-                  input: "$visitorPass",
-                  as: "vp",
-                  in: {
-                    $let: {
-                      vars: {
-                        matchedKey: {
-                          $arrayElemAt: [
-                            {
-                              $filter: {
-                                input: "$visitorPassDetails",
-                                as: "kd",
-                                cond: { $eq: ["$$kd._id", "$$vp.keyId"] }
-                              }
-                            },
-                            0
-                          ]
-                        }
-                      },
-                      in: {
-                        keyId: "$$vp.keyId",
-                        receivedDate: "$$vp.receivedDate",
-                        status: "$$vp.status",
-                        lastUpdate: {
-                          $max: [
-                            "$$matchedKey.createdAt",
-                            "$$matchedKey.updatedAt"
-                          ]
-                        },
-                        remarks: "$$vp.remarks",
-                        description: "$$matchedKey.description",
-                        prefixAndName: {
-                          $concat: [
-                            { $ifNull: ["$$matchedKey.prefix", ""] },
-                            { $ifNull: ["$$matchedKey.name", ""] }
-                          ]
+                  $lookup: {
+                    from: "qr-code-templates",
+                    localField: "template",
+                    foreignField: "_id",
+                    pipeline: [
+                      {
+                        $project: {
+                          _id: 1,
+                          prefixPass: 1,
+                          name: 1
                         }
                       }
-                    }
+                    ],
+                    as: "template"
                   }
-                }
-              }
-            }
-          },
-          {
-            $project: {
-              visitorPassDetails: 0
-            }
-          },
-          {
-            $lookup: {
-              from: "keys",
-              localField: "passKeys.keyId",
-              foreignField: "_id",
-              pipeline: [
+                },
                 {
                   $project: {
-                    _id: 1,
-                    prefix: 1,
-                    name: 1,
+                    _id: 0,
+                    keyId: "$_id",
+                    status: 1,
                     description: 1,
-                    createdAt: 1,
-                    updatedAt: 1
-                  }
-                }
-              ],
-              as: "passKeysDetails"
-            }
-          },
-          {
-            $addFields: {
-              passKeys: {
-                $map: {
-                  input: "$passKeys",
-                  as: "pk",
-                  in: {
-                    $let: {
-                      vars: {
-                        matchedKey: {
-                          $arrayElemAt: [
-                            {
-                              $filter: {
-                                input: "$passKeysDetails",
-                                as: "kd",
-                                cond: { $eq: ["$$kd._id", "$$pk.keyId"] }
-                              }
-                            },
-                            0
-                          ]
-                        }
-                      },
-                      in: {
-                        keyId: "$$pk.keyId",
-                        receivedDate: "$$pk.receivedDate",
-                        status: "$$pk.status",
-                        lastUpdate: {
-                          $max: [
-                            "$$matchedKey.createdAt",
-                            "$$matchedKey.updatedAt"
+                    templatePrefixPass: {
+                      $arrayElemAt: ["$template.prefixPass", 0]
+                    },
+                    prefixAndName: {
+                      $concat: [
+                        {
+                          $ifNull: [
+                            { $arrayElemAt: ["$template.prefixPass", 0] },
+                            ""
                           ]
                         },
-                        remarks: "$$pk.remarks",
-                        description: "$$matchedKey.description",
-                        prefixAndName: {
-                          $concat: [
-                            { $ifNull: ["$$matchedKey.prefix", ""] },
-                            { $ifNull: ["$$matchedKey.name", ""] }
-                          ]
-                        }
-                      }
+                        { $ifNull: ["$name", ""] }
+                      ]
                     }
                   }
                 }
-              }
-            }
-          },
-          {
-            $project: {
-              passKeysDetails: 0
+              ],
+              as: "passKeys"
             }
           },
           { $sort: sort },
@@ -21598,8 +21542,8 @@ var KeyRepo = class {
   static async updateKeyById(keyId, key, site, session, isChild) {
     try {
       keyId = new ObjectId57(keyId);
-      site = new ObjectId57(site);
-      key.updatedAt = /* @__PURE__ */ new Date();
+      if (site)
+        site = new ObjectId57(site);
       if (key.updatedBy)
         key.updatedBy = await convertObjectIdUtil(key.updatedBy);
       if (!key.status)
@@ -21609,7 +21553,8 @@ var KeyRepo = class {
     }
     try {
       key.updatedAt = /* @__PURE__ */ new Date();
-      let find = { _id: keyId, site };
+      const query = { _id: keyId, ...site && { site } };
+      let find = query;
       if (isChild)
         find = { parentId: keyId, site };
       const result = await this.collection().updateMany(
@@ -21669,6 +21614,7 @@ function useVisitorTransactionService() {
     getExpiredCheckedOutTransactionsBySite: _getExpiredCheckedOutTransactionsBySite,
     updateManyDahuaSyncStatus: _updateManyDahuaSyncStatus
   } = useVisitorTransactionRepo();
+  const { getById } = useBuildingUnitRepo();
   const {
     add: _addPerson,
     getByNRIC,
@@ -21761,7 +21707,7 @@ function useVisitorTransactionService() {
             if (member.visitorPass && Array.isArray(member.visitorPass) && member.visitorPass.length > 0) {
               for (const vp of member.visitorPass) {
                 try {
-                  const updatePayload = { status: "Not returned" /* NOT_RETURNED */ };
+                  const updatePayload = { status: "In Use" /* IN_USE */ };
                   const visitorPassId = typeof vp === "string" || vp instanceof ObjectId58 ? vp : vp.keyId;
                   await KeyRepo.updateKeyById(
                     visitorPassId,
@@ -21776,7 +21722,7 @@ function useVisitorTransactionService() {
             if (member.passKeys && Array.isArray(member.passKeys) && member.passKeys.length > 0) {
               for (const pk of member.passKeys) {
                 try {
-                  const updatePayload = { status: "Not returned" /* NOT_RETURNED */ };
+                  const updatePayload = { status: "In Use" /* IN_USE */ };
                   const passKeyId = typeof pk === "string" || pk instanceof ObjectId58 ? pk : pk.keyId;
                   await KeyRepo.updateKeyById(
                     passKeyId,
@@ -21892,7 +21838,7 @@ function useVisitorTransactionService() {
       if (value.visitorPass && Array.isArray(value.visitorPass) && value.visitorPass.length > 0) {
         for (const vp of value.visitorPass) {
           try {
-            const updatePayload = { status: "Not returned" /* NOT_RETURNED */ };
+            const updatePayload = { status: "In Use" /* IN_USE */ };
             const visitorPassId = typeof vp === "string" || vp instanceof ObjectId58 ? vp : vp.keyId;
             await KeyRepo.updateKeyById(
               visitorPassId,
@@ -21907,7 +21853,7 @@ function useVisitorTransactionService() {
       if (value.passKeys && Array.isArray(value.passKeys) && value.passKeys.length > 0) {
         for (const pk of value.passKeys) {
           try {
-            const updatePayload = { status: "Not returned" /* NOT_RETURNED */ };
+            const updatePayload = { status: "In Use" /* IN_USE */ };
             const passKeyId = typeof pk === "string" || pk instanceof ObjectId58 ? pk : pk.keyId;
             await KeyRepo.updateKeyById(
               passKeyId,
@@ -21933,6 +21879,52 @@ function useVisitorTransactionService() {
     const session = useAtlas48.getClient()?.startSession();
     session?.startTransaction();
     try {
+      if (Array.isArray(value.visitorPass) && value.visitorPass.length > 0) {
+        const keptVisitorPass = [];
+        for (const vp of value.visitorPass) {
+          const updatePayload = {
+            ...vp.status && { status: vp.status },
+            ...vp.remarks && { remarks: vp.remarks }
+          };
+          const visitorPassId = typeof vp === "string" || vp instanceof ObjectId58 ? vp : vp.keyId;
+          await KeyRepo.updateKeyById(
+            visitorPassId,
+            updatePayload,
+            value.site
+          );
+          if (typeof vp !== "string" && !(vp instanceof ObjectId58)) {
+            keptVisitorPass.push({
+              keyId: new ObjectId58(visitorPassId)
+            });
+          }
+        }
+        value.visitorPass = keptVisitorPass;
+      }
+      if (value.passKeys && Array.isArray(value.passKeys) && value.passKeys.length > 0) {
+        const keptPassKeys = [];
+        for (const pk of value.passKeys) {
+          try {
+            const updatePayload = {
+              ...pk.status && { status: pk.status },
+              ...pk.remarks && { remarks: pk.remarks }
+            };
+            const passKeyId = typeof pk === "string" || pk instanceof ObjectId58 ? pk : pk.keyId;
+            await KeyRepo.updateKeyById(
+              passKeyId,
+              updatePayload,
+              value.site
+            );
+            if (typeof pk !== "string" && !(pk instanceof ObjectId58)) {
+              keptPassKeys.push({
+                keyId: new ObjectId58(passKeyId)
+              });
+            }
+          } catch (error) {
+            throw error;
+          }
+        }
+        value.passKeys = keptPassKeys;
+      }
       await _updateVisitorTansactionById(id, value, session);
       await session?.commitTransaction();
       return "Successfully updated visitor transaction.";
@@ -22021,6 +22013,7 @@ function useVisitorTransactionService() {
     try {
       session.startTransaction();
       const inviter = await _getByUserId(userId);
+      const unit = await getById(inviter?.unit);
       value.checkIn = null;
       const dir = __dirname;
       const filePath = getDirectory2(dir, "./public/handlebars/visitor-invite");
@@ -22029,9 +22022,11 @@ function useVisitorTransactionService() {
         block: inviter?.block,
         level: inviter?.level,
         unit: inviter?.unit,
+        unitName: unit?.name,
         org: inviter?.org.toString(),
         site: inviter?.site.toString(),
-        status: "pending" /* PENDING */
+        status: "pending" /* PENDING */,
+        invitedId: inviter?._id
       };
       const result = await _add(payload);
       const emailContent = compileHandlebar2({
@@ -22254,7 +22249,7 @@ function useVisitorTransactionController() {
       arrivalTime: Joi55.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().allow(null, "").messages({
         "string.pattern.base": "arrivalTime must be in HH:mm format (e.g. 09:30, 18:45)"
       }),
-      duration: Joi55.number().integer().optional().allow(null),
+      duration: Joi55.number().integer().optional().allow(null, ""),
       name: Joi55.string().required(),
       contact: Joi55.string().required(),
       email: Joi55.string().email().required(),
@@ -22277,8 +22272,8 @@ function useVisitorTransactionController() {
     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 {
-      await _inviteVisitor(rest, inviterUserId);
-      res.status(200).json({ message: "Successfully invited visitor." });
+      const result = await _inviteVisitor(rest, inviterUserId);
+      res.status(200).json({ insertedId: result });
       return;
     } catch (error2) {
       logger78.log({ level: "error", message: error2.message });
@@ -22925,7 +22920,8 @@ function usePersonController() {
     getPeopleByUnit: _getPeopleByUnit,
     getCompany: _getCompany,
     getPeopleByPlateNumber: _getPeopleByPlateNumber,
-    getPeopleByNRIC: _getPeopleByNRIC
+    getPeopleByNRIC: _getPeopleByNRIC,
+    getByUserId: _getByUserId
   } = usePersonRepo();
   const { add: _add, updateById: _updateById } = usePersonService();
   async function add(req, res, next) {
@@ -23224,6 +23220,25 @@ function usePersonController() {
       return;
     }
   }
+  async function getPersonByUserId(req, res, next) {
+    const validation = Joi58.string().required();
+    const userId = req.params.userId;
+    const { error } = validation.validate(userId);
+    if (error) {
+      logger82.log({ level: "error", message: error.message });
+      next(new BadRequestError101(error.message));
+      return;
+    }
+    try {
+      const data = await _getByUserId(userId);
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger82.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
@@ -23234,7 +23249,8 @@ function usePersonController() {
     getPeopleByUnit,
     getCompany,
     getPeopleByPlateNumber,
-    getPeopleByNRIC
+    getPeopleByNRIC,
+    getPersonByUserId
   };
 }
 
@@ -30921,6 +30937,95 @@ function useSiteUnitBillingRepo() {
       throw error;
     }
   }
+  async function getResidentUserBilling({
+    search = "",
+    page = 1,
+    limit = 10,
+    sort = {},
+    status = "active",
+    site = "",
+    paymentStatus = "awaiting_payment",
+    month,
+    year,
+    unitId
+  }, session) {
+    page = page > 0 ? page - 1 : 0;
+    let dateExpr = {};
+    if (month && year) {
+      const monthNum = parseInt(month, 10);
+      const yearNum = parseInt(year, 10);
+      const startDate = new Date(yearNum, monthNum - 1, 1);
+      const endDate = new Date(yearNum, monthNum, 1);
+      dateExpr.createdAt = {
+        $gte: startDate,
+        $lt: endDate
+      };
+    }
+    const unitSearchRegex = search ? search.trim().replace(/\s+/g, "").replace(/\//g, "\\s*/\\s*") : null;
+    const query = {
+      paymentStatus,
+      status,
+      ...search && {
+        $or: [
+          { unitOwner: { $regex: search, $options: "i" } },
+          { billName: { $regex: search, $options: "i" } },
+          { unit: { $regex: unitSearchRegex, $options: "i" } },
+          {
+            $expr: {
+              $regexMatch: {
+                input: { $toString: "$amountPaid" },
+                regex: search,
+                options: "i"
+              }
+            }
+          }
+        ]
+      },
+      ...ObjectId86.isValid(site) && { site: new ObjectId86(site) },
+      ...dateExpr,
+      ...ObjectId86.isValid(unitId) && { unitId: new ObjectId86(unitId) }
+    };
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    try {
+      const basePipeline = [
+        { $match: query },
+        { $sort: sort },
+        { $skip: page * limit },
+        { $limit: limit },
+        {
+          $lookup: {
+            from: "site.billing.items",
+            localField: "billItem",
+            foreignField: "_id",
+            pipeline: [
+              {
+                $project: {
+                  _id: 1,
+                  totalAmount: 1
+                }
+              }
+            ],
+            as: "billDetails"
+          }
+        },
+        {
+          $unwind: {
+            path: "$billDetails",
+            preserveNullAndEmptyArrays: true
+          }
+        }
+      ];
+      const [items, countResult] = await Promise.all([
+        collection.aggregate(basePipeline, { session }).toArray(),
+        collection.aggregate([{ $match: query }, { $count: "total" }], { session }).toArray()
+      ]);
+      const totalCount = countResult[0]?.total || 0;
+      const data = paginate37(items, page, limit, totalCount);
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   function delCachedData() {
     delNamespace().then(() => {
       logger117.log({
@@ -30952,7 +31057,8 @@ function useSiteUnitBillingRepo() {
     getById,
     updateById,
     deleteById,
-    getUnitBillingBySite
+    getUnitBillingBySite,
+    getResidentUserBilling
   };
 }
 
@@ -31143,7 +31249,8 @@ function useSiteUnitBillingController() {
     getAll: _getAll,
     updateById: _updateById,
     deleteById: _deleteById,
-    getById: _getById
+    getById: _getById,
+    getResidentUserBilling: _getResidentUserBilling
   } = useSiteUnitBillingRepo();
   async function add(req, res, next) {
     const data = { ...req.body };
@@ -31284,12 +31391,64 @@ function useSiteUnitBillingController() {
       return;
     }
   }
+  async function getResidentUserBilling(req, res, next) {
+    const validation = Joi84.object({
+      page: Joi84.number().integer().min(1).allow("", null).default(1),
+      limit: Joi84.number().integer().min(1).max(100).allow("", null).default(10),
+      status: Joi84.string().optional().allow(null, ""),
+      search: Joi84.string().optional().allow(null, ""),
+      site: Joi84.string().required(),
+      paymentStatus: Joi84.string().optional().allow(null, ""),
+      month: Joi84.string().optional().allow(null, ""),
+      year: Joi84.string().optional().allow(null, ""),
+      unitId: Joi84.string().optional().allow(null, "")
+    });
+    const query = { ...req.query };
+    const { error } = validation.validate(query, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      logger119.log({ level: "error", message: messages });
+      next(new BadRequestError140(messages));
+      return;
+    }
+    const search = req.query.search ?? "";
+    const page = parseInt(req.query.page ?? "1");
+    const limit = parseInt(req.query.limit ?? "10");
+    const status = req.query.status ?? "active";
+    const site = req.query.site;
+    const paymentStatus = req.query.paymentStatus ?? "awaiting_payment";
+    const month = req.query.month ?? "";
+    const year = req.query.year ?? "";
+    const unitId = req.query.unitId ?? "";
+    try {
+      const data = await _getResidentUserBilling({
+        search,
+        page,
+        limit,
+        status,
+        site,
+        paymentStatus,
+        month,
+        year,
+        unitId
+      });
+      res.status(200).json(data);
+      return;
+    } catch (error2) {
+      logger119.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
     getById,
     updateById,
-    deleteById
+    deleteById,
+    getResidentUserBilling
   };
 }
 
@@ -39856,6 +40015,7 @@ function useNfcPatrolSettingsController() {
 
 // src/services/occurrence-entry.service.ts
 import { useAtlas as useAtlas93 } from "@7365admin1/node-server-utils";
+import { ObjectId as ObjectId108 } from "mongodb";
 
 // src/repositories/occurrence-subject.repo.ts
 import {
@@ -40073,22 +40233,11 @@ function useOccurrenceSubjectRepo() {
     } catch (error) {
       throw new BadRequestError169("Invalid occurrence subject ID format.");
     }
-    const cacheKey = makeCacheKey54(namespace_collection, { _id });
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger146.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
     try {
       const data = await collection.findOne({ _id }, { session });
       if (!data) {
         throw new NotFoundError46("Occurrence subject not found.");
       }
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger146.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger146.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error) {
       throw error;
@@ -40229,11 +40378,22 @@ function useOccurrenceEntryService() {
       const updatedSerialNumber = (entrySerialNumber + 0.1).toFixed(1);
       const dobId = occurrenceEntry.dailyOccurrenceBookId;
       const book = await _getOccurrenceBookById(dobId);
-      const subject = await _getOccurrenceSubjectById(value.subject);
+      const subject = await _getOccurrenceSubjectById(
+        occurrenceEntry.subject._id
+      );
+      value.subject = value.subject ? value.subject : occurrenceEntry.subject._id;
+      value.subjectName = subject.subject;
       value.serialNumber = updatedSerialNumber;
       value.site = occurrenceEntry.site;
       value.dailyOccurrenceBookId = occurrenceEntry.dailyOccurrenceBookId;
-      value.subjectName = subject.subject;
+      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.createdAt = /* @__PURE__ */ new Date();
+      value.date = /* @__PURE__ */ new Date();
+      value.userName = value.userName ? value.userName : occurrenceEntry.signature.name;
+      value.createdByName = value.createdByName ? value.createdByName : occurrenceEntry.createdByName;
       await _updateOccurrenceBookById(dobId, {
         totalInput: book.totalInput + 1
       });
@@ -40429,7 +40589,7 @@ function useOccurrenceEntryController() {
 
 // src/models/online-form.model.ts
 import Joi105 from "joi";
-import { ObjectId as ObjectId108 } from "mongodb";
+import { ObjectId as ObjectId109 } from "mongodb";
 var schemaOnlineForm = Joi105.object({
   _id: Joi105.string().hex().optional().allow("", null),
   name: Joi105.string().required(),
@@ -40477,21 +40637,21 @@ function MOnlineForm(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId108(value._id);
+      value._id = new ObjectId109(value._id);
     } catch (error2) {
       throw new Error("Invalid ID.");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new ObjectId108(value.org);
+      value.org = new ObjectId109(value.org);
     } catch (error2) {
       throw new Error("Invalid org ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId108(value.site);
+      value.site = new ObjectId109(value.site);
     } catch (error2) {
       throw new Error("Invalid site ID.");
     }
@@ -40523,7 +40683,7 @@ import {
   useAtlas as useAtlas94,
   useCache as useCache57
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId109 } from "mongodb";
+import { ObjectId as ObjectId110 } from "mongodb";
 function useOnlineFormRepo() {
   const db = useAtlas94.getDb();
   if (!db) {
@@ -40575,7 +40735,7 @@ function useOnlineFormRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new ObjectId109(site);
+      site = new ObjectId110(site);
     } catch (error) {
       throw new BadRequestError171("Invalid site ID format.");
     }
@@ -40635,7 +40795,7 @@ function useOnlineFormRepo() {
   }
   async function getOnlineFormById(_id) {
     try {
-      _id = new ObjectId109(_id);
+      _id = new ObjectId110(_id);
     } catch (error) {
       throw new BadRequestError171("Invalid online form ID format.");
     }
@@ -40678,7 +40838,7 @@ function useOnlineFormRepo() {
   }
   async function updateOnlineFormById(_id, value) {
     try {
-      _id = new ObjectId109(_id);
+      _id = new ObjectId110(_id);
     } catch (error) {
       throw new BadRequestError171("Invalid online form ID format.");
     }
@@ -40706,7 +40866,7 @@ function useOnlineFormRepo() {
   }
   async function deleteOnlineFormById(_id, session) {
     try {
-      _id = new ObjectId109(_id);
+      _id = new ObjectId110(_id);
     } catch (error) {
       throw new BadRequestError171("Invalid online form ID format.");
     }
@@ -40739,7 +40899,7 @@ function useOnlineFormRepo() {
   }
   async function getOnlineFormsBySiteId(site, { search = "", page = 1, limit = 10, status = "active" }) {
     try {
-      site = new ObjectId109(site);
+      site = new ObjectId110(site);
     } catch (error) {
       throw new BadRequestError171(
         "Invalid online form configuration site ID format."
@@ -41180,7 +41340,7 @@ function useOccurrenceSubjectController() {
 }
 
 // src/models/nfc-patrol-log.model.ts
-import { ObjectId as ObjectId110 } from "mongodb";
+import { ObjectId as ObjectId111 } from "mongodb";
 import Joi108 from "joi";
 import { BadRequestError as BadRequestError174, logger as logger151 } from "@7365admin1/node-server-utils";
 var schemaNfcPatrolLog = Joi108.object({
@@ -41232,32 +41392,32 @@ function MNfcPatrolLog(valueArg) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new ObjectId110(value._id);
+      value._id = new ObjectId111(value._id);
     } catch (error2) {
       throw new BadRequestError174("Invalid _id format");
     }
   }
   try {
-    value.site = new ObjectId110(value.site);
+    value.site = new ObjectId111(value.site);
   } catch (error2) {
     throw new BadRequestError174("Invalid site format");
   }
   if (value?.createdBy) {
     try {
-      value.createdBy = new ObjectId110(value.createdBy);
+      value.createdBy = new ObjectId111(value.createdBy);
     } catch (error2) {
       throw new BadRequestError174("Invalid createdBy format");
     }
   }
   if (value?.route?._id) {
     try {
-      value.route._id = new ObjectId110(value.route._id);
+      value.route._id = new ObjectId111(value.route._id);
     } catch (error2) {
       throw new BadRequestError174("Invalid route _id format");
     }
   }
   return {
-    _id: value._id ?? new ObjectId110(),
+    _id: value._id ?? new ObjectId111(),
     site: value.site,
     route: value.route,
     date: value.date,
@@ -41279,7 +41439,7 @@ import {
   useAtlas as useAtlas96,
   useCache as useCache58
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId111 } from "mongodb";
+import { ObjectId as ObjectId112 } from "mongodb";
 function useNfcPatrolLogRepo() {
   const db = useAtlas96.getDb();
   if (!db) {
@@ -41332,7 +41492,7 @@ function useNfcPatrolLogRepo() {
     const pageIndex = page > 0 ? page - 1 : 0;
     let siteId;
     try {
-      siteId = typeof site === "string" ? new ObjectId111(site) : site;
+      siteId = typeof site === "string" ? new ObjectId112(site) : site;
     } catch {
       throw new BadRequestError175("Invalid site ID format.");
     }
@@ -41343,7 +41503,7 @@ function useNfcPatrolLogRepo() {
       query.date = date;
     }
     if (route?._id) {
-      query["route._id"] = typeof route._id === "string" ? new ObjectId111(route._id) : route._id;
+      query["route._id"] = typeof route._id === "string" ? new ObjectId112(route._id) : route._id;
     }
     if (route?.startTime) {
       query["route.startTime"] = route.startTime;
@@ -42215,7 +42375,7 @@ function useNewDashboardController() {
 
 // src/models/manpower-monitoring.model.ts
 import Joi111 from "joi";
-import { ObjectId as ObjectId112 } from "mongodb";
+import { ObjectId as ObjectId113 } from "mongodb";
 var shiftSchema = Joi111.object({
   name: Joi111.string().required(),
   checkIn: Joi111.string().optional().allow("", null),
@@ -42240,7 +42400,7 @@ var manpowerMonitoringSchema = Joi111.object({
 });
 var MManpowerMonitoring = class {
   constructor(data) {
-    this._id = new ObjectId112();
+    this._id = new ObjectId113();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName;
@@ -42710,7 +42870,7 @@ var hrmlabs_attendance_util_default = {
 };
 
 // src/repositories/manpower-monitoring.repo.ts
-import { ObjectId as ObjectId113 } from "mongodb";
+import { ObjectId as ObjectId114 } from "mongodb";
 var { hrmLabsAuthentication: hrmLabsAuthentication2, fetchSites: fetchSites2 } = hrmlabs_attendance_util_default;
 function useManpowerMonitoringRepo() {
   const db = useAtlas99.getDb();
@@ -42724,11 +42884,11 @@ function useManpowerMonitoringRepo() {
     try {
       value = new MManpowerMonitoring(value);
       if (value.createdBy)
-        value.createdBy = new ObjectId113(value.createdBy);
+        value.createdBy = new ObjectId114(value.createdBy);
       if (value.siteId)
-        value.siteId = new ObjectId113(value.siteId);
+        value.siteId = new ObjectId114(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new ObjectId113(value.serviceProviderId);
+        value.serviceProviderId = new ObjectId114(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -42769,8 +42929,8 @@ function useManpowerMonitoringRepo() {
   }
   async function getManpowerSettingsBySiteId(_id, serviceProviderId) {
     try {
-      _id = new ObjectId113(_id);
-      serviceProviderId = new ObjectId113(serviceProviderId);
+      _id = new ObjectId114(_id);
+      serviceProviderId = new ObjectId114(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -42786,7 +42946,7 @@ function useManpowerMonitoringRepo() {
   }
   async function updateManpowerMonitoringSettings(_id, value) {
     try {
-      _id = new ObjectId113(_id);
+      _id = new ObjectId114(_id);
     } catch (error) {
       throw new BadRequestError180("Invalid ID format.");
     }
@@ -42813,7 +42973,7 @@ function useManpowerMonitoringRepo() {
       for (let item of value) {
         item = new MManpowerMonitoring(item);
         const data = await collection.findOne({
-          siteId: new ObjectId113(item.siteId)
+          siteId: new ObjectId114(item.siteId)
         });
         if (data) {
           let updateValue;
@@ -42838,11 +42998,11 @@ function useManpowerMonitoringRepo() {
           }
         } else {
           if (item.createdBy)
-            item.createdBy = new ObjectId113(item.createdBy);
+            item.createdBy = new ObjectId114(item.createdBy);
           if (item.siteId)
-            item.siteId = new ObjectId113(item.siteId);
+            item.siteId = new ObjectId114(item.siteId);
           if (item.serviceProviderId)
-            item.serviceProviderId = new ObjectId113(item.serviceProviderId);
+            item.serviceProviderId = new ObjectId114(item.serviceProviderId);
           const result = await collection.insertOne(item);
           if (result.insertedId) {
             results.inserted++;
@@ -42866,7 +43026,7 @@ function useManpowerMonitoringRepo() {
     const siteUrl = process.env.HRMLABS_SITE_URL;
     try {
       const serviceProvider = await serviceProviderCollection.findOne({
-        _id: new ObjectId113(serviceProviderId)
+        _id: new ObjectId114(serviceProviderId)
       });
       if (!serviceProvider) {
         throw new Error("Service Provider not found.");
@@ -42916,7 +43076,7 @@ import {
 
 // src/models/manpower-remarks.model.ts
 import Joi112 from "joi";
-import { ObjectId as ObjectId114 } from "mongodb";
+import { ObjectId as ObjectId115 } from "mongodb";
 var remarksSchema = Joi112.object({
   name: Joi112.string().required(),
   remark: Joi112.object({
@@ -42940,7 +43100,7 @@ var manpowerRemarksSchema = Joi112.object({
 });
 var MManpowerRemarks = class {
   constructor(data) {
-    this._id = new ObjectId114();
+    this._id = new ObjectId115();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
@@ -42958,7 +43118,7 @@ var MManpowerRemarks = class {
 };
 
 // src/repositories/manpower-remarks.repo.ts
-import { ObjectId as ObjectId115 } from "mongodb";
+import { ObjectId as ObjectId116 } from "mongodb";
 import moment2 from "moment-timezone";
 function useManpowerRemarksRepo() {
   const db = useAtlas100.getDb();
@@ -42971,9 +43131,9 @@ function useManpowerRemarksRepo() {
     try {
       value = new MManpowerRemarks(value);
       if (value.siteId)
-        value.siteId = new ObjectId115(value.siteId);
+        value.siteId = new ObjectId116(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new ObjectId115(value.serviceProviderId);
+        value.serviceProviderId = new ObjectId116(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -42993,7 +43153,7 @@ function useManpowerRemarksRepo() {
       limit = limit || 10;
       const searchQuery = {};
       const nowSGT = moment2().tz("Asia/Singapore");
-      searchQuery.serviceProviderId = new ObjectId115(serviceProviderId);
+      searchQuery.serviceProviderId = new ObjectId116(serviceProviderId);
       if (search != "") {
         searchQuery.siteName = { $regex: search, $options: "i" };
       }
@@ -43025,8 +43185,8 @@ function useManpowerRemarksRepo() {
   }
   async function getManpowerRemarksBySiteId(_id, date, serviceProviderId) {
     try {
-      _id = new ObjectId115(_id);
-      serviceProviderId = new ObjectId115(serviceProviderId);
+      _id = new ObjectId116(_id);
+      serviceProviderId = new ObjectId116(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -43043,13 +43203,13 @@ function useManpowerRemarksRepo() {
   }
   async function updateManpowerRemarks(_id, value) {
     try {
-      _id = new ObjectId115(_id);
+      _id = new ObjectId116(_id);
     } catch (error) {
       throw new BadRequestError181("Invalid ID format.");
     }
     try {
       if (value.createdBy) {
-        value.createdBy = new ObjectId115(value.createdBy);
+        value.createdBy = new ObjectId116(value.createdBy);
       }
       const updateValue = {
         ...value,
@@ -43066,7 +43226,7 @@ function useManpowerRemarksRepo() {
   }
   async function updateRemarksStatus(_id, value) {
     try {
-      _id = new ObjectId115(_id);
+      _id = new ObjectId116(_id);
     } catch (error) {
       throw new BadRequestError181("Invalid ID format.");
     }
@@ -43338,7 +43498,7 @@ function useManpowerMonitoringCtrl() {
 
 // src/models/manpower-designations.model.ts
 import Joi114 from "joi";
-import { ObjectId as ObjectId116 } from "mongodb";
+import { ObjectId as ObjectId117 } from "mongodb";
 var designationsSchema = Joi114.object({
   title: Joi114.string().required(),
   shifts: Joi114.object({
@@ -43357,7 +43517,7 @@ var manpowerDesignationsSchema = Joi114.object({
 });
 var MManpowerDesignations = class {
   constructor(data) {
-    this._id = new ObjectId116();
+    this._id = new ObjectId117();
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
     this.serviceProviderId = data.serviceProviderId || "";
@@ -43373,7 +43533,7 @@ var MManpowerDesignations = class {
 import {
   useAtlas as useAtlas102
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId117 } from "mongodb";
+import { ObjectId as ObjectId118 } from "mongodb";
 function useManpowerDesignationRepo() {
   const db = useAtlas102.getDb();
   if (!db) {
@@ -43385,11 +43545,11 @@ function useManpowerDesignationRepo() {
     try {
       value = new MManpowerDesignations(value);
       if (value.createdBy)
-        value.createdBy = new ObjectId117(value.createdBy);
+        value.createdBy = new ObjectId118(value.createdBy);
       if (value.siteId)
-        value.siteId = new ObjectId117(value.siteId);
+        value.siteId = new ObjectId118(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new ObjectId117(value.serviceProviderId);
+        value.serviceProviderId = new ObjectId118(value.serviceProviderId);
       const result = await collection.insertOne(value);
       return result;
     } catch (error) {
@@ -43398,8 +43558,8 @@ function useManpowerDesignationRepo() {
   }
   async function getManpowerDesignationsBySiteId(_id, serviceProviderId) {
     try {
-      _id = new ObjectId117(_id);
-      serviceProviderId = new ObjectId117(serviceProviderId);
+      _id = new ObjectId118(_id);
+      serviceProviderId = new ObjectId118(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -43415,7 +43575,7 @@ function useManpowerDesignationRepo() {
   }
   async function updateManpowerDesignations(_id, value) {
     try {
-      _id = new ObjectId117(_id);
+      _id = new ObjectId118(_id);
     } catch (error) {
       throw new Error("Invalid ID format.");
     }
@@ -43518,7 +43678,7 @@ function useManpowerDesignationCtrl() {
 
 // src/models/overnight-parking.model.ts
 import Joi116 from "joi";
-import { ObjectId as ObjectId118 } from "mongodb";
+import { ObjectId as ObjectId119 } 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({
@@ -43560,7 +43720,7 @@ function MOvernightParkingApprovalHours(value) {
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new ObjectId118(value.site);
+      value.site = new ObjectId119(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
@@ -45184,7 +45344,7 @@ function useManpowerRemarkCtrl() {
 
 // src/models/manpower-sites.model.ts
 import Joi122 from "joi";
-import { ObjectId as ObjectId119 } from "mongodb";
+import { ObjectId as ObjectId120 } from "mongodb";
 var manpowerSitesSchema = Joi122.object({
   id: Joi122.string().hex().required(),
   text: Joi122.string().hex().optional().allow("", null),
@@ -45195,7 +45355,7 @@ var manpowerSitesSchema = Joi122.object({
 });
 var MManpowerSites = class {
   constructor(data) {
-    this._id = new ObjectId119();
+    this._id = new ObjectId120();
     this.id = data.id || "";
     this.text = data.text || "";
     this.contractID = data.contractID || "";
@@ -45417,7 +45577,7 @@ import {
   getDirectory as getDirectory3,
   logger as logger174
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId120 } from "mongodb";
+import { ObjectId as ObjectId121 } from "mongodb";
 import moment4 from "moment-timezone";
 var createManpowerRemarksDaily = async () => {
   const db = useAtlas108.getDb();
@@ -45577,7 +45737,7 @@ var updateRemarksisAcknowledged = async () => {
     for (const id of updatedIds) {
       const doc = await remarks.findOne({ _id: id });
       const setting = await settings.findOne(
-        { siteId: new ObjectId120(doc?.siteId) },
+        { siteId: new ObjectId121(doc?.siteId) },
         { projection: { emails: 1 } }
       );
       const payload = {
@@ -45663,7 +45823,7 @@ var updateRemarksStatusEod = async () => {
   for (const doc of docs) {
     let shiftsToCheck = [];
     const endShiftTime = await settings.findOne(
-      { siteId: new ObjectId120(doc.siteId) },
+      { siteId: new ObjectId121(doc.siteId) },
       { projection: { shifts: 1, shiftType: 1 } }
     );
     if (doc.createdAtSGT === nowSGT) {
@@ -45769,7 +45929,7 @@ var isWithinHour = (alertTime, timeNow) => {
 
 // src/events/manpower.event.ts
 import { useAtlas as useAtlas109 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId121 } from "mongodb";
+import { ObjectId as ObjectId122 } from "mongodb";
 import moment5 from "moment-timezone";
 async function manpowerEvents(io) {
   let intervalId = null;
@@ -45795,7 +45955,7 @@ async function manpowerEvents(io) {
     }).toArray();
     for (const doc of docs) {
       const siteSettings = await settings.findOne(
-        { siteId: new ObjectId121(doc.siteId), enabled: true },
+        { siteId: new ObjectId122(doc.siteId), enabled: true },
         { projection: { shifts: 1, shiftType: 1 } }
       );
       const shiftType = siteSettings?.shiftType || "2-shifts";
@@ -45914,7 +46074,7 @@ function genericSignature(params, secretKey) {
 }
 
 // src/repositories/reddot-payment.repository.ts
-import { ObjectId as ObjectId125 } from "mongodb";
+import { ObjectId as ObjectId126 } from "mongodb";
 
 // src/utils/date-format.util.ts
 import moment6 from "moment-timezone";
@@ -45939,11 +46099,11 @@ function formatDateString(today, format, dateRange) {
 }
 
 // src/models/credit-card.model.ts
-import { ObjectId as ObjectId122 } from "mongodb";
+import { ObjectId as ObjectId123 } from "mongodb";
 var MCardInfo = class {
   // this is coming from RDP transaction
   constructor({
-    _id = new ObjectId122(),
+    _id = new ObjectId123(),
     userId,
     cardType,
     cardNumber,
@@ -45978,11 +46138,11 @@ var MCardInfo = class {
 };
 
 // src/models/cart.model.ts
-import { ObjectId as ObjectId123 } from "mongodb";
+import { ObjectId as ObjectId124 } from "mongodb";
 var MUnitBillings = class {
   // transaction response messages
   constructor({
-    _id = new ObjectId123(),
+    _id = new ObjectId124(),
     unit,
     unitId,
     unitBill,
@@ -46023,7 +46183,7 @@ var MUnitBillings = class {
 };
 
 // src/repositories/payment.repository.ts
-import { ObjectId as ObjectId124 } from "mongodb";
+import { ObjectId as ObjectId125 } from "mongodb";
 import {
   InternalServerError as InternalServerError66,
   useAtlas as useAtlas110
@@ -46060,7 +46220,7 @@ var PaymentBillRepo = () => {
       if (unitBillInfo?.status === "Inactive" /* inactive */) {
         throw new Error("This Bill is Inactive!");
       }
-      const billId = new ObjectId124(unitBillInfo?.billId);
+      const billId = new ObjectId125(unitBillInfo?.billId);
       const billInfo = await billCollection().findOne({ _id: billId });
       if (!billInfo) {
         throw new Error("Bill info not found");
@@ -46099,13 +46259,13 @@ var PaymentBillRepo = () => {
   const saveCreditCardInfo = async (payload) => {
     try {
       if (payload.userId)
-        payload.userId = new ObjectId124(payload.userId);
+        payload.userId = new ObjectId125(payload.userId);
       if (payload.site)
-        payload.site = new ObjectId124(payload.site);
+        payload.site = new ObjectId125(payload.site);
       if (payload.organization)
-        payload.organization = new ObjectId124(payload.organization);
+        payload.organization = new ObjectId125(payload.organization);
       if (payload.createdBy)
-        payload.createdBy = new ObjectId124(payload.createdBy);
+        payload.createdBy = new ObjectId125(payload.createdBy);
       const createdAt = formatDateString(/* @__PURE__ */ new Date(), "mm-dd-yyyy");
       payload.createdAt = createdAt;
       const result = await creditCollection().insertOne(new MCardInfo(payload));
@@ -46117,19 +46277,19 @@ var PaymentBillRepo = () => {
   const checkOutUnitBills = async (payload) => {
     try {
       if (payload.unitId)
-        payload.unitId = new ObjectId124(payload.unitId);
+        payload.unitId = new ObjectId125(payload.unitId);
       if (payload.site)
-        payload.site = new ObjectId124(payload.site);
+        payload.site = new ObjectId125(payload.site);
       if (payload.organization)
-        payload.organization = new ObjectId124(payload.organization);
+        payload.organization = new ObjectId125(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 ObjectId124(addToCart?.insertedId).toString().slice(-4);
+      const newId = new ObjectId125(addToCart?.insertedId).toString().slice(-4);
       const referenceNumber = `CRT${unit}${newId}${dateFormatted}`;
-      const result = await cartCollection().findOneAndUpdate({ _id: new ObjectId124(addToCart.insertedId) }, { $set: { referenceNumber } }, { returnDocument: "after" });
+      const result = await cartCollection().findOneAndUpdate({ _id: new ObjectId125(addToCart.insertedId) }, { $set: { referenceNumber } }, { returnDocument: "after" });
       return result;
     } catch (error) {
       throw new Error(error.message || error || "Server Internal Error");
@@ -46160,7 +46320,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 ObjectId124(billId) });
+          const billInfo = await billCollection().findOne({ _id: new ObjectId125(billId) });
           const billAmount = billInfo?.price;
           payload.updatedAt = updatedAt;
           payload.amountPaid = billAmount;
@@ -46314,7 +46474,7 @@ var useRedDotPaymentRepo = () => {
         throw new Error("Failed to Add Merchant Details");
       }
       const merchantId = merchant?.insertedId;
-      const orgId = new ObjectId125(_id);
+      const orgId = new ObjectId126(_id);
       const result = await orgCollection().findOneAndUpdate({ _id: orgId }, { $push: { merchant: merchantId } }, {
         returnDocument: "after"
       });
@@ -46343,7 +46503,7 @@ var useRedDotPaymentRepo = () => {
   const getMerchantDetailsById = async (_id) => {
     try {
       if (_id)
-        _id = new ObjectId125(_id);
+        _id = new ObjectId126(_id);
       const result = await redDotMerchantCollection().aggregate([
         {
           $match: {
@@ -46606,7 +46766,7 @@ import {
   useAtlas as useAtlas112,
   useCache as useCache66
 } from "@7365admin1/node-server-utils";
-import { ObjectId as ObjectId126 } from "mongodb";
+import { ObjectId as ObjectId127 } from "mongodb";
 function useVerificationRepoV2() {
   const db = useAtlas112.getDb();
   if (!db) {
@@ -46659,7 +46819,7 @@ function useVerificationRepoV2() {
   }
   async function updateVerificationStatusById(_id, status, session) {
     try {
-      _id = new ObjectId126(_id);
+      _id = new ObjectId127(_id);
     } catch (error) {
       throw new BadRequestError195("Invalid verification ID format.");
     }
@@ -47227,7 +47387,7 @@ import {
 import { v4 as uuidv42 } from "uuid";
 
 // src/repositories/user-v2.repo.ts
-import { ObjectId as ObjectId127 } from "mongodb";
+import { ObjectId as ObjectId128 } from "mongodb";
 import {
   useAtlas as useAtlas114,
   InternalServerError as InternalServerError70,
@@ -47439,7 +47599,7 @@ function useUserRepoV2() {
     }
     if (organization) {
       try {
-        query.defaultOrg = new ObjectId127(organization);
+        query.defaultOrg = new ObjectId128(organization);
         cacheOptions.organization = organization.toString();
       } catch (error) {
         throw new BadRequestError198("Invalid organization ID format.");
@@ -47578,13 +47738,13 @@ function useUserRepoV2() {
       );
     }
     try {
-      _id = new ObjectId127(_id);
+      _id = new ObjectId128(_id);
     } catch (error) {
       throw new BadRequestError198("Invalid ID.");
     }
     if (field === "defaultOrg") {
       try {
-        value = new ObjectId127(value);
+        value = new ObjectId128(value);
       } catch (error) {
         throw new BadRequestError198("Invalid organization ID.");
       }
@@ -47625,7 +47785,7 @@ function useUserRepoV2() {
     year
   }, session) {
     try {
-      _id = new ObjectId127(_id);
+      _id = new ObjectId128(_id);
     } catch (error) {
       throw new BadRequestError198("Invalid user ID format.");
     }
@@ -47655,7 +47815,7 @@ function useUserRepoV2() {
   }
   async function updatePassword({ _id, password }, session) {
     try {
-      _id = new ObjectId127(_id);
+      _id = new ObjectId128(_id);
     } catch (error) {
       throw new BadRequestError198("Invalid user ID format.");
     }