@7365admin1/core 2.30.2 → 2.31.1

package/dist/index.js

@@ -13314,7 +13314,7 @@ var schemaVisitorTransaction = import_joi36.default.object({
   arrivalTime: import_joi36.default.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: import_joi36.default.number().integer().optional().allow(null),
+  duration: import_joi36.default.number().integer().optional().allow(null, ""),
   isOvernightParking: import_joi36.default.boolean().optional().default(false),
   email: import_joi36.default.string().email().optional().allow(null, ""),
   numberOfPassengers: import_joi36.default.number().integer().optional().allow(null, ""),
@@ -13331,7 +13331,8 @@ var schemaVisitorTransaction = import_joi36.default.object({
   checkInRemarks: import_joi36.default.string().optional().allow("", null),
   checkOutRemarks: import_joi36.default.string().optional().allow("", null),
   expectedCheckIn: import_joi36.default.string().isoDate().optional(),
-  purpose: import_joi36.default.string().optional().allow(null, "")
+  purpose: import_joi36.default.string().optional().allow(null, ""),
+  invitedId: import_joi36.default.any().optional().allow(null, "")
 });
 var schemaUpdateVisTrans = import_joi36.default.object({
   _id: import_joi36.default.string().hex().length(24).required(),
@@ -13360,12 +13361,16 @@ var schemaUpdateVisTrans = import_joi36.default.object({
   expiredAt: import_joi36.default.date().iso().optional().allow(null, ""),
   visitorPass: import_joi36.default.array().items(
     import_joi36.default.object({
-      keyId: import_joi36.default.string().hex().length(24).required()
+      keyId: import_joi36.default.string().hex().length(24).required(),
+      status: import_joi36.default.string().optional().allow(null, ""),
+      remarks: import_joi36.default.string().optional().allow(null, "")
     })
   ).optional().allow(null),
   passKeys: import_joi36.default.array().items(
     import_joi36.default.object({
-      keyId: import_joi36.default.string().hex().length(24).required()
+      keyId: import_joi36.default.string().hex().length(24).required(),
+      status: import_joi36.default.string().optional().allow(null, ""),
+      remarks: import_joi36.default.string().optional().allow(null, "")
     })
   ).optional().allow(null),
   checkInRemarks: import_joi36.default.string().optional().allow("", null),
@@ -13471,7 +13476,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 import_mongodb39.ObjectId(String(value.invitedId)) ?? null,
+    overnightParking: value.isOvernightParking == true ? {
+      status: "pending approval",
+      remarks: "",
+      updatedBy: new import_mongodb39.ObjectId(String(value.invitedId)) ?? null
+    } : null
   };
 }
 
@@ -13603,16 +13618,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", ""] }
                       ]
                     }
@@ -13625,145 +13664,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 },
@@ -21700,8 +21644,8 @@ var KeyRepo = class {
   static async updateKeyById(keyId, key, site, session, isChild) {
     try {
       keyId = new import_mongodb57.ObjectId(keyId);
-      site = new import_mongodb57.ObjectId(site);
-      key.updatedAt = /* @__PURE__ */ new Date();
+      if (site)
+        site = new import_mongodb57.ObjectId(site);
       if (key.updatedBy)
         key.updatedBy = await convertObjectIdUtil(key.updatedBy);
       if (!key.status)
@@ -21711,7 +21655,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(
@@ -21771,6 +21716,7 @@ function useVisitorTransactionService() {
     getExpiredCheckedOutTransactionsBySite: _getExpiredCheckedOutTransactionsBySite,
     updateManyDahuaSyncStatus: _updateManyDahuaSyncStatus
   } = useVisitorTransactionRepo();
+  const { getById } = useBuildingUnitRepo();
   const {
     add: _addPerson,
     getByNRIC,
@@ -21863,7 +21809,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 import_mongodb58.ObjectId ? vp : vp.keyId;
                   await KeyRepo.updateKeyById(
                     visitorPassId,
@@ -21878,7 +21824,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 import_mongodb58.ObjectId ? pk : pk.keyId;
                   await KeyRepo.updateKeyById(
                     passKeyId,
@@ -21994,7 +21940,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 import_mongodb58.ObjectId ? vp : vp.keyId;
             await KeyRepo.updateKeyById(
               visitorPassId,
@@ -22009,7 +21955,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 import_mongodb58.ObjectId ? pk : pk.keyId;
             await KeyRepo.updateKeyById(
               passKeyId,
@@ -22035,6 +21981,52 @@ function useVisitorTransactionService() {
     const session = import_node_server_utils101.useAtlas.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 import_mongodb58.ObjectId ? vp : vp.keyId;
+          await KeyRepo.updateKeyById(
+            visitorPassId,
+            updatePayload,
+            value.site
+          );
+          if (typeof vp !== "string" && !(vp instanceof import_mongodb58.ObjectId)) {
+            keptVisitorPass.push({
+              keyId: new import_mongodb58.ObjectId(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 import_mongodb58.ObjectId ? pk : pk.keyId;
+            await KeyRepo.updateKeyById(
+              passKeyId,
+              updatePayload,
+              value.site
+            );
+            if (typeof pk !== "string" && !(pk instanceof import_mongodb58.ObjectId)) {
+              keptPassKeys.push({
+                keyId: new import_mongodb58.ObjectId(passKeyId)
+              });
+            }
+          } catch (error) {
+            throw error;
+          }
+        }
+        value.passKeys = keptPassKeys;
+      }
       await _updateVisitorTansactionById(id, value, session);
       await session?.commitTransaction();
       return "Successfully updated visitor transaction.";
@@ -22123,6 +22115,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 = (0, import_node_server_utils101.getDirectory)(dir, "./public/handlebars/visitor-invite");
@@ -22131,9 +22124,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 = (0, import_node_server_utils101.compileHandlebar)({
@@ -22356,7 +22351,7 @@ function useVisitorTransactionController() {
       arrivalTime: import_joi55.default.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: import_joi55.default.number().integer().optional().allow(null),
+      duration: import_joi55.default.number().integer().optional().allow(null, ""),
       name: import_joi55.default.string().required(),
       contact: import_joi55.default.string().required(),
       email: import_joi55.default.string().email().required(),
@@ -22379,8 +22374,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) {
       import_node_server_utils102.logger.log({ level: "error", message: error2.message });
@@ -23013,7 +23008,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) {
@@ -23312,6 +23308,25 @@ function usePersonController() {
       return;
     }
   }
+  async function getPersonByUserId(req, res, next) {
+    const validation = import_joi58.default.string().required();
+    const userId = req.params.userId;
+    const { error } = validation.validate(userId);
+    if (error) {
+      import_node_server_utils107.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils107.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getByUserId(userId);
+      res.json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils107.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
@@ -23322,7 +23337,8 @@ function usePersonController() {
     getPeopleByUnit,
     getCompany,
     getPeopleByPlateNumber,
-    getPeopleByNRIC
+    getPeopleByNRIC,
+    getPersonByUserId
   };
 }
 
@@ -30875,6 +30891,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"
+              }
+            }
+          }
+        ]
+      },
+      ...import_mongodb86.ObjectId.isValid(site) && { site: new import_mongodb86.ObjectId(site) },
+      ...dateExpr,
+      ...import_mongodb86.ObjectId.isValid(unitId) && { unitId: new import_mongodb86.ObjectId(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 = (0, import_node_server_utils149.paginate)(items, page, limit, totalCount);
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   function delCachedData() {
     delNamespace().then(() => {
       import_node_server_utils149.logger.log({
@@ -30906,7 +31011,8 @@ function useSiteUnitBillingRepo() {
     getById,
     updateById,
     deleteById,
-    getUnitBillingBySite
+    getUnitBillingBySite,
+    getResidentUserBilling
   };
 }
 
@@ -31093,7 +31199,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 };
@@ -31234,12 +31341,64 @@ function useSiteUnitBillingController() {
       return;
     }
   }
+  async function getResidentUserBilling(req, res, next) {
+    const validation = import_joi84.default.object({
+      page: import_joi84.default.number().integer().min(1).allow("", null).default(1),
+      limit: import_joi84.default.number().integer().min(1).max(100).allow("", null).default(10),
+      status: import_joi84.default.string().optional().allow(null, ""),
+      search: import_joi84.default.string().optional().allow(null, ""),
+      site: import_joi84.default.string().required(),
+      paymentStatus: import_joi84.default.string().optional().allow(null, ""),
+      month: import_joi84.default.string().optional().allow(null, ""),
+      year: import_joi84.default.string().optional().allow(null, ""),
+      unitId: import_joi84.default.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(", ");
+      import_node_server_utils151.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils151.BadRequestError(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) {
+      import_node_server_utils151.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
     getById,
     updateById,
-    deleteById
+    deleteById,
+    getResidentUserBilling
   };
 }
 
@@ -39705,6 +39864,7 @@ function useNfcPatrolSettingsController() {
 
 // src/services/occurrence-entry.service.ts
 var import_node_server_utils184 = require("@7365admin1/node-server-utils");
+var import_mongodb108 = require("mongodb");
 
 // src/repositories/occurrence-subject.repo.ts
 var import_node_server_utils183 = require("@7365admin1/node-server-utils");
@@ -39913,22 +40073,11 @@ function useOccurrenceSubjectRepo() {
     } catch (error) {
       throw new import_node_server_utils183.BadRequestError("Invalid occurrence subject ID format.");
     }
-    const cacheKey = (0, import_node_server_utils183.makeCacheKey)(namespace_collection, { _id });
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      import_node_server_utils183.logger.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
     try {
       const data = await collection.findOne({ _id }, { session });
       if (!data) {
         throw new import_node_server_utils183.NotFoundError("Occurrence subject not found.");
       }
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils183.logger.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        import_node_server_utils183.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error) {
       throw error;
@@ -40069,11 +40218,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 import_mongodb108.ObjectId(value.signature) : occurrenceEntry.signature._id;
+      value.eSignature = value.eSignature ? new import_mongodb108.ObjectId(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
       });
@@ -40269,7 +40429,7 @@ function useOccurrenceEntryController() {
 
 // src/models/online-form.model.ts
 var import_joi105 = __toESM(require("joi"));
-var import_mongodb108 = require("mongodb");
+var import_mongodb109 = require("mongodb");
 var schemaOnlineForm = import_joi105.default.object({
   _id: import_joi105.default.string().hex().optional().allow("", null),
   name: import_joi105.default.string().required(),
@@ -40317,21 +40477,21 @@ function MOnlineForm(value) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb108.ObjectId(value._id);
+      value._id = new import_mongodb109.ObjectId(value._id);
     } catch (error2) {
       throw new Error("Invalid ID.");
     }
   }
   if (value.org && typeof value.org === "string") {
     try {
-      value.org = new import_mongodb108.ObjectId(value.org);
+      value.org = new import_mongodb109.ObjectId(value.org);
     } catch (error2) {
       throw new Error("Invalid org ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb108.ObjectId(value.site);
+      value.site = new import_mongodb109.ObjectId(value.site);
     } catch (error2) {
       throw new Error("Invalid site ID.");
     }
@@ -40354,7 +40514,7 @@ function MOnlineForm(value) {
 
 // src/repositories/online-form.repo.ts
 var import_node_server_utils186 = require("@7365admin1/node-server-utils");
-var import_mongodb109 = require("mongodb");
+var import_mongodb110 = require("mongodb");
 function useOnlineFormRepo() {
   const db = import_node_server_utils186.useAtlas.getDb();
   if (!db) {
@@ -40406,7 +40566,7 @@ function useOnlineFormRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     try {
-      site = new import_mongodb109.ObjectId(site);
+      site = new import_mongodb110.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils186.BadRequestError("Invalid site ID format.");
     }
@@ -40466,7 +40626,7 @@ function useOnlineFormRepo() {
   }
   async function getOnlineFormById(_id) {
     try {
-      _id = new import_mongodb109.ObjectId(_id);
+      _id = new import_mongodb110.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils186.BadRequestError("Invalid online form ID format.");
     }
@@ -40509,7 +40669,7 @@ function useOnlineFormRepo() {
   }
   async function updateOnlineFormById(_id, value) {
     try {
-      _id = new import_mongodb109.ObjectId(_id);
+      _id = new import_mongodb110.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils186.BadRequestError("Invalid online form ID format.");
     }
@@ -40537,7 +40697,7 @@ function useOnlineFormRepo() {
   }
   async function deleteOnlineFormById(_id, session) {
     try {
-      _id = new import_mongodb109.ObjectId(_id);
+      _id = new import_mongodb110.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils186.BadRequestError("Invalid online form ID format.");
     }
@@ -40570,7 +40730,7 @@ function useOnlineFormRepo() {
   }
   async function getOnlineFormsBySiteId(site, { search = "", page = 1, limit = 10, status = "active" }) {
     try {
-      site = new import_mongodb109.ObjectId(site);
+      site = new import_mongodb110.ObjectId(site);
     } catch (error) {
       throw new import_node_server_utils186.BadRequestError(
         "Invalid online form configuration site ID format."
@@ -41011,7 +41171,7 @@ function useOccurrenceSubjectController() {
 }
 
 // src/models/nfc-patrol-log.model.ts
-var import_mongodb110 = require("mongodb");
+var import_mongodb111 = require("mongodb");
 var import_joi108 = __toESM(require("joi"));
 var import_node_server_utils190 = require("@7365admin1/node-server-utils");
 var schemaNfcPatrolLog = import_joi108.default.object({
@@ -41063,32 +41223,32 @@ function MNfcPatrolLog(valueArg) {
   }
   if (value._id && typeof value._id === "string") {
     try {
-      value._id = new import_mongodb110.ObjectId(value._id);
+      value._id = new import_mongodb111.ObjectId(value._id);
     } catch (error2) {
       throw new import_node_server_utils190.BadRequestError("Invalid _id format");
     }
   }
   try {
-    value.site = new import_mongodb110.ObjectId(value.site);
+    value.site = new import_mongodb111.ObjectId(value.site);
   } catch (error2) {
     throw new import_node_server_utils190.BadRequestError("Invalid site format");
   }
   if (value?.createdBy) {
     try {
-      value.createdBy = new import_mongodb110.ObjectId(value.createdBy);
+      value.createdBy = new import_mongodb111.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_mongodb110.ObjectId(value.route._id);
+      value.route._id = new import_mongodb111.ObjectId(value.route._id);
     } catch (error2) {
       throw new import_node_server_utils190.BadRequestError("Invalid route _id format");
     }
   }
   return {
-    _id: value._id ?? new import_mongodb110.ObjectId(),
+    _id: value._id ?? new import_mongodb111.ObjectId(),
     site: value.site,
     route: value.route,
     date: value.date,
@@ -41102,7 +41262,7 @@ function MNfcPatrolLog(valueArg) {
 
 // src/repositories/nfc-patrol-log.repository.ts
 var import_node_server_utils191 = require("@7365admin1/node-server-utils");
-var import_mongodb111 = require("mongodb");
+var import_mongodb112 = require("mongodb");
 function useNfcPatrolLogRepo() {
   const db = import_node_server_utils191.useAtlas.getDb();
   if (!db) {
@@ -41155,7 +41315,7 @@ function useNfcPatrolLogRepo() {
     const pageIndex = page > 0 ? page - 1 : 0;
     let siteId;
     try {
-      siteId = typeof site === "string" ? new import_mongodb111.ObjectId(site) : site;
+      siteId = typeof site === "string" ? new import_mongodb112.ObjectId(site) : site;
     } catch {
       throw new import_node_server_utils191.BadRequestError("Invalid site ID format.");
     }
@@ -41166,7 +41326,7 @@ function useNfcPatrolLogRepo() {
       query.date = date;
     }
     if (route?._id) {
-      query["route._id"] = typeof route._id === "string" ? new import_mongodb111.ObjectId(route._id) : route._id;
+      query["route._id"] = typeof route._id === "string" ? new import_mongodb112.ObjectId(route._id) : route._id;
     }
     if (route?.startTime) {
       query["route.startTime"] = route.startTime;
@@ -42025,7 +42185,7 @@ function useNewDashboardController() {
 
 // src/models/manpower-monitoring.model.ts
 var import_joi111 = __toESM(require("joi"));
-var import_mongodb112 = require("mongodb");
+var import_mongodb113 = require("mongodb");
 var shiftSchema = import_joi111.default.object({
   name: import_joi111.default.string().required(),
   checkIn: import_joi111.default.string().optional().allow("", null),
@@ -42050,7 +42210,7 @@ var manpowerMonitoringSchema = import_joi111.default.object({
 });
 var MManpowerMonitoring = class {
   constructor(data) {
-    this._id = new import_mongodb112.ObjectId();
+    this._id = new import_mongodb113.ObjectId();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName;
@@ -42516,7 +42676,7 @@ var hrmlabs_attendance_util_default = {
 };
 
 // src/repositories/manpower-monitoring.repo.ts
-var import_mongodb113 = require("mongodb");
+var import_mongodb114 = require("mongodb");
 var { hrmLabsAuthentication: hrmLabsAuthentication2, fetchSites: fetchSites2 } = hrmlabs_attendance_util_default;
 function useManpowerMonitoringRepo() {
   const db = import_node_server_utils196.useAtlas.getDb();
@@ -42530,11 +42690,11 @@ function useManpowerMonitoringRepo() {
     try {
       value = new MManpowerMonitoring(value);
       if (value.createdBy)
-        value.createdBy = new import_mongodb113.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb114.ObjectId(value.createdBy);
       if (value.siteId)
-        value.siteId = new import_mongodb113.ObjectId(value.siteId);
+        value.siteId = new import_mongodb114.ObjectId(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new import_mongodb113.ObjectId(value.serviceProviderId);
+        value.serviceProviderId = new import_mongodb114.ObjectId(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -42575,8 +42735,8 @@ function useManpowerMonitoringRepo() {
   }
   async function getManpowerSettingsBySiteId(_id, serviceProviderId) {
     try {
-      _id = new import_mongodb113.ObjectId(_id);
-      serviceProviderId = new import_mongodb113.ObjectId(serviceProviderId);
+      _id = new import_mongodb114.ObjectId(_id);
+      serviceProviderId = new import_mongodb114.ObjectId(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -42592,7 +42752,7 @@ function useManpowerMonitoringRepo() {
   }
   async function updateManpowerMonitoringSettings(_id, value) {
     try {
-      _id = new import_mongodb113.ObjectId(_id);
+      _id = new import_mongodb114.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils196.BadRequestError("Invalid ID format.");
     }
@@ -42619,7 +42779,7 @@ function useManpowerMonitoringRepo() {
       for (let item of value) {
         item = new MManpowerMonitoring(item);
         const data = await collection.findOne({
-          siteId: new import_mongodb113.ObjectId(item.siteId)
+          siteId: new import_mongodb114.ObjectId(item.siteId)
         });
         if (data) {
           let updateValue;
@@ -42644,11 +42804,11 @@ function useManpowerMonitoringRepo() {
           }
         } else {
           if (item.createdBy)
-            item.createdBy = new import_mongodb113.ObjectId(item.createdBy);
+            item.createdBy = new import_mongodb114.ObjectId(item.createdBy);
           if (item.siteId)
-            item.siteId = new import_mongodb113.ObjectId(item.siteId);
+            item.siteId = new import_mongodb114.ObjectId(item.siteId);
           if (item.serviceProviderId)
-            item.serviceProviderId = new import_mongodb113.ObjectId(item.serviceProviderId);
+            item.serviceProviderId = new import_mongodb114.ObjectId(item.serviceProviderId);
           const result = await collection.insertOne(item);
           if (result.insertedId) {
             results.inserted++;
@@ -42672,7 +42832,7 @@ function useManpowerMonitoringRepo() {
     const siteUrl = process.env.HRMLABS_SITE_URL;
     try {
       const serviceProvider = await serviceProviderCollection.findOne({
-        _id: new import_mongodb113.ObjectId(serviceProviderId)
+        _id: new import_mongodb114.ObjectId(serviceProviderId)
       });
       if (!serviceProvider) {
         throw new Error("Service Provider not found.");
@@ -42714,7 +42874,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_mongodb114 = require("mongodb");
+var import_mongodb115 = require("mongodb");
 var remarksSchema = import_joi112.default.object({
   name: import_joi112.default.string().required(),
   remark: import_joi112.default.object({
@@ -42738,7 +42898,7 @@ var manpowerRemarksSchema = import_joi112.default.object({
 });
 var MManpowerRemarks = class {
   constructor(data) {
-    this._id = new import_mongodb114.ObjectId();
+    this._id = new import_mongodb115.ObjectId();
     this.serviceProviderId = data.serviceProviderId || "";
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
@@ -42756,7 +42916,7 @@ var MManpowerRemarks = class {
 };
 
 // src/repositories/manpower-remarks.repo.ts
-var import_mongodb115 = require("mongodb");
+var import_mongodb116 = require("mongodb");
 var import_moment_timezone2 = __toESM(require("moment-timezone"));
 function useManpowerRemarksRepo() {
   const db = import_node_server_utils197.useAtlas.getDb();
@@ -42769,9 +42929,9 @@ function useManpowerRemarksRepo() {
     try {
       value = new MManpowerRemarks(value);
       if (value.siteId)
-        value.siteId = new import_mongodb115.ObjectId(value.siteId);
+        value.siteId = new import_mongodb116.ObjectId(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new import_mongodb115.ObjectId(value.serviceProviderId);
+        value.serviceProviderId = new import_mongodb116.ObjectId(value.serviceProviderId);
       const result = await collection.insertOne(value, { session });
       return result;
     } catch (error) {
@@ -42791,7 +42951,7 @@ function useManpowerRemarksRepo() {
       limit = limit || 10;
       const searchQuery = {};
       const nowSGT = (0, import_moment_timezone2.default)().tz("Asia/Singapore");
-      searchQuery.serviceProviderId = new import_mongodb115.ObjectId(serviceProviderId);
+      searchQuery.serviceProviderId = new import_mongodb116.ObjectId(serviceProviderId);
       if (search != "") {
         searchQuery.siteName = { $regex: search, $options: "i" };
       }
@@ -42823,8 +42983,8 @@ function useManpowerRemarksRepo() {
   }
   async function getManpowerRemarksBySiteId(_id, date, serviceProviderId) {
     try {
-      _id = new import_mongodb115.ObjectId(_id);
-      serviceProviderId = new import_mongodb115.ObjectId(serviceProviderId);
+      _id = new import_mongodb116.ObjectId(_id);
+      serviceProviderId = new import_mongodb116.ObjectId(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -42841,13 +43001,13 @@ function useManpowerRemarksRepo() {
   }
   async function updateManpowerRemarks(_id, value) {
     try {
-      _id = new import_mongodb115.ObjectId(_id);
+      _id = new import_mongodb116.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils197.BadRequestError("Invalid ID format.");
     }
     try {
       if (value.createdBy) {
-        value.createdBy = new import_mongodb115.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb116.ObjectId(value.createdBy);
       }
       const updateValue = {
         ...value,
@@ -42864,7 +43024,7 @@ function useManpowerRemarksRepo() {
   }
   async function updateRemarksStatus(_id, value) {
     try {
-      _id = new import_mongodb115.ObjectId(_id);
+      _id = new import_mongodb116.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils197.BadRequestError("Invalid ID format.");
     }
@@ -43136,7 +43296,7 @@ function useManpowerMonitoringCtrl() {
 
 // src/models/manpower-designations.model.ts
 var import_joi114 = __toESM(require("joi"));
-var import_mongodb116 = require("mongodb");
+var import_mongodb117 = require("mongodb");
 var designationsSchema = import_joi114.default.object({
   title: import_joi114.default.string().required(),
   shifts: import_joi114.default.object({
@@ -43155,7 +43315,7 @@ var manpowerDesignationsSchema = import_joi114.default.object({
 });
 var MManpowerDesignations = class {
   constructor(data) {
-    this._id = new import_mongodb116.ObjectId();
+    this._id = new import_mongodb117.ObjectId();
     this.siteId = data.siteId || "";
     this.siteName = data.siteName || "";
     this.serviceProviderId = data.serviceProviderId || "";
@@ -43169,7 +43329,7 @@ var MManpowerDesignations = class {
 
 // src/repositories/manpower-designations.repo.ts
 var import_node_server_utils200 = require("@7365admin1/node-server-utils");
-var import_mongodb117 = require("mongodb");
+var import_mongodb118 = require("mongodb");
 function useManpowerDesignationRepo() {
   const db = import_node_server_utils200.useAtlas.getDb();
   if (!db) {
@@ -43181,11 +43341,11 @@ function useManpowerDesignationRepo() {
     try {
       value = new MManpowerDesignations(value);
       if (value.createdBy)
-        value.createdBy = new import_mongodb117.ObjectId(value.createdBy);
+        value.createdBy = new import_mongodb118.ObjectId(value.createdBy);
       if (value.siteId)
-        value.siteId = new import_mongodb117.ObjectId(value.siteId);
+        value.siteId = new import_mongodb118.ObjectId(value.siteId);
       if (value.serviceProviderId)
-        value.serviceProviderId = new import_mongodb117.ObjectId(value.serviceProviderId);
+        value.serviceProviderId = new import_mongodb118.ObjectId(value.serviceProviderId);
       const result = await collection.insertOne(value);
       return result;
     } catch (error) {
@@ -43194,8 +43354,8 @@ function useManpowerDesignationRepo() {
   }
   async function getManpowerDesignationsBySiteId(_id, serviceProviderId) {
     try {
-      _id = new import_mongodb117.ObjectId(_id);
-      serviceProviderId = new import_mongodb117.ObjectId(serviceProviderId);
+      _id = new import_mongodb118.ObjectId(_id);
+      serviceProviderId = new import_mongodb118.ObjectId(serviceProviderId);
     } catch (error) {
       throw new Error("Invalid Site ID format.");
     }
@@ -43211,7 +43371,7 @@ function useManpowerDesignationRepo() {
   }
   async function updateManpowerDesignations(_id, value) {
     try {
-      _id = new import_mongodb117.ObjectId(_id);
+      _id = new import_mongodb118.ObjectId(_id);
     } catch (error) {
       throw new Error("Invalid ID format.");
     }
@@ -43314,7 +43474,7 @@ function useManpowerDesignationCtrl() {
 
 // src/models/overnight-parking.model.ts
 var import_joi116 = __toESM(require("joi"));
-var import_mongodb118 = require("mongodb");
+var import_mongodb119 = 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({
@@ -43356,7 +43516,7 @@ function MOvernightParkingApprovalHours(value) {
   }
   if (value.site && typeof value.site === "string") {
     try {
-      value.site = new import_mongodb118.ObjectId(value.site);
+      value.site = new import_mongodb119.ObjectId(value.site);
     } catch {
       throw new Error("Invalid site ID.");
     }
@@ -44961,7 +45121,7 @@ function useManpowerRemarkCtrl() {
 
 // src/models/manpower-sites.model.ts
 var import_joi122 = __toESM(require("joi"));
-var import_mongodb119 = require("mongodb");
+var import_mongodb120 = require("mongodb");
 var manpowerSitesSchema = import_joi122.default.object({
   id: import_joi122.default.string().hex().required(),
   text: import_joi122.default.string().hex().optional().allow("", null),
@@ -44972,7 +45132,7 @@ var manpowerSitesSchema = import_joi122.default.object({
 });
 var MManpowerSites = class {
   constructor(data) {
-    this._id = new import_mongodb119.ObjectId();
+    this._id = new import_mongodb120.ObjectId();
     this.id = data.id || "";
     this.text = data.text || "";
     this.contractID = data.contractID || "";
@@ -45182,7 +45342,7 @@ function useManpowerSitesCtrl() {
 
 // src/utils/cron.util.ts
 var import_node_server_utils214 = require("@7365admin1/node-server-utils");
-var import_mongodb120 = require("mongodb");
+var import_mongodb121 = require("mongodb");
 var import_moment_timezone4 = __toESM(require("moment-timezone"));
 var createManpowerRemarksDaily = async () => {
   const db = import_node_server_utils214.useAtlas.getDb();
@@ -45342,7 +45502,7 @@ var updateRemarksisAcknowledged = async () => {
     for (const id of updatedIds) {
       const doc = await remarks.findOne({ _id: id });
       const setting = await settings.findOne(
-        { siteId: new import_mongodb120.ObjectId(doc?.siteId) },
+        { siteId: new import_mongodb121.ObjectId(doc?.siteId) },
         { projection: { emails: 1 } }
       );
       const payload = {
@@ -45428,7 +45588,7 @@ var updateRemarksStatusEod = async () => {
   for (const doc of docs) {
     let shiftsToCheck = [];
     const endShiftTime = await settings.findOne(
-      { siteId: new import_mongodb120.ObjectId(doc.siteId) },
+      { siteId: new import_mongodb121.ObjectId(doc.siteId) },
       { projection: { shifts: 1, shiftType: 1 } }
     );
     if (doc.createdAtSGT === nowSGT) {
@@ -45534,7 +45694,7 @@ var isWithinHour = (alertTime, timeNow) => {
 
 // src/events/manpower.event.ts
 var import_node_server_utils215 = require("@7365admin1/node-server-utils");
-var import_mongodb121 = require("mongodb");
+var import_mongodb122 = require("mongodb");
 var import_moment_timezone5 = __toESM(require("moment-timezone"));
 async function manpowerEvents(io) {
   let intervalId = null;
@@ -45560,7 +45720,7 @@ async function manpowerEvents(io) {
     }).toArray();
     for (const doc of docs) {
       const siteSettings = await settings.findOne(
-        { siteId: new import_mongodb121.ObjectId(doc.siteId), enabled: true },
+        { siteId: new import_mongodb122.ObjectId(doc.siteId), enabled: true },
         { projection: { shifts: 1, shiftType: 1 } }
       );
       const shiftType = siteSettings?.shiftType || "2-shifts";
@@ -45679,7 +45839,7 @@ function genericSignature(params, secretKey) {
 }
 
 // src/repositories/reddot-payment.repository.ts
-var import_mongodb125 = require("mongodb");
+var import_mongodb126 = require("mongodb");
 
 // src/utils/date-format.util.ts
 var import_moment_timezone6 = __toESM(require("moment-timezone"));
@@ -45704,11 +45864,11 @@ function formatDateString(today, format, dateRange) {
 }
 
 // src/models/credit-card.model.ts
-var import_mongodb122 = require("mongodb");
+var import_mongodb123 = require("mongodb");
 var MCardInfo = class {
   // this is coming from RDP transaction
   constructor({
-    _id = new import_mongodb122.ObjectId(),
+    _id = new import_mongodb123.ObjectId(),
     userId,
     cardType,
     cardNumber,
@@ -45743,11 +45903,11 @@ var MCardInfo = class {
 };
 
 // src/models/cart.model.ts
-var import_mongodb123 = require("mongodb");
+var import_mongodb124 = require("mongodb");
 var MUnitBillings = class {
   // transaction response messages
   constructor({
-    _id = new import_mongodb123.ObjectId(),
+    _id = new import_mongodb124.ObjectId(),
     unit,
     unitId,
     unitBill,
@@ -45788,7 +45948,7 @@ var MUnitBillings = class {
 };
 
 // src/repositories/payment.repository.ts
-var import_mongodb124 = require("mongodb");
+var import_mongodb125 = require("mongodb");
 var import_node_server_utils216 = require("@7365admin1/node-server-utils");
 var PaymentBillRepo = () => {
   const getDB2 = () => {
@@ -45822,7 +45982,7 @@ var PaymentBillRepo = () => {
       if (unitBillInfo?.status === "Inactive" /* inactive */) {
         throw new Error("This Bill is Inactive!");
       }
-      const billId = new import_mongodb124.ObjectId(unitBillInfo?.billId);
+      const billId = new import_mongodb125.ObjectId(unitBillInfo?.billId);
       const billInfo = await billCollection().findOne({ _id: billId });
       if (!billInfo) {
         throw new Error("Bill info not found");
@@ -45861,13 +46021,13 @@ var PaymentBillRepo = () => {
   const saveCreditCardInfo = async (payload) => {
     try {
       if (payload.userId)
-        payload.userId = new import_mongodb124.ObjectId(payload.userId);
+        payload.userId = new import_mongodb125.ObjectId(payload.userId);
       if (payload.site)
-        payload.site = new import_mongodb124.ObjectId(payload.site);
+        payload.site = new import_mongodb125.ObjectId(payload.site);
       if (payload.organization)
-        payload.organization = new import_mongodb124.ObjectId(payload.organization);
+        payload.organization = new import_mongodb125.ObjectId(payload.organization);
       if (payload.createdBy)
-        payload.createdBy = new import_mongodb124.ObjectId(payload.createdBy);
+        payload.createdBy = new import_mongodb125.ObjectId(payload.createdBy);
       const createdAt = formatDateString(/* @__PURE__ */ new Date(), "mm-dd-yyyy");
       payload.createdAt = createdAt;
       const result = await creditCollection().insertOne(new MCardInfo(payload));
@@ -45879,19 +46039,19 @@ var PaymentBillRepo = () => {
   const checkOutUnitBills = async (payload) => {
     try {
       if (payload.unitId)
-        payload.unitId = new import_mongodb124.ObjectId(payload.unitId);
+        payload.unitId = new import_mongodb125.ObjectId(payload.unitId);
       if (payload.site)
-        payload.site = new import_mongodb124.ObjectId(payload.site);
+        payload.site = new import_mongodb125.ObjectId(payload.site);
       if (payload.organization)
-        payload.organization = new import_mongodb124.ObjectId(payload.organization);
+        payload.organization = new import_mongodb125.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_mongodb124.ObjectId(addToCart?.insertedId).toString().slice(-4);
+      const newId = new import_mongodb125.ObjectId(addToCart?.insertedId).toString().slice(-4);
       const referenceNumber = `CRT${unit}${newId}${dateFormatted}`;
-      const result = await cartCollection().findOneAndUpdate({ _id: new import_mongodb124.ObjectId(addToCart.insertedId) }, { $set: { referenceNumber } }, { returnDocument: "after" });
+      const result = await cartCollection().findOneAndUpdate({ _id: new import_mongodb125.ObjectId(addToCart.insertedId) }, { $set: { referenceNumber } }, { returnDocument: "after" });
       return result;
     } catch (error) {
       throw new Error(error.message || error || "Server Internal Error");
@@ -45922,7 +46082,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_mongodb124.ObjectId(billId) });
+          const billInfo = await billCollection().findOne({ _id: new import_mongodb125.ObjectId(billId) });
           const billAmount = billInfo?.price;
           payload.updatedAt = updatedAt;
           payload.amountPaid = billAmount;
@@ -46073,7 +46233,7 @@ var useRedDotPaymentRepo = () => {
         throw new Error("Failed to Add Merchant Details");
       }
       const merchantId = merchant?.insertedId;
-      const orgId = new import_mongodb125.ObjectId(_id);
+      const orgId = new import_mongodb126.ObjectId(_id);
       const result = await orgCollection().findOneAndUpdate({ _id: orgId }, { $push: { merchant: merchantId } }, {
         returnDocument: "after"
       });
@@ -46102,7 +46262,7 @@ var useRedDotPaymentRepo = () => {
   const getMerchantDetailsById = async (_id) => {
     try {
       if (_id)
-        _id = new import_mongodb125.ObjectId(_id);
+        _id = new import_mongodb126.ObjectId(_id);
       const result = await redDotMerchantCollection().aggregate([
         {
           $match: {
@@ -46357,7 +46517,7 @@ function useRedDotPaymentController() {
 
 // src/repositories/verification-v2.repo.ts
 var import_node_server_utils218 = require("@7365admin1/node-server-utils");
-var import_mongodb126 = require("mongodb");
+var import_mongodb127 = require("mongodb");
 function useVerificationRepoV2() {
   const db = import_node_server_utils218.useAtlas.getDb();
   if (!db) {
@@ -46410,7 +46570,7 @@ function useVerificationRepoV2() {
   }
   async function updateVerificationStatusById(_id, status, session) {
     try {
-      _id = new import_mongodb126.ObjectId(_id);
+      _id = new import_mongodb127.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils218.BadRequestError("Invalid verification ID format.");
     }
@@ -46962,7 +47122,7 @@ var import_node_server_utils222 = require("@7365admin1/node-server-utils");
 var import_uuid2 = require("uuid");
 
 // src/repositories/user-v2.repo.ts
-var import_mongodb127 = require("mongodb");
+var import_mongodb128 = require("mongodb");
 var import_node_server_utils221 = require("@7365admin1/node-server-utils");
 function useUserRepoV2() {
   const { updateFeedbackCreatedByName } = useFeedbackRepo();
@@ -47163,7 +47323,7 @@ function useUserRepoV2() {
     }
     if (organization) {
       try {
-        query.defaultOrg = new import_mongodb127.ObjectId(organization);
+        query.defaultOrg = new import_mongodb128.ObjectId(organization);
         cacheOptions.organization = organization.toString();
       } catch (error) {
         throw new import_node_server_utils221.BadRequestError("Invalid organization ID format.");
@@ -47302,13 +47462,13 @@ function useUserRepoV2() {
       );
     }
     try {
-      _id = new import_mongodb127.ObjectId(_id);
+      _id = new import_mongodb128.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils221.BadRequestError("Invalid ID.");
     }
     if (field === "defaultOrg") {
       try {
-        value = new import_mongodb127.ObjectId(value);
+        value = new import_mongodb128.ObjectId(value);
       } catch (error) {
         throw new import_node_server_utils221.BadRequestError("Invalid organization ID.");
       }
@@ -47349,7 +47509,7 @@ function useUserRepoV2() {
     year
   }, session) {
     try {
-      _id = new import_mongodb127.ObjectId(_id);
+      _id = new import_mongodb128.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils221.BadRequestError("Invalid user ID format.");
     }
@@ -47379,7 +47539,7 @@ function useUserRepoV2() {
   }
   async function updatePassword({ _id, password }, session) {
     try {
-      _id = new import_mongodb127.ObjectId(_id);
+      _id = new import_mongodb128.ObjectId(_id);
     } catch (error) {
       throw new import_node_server_utils221.BadRequestError("Invalid user ID format.");
     }