@7365admin1/core 3.25.0 → 3.27.0

package/dist/index.js

@@ -9141,6 +9141,31 @@ function useUserRepo() {
       throw new import_node_server_utils10.InternalServerError("Failed to update user organization.");
     }
   }
+  async function updateUserUnitById(id, value, session) {
+    const _id = (0, import_node_server_utils10.toObjectId)(id);
+    const update = {};
+    if ("block" in value)
+      update.block = value.block ?? null;
+    if ("level" in value)
+      update.level = value.level ?? null;
+    if ("unitId" in value)
+      update.unitId = value.unitId ?? null;
+    if ("unitName" in value)
+      update.unitName = value.unitName ?? "";
+    if (Object.keys(update).length === 0) {
+      return "No user unit fields to update.";
+    }
+    try {
+      await collection.updateOne(
+        { _id },
+        { $set: { ...update, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      return "Successfully updated user unit information.";
+    } catch (error) {
+      throw new import_node_server_utils10.InternalServerError("Failed to update user unit information.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -9159,7 +9184,8 @@ function useUserRepo() {
     getUserByEmailStatus,
     updateUserSIDById,
     resetPassword,
-    updateUserOrgById
+    updateUserOrgById,
+    updateUserUnitById
   };
 }
 
@@ -12520,19 +12546,22 @@ function useVerificationService() {
     orgId,
     siteId,
     siteName,
+    app,
     inviteType
   }) {
     const schema2 = import_joi11.default.object({
       email: import_joi11.default.string().email().lowercase().required(),
       orgId: import_joi11.default.string().hex().length(24).required(),
       siteId: import_joi11.default.string().hex().length(24).required(),
-      siteName: import_joi11.default.string().required()
+      siteName: import_joi11.default.string().required(),
+      app: import_joi11.default.string().required()
     });
     const { error } = schema2.validate({
       email,
       orgId,
       siteId,
-      siteName
+      siteName,
+      app
     });
     if (error) {
       const messages = error.details.map((d) => d.message).join(", ");
@@ -12547,7 +12576,8 @@ function useVerificationService() {
       metadata: {
         siteId,
         siteName,
-        org: orgId
+        org: orgId,
+        app
       },
       expireAt: new Date(
         (/* @__PURE__ */ new Date()).getTime() + 72 * 60 * 60 * 1e3
@@ -12567,7 +12597,7 @@ function useVerificationService() {
       const res = await _add(value);
       const dir = __dirname;
       const filePath = (0, import_node_server_utils21.getDirectory)(dir, `./public/handlebars/${value.type}`);
-      const link = `${APP_MAIN}/verify/${value.type}/${res}`;
+      const link = `${APP_MAIN}/verify/service-provider-invite/${res}`;
       const emailContent = (0, import_node_server_utils21.compileHandlebar)({
         context: {
           email,
@@ -15136,6 +15166,7 @@ function useVerificationController() {
       orgId: import_joi16.default.string().hex().required(),
       siteId: import_joi16.default.string().hex().required(),
       siteName: import_joi16.default.string().required(),
+      app: import_joi16.default.string().required(),
       inviteType: import_joi16.default.string().valid("create-org", "organization-invite").required()
     });
     const { error } = validation.validate(payload);
@@ -15152,6 +15183,7 @@ function useVerificationController() {
       orgId,
       siteId,
       siteName,
+      app,
       inviteType
     } = payload;
     try {
@@ -15160,6 +15192,7 @@ function useVerificationController() {
         orgId,
         siteId,
         siteName,
+        app,
         inviteType
       });
       const cookieOptions = {
@@ -21515,7 +21548,8 @@ function MVisitorTransaction(value) {
       updatedBy: value.inviterId ?? ""
     } : null,
     arrivalTime: value.arrivalTime,
-    duration: value.duration
+    duration: value.duration,
+    members: value.members
   };
 }
 
@@ -25393,6 +25427,10 @@ function usePersonRepo() {
   }
   async function getByNRIC(value) {
     try {
+      if (!value || value.trim() === "") {
+        import_node_server_utils74.logger.warn("getByNRIC called with an empty or invalid NRIC value.");
+        return null;
+      }
       const cacheKey = (0, import_node_server_utils74.makeCacheKey)(site_people_namespace_collection, {
         nric: value
       });
@@ -25441,8 +25479,11 @@ function usePersonRepo() {
     unit
   }, session) {
     try {
+      if (!unit || !import_mongodb45.ObjectId.isValid(unit)) {
+        throw new import_node_server_utils74.BadRequestError("Invalid unit ID.");
+      }
       const query = {
-        unit,
+        unit: new import_mongodb45.ObjectId(unit),
         status,
         ...Array.isArray(type) && type.length > 0 && {
           type: { $in: type }
@@ -26411,18 +26452,7 @@ function useBuildingUnitRepo() {
     } catch (error) {
       throw new import_node_server_utils76.BadRequestError("Invalid ID.");
     }
-    const cacheKey = (0, import_node_server_utils76.makeCacheKey)(building_units_namespace_collection, {
-      _id: String(_id)
-    });
     try {
-      const cached = await getCache(cacheKey);
-      if (cached) {
-        import_node_server_utils76.logger.log({
-          level: "info",
-          message: `Cache hit for getById building unit: ${cacheKey}`
-        });
-        return cached;
-      }
       const result = await collection.findOne({
         _id,
         deletedAt: { $in: ["", null] }
@@ -26430,17 +26460,6 @@ function useBuildingUnitRepo() {
       if (!result) {
         throw new import_node_server_utils76.BadRequestError("Building unit not found.");
       }
-      setCache(cacheKey, result, 300).then(() => {
-        import_node_server_utils76.logger.log({
-          level: "info",
-          message: `Cache set for building unit by id: ${cacheKey}`
-        });
-      }).catch((err) => {
-        import_node_server_utils76.logger.log({
-          level: "error",
-          message: `Failed to set cache for building unit by id: ${err.message}`
-        });
-      });
       return result;
     } catch (error) {
       if (error instanceof import_node_server_utils76.AppError) {
@@ -34452,7 +34471,7 @@ var KeyRepo = class {
           findOptions
         );
         console.log("visitorId", visitorId.toString());
-        console.log("latestHistory.visitorId", latestHistory?.visitorId.toString());
+        console.log("latestHistory.visitorId", latestHistory?.visitorId?.toString());
         if (latestHistory?.visitorId && latestHistory.visitorId?.toString() !== visitorId.toString()) {
           console.log("Not updating keyId", keyId);
           return;
@@ -34525,70 +34544,59 @@ var KeyRepo = class {
       return Promise.reject("Failed to delete key");
     }
   }
-  static async getById2(id) {
-    return this.collection().aggregate([
-      { $match: { _id: new import_mongodb62.ObjectId(id) } },
-      {
-        $lookup: {
-          from: "qr-code-templates",
-          localField: "template",
-          foreignField: "_id",
-          as: "QRTemplateInfo"
-        }
-      },
-      {
-        $unwind: {
-          path: "$QRTemplateInfo",
-          preserveNullAndEmptyArrays: true
-        }
-      },
-      {
-        $addFields: {
-          prefixPass: { $toUpper: "$QRTemplateInfo.prefixPass" },
-          prefixKey: { $toUpper: "$QRTemplateInfo.prefixKey" },
-          templateName: "$QRTemplateInfo.name"
-        }
-      },
-      {
-        $addFields: {
-          prefixAndName: {
-            $cond: {
-              if: { $or: [{ $not: "$prefixPass" }, { $not: "$prefixKey" }] },
-              then: "$name",
-              else: {
-                $cond: {
-                  if: { $eq: ["$passType", "pass-key"] },
-                  then: { $concat: ["$prefixKey", "$name"] },
-                  else: { $concat: ["$prefixPass", "$name"] }
+  static async getById2(id, session) {
+    return this.collection().aggregate(
+      [
+        { $match: { _id: new import_mongodb62.ObjectId(id) } },
+        {
+          $lookup: {
+            from: "qr-code-templates",
+            localField: "template",
+            foreignField: "_id",
+            as: "QRTemplateInfo"
+          }
+        },
+        {
+          $unwind: {
+            path: "$QRTemplateInfo",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $addFields: {
+            prefixPass: { $toUpper: "$QRTemplateInfo.prefixPass" },
+            prefixKey: { $toUpper: "$QRTemplateInfo.prefixKey" },
+            templateName: "$QRTemplateInfo.name"
+          }
+        },
+        {
+          $addFields: {
+            prefixAndName: {
+              $cond: {
+                if: { $or: [{ $not: "$prefixPass" }, { $not: "$prefixKey" }] },
+                then: "$name",
+                else: {
+                  $cond: {
+                    if: { $eq: ["$passType", "pass-key"] },
+                    then: { $concat: ["$prefixKey", "$name"] },
+                    else: { $concat: ["$prefixPass", "$name"] }
+                  }
                 }
               }
             }
           }
         }
-      }
-    ]).toArray().then((results) => results.length ? results[0] : null);
+      ],
+      { session }
+    ).toArray().then((results) => results.length ? results[0] : null);
   }
-  static async checkPassKeyAvailability(visitorPass, passKeys) {
-    if (Array.isArray(visitorPass) && visitorPass.length > 0) {
-      for (let i = 0; i < visitorPass.length; i++) {
-        let pass = await convertObjectIdUtil2(visitorPass[i].keyId, "Pass ID");
-        const getPass = await this.getById2(pass);
-        if (!getPass)
-          throw new Error("Pass not found");
-        if (getPass?.status && getPass?.status.toLowerCase() != "Available".toLowerCase())
-          throw new Error(`Pass ${getPass?.prefixAndName} is ${getPass?.status}`);
-      }
-    }
-    if (Array.isArray(passKeys) && passKeys.length > 0) {
-      for (let i = 0; i < passKeys.length; i++) {
-        let key = await convertObjectIdUtil2(passKeys[i].keyId, "Key ID");
-        const getPass = await this.getById2(key);
-        if (!getPass)
-          throw new Error(`Key not found`);
-        if (getPass?.status && getPass?.status.toLowerCase() != "Available".toLowerCase())
-          throw new Error(`Pass ${getPass?.prefixAndName} is ${getPass?.status}`);
-      }
-    }
+  static async checkPassOrKeyAvailability(passOrKeyId, type, session) {
+    let passOrKeyObjectId = await convertObjectIdUtil2(passOrKeyId, `${type} Id`);
+    const getPassOrKey = await this.getById2(passOrKeyObjectId, session);
+    if (!getPassOrKey)
+      throw new Error(`${type} not found`);
+    if (getPassOrKey?.status && getPassOrKey?.status.toLowerCase() != "Available".toLowerCase())
+      throw new Error(`${type} ${getPassOrKey?.prefixAndName} is ${getPassOrKey?.status}`);
   }
 };
 
@@ -34907,7 +34915,7 @@ function useVisitorTransactionService() {
         const unit = await _getUnitById(value.unit);
         value.unitName = unit?.name;
       }
-      if (allowedPersonTypes.includes(value?.type)) {
+      if (allowedPersonTypes.includes(value?.type) && value?.nric) {
         const nric = value?.nric || "";
         const person = await getByNRIC(nric);
         const existingCompanyName = person?.companyName?.includes(
@@ -34953,9 +34961,6 @@ function useVisitorTransactionService() {
         } = value;
         for (let i = 0; i < value.members.length; i += chunkSize) {
           const chunk = value.members.slice(i, i + chunkSize);
-          for (const member of chunk) {
-            await KeyRepo.checkPassKeyAvailability(member.visitorPass, member.passKeys);
-          }
           await Promise.all(
             chunk.map(async (member) => {
               const clonedMember = structuredClone(member);
@@ -34996,6 +35001,7 @@ function useVisitorTransactionService() {
               );
               console.log("visitorId service", visitorId);
               for (const item of preparedVisitorPass) {
+                await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Pass", session);
                 await KeyRepo.updateKeyById(
                   item.keyId,
                   {
@@ -35011,6 +35017,7 @@ function useVisitorTransactionService() {
                 );
               }
               for (const item of preparedPassKeys) {
+                await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Key", session);
                 await KeyRepo.updateKeyById(
                   item.keyId,
                   {
@@ -35053,7 +35060,6 @@ function useVisitorTransactionService() {
         if (found === 1)
           throw new import_node_server_utils107.BadRequestError("This plate number is blocklisted");
       }
-      await KeyRepo.checkPassKeyAvailability(value.visitorPass, value.passKeys);
       if (Array.isArray(value.visitorPass)) {
         for (const item of value.visitorPass) {
           item.receivedDate = /* @__PURE__ */ new Date();
@@ -35073,6 +35079,7 @@ function useVisitorTransactionService() {
       const result = await _add(value, session);
       if (Array.isArray(value.visitorPass)) {
         for (const item of value.visitorPass) {
+          await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Pass", session);
           await KeyRepo.updateKeyById(
             item.keyId,
             { status: "In Use" /* IN_USE */, updatedBy: value.createdBy },
@@ -35087,6 +35094,7 @@ function useVisitorTransactionService() {
       }
       if (Array.isArray(value.passKeys)) {
         for (const item of value.passKeys) {
+          await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Key", session);
           await KeyRepo.updateKeyById(
             item.keyId,
             { status: "In Use" /* IN_USE */, updatedBy: value.createdBy },
@@ -35139,6 +35147,103 @@ function useVisitorTransactionService() {
       let host;
       let username;
       let password;
+      if (value.checkIn) {
+        const parsed = new Date(value.checkIn);
+        value.checkIn = isNaN(parsed.getTime()) ? null : parsed;
+      }
+      if (value.isMembersAdded != true && Array.isArray(value.members) && value.members.length > 0) {
+        const chunkSize = 10;
+        const {
+          block,
+          level,
+          unit,
+          site,
+          org,
+          type,
+          company,
+          remarks,
+          contractorType,
+          unitName
+        } = value;
+        for (let i = 0; i < value.members.length; i += chunkSize) {
+          const chunk = value.members.slice(i, i + chunkSize);
+          await Promise.all(
+            chunk.map(async (member) => {
+              const clonedMember = structuredClone(member);
+              const { visitorPass, passKeys } = clonedMember;
+              const preparedVisitorPass = Array.isArray(visitorPass) ? visitorPass.map((item) => ({
+                ...item,
+                receivedDate: /* @__PURE__ */ new Date(),
+                status: "Not Returned" /* NOT_RETURNED */,
+                lastUpdate: null,
+                remarks: ""
+              })) : [];
+              const preparedPassKeys = Array.isArray(passKeys) ? passKeys.map((item) => ({
+                ...item,
+                receivedDate: /* @__PURE__ */ new Date(),
+                status: "Not Returned" /* NOT_RETURNED */,
+                lastUpdate: null,
+                remarks: ""
+              })) : [];
+              const visitorId = await _add(
+                {
+                  ...clonedMember,
+                  block,
+                  level,
+                  unit,
+                  unitName,
+                  site,
+                  org,
+                  type,
+                  company,
+                  remarks,
+                  contractorType,
+                  checkIn: value.checkIn,
+                  visitorPass: preparedVisitorPass,
+                  passKeys: preparedPassKeys,
+                  status: "registered" /* REGISTERED */
+                },
+                session
+              );
+              console.log("visitorId service", visitorId);
+              for (const item of preparedVisitorPass) {
+                await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Pass", session);
+                await KeyRepo.updateKeyById(
+                  item.keyId,
+                  {
+                    status: "In Use" /* IN_USE */,
+                    updatedBy: value.createdBy
+                  },
+                  value.site,
+                  session,
+                  void 0,
+                  visitorId,
+                  void 0,
+                  true
+                );
+              }
+              for (const item of preparedPassKeys) {
+                await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Key", session);
+                await KeyRepo.updateKeyById(
+                  item.keyId,
+                  {
+                    status: "In Use" /* IN_USE */,
+                    updatedBy: value.createdBy,
+                    visitorId
+                  },
+                  value.site,
+                  session,
+                  void 0,
+                  visitorId,
+                  void 0,
+                  true
+                );
+              }
+            })
+          );
+        }
+        value.isMembersAdded = true;
+      }
       if (value.site && value.plateNumber) {
         try {
           camera = await _getVisitorsInBySite(value.site);
@@ -35172,10 +35277,6 @@ function useVisitorTransactionService() {
         if (found === 1)
           throw new import_node_server_utils107.BadRequestError("This plate number is blocklisted");
       }
-      if (value.checkIn) {
-        const parsed = new Date(value.checkIn);
-        value.checkIn = isNaN(parsed.getTime()) ? null : parsed;
-      }
       if (value.checkOut) {
         const parsed = new Date(value.checkOut);
         value.checkOut = isNaN(parsed.getTime()) ? null : parsed;
@@ -35183,6 +35284,12 @@ function useVisitorTransactionService() {
       if (value.site) {
         value.site = typeof value.site === "string" ? new import_mongodb63.ObjectId(value.site) : value.site;
       }
+      if (value?.block) {
+        value.block = await convertObjectIdUtil2(value.block, "block Id");
+      }
+      if (value?.level) {
+        value.level = await convertObjectIdUtil2(value.level, "level Id");
+      }
       if (value.unit) {
         value.unit = typeof value.unit === "string" ? new import_mongodb63.ObjectId(value.unit) : value.unit;
         const unit = await _getUnitById(value.unit);
@@ -35194,6 +35301,7 @@ function useVisitorTransactionService() {
       if (Array.isArray(value.visitorPass)) {
         for (const item of value.visitorPass) {
           if (item.add) {
+            await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Pass", session);
             await KeyRepo.updateKeyById(
               item.keyId,
               {
@@ -35242,6 +35350,7 @@ function useVisitorTransactionService() {
       if (Array.isArray(value.passKeys)) {
         for (const item of value.passKeys) {
           if (item.add) {
+            await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Key", session);
             await KeyRepo.updateKeyById(
               item.keyId,
               {
@@ -36211,7 +36320,8 @@ function usePersonService() {
     getUserByEmail,
     updateUserFieldById: _updateUserFieldById,
     getUserById,
-    updateUserOrgById: _updateUserOrgById
+    updateUserOrgById: _updateUserOrgById,
+    updateUserUnitById: _updateUserUnitById
   } = useUserRepo();
   const { add: addMember } = useMemberRepo();
   const { getById: _getUnitById, updateById: updateUnitById } = useBuildingUnitRepo();
@@ -36358,6 +36468,10 @@ function usePersonService() {
         value.unit = new import_mongodb66.ObjectId(value.unit);
       }
       const isOrgChanged = value.org && person.org?.toString() !== value.org.toString();
+      const toKey = (v) => v === null || v === void 0 || v === "" ? "" : v.toString();
+      const isBlockChanged = "block" in value && toKey(value.block) !== toKey(person.block);
+      const isLevelChanged = "level" in value && toKey(value.level) !== toKey(person.level);
+      const isUnitChanged = "unit" in value && toKey(value.unit) !== toKey(person.unit);
       await _updateById(_id, value, session);
       if (isOrgChanged && person.user) {
         await _updateUserOrgById(
@@ -36366,6 +36480,26 @@ function usePersonService() {
           session
         );
       }
+      if ((isBlockChanged || isLevelChanged || isUnitChanged) && person.user) {
+        const userUnitPayload = {};
+        if (isBlockChanged) {
+          userUnitPayload.block = value.block ?? null;
+        }
+        if (isLevelChanged) {
+          userUnitPayload.level = value.level ?? null;
+        }
+        if (isUnitChanged) {
+          userUnitPayload.unitId = value.unit ?? null;
+          if ("unitName" in value) {
+            userUnitPayload.unitName = value.unitName ?? "";
+          }
+        }
+        await _updateUserUnitById(
+          person.user.toString(),
+          userUnitPayload,
+          session
+        );
+      }
       if (value.unit && (isNameUpdated || isOwnerChanged || value.isOwner)) {
         const unit = await _getUnitById(value.unit.toString());
         if (unit) {
@@ -36395,6 +36529,16 @@ function usePersonService() {
           }
         }
       }
+      if (isUnitChanged && person.isOwner && person.unit) {
+        const previousUnit = await _getUnitById(person.unit.toString());
+        if (previousUnit && previousUnit._id && previousUnit.owner?.toString() === person?._id?.toString()) {
+          await updateUnitById(
+            previousUnit._id.toString(),
+            { owner: "", ownerName: "" },
+            session
+          );
+        }
+      }
       await session.commitTransaction();
       return "Person updated successfully.";
     } catch (error) {
@@ -45299,7 +45443,6 @@ function useSiteUnitBillingService() {
   const { getAll, updateById: _updateById } = useSiteBillingItemRepo();
   const { getBuildingUnitsWithOwner: _getBuildingUnitsWithOwner } = useBuildingUnitRepo();
   async function processBilling() {
-    console.log("Starting billing process...");
     const billing_items = await getAll({
       search: "",
       page: 1,
@@ -45342,7 +45485,7 @@ function useSiteUnitBillingService() {
           const buildUnitBilling = (unit) => ({
             site: billing_item.site.toString(),
             org: billing_item.org.toString(),
-            billItem: billing_item._id,
+            billItem: billing_item._id?.toString(),
             billName: billing_item.name,
             unitId: unit._id.toString(),
             unit: unit.blockName + " / " + unit.levelName + " / " + unit.name,
@@ -45376,6 +45519,9 @@ function useSiteUnitBillingService() {
           level: "error",
           message: `Failed to proccess cron billing: ${error.message}`
         });
+        if (session.inTransaction()) {
+          await session.abortTransaction();
+        }
         continue;
       } finally {
         session.endSession();
@@ -45430,6 +45576,7 @@ function useSiteUnitBillingService() {
     const billingMonth = Number(billing_item.month);
     const billingDay = Number(billing_item.date);
     if (billing_item.frequency === "monthly" /* MONTHLY */) {
+      console.log("billing_item", billing_item.name);
       return todayDate === billingDay;
     }
     if (billing_item.frequency === "quarterly" /* QAURTERLY */) {
@@ -46561,7 +46708,7 @@ function UseAccessManagementRepo() {
             $lookup: {
               from: "building-levels",
               localField: "_id",
-              foreignField: "block",
+              foreignField: "blockId",
               pipeline: [
                 { $match: { status: { $ne: "deleted" } } },
                 {
@@ -46582,7 +46729,7 @@ function UseAccessManagementRepo() {
                 {
                   $project: {
                     _id: 1,
-                    level: 1,
+                    name: 1,
                     units: 1
                   }
                 }
@@ -46743,7 +46890,7 @@ function UseAccessManagementRepo() {
                   $project: {
                     _id: "$level.units._id",
                     name: "$level.units.name",
-                    level: { _id: "$level._id", level: "$level.level" },
+                    level: { _id: "$level._id", level: "$level.name" },
                     block: { _id: "$_id", name: "$name", block: "$block" },
                     site: "$site",
                     unit_owner: { $arrayElemAt: ["$unitOwner", 0] },
@@ -48352,7 +48499,7 @@ function UseAccessManagementRepo() {
           $lookup: {
             from: "building-levels",
             localField: "_id",
-            foreignField: "block",
+            foreignField: "blockId",
             as: "levels",
             pipeline: [
               {
@@ -50838,11 +50985,24 @@ function useNfcPatrolTagRepo() {
       });
     });
   }
+  async function getById(_id, session) {
+    try {
+      _id = typeof _id === "string" ? new import_mongodb99.ObjectId(_id) : _id;
+    } catch {
+      throw new import_node_server_utils161.BadRequestError("Invalid NFC Patrol Tag ID.");
+    }
+    const tag = await collection.findOne({ _id }, { session });
+    if (!tag) {
+      throw new import_node_server_utils161.NotFoundError("NFC Patrol Tag not found.");
+    }
+    return tag;
+  }
   return {
     createIndexes,
     add,
     getAll,
-    updateNfcPatrolTagBySite
+    updateNfcPatrolTagBySite,
+    getById
   };
 }
 
@@ -57474,7 +57634,7 @@ var schemaNfcPatrolLog = import_joi110.default.object({
   checkPoints: import_joi110.default.array().items(
     import_joi110.default.object({
       nfcTag_id: import_joi110.default.string().length(24).hex().required(),
-      nfcTag_name: import_joi110.default.string().length(24).hex().required(),
+      nfcTag_name: import_joi110.default.string().required(),
       travelTime: import_joi110.default.number().integer().min(0).required(),
       startDateTime: import_joi110.default.date().required().messages({
         "date.base": "startDateTime must be a valid date or ISO string"
@@ -57482,7 +57642,7 @@ var schemaNfcPatrolLog = import_joi110.default.object({
       endDateTime: import_joi110.default.date().required().messages({
         "date.base": "endDateTime must be a valid date or ISO string"
       }),
-      status: import_joi110.default.string().valid("Completed", "Skipped").required(),
+      status: import_joi110.default.string().valid("Pending", "Completed", "Skipped").required(),
       skippedRemarks: import_joi110.default.string().required()
     })
   ).min(0).required(),
@@ -57659,17 +57819,59 @@ function useNfcPatrolLogRepo() {
       });
     });
   }
+  async function getById(id, session) {
+    try {
+      id = new import_mongodb121.ObjectId(id);
+    } catch {
+      throw new import_node_server_utils198.BadRequestError("Invalid Log ID.");
+    }
+    return collection.findOne(
+      { _id: id },
+      { session }
+    );
+  }
+  async function updateCheckpoint(id, checkpointIndex, payload, session) {
+    try {
+      id = new import_mongodb121.ObjectId(id);
+    } catch {
+      throw new import_node_server_utils198.BadRequestError("Invalid Log ID.");
+    }
+    const setData = {
+      [`checkPoints.${checkpointIndex}.status`]: payload.action === "complete" ? "Completed" : "Skipped",
+      [`checkPoints.${checkpointIndex}.endDateTime`]: /* @__PURE__ */ new Date()
+    };
+    if (payload.action === "skip") {
+      setData[`checkPoints.${checkpointIndex}.skippedRemarks`] = payload.skippedRemarks;
+    }
+    const res = await collection.updateOne(
+      { _id: id },
+      {
+        $set: setData
+      },
+      { session }
+    );
+    delCachedData();
+    return res;
+  }
   return {
     createIndexes,
     add,
-    getAllBySite
+    getAllBySite,
+    getById,
+    updateCheckpoint
   };
 }
 
 // src/services/nfc-patrol-log.service.ts
 var import_node_server_utils199 = require("@7365admin1/node-server-utils");
 function useNfcPatrolLogService() {
-  const { add: _add } = useNfcPatrolLogRepo();
+  const {
+    add: _add,
+    getById,
+    updateCheckpoint
+  } = useNfcPatrolLogRepo();
+  const routeRepo = useNfcPatrolRouteRepo();
+  const tagRepo = useNfcPatrolTagRepo();
   async function add(value) {
     const session = import_node_server_utils199.useAtlas.getClient()?.startSession();
     session?.startTransaction();
@@ -57684,8 +57886,59 @@ function useNfcPatrolLogService() {
       session?.endSession();
     }
   }
+  async function completeCheckpoint(logId, payload) {
+    const session = import_node_server_utils199.useAtlas.getClient()?.startSession();
+    session?.startTransaction();
+    try {
+      const log = await getById(logId, session);
+      if (!log) {
+        throw new import_node_server_utils199.BadRequestError("Patrol Log not found.");
+      }
+      const route = await routeRepo.getById(log.route._id);
+      if (!route) {
+        throw new import_node_server_utils199.BadRequestError("Route not found.");
+      }
+      const checkpoint = route.checkPoints[payload.checkpointIndex];
+      if (!checkpoint) {
+        throw new import_node_server_utils199.BadRequestError("Checkpoint not found.");
+      }
+      const logCheckpoint = log.checkPoints[payload.checkpointIndex];
+      if (!logCheckpoint) {
+        throw new import_node_server_utils199.BadRequestError("Checkpoint log not found.");
+      }
+      if (logCheckpoint.status === "Completed") {
+        throw new import_node_server_utils199.BadRequestError("Checkpoint already completed.");
+      }
+      if (payload.action === "skip" && !payload.skippedRemarks?.trim()) {
+        throw new import_node_server_utils199.BadRequestError("Skipped remarks are required.");
+      }
+      if (payload.action === "complete") {
+        const tag = await tagRepo.getById(checkpoint.nfcTag_id, session);
+        if (!tag.tagUID) {
+          throw new import_node_server_utils199.BadRequestError("NFC Tag has not been configured.");
+        }
+        if (tag.tagUID !== payload.uid) {
+          throw new import_node_server_utils199.BadRequestError("Invalid NFC Tag.");
+        }
+      }
+      await updateCheckpoint(
+        logId,
+        payload.checkpointIndex,
+        payload,
+        session
+      );
+      await session?.commitTransaction();
+      return "Checkpoint updated.";
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
   return {
-    add
+    add,
+    completeCheckpoint
   };
 }
 
@@ -57693,7 +57946,7 @@ function useNfcPatrolLogService() {
 var import_node_server_utils200 = require("@7365admin1/node-server-utils");
 var import_joi111 = __toESM(require("joi"));
 function useNfcPatrolLogController() {
-  const { add: _add } = useNfcPatrolLogService();
+  const { add: _add, completeCheckpoint: _completeCheckpoint } = useNfcPatrolLogService();
   const { getAllBySite: _getAllBySite } = useNfcPatrolLogRepo();
   async function add(req, res, next) {
     const payload = { ...req.body };
@@ -57756,9 +58009,27 @@ function useNfcPatrolLogController() {
       return;
     }
   }
+  async function completeCheckpoint(req, res, next) {
+    const { id } = req.params;
+    const payload = {
+      checkpointIndex: req.body.checkpointIndex,
+      uid: req.body.uid,
+      action: req.body.action,
+      skippedRemarks: req.body.skippedRemarks
+    };
+    try {
+      const data = await _completeCheckpoint(id, payload);
+      res.status(200).json(data);
+      return;
+    } catch (error) {
+      import_node_server_utils200.logger.error(error.message);
+      next(error);
+    }
+  }
   return {
     add,
-    getAllBySite
+    getAllBySite,
+    completeCheckpoint
   };
 }
 
@@ -57814,12 +58085,9 @@ function useNewDashboardRepo() {
   function getDateRange(p) {
     const now = (0, import_moment.default)().tz("Asia/Singapore");
     if (p === "thisWeek" /* THIS_WEEK */) {
-      const rollingStart = now.clone().subtract(6, "days").startOf("day");
-      const monthStart = now.clone().startOf("month");
-      const start = import_moment.default.max(rollingStart, monthStart);
       return {
-        $gte: start.toDate(),
-        $lte: now.clone().endOf("day").toDate()
+        $gte: now.clone().startOf("isoWeek").toDate(),
+        $lte: now.clone().endOf("isoWeek").toDate()
       };
     }
     if (p === "thisMonth" /* THIS_MONTH */) {
@@ -57833,6 +58101,12 @@ function useNewDashboardRepo() {
       $lte: now.clone().endOf("day").toDate()
     };
   }
+  function getSiteDayRange(date = import_moment.default.tz("Asia/Singapore")) {
+    return {
+      $gte: date.clone().startOf("day").toDate(),
+      $lte: date.clone().endOf("day").toDate()
+    };
+  }
   const calculatePercentageChange = (currentCount, previousCount) => {
     if (previousCount === 0) {
       return currentCount > 0 ? 100 : 0;
@@ -58259,24 +58533,27 @@ function useNewDashboardRepo() {
     const siteIdObj = (0, import_node_server_utils201.toObjectId)(siteId);
     const startOfToday = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
     const endOfToday = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
-    const localTodayStr = import_moment.default.tz("Asia/Singapore").format("YYYY-MM-DD");
-    const facilityTodayStart = import_moment.default.utc(`${localTodayStr}T00:00:00.000Z`).toDate();
-    const facilityTodayEnd = import_moment.default.utc(`${localTodayStr}T23:59:59.999Z`).toDate();
-    const localYesterdayStr = import_moment.default.tz("Asia/Singapore").subtract(1, "day").format("YYYY-MM-DD");
-    const facilityYesterdayStart = import_moment.default.utc(`${localYesterdayStr}T00:00:00.000Z`).toDate();
-    const facilityYesterdayEnd = import_moment.default.utc(`${localYesterdayStr}T23:59:59.999Z`).toDate();
-    let facilityPeriodRange = { $gte: facilityTodayStart, $lte: facilityTodayEnd };
+    const facilityTodayRange = getSiteDayRange();
+    const facilityYesterdayRange = getSiteDayRange(
+      import_moment.default.tz("Asia/Singapore").subtract(1, "day")
+    );
+    const facilityTodayStart = facilityTodayRange.$gte;
+    const facilityTodayEnd = facilityTodayRange.$lte;
+    const facilityYesterdayStart = facilityYesterdayRange.$gte;
+    const facilityYesterdayEnd = facilityYesterdayRange.$lte;
+    let facilityPeriodRange = {
+      $gte: facilityTodayStart,
+      $lte: facilityTodayEnd
+    };
     if (period === "thisWeek" /* THIS_WEEK */) {
-      const startStr = import_moment.default.tz("Asia/Singapore").subtract(7, "days").format("YYYY-MM-DD");
       facilityPeriodRange = {
-        $gte: import_moment.default.utc(`${startStr}T00:00:00.000Z`).toDate(),
-        $lte: facilityTodayEnd
+        $gte: import_moment.default.tz("Asia/Singapore").startOf("isoWeek").toDate(),
+        $lte: import_moment.default.tz("Asia/Singapore").endOf("isoWeek").toDate()
       };
     } else if (period === "thisMonth" /* THIS_MONTH */) {
-      const startStr = import_moment.default.tz("Asia/Singapore").subtract(30, "days").format("YYYY-MM-DD");
       facilityPeriodRange = {
-        $gte: import_moment.default.utc(`${startStr}T00:00:00.000Z`).toDate(),
-        $lte: facilityTodayEnd
+        $gte: import_moment.default.tz("Asia/Singapore").startOf("month").toDate(),
+        $lte: import_moment.default.tz("Asia/Singapore").endOf("month").toDate()
       };
     }
     const upcomingEvents = await db.collection(events_namespace_collection).find({
@@ -58360,6 +58637,18 @@ function useNewDashboardRepo() {
     const facilityCollection = db.collection(
       facility_bookings_namespace_collection2
     );
+    const facilityBookingStatuses = [
+      "Pending",
+      "Approved",
+      "Ongoing",
+      "For Review",
+      "With Balance",
+      "For Refund",
+      "With Refund",
+      "Completed",
+      "Rejected",
+      "Cancelled"
+    ];
     const [
       workOrderReport,
       yesterdayWorkOrderReport,
@@ -58510,7 +58799,7 @@ function useNewDashboardRepo() {
                 }
               }
             ],
-            status: { $nin: ["deleted", "Deleted"] }
+            status: { $in: facilityBookingStatuses }
           }
         },
         {
@@ -58535,6 +58824,25 @@ function useNewDashboardRepo() {
                 }
               },
               { $count: "count" }
+            ],
+            byStatus: [
+              {
+                $match: {
+                  status: { $in: facilityBookingStatuses }
+                }
+              },
+              {
+                $group: {
+                  _id: {
+                    $cond: [
+                      { $eq: ["$status", "For Refund"] },
+                      "With Refund",
+                      "$status"
+                    ]
+                  },
+                  count: { $sum: 1 }
+                }
+              }
             ]
           }
         }
@@ -58545,7 +58853,12 @@ function useNewDashboardRepo() {
             site: { $in: [siteIdObj, siteId] },
             ...facilityMatchObj,
             $or: [
-              { date: { $gte: facilityYesterdayStart, $lte: facilityYesterdayEnd } },
+              {
+                date: {
+                  $gte: facilityYesterdayStart,
+                  $lte: facilityYesterdayEnd
+                }
+              },
               {
                 date: {
                   $gte: facilityYesterdayStart.toISOString(),
@@ -58553,7 +58866,7 @@ function useNewDashboardRepo() {
                 }
               }
             ],
-            status: { $nin: ["deleted", "Deleted"] }
+            status: { $in: facilityBookingStatuses }
           }
         },
         { $count: "count" }
@@ -58572,7 +58885,7 @@ function useNewDashboardRepo() {
                 }
               }
             ],
-            status: { $nin: ["deleted", "Deleted"] }
+            status: { $in: facilityBookingStatuses }
           }
         },
         { $count: "count" }
@@ -58596,8 +58909,25 @@ function useNewDashboardRepo() {
     const fFacet = facilityReport[0] ?? {
       total: [],
       ongoing: [],
-      waitingApproval: []
+      waitingApproval: [],
+      byStatus: []
+    };
+    const facilityBookingStatusCounts = {
+      Pending: 0,
+      Approved: 0,
+      Ongoing: 0,
+      "For Review": 0,
+      "With Balance": 0,
+      "With Refund": 0,
+      Completed: 0,
+      Rejected: 0,
+      Cancelled: 0
     };
+    for (const item of fFacet.byStatus ?? []) {
+      if (typeof item?._id === "string" && item._id in facilityBookingStatusCounts) {
+        facilityBookingStatusCounts[item._id] = item.count ?? 0;
+      }
+    }
     const workOrderStatus = {
       pending: 0,
       inProgress: 0,
@@ -58644,6 +58974,7 @@ function useNewDashboardRepo() {
         count: fFacet.total[0]?.count ?? 0,
         ongoing: fFacet.ongoing[0]?.count ?? 0,
         waitingApproval: fFacet.waitingApproval[0]?.count ?? 0,
+        byStatus: facilityBookingStatusCounts,
         percentage: calculatePercentageChange(
           todayFacilityReport[0]?.count ?? 0,
           yesterdayFacilityReport[0]?.count ?? 0
@@ -63374,9 +63705,12 @@ var useRedDotPaymentRepo = () => {
       }
       const now = /* @__PURE__ */ new Date();
       const unitUpdate = {
+        method: payload.method,
+        message: payload.message,
         updatedAt: now.toISOString(),
         paymentStatus: payload.paymentStatus,
-        transaction_id: payload.transaction_id
+        transaction_id: payload.transaction_id,
+        paidBy: paymentInfo.paidBy
       };
       const paymentUpdate = {
         updatedAt: now.toISOString(),