@7365admin1/core 2.41.0 → 2.42.0

package/dist/index.mjs

@@ -423,7 +423,6 @@ function useFeedbackRepo() {
       cacheOptions.from = from;
       cacheOptions.to = to;
     }
-    console.log("query", JSON.stringify(query));
     const cacheKey = makeCacheKey2(feedbacks_namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -1892,7 +1891,6 @@ function useOccurrenceEntryRepo() {
         throw new Error("Invalid incident report ID.");
       }
     }
-    console.log("Updating occurrence entry:", _id, value);
     try {
       const res = await collection.updateOne(
         { _id },
@@ -10332,7 +10330,6 @@ function useSubscriptionService() {
         subscription.nextBillingDate,
         "pending"
       );
-      console.log("dueInvoice", dueInvoice);
       if (value.promoCode) {
         const promoCode = await getByCode(value.promoCode);
         if (!promoCode) {
@@ -11361,11 +11358,8 @@ function useFeedbackController() {
       (acc, [key, value]) => ({ ...acc, [key]: value }),
       {}
     );
-    console.log("cookies", cookies);
     const createdBy = cookies?.["user"].toString() ?? "";
-    console.log("createdBy", createdBy);
     const payload = { ...req.body, createdBy };
-    console.log("payload", payload);
     const { error } = feedbackSchema.validate(payload);
     if (error) {
       logger40.log({ level: "error", message: error.message });
@@ -13301,7 +13295,8 @@ var schemaPerson = Joi35.object({
   plates: Joi35.array().items(schemaPlate).optional().allow(null),
   isOwner: Joi35.boolean().required(),
   files: Joi35.array().items(schemaFiles).optional().allow(null),
-  password: Joi35.string().optional().allow(null, "")
+  password: Joi35.string().optional().allow(null, ""),
+  plateNumber: Joi35.string().optional().allow(null, "")
 });
 var schemaUpdatePerson = Joi35.object({
   _id: Joi35.string().hex().required(),
@@ -13321,7 +13316,8 @@ var schemaUpdatePerson = Joi35.object({
   plates: Joi35.array().items(schemaFiles).optional().allow(null, ""),
   isOwner: Joi35.boolean().optional().allow(null, ""),
   files: Joi35.array().items(schemaFiles).optional().allow(null),
-  password: Joi35.string().optional().allow(null, "")
+  password: Joi35.string().optional().allow(null, ""),
+  plateNumber: Joi35.string().optional().allow(null, "")
 });
 function MPerson(value) {
   const { error } = schemaPerson.validate(value);
@@ -13391,6 +13387,7 @@ function MPerson(value) {
     plates: value.plates ?? [],
     isOwner: value.isOwner ?? false,
     files: value.files ?? [],
+    plateNumber: value.plateNumber ?? "",
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: value.updatedAt,
     deletedAt: value.deletedAt
@@ -13724,7 +13721,6 @@ function useVisitorTransactionRepo() {
       ...status && { status },
       ...tab == "Overnight Parking" && { isOvernightParking: true }
     };
-    console.log(query);
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     try {
       const basePipeline = [{ $match: query }];
@@ -14197,8 +14193,8 @@ function MVehicle(value) {
   const createdAtDate = value.createdAt ? new Date(value.createdAt) : /* @__PURE__ */ new Date();
   const expiredDate = new Date(createdAtDate);
   expiredDate.setFullYear(expiredDate.getFullYear() + 10);
-  const createdAt = createdAtDate.toISOString();
-  const expiredAt = value.end ?? expiredDate.toISOString();
+  const createdAt = createdAtDate;
+  const expiredAt = value.end ?? expiredDate;
   return {
     plateNumber: value.plateNumber ?? "",
     type: value.type ?? "",
@@ -14214,8 +14210,8 @@ function MVehicle(value) {
     nric: value.nric ?? "",
     remarks: value.remarks ?? "",
     seasonPassType: value.seasonPassType ?? "",
-    start: value.start ?? createdAt,
-    end: value.end ?? expiredAt,
+    start: value.start ? new Date(value.start) : createdAt,
+    end: value.end ? new Date(value.end) : expiredAt,
     status: value.status ?? "active" /* ACTIVE */,
     unitName: value.unitName ?? "",
     peopleId: value.peopleId ?? "",
@@ -14353,10 +14349,11 @@ function useVehicleRepo() {
     const baseQuery = {
       ...status && { status },
       ...type && { type },
-      ...category && { category },
-      ...search && { $text: { search } }
+      ...category && { category }
     };
     let query = { ...baseQuery };
+    if (search)
+      query.$text = { $search: search };
     const escapeRegex = (input) => input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const buildGroupedPipeline = (matchQuery) => [
       { $match: matchQuery },
@@ -14916,7 +14913,7 @@ function useVehicleRepo() {
       throw error;
     }
   }
-  async function bulkUpsertVehicles(values, session) {
+  async function bulkUpsertVehicles(values) {
     try {
       if (!Array.isArray(values) || values.length === 0) {
         return {
@@ -14925,7 +14922,7 @@ function useVehicleRepo() {
           upsertedCount: 0
         };
       }
-      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const now = /* @__PURE__ */ new Date();
       const operations = values.map((item) => {
         const vehicle = MVehicle(item);
         const plateNumber = Array.isArray(vehicle.plateNumber) ? vehicle.plateNumber[0] : vehicle.plateNumber;
@@ -14933,7 +14930,7 @@ function useVehicleRepo() {
         return {
           updateOne: {
             filter: {
-              site: vehicle.site,
+              site: new ObjectId43(vehicle.site),
               plateNumber,
               $or: [
                 { deletedAt: "" },
@@ -14944,6 +14941,9 @@ function useVehicleRepo() {
             update: {
               $set: {
                 ...rest,
+                site: new ObjectId43(vehicle.site),
+                unit: vehicle.unit ? new ObjectId43(vehicle.unit) : null,
+                org: vehicle.org ? new ObjectId43(vehicle.org) : null,
                 plateNumber,
                 updatedAt: now
               },
@@ -14955,10 +14955,7 @@ function useVehicleRepo() {
           }
         };
       });
-      const res = await collection.bulkWrite(operations, {
-        ordered: false,
-        session
-      });
+      const res = await collection.bulkWrite(operations);
       return {
         matchedCount: res.matchedCount,
         modifiedCount: res.modifiedCount,
@@ -15007,10 +15004,10 @@ import {
   BadRequestError as BadRequestError70,
   InternalServerError as InternalServerError26,
   logger as logger51,
-  makeCacheKey as makeCacheKey25,
+  makeCacheKey as makeCacheKey24,
   paginate as paginate20,
   useAtlas as useAtlas33,
-  useCache as useCache26,
+  useCache as useCache25,
   AppError as AppError10,
   toObjectId as toObjectId10
 } from "@7365admin1/node-server-utils";
@@ -15022,7 +15019,7 @@ function usePersonRepo() {
     throw new InternalServerError26("Unable to connect to server.");
   }
   const collection = db.collection(site_people_namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache26(
+  const { delNamespace, getCache, setCache } = useCache25(
     site_people_namespace_collection
   );
   async function createIndexes() {
@@ -15123,7 +15120,7 @@ function usePersonRepo() {
       ...query.site && { site: query.site.toString() },
       ...PERSON_TYPES.includes(type) && { type }
     };
-    const cacheKey = makeCacheKey25(
+    const cacheKey = makeCacheKey24(
       site_people_namespace_collection,
       cacheOptions
     );
@@ -15218,7 +15215,7 @@ function usePersonRepo() {
     } catch (error) {
       throw new BadRequestError70("Invalid person ID.");
     }
-    const cacheKey = makeCacheKey25(site_people_namespace_collection, {
+    const cacheKey = makeCacheKey24(site_people_namespace_collection, {
       _id: String(_id)
     });
     try {
@@ -15254,7 +15251,7 @@ function usePersonRepo() {
     }
   }
   async function getPersonByPlateNumber(plateNumber) {
-    const cacheKey = makeCacheKey25(site_people_namespace_collection, {
+    const cacheKey = makeCacheKey24(site_people_namespace_collection, {
       plateNumber,
       key: "get-person-plate-number"
     });
@@ -15282,7 +15279,7 @@ function usePersonRepo() {
   }
   async function getByNRIC(value) {
     try {
-      const cacheKey = makeCacheKey25(site_people_namespace_collection, {
+      const cacheKey = makeCacheKey24(site_people_namespace_collection, {
         nric: value
       });
       const cachedData = await getCache(cacheKey);
@@ -15303,7 +15300,7 @@ function usePersonRepo() {
   }
   async function getPersonByPhoneNumber(value) {
     try {
-      const cacheKey = makeCacheKey25(site_people_namespace_collection, {
+      const cacheKey = makeCacheKey24(site_people_namespace_collection, {
         contact: value
       });
       const cachedData = await getCache(cacheKey);
@@ -15329,7 +15326,7 @@ function usePersonRepo() {
     type = [],
     unit
   }, session) {
-    const cacheKey = makeCacheKey25(site_people_namespace_collection, {
+    const cacheKey = makeCacheKey24(site_people_namespace_collection, {
       unit: JSON.stringify(unit),
       status,
       type,
@@ -15363,7 +15360,7 @@ function usePersonRepo() {
   }
   async function getCompany(search) {
     try {
-      const cacheKey = makeCacheKey25(site_people_namespace_collection, {
+      const cacheKey = makeCacheKey24(site_people_namespace_collection, {
         company: search
       });
       const cachedData = await getCache(cacheKey);
@@ -15422,7 +15419,7 @@ function usePersonRepo() {
     }
   }
   async function getPeopleByPlateNumber(plateNumber) {
-    const cacheKey = makeCacheKey25(site_people_namespace_collection, {
+    const cacheKey = makeCacheKey24(site_people_namespace_collection, {
       plateNumber,
       key: "get-people-plate-number"
     });
@@ -15468,7 +15465,7 @@ function usePersonRepo() {
       sort: JSON.stringify(sort)
     };
     try {
-      const cacheKey = makeCacheKey25(
+      const cacheKey = makeCacheKey24(
         site_people_namespace_collection,
         cacheOptions
       );
@@ -15552,7 +15549,7 @@ function usePersonRepo() {
   }
   async function getByUserId(userId) {
     const user = toObjectId10(userId);
-    const cacheKey = makeCacheKey25(site_people_namespace_collection, {
+    const cacheKey = makeCacheKey24(site_people_namespace_collection, {
       user: userId
     });
     try {
@@ -15617,11 +15614,11 @@ import {
   BadRequestError as BadRequestError72,
   InternalServerError as InternalServerError27,
   logger as logger53,
-  makeCacheKey as makeCacheKey26,
+  makeCacheKey as makeCacheKey25,
   paginate as paginate21,
   toObjectId as toObjectId11,
   useAtlas as useAtlas34,
-  useCache as useCache27
+  useCache as useCache26
 } from "@7365admin1/node-server-utils";
 
 // src/models/building.model.ts
@@ -15821,7 +15818,7 @@ function useBuildingUnitRepo() {
   }
   const namespace_collection = "building-units";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace, delCache } = useCache27(namespace_collection);
+  const { getCache, setCache, delNamespace, delCache } = useCache26(namespace_collection);
   async function createIndexes() {
     try {
       await collection.createIndexes([
@@ -15999,7 +15996,7 @@ function useBuildingUnitRepo() {
       ...building && { building },
       ...status && { status }
     };
-    const cacheKey = makeCacheKey26(namespace_collection, cacheParams);
+    const cacheKey = makeCacheKey25(namespace_collection, cacheParams);
     logger53.log({
       level: "info",
       message: `Cache key for getAll building units: ${cacheKey}`
@@ -16070,7 +16067,7 @@ function useBuildingUnitRepo() {
     } catch (error) {
       throw new BadRequestError72("Invalid ID.");
     }
-    const cacheKey = makeCacheKey26(namespace_collection, { _id: String(_id) });
+    const cacheKey = makeCacheKey25(namespace_collection, { _id: String(_id) });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -16113,7 +16110,7 @@ function useBuildingUnitRepo() {
     } catch (error) {
       throw new BadRequestError72("Invalid building ID.");
     }
-    const cacheKey = makeCacheKey26(namespace_collection, {
+    const cacheKey = makeCacheKey25(namespace_collection, {
       building: String(building),
       level
     });
@@ -16187,7 +16184,7 @@ function useBuildingUnitRepo() {
     } catch (error) {
       throw new BadRequestError72("Invalid building ID.");
     }
-    const cacheKey = makeCacheKey26(namespace_collection, {
+    const cacheKey = makeCacheKey25(namespace_collection, {
       building: String(building)
     });
     try {
@@ -16261,7 +16258,7 @@ function useBuildingUnitRepo() {
       block,
       level
     };
-    const cacheKey = makeCacheKey26(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey25(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger53.info(`Cache hit for key: ${cacheKey}`);
@@ -16299,7 +16296,7 @@ function useBuildingUnitRepo() {
     const cacheOptions = {
       site: site.toString()
     };
-    const cacheKey = makeCacheKey26(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey25(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger53.info(`Cache hit for key: ${cacheKey}`);
@@ -16347,7 +16344,7 @@ function useBuildingUnitRepo() {
         { deletedAt: "" }
       ]
     };
-    const cacheKey = makeCacheKey26(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey25(namespace_collection, cacheOptions);
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -17051,15 +17048,11 @@ function useVehicleService() {
     }
   }
   async function bulkUpsertVehicles(values, site, org) {
-    const session = useAtlas35.getClient()?.startSession();
-    if (!session) {
-      throw new Error("Unable to start session for vehicle service.");
-    }
     try {
       if (!Array.isArray(values) || values.length === 0) {
         throw new Error("Vehicle list is required.");
       }
-      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const now = /* @__PURE__ */ new Date();
       const sanitizedValues = (await Promise.all(
         values.map(async (item) => {
           const plateNumber = Array.isArray(item.plateNumber) ? item.plateNumber[0] : item.plateNumber;
@@ -17074,7 +17067,7 @@ function useVehicleService() {
             ...item,
             org,
             site,
-            start: item.start ?? now,
+            start: now.toISOString(),
             unit: unitId,
             plateNumber: typeof plateNumber === "string" ? plateNumber.trim().toUpperCase() : plateNumber
           };
@@ -17104,33 +17097,36 @@ function useVehicleService() {
       if (!siteCameras.length) {
         throw new Error("No site cameras found.");
       }
-      for (const vehicleValue of sanitizedValues) {
-        const plateNumber = vehicleValue.plateNumber;
-        const _mode = vehicleValue.type === "whitelist" /* WHITELIST */ ? "TrafficRedList" /* TRAFFIC_REDLIST */ : "TrafficBlackList" /* TRAFFIC_BLACKLIST */;
-        for (const camera of siteCameras) {
-          const { host, username, password } = camera;
-          const dahuaPayload = {
-            host,
-            username,
-            password,
-            plateNumber,
-            mode: _mode,
-            ...vehicleValue.start ? { start: String(vehicleValue.start) } : {},
-            ...vehicleValue.end ? { end: String(vehicleValue.end) } : {},
-            ...vehicleValue.name ? { owner: vehicleValue.name } : {},
-            ...vehicleValue.vehicleModel ? { vehicleType: vehicleValue.vehicleModel } : {},
-            ...vehicleValue.vehicleColor ? { vehicleColor: vehicleValue.vehicleColor } : {}
-          };
-          const dahuaResponse = await _bulkInsertPlateNumber(dahuaPayload);
-          const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
-          vehicleValue.recNo = responseData.split("=")[1]?.trim();
-        }
-      }
-      return await _bulkUpsertVehicles(sanitizedValues, session);
+      await Promise.all(
+        sanitizedValues.map(async (vehicleValue) => {
+          const plateNumber = vehicleValue.plateNumber;
+          const _mode = vehicleValue.type === "whitelist" /* WHITELIST */ ? "TrafficRedList" /* TRAFFIC_REDLIST */ : "TrafficBlackList" /* TRAFFIC_BLACKLIST */;
+          const recNos = await Promise.all(
+            siteCameras.map(async (camera) => {
+              const { host, username, password } = camera;
+              const dahuaPayload = {
+                host,
+                username,
+                password,
+                plateNumber,
+                mode: _mode,
+                ...vehicleValue.start ? { start: String(vehicleValue.start) } : {},
+                ...vehicleValue.end ? { end: String(vehicleValue.end) } : {},
+                ...vehicleValue.name ? { owner: vehicleValue.name } : {},
+                ...vehicleValue.vehicleModel ? { vehicleType: vehicleValue.vehicleModel } : {},
+                ...vehicleValue.vehicleColor ? { vehicleColor: vehicleValue.vehicleColor } : {}
+              };
+              const dahuaResponse = await _bulkInsertPlateNumber(dahuaPayload);
+              const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
+              return responseData.split("=")[1]?.trim();
+            })
+          );
+          vehicleValue.recNo = recNos.find((r) => r) ?? void 0;
+        })
+      );
+      return await _bulkUpsertVehicles(sanitizedValues);
     } catch (error) {
       throw error;
-    } finally {
-      session.endSession();
     }
   }
   return {
@@ -18194,7 +18190,7 @@ function MChat(value) {
 import {
   useAtlas as useAtlas37,
   InternalServerError as InternalServerError28,
-  useCache as useCache28,
+  useCache as useCache27,
   logger as logger59
 } from "@7365admin1/node-server-utils";
 function useChatRepo() {
@@ -18204,7 +18200,7 @@ function useChatRepo() {
   }
   const namespace_collection = "chats";
   const collection = db.collection(namespace_collection);
-  const { delNamespace } = useCache28(namespace_collection);
+  const { delNamespace } = useCache27(namespace_collection);
   async function createChat(value, session) {
     try {
       value = MChat(value);
@@ -18258,10 +18254,10 @@ import {
   BadRequestError as BadRequestError79,
   InternalServerError as InternalServerError29,
   logger as logger61,
-  makeCacheKey as makeCacheKey27,
+  makeCacheKey as makeCacheKey26,
   paginate as paginate22,
   useAtlas as useAtlas38,
-  useCache as useCache29
+  useCache as useCache28
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId49 } from "mongodb";
 var buildings_namespace_collection = "buildings";
@@ -18271,7 +18267,7 @@ function useBuildingRepo() {
     throw new Error("Unable to connect to server.");
   }
   const collection = db.collection(buildings_namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache29(
+  const { getCache, setCache, delNamespace } = useCache28(
     buildings_namespace_collection
   );
   async function createIndexes() {
@@ -18382,7 +18378,7 @@ function useBuildingRepo() {
       ...site && { site },
       ...status && { status }
     };
-    const cacheKey = makeCacheKey27(buildings_namespace_collection, cacheParams);
+    const cacheKey = makeCacheKey26(buildings_namespace_collection, cacheParams);
     logger61.log({
       level: "info",
       message: `Cache key for getAll buildings: ${cacheKey}`
@@ -18427,7 +18423,7 @@ function useBuildingRepo() {
     } catch (error) {
       throw new BadRequestError79("Invalid ID.");
     }
-    const cacheKey = makeCacheKey27(buildings_namespace_collection, {
+    const cacheKey = makeCacheKey26(buildings_namespace_collection, {
       _id: String(_id)
     });
     try {
@@ -18498,7 +18494,7 @@ function useBuildingRepo() {
       block
     };
     const cacheOptions = { ...query };
-    const cacheKey = makeCacheKey27(buildings_namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey26(buildings_namespace_collection, cacheOptions);
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -19188,6 +19184,7 @@ function useBuildingUnitController() {
 import { BadRequestError as BadRequestError84, logger as logger66 } from "@7365admin1/node-server-utils";
 import Joi46 from "joi";
 import ExcelJS from "exceljs";
+import csv from "csv-parser";
 import fs from "fs";
 function useVehicleController() {
   const {
@@ -19232,8 +19229,15 @@ function useVehicleController() {
     };
   }
   function parseExpiryDate(value) {
-    if (!value)
-      return void 0;
+    if (!value) {
+      const today = /* @__PURE__ */ new Date();
+      today.setFullYear(today.getFullYear() + 10);
+      return today.toISOString();
+    }
+    const date = new Date(value);
+    if (!isNaN(date.getTime())) {
+      return date.toISOString();
+    }
     const [day, monthStr, yearShort] = value.split("-");
     const months = {
       Jan: 0,
@@ -19253,19 +19257,17 @@ function useVehicleController() {
     if (month === void 0)
       return void 0;
     const year = 2e3 + Number(yearShort);
-    const date = new Date(year, month, Number(day));
-    return isNaN(date.getTime()) ? void 0 : date.toISOString();
+    const fallbackDate = new Date(year, month, Number(day));
+    return isNaN(fallbackDate.getTime()) ? void 0 : fallbackDate.toISOString();
   }
-  async function uploadExcelVehicles(req, res, next) {
+  async function uploadSpreadsheetVehicles(req, res, next) {
     try {
       if (!req.file) {
-        next(new BadRequestError84("Excel file is required."));
-        return;
-      }
-      if (!req.file.originalname.toLowerCase().endsWith(".xlsx")) {
-        next(new BadRequestError84("Only .xlsx files are allowed."));
+        next(new BadRequestError84("Spreadsheet file is required."));
         return;
       }
+      const { originalname, path: path4 } = req.file;
+      const lowerName = originalname.toLowerCase();
       const rowSchema = Joi46.object({
         fullName: Joi46.string().trim().required(),
         userType: Joi46.string().trim().required(),
@@ -19277,7 +19279,11 @@ function useVehicleController() {
         plateNumber: Joi46.string().trim().uppercase().required(),
         vehicleModel: Joi46.string().trim().allow("", null).optional(),
         vehicleColor: Joi46.string().trim().allow("", null).optional(),
-        subscriptionExpiry: Joi46.string().trim().allow("", null).optional()
+        subscriptionExpiry: Joi46.alternatives().try(
+          Joi46.date().iso(),
+          // ISO format
+          Joi46.string().pattern(/^\d{1,2}-[A-Za-z]{3}-\d{2}$/)
+        ).allow("", null).optional()
       });
       const querySchema = Joi46.object({
         site: Joi46.string().hex().length(24).required(),
@@ -19285,10 +19291,7 @@ function useVehicleController() {
       });
       const { error: queryError, value: queryValue } = querySchema.validate(
         req.query,
-        {
-          abortEarly: false,
-          convert: true
-        }
+        { abortEarly: false, convert: true }
       );
       if (queryError) {
         next(
@@ -19299,30 +19302,43 @@ function useVehicleController() {
         return;
       }
       const { site, org } = queryValue;
-      const workbook = new ExcelJS.Workbook();
-      await workbook.xlsx.readFile(req.file.path);
-      const worksheet = workbook.worksheets[0];
-      if (!worksheet) {
-        next(new BadRequestError84("No worksheet found in uploaded Excel file."));
-        return;
-      }
-      const rows = [];
-      const headerRow = worksheet.getRow(1);
-      const headers = (headerRow.values || []).slice(1).map((header) => String(header ?? "").trim());
-      worksheet.eachRow((row, rowNumber) => {
-        if (rowNumber === 1)
+      let rows = [];
+      if (lowerName.endsWith(".xlsx") || lowerName.endsWith(".xls")) {
+        const workbook = new ExcelJS.Workbook();
+        await workbook.xlsx.readFile(path4);
+        const worksheet = workbook.worksheets[0];
+        if (!worksheet) {
+          next(
+            new BadRequestError84("No worksheet found in uploaded Excel file.")
+          );
           return;
-        const rowData = {};
-        headers.forEach((header, index) => {
-          rowData[header] = row.getCell(index + 1).value ?? "";
+        }
+        const headerRow = worksheet.getRow(1);
+        const headers = (headerRow.values || []).slice(1).map((header) => String(header ?? "").trim());
+        worksheet.eachRow((row, rowNumber) => {
+          if (rowNumber === 1)
+            return;
+          const rowData = {};
+          headers.forEach((header, index) => {
+            rowData[header] = row.getCell(index + 1).value ?? "";
+          });
+          if (Object.values(rowData).some(
+            (v) => v !== "" && v !== null && v !== void 0
+          )) {
+            rows.push(rowData);
+          }
         });
-        const hasValue = Object.values(rowData).some(
-          (value) => value !== null && value !== void 0 && value !== ""
+      } else if (lowerName.endsWith(".csv")) {
+        rows = await new Promise((resolve, reject) => {
+          const parsed = [];
+          fs.createReadStream(path4).pipe(csv()).on("data", (row) => parsed.push(row)).on("end", () => resolve(parsed)).on("error", reject);
+        });
+      } else {
+        next(
+          new BadRequestError84("Only .xlsx, .xls, or .csv files are allowed.")
         );
-        if (hasValue) {
-          rows.push(rowData);
-        }
-      });
+        return;
+      }
       const validRows = [];
       const invalidRows = [];
       rows.forEach((row, index) => {
@@ -19336,9 +19352,9 @@ function useVehicleController() {
             data: row,
             errors: error.details.map((d) => d.message)
           });
-          return;
+        } else {
+          validRows.push(value);
         }
-        validRows.push(value);
       });
       const vehicles = validRows.map((row) => mapRowToVehicle(row, site, org));
       let data = {};
@@ -19346,15 +19362,15 @@ function useVehicleController() {
         data = await _bulkUpsertVehicles(vehicles, site, org);
       }
       res.status(200).json({
-        message: "Excel import completed.",
-        sheetName: worksheet.name,
+        message: "Spreadsheet import completed.",
+        fileName: originalname,
         totalRows: rows.length,
         validRows: validRows.length,
         invalidRows: invalidRows.length,
         validationErrors: invalidRows,
         data
       });
-      fs.unlink(req.file.path, () => {
+      fs.unlink(path4, () => {
       });
     } catch (error) {
       logger66.log({ level: "error", message: error.message });
@@ -19696,8 +19712,7 @@ function useVehicleController() {
     getVehiclesByNRIC,
     reactivateVehicleById,
     getAllVehiclesByUnitId,
-    // uploadCsvVehicles,
-    uploadExcelVehicles
+    uploadSpreadsheetVehicles
   };
 }
 
@@ -19942,10 +19957,10 @@ import {
   BadRequestError as BadRequestError87,
   InternalServerError as InternalServerError30,
   logger as logger68,
-  makeCacheKey as makeCacheKey28,
+  makeCacheKey as makeCacheKey27,
   paginate as paginate23,
   useAtlas as useAtlas42,
-  useCache as useCache30
+  useCache as useCache29
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId51 } from "mongodb";
 import Joi49 from "joi";
@@ -19956,7 +19971,7 @@ function useCustomerSiteRepo() {
   }
   const namespace_collection = "customer.sites";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache30(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache29(namespace_collection);
   async function createIndexes() {
     try {
       await collection.createIndexes([
@@ -20016,7 +20031,7 @@ function useCustomerSiteRepo() {
         throw new BadRequestError87("Invalid org ID.");
       }
     }
-    const cacheKey = makeCacheKey28(namespace_collection, cacheKeyOptions);
+    const cacheKey = makeCacheKey27(namespace_collection, cacheKeyOptions);
     try {
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
@@ -20068,7 +20083,7 @@ function useCustomerSiteRepo() {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey28(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey27(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger68.info(`Cache hit for key: ${cacheKey}`);
@@ -20118,7 +20133,7 @@ function useCustomerSiteRepo() {
     }
     try {
       const query = { site, status: "active" };
-      const cacheKey = makeCacheKey28(namespace_collection, {
+      const cacheKey = makeCacheKey27(namespace_collection, {
         site: site.toString(),
         status: "active",
         tag: "get-by-site-as-sp"
@@ -20533,9 +20548,9 @@ import {
   useAtlas as useAtlas44,
   InternalServerError as InternalServerError31,
   BadRequestError as BadRequestError91,
-  useCache as useCache31,
+  useCache as useCache30,
   logger as logger71,
-  makeCacheKey as makeCacheKey29,
+  makeCacheKey as makeCacheKey28,
   NotFoundError as NotFoundError21
 } from "@7365admin1/node-server-utils";
 function useAttendanceSettingsRepository() {
@@ -20545,7 +20560,7 @@ function useAttendanceSettingsRepository() {
   }
   const namespace_collection = "site.attendance-settings";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache } = useCache31(namespace_collection);
+  const { delNamespace, setCache, getCache } = useCache30(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -20582,7 +20597,7 @@ function useAttendanceSettingsRepository() {
       throw new BadRequestError91("Invalid attendance settings site ID format.");
     }
     const query = { site, serviceType };
-    const cacheKey = makeCacheKey29(namespace_collection, {
+    const cacheKey = makeCacheKey28(namespace_collection, {
       site: site.toString(),
       serviceType
     });
@@ -20814,9 +20829,9 @@ import {
   InternalServerError as InternalServerError32,
   paginate as paginate24,
   BadRequestError as BadRequestError94,
-  useCache as useCache32,
+  useCache as useCache31,
   logger as logger75,
-  makeCacheKey as makeCacheKey30,
+  makeCacheKey as makeCacheKey29,
   NotFoundError as NotFoundError22
 } from "@7365admin1/node-server-utils";
 function useAttendanceRepository() {
@@ -20826,7 +20841,7 @@ function useAttendanceRepository() {
   }
   const namespace_collection = "site.attendances";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache, delCache } = useCache32(namespace_collection);
+  const { delNamespace, setCache, getCache, delCache } = useCache31(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -20879,7 +20894,7 @@ function useAttendanceRepository() {
     if (search) {
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey30(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey29(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger75.info(`Cache hit for key: ${cacheKey}`);
@@ -20983,7 +20998,7 @@ function useAttendanceRepository() {
     if (search) {
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey30(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey29(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger75.info(`Cache hit for key: ${cacheKey}`);
@@ -21061,7 +21076,7 @@ function useAttendanceRepository() {
       throw new BadRequestError94("Invalid attendance ID format.");
     }
     const query = { _id };
-    const cacheKey = makeCacheKey30(namespace_collection, {
+    const cacheKey = makeCacheKey29(namespace_collection, {
       _id: _id.toString()
     });
     if (!session) {
@@ -21114,7 +21129,7 @@ function useAttendanceRepository() {
       throw new BadRequestError94("Invalid attendance ID format.");
     }
     const query = { _id };
-    const cacheKey = makeCacheKey30(namespace_collection, {
+    const cacheKey = makeCacheKey29(namespace_collection, {
       _id: _id.toString()
     });
     if (!session) {
@@ -21194,7 +21209,7 @@ function useAttendanceRepository() {
       );
       if (res.modifiedCount === 0)
         throw new InternalServerError32("Unable to delete attendance.");
-      const cacheKey = makeCacheKey30(namespace_collection, { _id });
+      const cacheKey = makeCacheKey29(namespace_collection, { _id });
       delCache(cacheKey).then(() => {
         logger75.info(`Cache deleted for key: ${cacheKey}`);
       }).catch((err) => {
@@ -22149,11 +22164,6 @@ var KeyRepo = class {
     } else if (organization) {
       defaultQuery = { organization };
     }
-    console.log("key-query: ", {
-      ...defaultQuery,
-      ...searchQuery,
-      ...dateFilter
-    });
     try {
       const result = await this.collection().aggregate([
         {
@@ -22666,14 +22676,28 @@ function useVisitorTransactionService() {
         const host = camera.host;
         const username = camera.username;
         const password = camera.password;
-        const mode = "TrafficRedList" /* TRAFFIC_REDLIST */;
+        const redlist = "TrafficRedList" /* TRAFFIC_REDLIST */;
+        const blacklist = "TrafficBlackList" /* TRAFFIC_BLACKLIST */;
         const _plateNumber = value.plateNumber;
+        const dahuaBlocklistQuery = {
+          host,
+          username,
+          password,
+          plateNumber: _plateNumber,
+          mode: blacklist
+        };
+        const isBlocklistedRaw = await _getPlateNumber(dahuaBlocklistQuery);
+        const rawString = isBlocklistedRaw?.toString?.("utf-8") ?? String(isBlocklistedRaw);
+        const foundMatch = rawString.match(/found=(\d+)/);
+        const found = foundMatch ? Number(foundMatch[1]) : 0;
+        if (found === 1)
+          throw new BadRequestError97("This plate number is blocklisted");
         const dahuaQuery = {
           host,
           username,
           password,
           plateNumber: _plateNumber,
-          mode
+          mode: redlist
         };
         const raw = await _getPlateNumber(dahuaQuery);
         const parsed = parseDahuaFind(raw);
@@ -22683,7 +22707,7 @@ function useVisitorTransactionService() {
             username,
             password,
             plateNumber: _plateNumber,
-            mode,
+            mode: redlist,
             start: startDahuaDate,
             end: endDahuaDate,
             owner: value.name ?? "",
@@ -22719,7 +22743,7 @@ function useVisitorTransactionService() {
             password,
             plateNumber: _plateNumber,
             recno: parsed.recNo,
-            mode,
+            mode: redlist,
             start: startDahuaDate,
             end: endDahuaDate,
             owner: value.name ?? "",
@@ -23416,10 +23440,10 @@ import {
   BadRequestError as BadRequestError99,
   InternalServerError as InternalServerError33,
   logger as logger80,
-  makeCacheKey as makeCacheKey31,
+  makeCacheKey as makeCacheKey30,
   paginate as paginate25,
   useAtlas as useAtlas50,
-  useCache as useCache33
+  useCache as useCache32
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId61 } from "mongodb";
 var guests_namespace_collection = "visitor.guests";
@@ -23429,7 +23453,7 @@ function useGuestManagementRepo() {
     throw new InternalServerError33("Unable to connect to server.");
   }
   const collection = db.collection(guests_namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache33(
+  const { delNamespace, getCache, setCache } = useCache32(
     guests_namespace_collection
   );
   async function createTextIndex() {
@@ -23508,7 +23532,7 @@ function useGuestManagementRepo() {
       ...query.org && { org: query.org.toString() },
       ...query.site && { site: query.site.toString() }
     };
-    const cacheKey = makeCacheKey31(guests_namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey30(guests_namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger80.info(`Cache hit for key: ${cacheKey}`);
@@ -24145,7 +24169,6 @@ function usePersonController() {
   }
   async function getPeopleByUnit(req, res, next) {
     const PERSON_TYPES3 = Object.values(PersonTypes);
-    console.log(req.query);
     try {
       const schema2 = Joi58.object({
         unit: Joi58.string().required(),
@@ -24389,8 +24412,8 @@ import {
   InternalServerError as InternalServerError34,
   paginate as paginate26,
   BadRequestError as BadRequestError104,
-  useCache as useCache34,
-  makeCacheKey as makeCacheKey32,
+  useCache as useCache33,
+  makeCacheKey as makeCacheKey31,
   logger as logger85
 } from "@7365admin1/node-server-utils";
 function useRobotRepo() {
@@ -24400,7 +24423,7 @@ function useRobotRepo() {
   }
   const namespace_collection = "robots";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache34(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache33(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -24500,7 +24523,7 @@ function useRobotRepo() {
       cacheOptions.from = from;
       cacheOptions.to = to;
     }
-    const cacheKey = makeCacheKey32(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey31(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger85.info(`Cache hit for key: ${cacheKey}`);
@@ -24729,10 +24752,10 @@ import {
   BadRequestError as BadRequestError108,
   InternalServerError as InternalServerError35,
   logger as logger88,
-  makeCacheKey as makeCacheKey33,
+  makeCacheKey as makeCacheKey32,
   paginate as paginate27,
   useAtlas as useAtlas54,
-  useCache as useCache35
+  useCache as useCache34
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId65 } from "mongodb";
 function usePatrolQuestionRepo() {
@@ -24742,7 +24765,7 @@ function usePatrolQuestionRepo() {
   }
   const namespace_collection = "patrol.questions";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache35(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache34(namespace_collection);
   async function createIndexes() {
     try {
       await collection.createIndexes([
@@ -24828,7 +24851,7 @@ function usePatrolQuestionRepo() {
       ...search && { search },
       ...query.site && { site: query.site.toString() }
     };
-    const cacheKey = makeCacheKey33(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey32(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger88.info(`Cache hit for key: ${cacheKey}`);
@@ -24904,7 +24927,7 @@ function usePatrolQuestionRepo() {
     } catch (error) {
       throw new BadRequestError108("Invalid patrol question ID format.");
     }
-    const cacheKey = makeCacheKey33(namespace_collection, { _id });
+    const cacheKey = makeCacheKey32(namespace_collection, { _id });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger88.info(`Cache hit for key: ${cacheKey}`);
@@ -25180,10 +25203,10 @@ import {
   BadRequestError as BadRequestError111,
   InternalServerError as InternalServerError36,
   logger as logger91,
-  makeCacheKey as makeCacheKey34,
+  makeCacheKey as makeCacheKey33,
   paginate as paginate28,
   useAtlas as useAtlas55,
-  useCache as useCache36
+  useCache as useCache35
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId67 } from "mongodb";
 function usePatrolRouteRepo() {
@@ -25193,7 +25216,7 @@ function usePatrolRouteRepo() {
   }
   const namespace_collection = "patrol.route";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache36(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache35(namespace_collection);
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -25254,7 +25277,7 @@ function usePatrolRouteRepo() {
       ...search && { search },
       ...query.site && { site: query.site.toString() }
     };
-    const cacheKey = makeCacheKey34(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey33(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger91.info(`Cache hit for key: ${cacheKey}`);
@@ -25475,7 +25498,7 @@ function usePatrolRouteRepo() {
       ...day && { day },
       ...start && { start }
     };
-    const cacheKey = makeCacheKey34(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey33(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger91.info(`Cache hit for key: ${cacheKey}`);
@@ -25542,7 +25565,7 @@ function usePatrolRouteRepo() {
     } catch (error) {
       throw new BadRequestError111("Invalid patrol log ID format.");
     }
-    const cacheKey = makeCacheKey34(namespace_collection, { _id });
+    const cacheKey = makeCacheKey33(namespace_collection, { _id });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger91.info(`Cache hit for key: ${cacheKey}`);
@@ -25897,10 +25920,10 @@ import {
   BadRequestError as BadRequestError114,
   InternalServerError as InternalServerError37,
   logger as logger94,
-  makeCacheKey as makeCacheKey35,
+  makeCacheKey as makeCacheKey34,
   paginate as paginate29,
   useAtlas as useAtlas56,
-  useCache as useCache37
+  useCache as useCache36
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId69 } from "mongodb";
 function usePatrolLogRepo() {
@@ -25910,7 +25933,7 @@ function usePatrolLogRepo() {
   }
   const namespace_collection = "patrol.logs";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache37(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache36(namespace_collection);
   async function createIndexes() {
     try {
       await collection.createIndexes([
@@ -26007,7 +26030,7 @@ function usePatrolLogRepo() {
         ...query.site && { site: query.site.toString() },
         ...dateFrom && { dateFrom: dateFrom.toString() }
       };
-      const cacheKey = makeCacheKey35(namespace_collection, cacheOptions);
+      const cacheKey = makeCacheKey34(namespace_collection, cacheOptions);
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
         logger94.info(`Cache hit for key: ${cacheKey}`);
@@ -26171,7 +26194,7 @@ function usePatrolLogRepo() {
     } catch (error) {
       throw new BadRequestError114("Invalid patrol log ID format.");
     }
-    const cacheKey = makeCacheKey35(namespace_collection, { _id });
+    const cacheKey = makeCacheKey34(namespace_collection, { _id });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger94.info(`Cache hit for key: ${cacheKey}`);
@@ -26687,11 +26710,11 @@ import {
   BadRequestError as BadRequestError117,
   InternalServerError as InternalServerError38,
   logger as logger97,
-  makeCacheKey as makeCacheKey36,
+  makeCacheKey as makeCacheKey35,
   NotFoundError as NotFoundError25,
   paginate as paginate30,
   useAtlas as useAtlas58,
-  useCache as useCache38
+  useCache as useCache37
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId71 } from "mongodb";
 function useSiteFacilityRepo() {
@@ -26701,7 +26724,7 @@ function useSiteFacilityRepo() {
   }
   const namespace_collection = "site.facilities";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache38(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache37(namespace_collection);
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -26776,7 +26799,7 @@ function useSiteFacilityRepo() {
       query.$text = { $search: search };
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey36(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey35(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger97.info(`Cache hit for key: ${cacheKey}`);
@@ -26810,7 +26833,7 @@ function useSiteFacilityRepo() {
     } catch (error) {
       throw new BadRequestError117("Invalid site facility ID format.");
     }
-    const cacheKey = makeCacheKey36(namespace_collection, { _id });
+    const cacheKey = makeCacheKey35(namespace_collection, { _id });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger97.info(`Cache hit for key: ${cacheKey}`);
@@ -26935,7 +26958,7 @@ function useSiteFacilityRepo() {
       _id,
       site
     };
-    const cacheKey = makeCacheKey36(namespace_collection, query);
+    const cacheKey = makeCacheKey35(namespace_collection, query);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger97.info(`Cache hit for key: ${cacheKey}`);
@@ -27345,11 +27368,11 @@ import {
   BadRequestError as BadRequestError119,
   InternalServerError as InternalServerError39,
   logger as logger99,
-  makeCacheKey as makeCacheKey37,
+  makeCacheKey as makeCacheKey36,
   NotFoundError as NotFoundError26,
   paginate as paginate31,
   useAtlas as useAtlas60,
-  useCache as useCache39
+  useCache as useCache38
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId73 } from "mongodb";
 function useServiceProviderBillingRepo() {
@@ -27359,7 +27382,7 @@ function useServiceProviderBillingRepo() {
   }
   const namespace_collection = "site.service-provider.billing";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache39(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache38(namespace_collection);
   async function createIndexes() {
     try {
       await collection.createIndexes([{ key: { orgId: 1, status: 1 } }]);
@@ -27418,7 +27441,7 @@ function useServiceProviderBillingRepo() {
       query.$text = { $search: search };
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey37(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey36(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger99.info(`Cache hit for key: ${cacheKey}`);
@@ -27452,7 +27475,7 @@ function useServiceProviderBillingRepo() {
     } catch (error) {
       throw new BadRequestError119("Invalid service provider billing ID format.");
     }
-    const cacheKey = makeCacheKey37(namespace_collection, { _id });
+    const cacheKey = makeCacheKey36(namespace_collection, { _id });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger99.info(`Cache hit for key: ${cacheKey}`);
@@ -27996,12 +28019,12 @@ import {
   BadRequestError as BadRequestError121,
   InternalServerError as InternalServerError40,
   logger as logger101,
-  makeCacheKey as makeCacheKey38,
+  makeCacheKey as makeCacheKey37,
   NotFoundError as NotFoundError27,
   paginate as paginate32,
   toObjectId as toObjectId13,
   useAtlas as useAtlas62,
-  useCache as useCache40
+  useCache as useCache39
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId75 } from "mongodb";
 var facility_bookings_namespace_collection = "site.facilty-booking";
@@ -28011,7 +28034,7 @@ function useSiteFacilityBookingRepo() {
     throw new InternalServerError40("Unable to connect to server.");
   }
   const collection = db.collection(facility_bookings_namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache40(
+  const { delNamespace, getCache, setCache } = useCache39(
     facility_bookings_namespace_collection
   );
   async function createIndexes() {
@@ -28069,7 +28092,7 @@ function useSiteFacilityBookingRepo() {
       limit,
       ...search && { search }
     };
-    const cacheKey = makeCacheKey38(
+    const cacheKey = makeCacheKey37(
       facility_bookings_namespace_collection,
       cacheOptions
     );
@@ -28102,7 +28125,7 @@ function useSiteFacilityBookingRepo() {
   }
   async function getSiteFacilityBookingById(id, session) {
     const _id = toObjectId13(id);
-    const cacheKey = makeCacheKey38(facility_bookings_namespace_collection, {
+    const cacheKey = makeCacheKey37(facility_bookings_namespace_collection, {
       id
     });
     const cachedData = await getCache(cacheKey);
@@ -28475,11 +28498,11 @@ import {
   BadRequestError as BadRequestError123,
   InternalServerError as InternalServerError41,
   logger as logger103,
-  makeCacheKey as makeCacheKey39,
+  makeCacheKey as makeCacheKey38,
   NotFoundError as NotFoundError28,
   paginate as paginate33,
   useAtlas as useAtlas64,
-  useCache as useCache41
+  useCache as useCache40
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId77 } from "mongodb";
 function useDocumentManagementRepo() {
@@ -28489,7 +28512,7 @@ function useDocumentManagementRepo() {
   }
   const namespace_collection = "documents";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache41(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache40(namespace_collection);
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -28558,7 +28581,7 @@ function useDocumentManagementRepo() {
       ];
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey39(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey38(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger103.info(`Cache hit for key: ${cacheKey}`);
@@ -28599,7 +28622,7 @@ function useDocumentManagementRepo() {
     } catch (error) {
       throw new BadRequestError123("Invalid document ID format.");
     }
-    const cacheKey = makeCacheKey39(namespace_collection, { _id });
+    const cacheKey = makeCacheKey38(namespace_collection, { _id });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger103.info(`Cache hit for key: ${cacheKey}`);
@@ -28716,7 +28739,7 @@ function useDocumentManagementRepo() {
     } catch (error) {
       throw new BadRequestError123("Invalid document management site ID format.");
     }
-    const cacheKey = makeCacheKey39(namespace_collection, { site });
+    const cacheKey = makeCacheKey38(namespace_collection, { site });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger103.info(`Cache hit for key: ${cacheKey}`);
@@ -29140,11 +29163,11 @@ import {
   BadRequestError as BadRequestError126,
   InternalServerError as InternalServerError42,
   logger as logger105,
-  makeCacheKey as makeCacheKey40,
+  makeCacheKey as makeCacheKey39,
   NotFoundError as NotFoundError30,
   paginate as paginate34,
   useAtlas as useAtlas66,
-  useCache as useCache42
+  useCache as useCache41
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId79 } from "mongodb";
 var bulletin_boards_namespace_collection = "bulletin-boards";
@@ -29154,7 +29177,7 @@ function useBulletinBoardRepo() {
     throw new InternalServerError42("Unable to connect to server.");
   }
   const collection = db.collection(bulletin_boards_namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache42(
+  const { delNamespace, getCache, setCache } = useCache41(
     bulletin_boards_namespace_collection
   );
   async function createIndexes() {
@@ -29218,7 +29241,7 @@ function useBulletinBoardRepo() {
       ...search && { search },
       ...recipients?.length && { recipients: recipients.sort().join(",") }
     };
-    const cacheKey = makeCacheKey40(
+    const cacheKey = makeCacheKey39(
       bulletin_boards_namespace_collection,
       cacheOptions
     );
@@ -29255,7 +29278,7 @@ function useBulletinBoardRepo() {
     } catch (error) {
       throw new BadRequestError126("Invalid bulletin board ID format.");
     }
-    const cacheKey = makeCacheKey40(bulletin_boards_namespace_collection, {
+    const cacheKey = makeCacheKey39(bulletin_boards_namespace_collection, {
       _id
     });
     const cachedData = await getCache(cacheKey);
@@ -29786,9 +29809,9 @@ import {
   InternalServerError as InternalServerError43,
   logger as logger108,
   useAtlas as useAtlas68,
-  useCache as useCache43,
+  useCache as useCache42,
   paginate as paginate35,
-  makeCacheKey as makeCacheKey41
+  makeCacheKey as makeCacheKey40
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId81 } from "mongodb";
 function useSiteBillingItemRepo() {
@@ -29798,7 +29821,7 @@ function useSiteBillingItemRepo() {
   }
   const namespace_collection = "site.billing.items";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache } = useCache43(namespace_collection);
+  const { delNamespace, setCache, getCache } = useCache42(namespace_collection);
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -29874,7 +29897,7 @@ function useSiteBillingItemRepo() {
       ...search && { search },
       ...query.site && { site: query.site.toString() }
     };
-    const cacheKey = makeCacheKey41(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey40(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger108.info(`Cache hit for key: ${cacheKey}`);
@@ -29907,7 +29930,7 @@ function useSiteBillingItemRepo() {
     } catch (error) {
       throw new BadRequestError129("Invalid ID.");
     }
-    const cacheKey = makeCacheKey41(namespace_collection, { _id: String(_id) });
+    const cacheKey = makeCacheKey40(namespace_collection, { _id: String(_id) });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -30039,9 +30062,9 @@ import {
   InternalServerError as InternalServerError44,
   logger as logger110,
   useAtlas as useAtlas69,
-  useCache as useCache44,
+  useCache as useCache43,
   paginate as paginate36,
-  makeCacheKey as makeCacheKey42
+  makeCacheKey as makeCacheKey41
 } from "@7365admin1/node-server-utils";
 
 // src/models/site-billing-configuration.model.ts
@@ -30171,7 +30194,7 @@ function useSiteBillingConfigurationRepo() {
   }
   const namespace_collection = "site.billing.configuration";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache } = useCache44(namespace_collection);
+  const { delNamespace, setCache, getCache } = useCache43(namespace_collection);
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -30233,7 +30256,7 @@ function useSiteBillingConfigurationRepo() {
       ...search && { search },
       ...query.site && { site: query.site.toString() }
     };
-    const cacheKey = makeCacheKey42(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey41(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger110.info(`Cache hit for key: ${cacheKey}`);
@@ -30266,7 +30289,7 @@ function useSiteBillingConfigurationRepo() {
     } catch (error) {
       throw new BadRequestError131("Invalid ID.");
     }
-    const cacheKey = makeCacheKey42(namespace_collection, { _id: String(_id) });
+    const cacheKey = makeCacheKey41(namespace_collection, { _id: String(_id) });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -30972,11 +30995,11 @@ import {
   BadRequestError as BadRequestError136,
   InternalServerError as InternalServerError45,
   logger as logger115,
-  makeCacheKey as makeCacheKey43,
+  makeCacheKey as makeCacheKey42,
   NotFoundError as NotFoundError33,
   paginate as paginate37,
   useAtlas as useAtlas72,
-  useCache as useCache45
+  useCache as useCache44
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId85 } from "mongodb";
 var events_namespace_collection = "event-management";
@@ -30986,7 +31009,7 @@ function useEventManagementRepo() {
     throw new InternalServerError45("Unable to connect to server.");
   }
   const collection = db.collection(events_namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache45(
+  const { delNamespace, getCache, setCache } = useCache44(
     events_namespace_collection
   );
   async function createIndexes() {
@@ -31074,7 +31097,7 @@ function useEventManagementRepo() {
       query.$text = { $search: search };
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey43(events_namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey42(events_namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger115.info(`Cache hit for key: ${cacheKey}`);
@@ -31126,7 +31149,7 @@ function useEventManagementRepo() {
     } catch (error) {
       throw new BadRequestError136("Invalid event ID format.");
     }
-    const cacheKey = makeCacheKey43(events_namespace_collection, { _id });
+    const cacheKey = makeCacheKey42(events_namespace_collection, { _id });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger115.info(`Cache hit for key: ${cacheKey}`);
@@ -31658,9 +31681,9 @@ import {
   InternalServerError as InternalServerError46,
   logger as logger118,
   useAtlas as useAtlas74,
-  useCache as useCache46,
+  useCache as useCache45,
   paginate as paginate38,
-  makeCacheKey as makeCacheKey44
+  makeCacheKey as makeCacheKey43
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId87 } from "mongodb";
 function useSiteUnitBillingRepo() {
@@ -31670,7 +31693,7 @@ function useSiteUnitBillingRepo() {
   }
   const namespace_collection = "site.unit.billing";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache } = useCache46(namespace_collection);
+  const { delNamespace, setCache, getCache } = useCache45(namespace_collection);
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -31786,7 +31809,7 @@ function useSiteUnitBillingRepo() {
       ...dateFrom && { dateFrom },
       ...dateTo && { dateTo }
     };
-    const cacheKey = makeCacheKey44(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey43(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger118.info(`Cache hit for key: ${cacheKey}`);
@@ -31841,7 +31864,7 @@ function useSiteUnitBillingRepo() {
     } catch (error) {
       throw new BadRequestError139("Invalid ID.");
     }
-    const cacheKey = makeCacheKey44(namespace_collection, { _id: String(_id) });
+    const cacheKey = makeCacheKey43(namespace_collection, { _id: String(_id) });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -32890,7 +32913,11 @@ var formatEntryPassDate = (date) => {
   const day = String(newDate.getDate()).padStart(2, "0");
   return `${year}${month}${day}`;
 };
-async function removeAccessGroup({ cardNo, staffNo, url }) {
+async function removeAccessGroup({
+  cardNo,
+  staffNo,
+  url
+}) {
   try {
     const commands = readTemplate("delete-qr-card", {
       staffNo,
@@ -32911,8 +32938,6 @@ async function removeAccessGroup({ cardNo, staffNo, url }) {
     });
     const response = await sendCommand(commands, url);
     const result = await parseStringPromise(response, { explicitArray: false });
-    console.log(result.RESULT.$.STCODE);
-    console.log(commands);
     if (result && result.RESULT.$.STCODE !== "0") {
       throw new Error("Command failed, server error.");
     }
@@ -36203,10 +36228,10 @@ import {
   BadRequestError as BadRequestError144,
   InternalServerError as InternalServerError48,
   logger as logger122,
-  makeCacheKey as makeCacheKey46,
+  makeCacheKey as makeCacheKey45,
   paginate as paginate40,
   useAtlas as useAtlas77,
-  useCache as useCache48
+  useCache as useCache47
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId92 } from "mongodb";
 function useNfcPatrolTagRepo() {
@@ -36217,8 +36242,8 @@ function useNfcPatrolTagRepo() {
   const namespace_collection = "nfc-patrol-tags";
   const namespace_collection_nfc_patrol_routes = "nfc-patrol-routes";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache48(namespace_collection);
-  const { delNamespace: delNamespaceNfcPatrolRoutes } = useCache48(
+  const { delNamespace, getCache, setCache } = useCache47(namespace_collection);
+  const { delNamespace: delNamespaceNfcPatrolRoutes } = useCache47(
     namespace_collection_nfc_patrol_routes
   );
   async function createIndexes() {
@@ -36274,7 +36299,7 @@ function useNfcPatrolTagRepo() {
       page,
       limit
     };
-    const cacheKey = makeCacheKey46(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey45(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger122.info(`Cache hit for key: ${cacheKey}`);
@@ -36666,12 +36691,12 @@ import {
   BadRequestError as BadRequestError147,
   InternalServerError as InternalServerError49,
   logger as logger124,
-  makeCacheKey as makeCacheKey47,
+  makeCacheKey as makeCacheKey46,
   NotFoundError as NotFoundError37,
   paginate as paginate41,
   toObjectId as toObjectId14,
   useAtlas as useAtlas79,
-  useCache as useCache49
+  useCache as useCache48
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId94 } from "mongodb";
 var occurrence_book_namespace_collection = "occurrence-books";
@@ -36708,7 +36733,7 @@ function useOccurrenceBookRepo() {
     }
   }
   const collection = db.collection(occurrence_book_namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache49(
+  const { delNamespace, getCache, setCache } = useCache48(
     occurrence_book_namespace_collection
   );
   async function add(value, session) {
@@ -36784,7 +36809,7 @@ function useOccurrenceBookRepo() {
         $lt: endDateISO
       };
     }
-    const cacheKey = makeCacheKey47(
+    const cacheKey = makeCacheKey46(
       occurrence_book_namespace_collection,
       cacheOptions
     );
@@ -36821,7 +36846,7 @@ function useOccurrenceBookRepo() {
     } catch (error) {
       throw new BadRequestError147("Invalid occurrence book ID format.");
     }
-    const cacheKey = makeCacheKey47(occurrence_book_namespace_collection, {
+    const cacheKey = makeCacheKey46(occurrence_book_namespace_collection, {
       _id
     });
     const cachedData = await getCache(cacheKey);
@@ -37317,11 +37342,11 @@ import {
   BadRequestError as BadRequestError149,
   InternalServerError as InternalServerError50,
   logger as logger126,
-  makeCacheKey as makeCacheKey48,
+  makeCacheKey as makeCacheKey47,
   NotFoundError as NotFoundError38,
   paginate as paginate42,
   useAtlas as useAtlas81,
-  useCache as useCache50
+  useCache as useCache49
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId96 } from "mongodb";
 function useBulletinVideoRepo() {
@@ -37340,7 +37365,7 @@ function useBulletinVideoRepo() {
   }
   const namespace_collection = "bulletin-videos";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache50(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache49(namespace_collection);
   async function add(value, session) {
     try {
       value = MBulletinVideo(value);
@@ -37391,7 +37416,7 @@ function useBulletinVideoRepo() {
       query.$text = { $search: search };
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey48(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey47(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger126.info(`Cache hit for key: ${cacheKey}`);
@@ -37425,7 +37450,7 @@ function useBulletinVideoRepo() {
     } catch (error) {
       throw new BadRequestError149("Invalid bulletin video ID format.");
     }
-    const cacheKey = makeCacheKey48(namespace_collection, { _id });
+    const cacheKey = makeCacheKey47(namespace_collection, { _id });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger126.info(`Cache hit for key: ${cacheKey}`);
@@ -37879,9 +37904,9 @@ import {
   InternalServerError as InternalServerError51,
   logger as logger129,
   useAtlas as useAtlas83,
-  useCache as useCache51,
+  useCache as useCache50,
   paginate as paginate43,
-  makeCacheKey as makeCacheKey49
+  makeCacheKey as makeCacheKey48
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId98 } from "mongodb";
 function useStatementOfAccountRepo() {
@@ -37891,7 +37916,7 @@ function useStatementOfAccountRepo() {
   }
   const namespace_collection = "site.statement-of-accounts";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache51(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache50(namespace_collection);
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -37979,7 +38004,7 @@ function useStatementOfAccountRepo() {
       ...dateFrom && { dateFrom: dateFrom.toString() },
       ...dateTo && { dateTo: dateTo.toString() }
     };
-    const cacheKey = makeCacheKey49(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey48(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger129.info(`Cache hit for key: ${cacheKey}`);
@@ -38024,7 +38049,7 @@ function useStatementOfAccountRepo() {
     } catch (error) {
       throw new BadRequestError152("Invalid ID.");
     }
-    const cacheKey = makeCacheKey49(namespace_collection, { _id: String(_id) });
+    const cacheKey = makeCacheKey48(namespace_collection, { _id: String(_id) });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -38665,7 +38690,6 @@ function useStatementOfAccountController() {
     try {
       const _id = req.params.id;
       const status = req.params.status;
-      console.log(_id, status);
       const result = await _updateStatusById(_id, { status });
       res.status(200).json({ message: result });
       return;
@@ -38870,11 +38894,11 @@ import {
   BadRequestError as BadRequestError156,
   InternalServerError as InternalServerError52,
   logger as logger133,
-  makeCacheKey as makeCacheKey50,
+  makeCacheKey as makeCacheKey49,
   NotFoundError as NotFoundError40,
   paginate as paginate44,
   useAtlas as useAtlas85,
-  useCache as useCache52
+  useCache as useCache51
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId101 } from "mongodb";
 function useEntryPassSettingsRepo() {
@@ -38884,7 +38908,7 @@ function useEntryPassSettingsRepo() {
   }
   const namespace_collection = "site.entrypass-settings";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache52(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache51(namespace_collection);
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -38937,7 +38961,7 @@ function useEntryPassSettingsRepo() {
     const query = {
       ...status ? { $and: [{ status }, { status: { $ne: "deleted" } }] } : { status: { $ne: "deleted" } }
     };
-    const cacheKey = makeCacheKey50(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey49(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger133.info(`Cache hit for key: ${cacheKey}`);
@@ -38990,7 +39014,7 @@ function useEntryPassSettingsRepo() {
     } catch (error) {
       throw new BadRequestError156("Invalid entry pass settings ID format.");
     }
-    const cacheKey = makeCacheKey50(namespace_collection, { _id });
+    const cacheKey = makeCacheKey49(namespace_collection, { _id });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger133.info(`Cache hit for key: ${cacheKey}`);
@@ -39118,7 +39142,7 @@ function useEntryPassSettingsRepo() {
     } catch (error) {
       throw new BadRequestError156("Invalid entry pass settings ID format.");
     }
-    const cacheKey = makeCacheKey50(namespace_collection, { site });
+    const cacheKey = makeCacheKey49(namespace_collection, { site });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger133.info(`Cache hit for key: ${cacheKey}`);
@@ -39444,9 +39468,9 @@ function useEntryPassSettingsController() {
 import {
   InternalServerError as InternalServerError53,
   logger as logger135,
-  makeCacheKey as makeCacheKey51,
+  makeCacheKey as makeCacheKey50,
   useAtlas as useAtlas86,
-  useCache as useCache53
+  useCache as useCache52
 } from "@7365admin1/node-server-utils";
 function useDashboardRepo() {
   const db = useAtlas86.getDb();
@@ -39457,7 +39481,7 @@ function useDashboardRepo() {
   const work_order_collection = db.collection("work-orders");
   const visitor_collection = db.collection("visitor.transactions");
   const namespace_collection = "dashboard";
-  const { delNamespace, getCache, setCache } = useCache53(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache52(namespace_collection);
   async function getAll({
     site = ""
   }, session) {
@@ -39468,7 +39492,7 @@ function useDashboardRepo() {
     const cacheOptions = {
       site: site.toString()
     };
-    const cacheKey = makeCacheKey51(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey50(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger135.info(`Cache hit for key: ${cacheKey}`);
@@ -39618,10 +39642,10 @@ import {
   BadRequestError as BadRequestError160,
   InternalServerError as InternalServerError54,
   logger as logger138,
-  makeCacheKey as makeCacheKey52,
+  makeCacheKey as makeCacheKey51,
   paginate as paginate45,
   useAtlas as useAtlas87,
-  useCache as useCache54
+  useCache as useCache53
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId103 } from "mongodb";
 function useNfcPatrolRouteRepo() {
@@ -39631,7 +39655,7 @@ function useNfcPatrolRouteRepo() {
   }
   const namespace_collection = "nfc-patrol-routes";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache54(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache53(namespace_collection);
   async function createIndexes() {
     try {
       await collection.createIndexes([
@@ -39697,7 +39721,7 @@ function useNfcPatrolRouteRepo() {
       cacheOptions.search = search;
     if (filter)
       cacheOptions.filter = filter;
-    const cacheKey = makeCacheKey52(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey51(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger138.info(`Cache hit for key: ${cacheKey}`);
@@ -39748,7 +39772,7 @@ function useNfcPatrolRouteRepo() {
     if (isStart === true) {
       cacheParams.isStart = true;
     }
-    const cacheKey = makeCacheKey52(namespace_collection, cacheParams);
+    const cacheKey = makeCacheKey51(namespace_collection, cacheParams);
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -40370,11 +40394,11 @@ import {
   BadRequestError as BadRequestError163,
   InternalServerError as InternalServerError55,
   logger as logger141,
-  makeCacheKey as makeCacheKey53,
+  makeCacheKey as makeCacheKey52,
   NotFoundError as NotFoundError43,
   paginate as paginate46,
   useAtlas as useAtlas89,
-  useCache as useCache55
+  useCache as useCache54
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId105 } from "mongodb";
 var incidents_namespace_collection = "incident-reports";
@@ -40405,7 +40429,7 @@ function useIncidentReportRepo() {
     }
   }
   const collection = db.collection(incidents_namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache55(
+  const { delNamespace, getCache, setCache } = useCache54(
     incidents_namespace_collection
   );
   async function add(value, session) {
@@ -40504,7 +40528,7 @@ function useIncidentReportRepo() {
     if (search) {
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey53(incidents_namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey52(incidents_namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger141.info(`Cache hit for key: ${cacheKey}`);
@@ -40617,7 +40641,7 @@ function useIncidentReportRepo() {
     } catch (error) {
       throw new BadRequestError163("Invalid incident report ID format.");
     }
-    const cacheKey = makeCacheKey53(incidents_namespace_collection, { _id });
+    const cacheKey = makeCacheKey52(incidents_namespace_collection, { _id });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger141.info(`Cache hit for key: ${cacheKey}`);
@@ -41294,10 +41318,10 @@ import {
   BadRequestError as BadRequestError167,
   InternalServerError as InternalServerError56,
   logger as logger144,
-  makeCacheKey as makeCacheKey54,
+  makeCacheKey as makeCacheKey53,
   NotFoundError as NotFoundError45,
   useAtlas as useAtlas91,
-  useCache as useCache56
+  useCache as useCache55
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId107 } from "mongodb";
 function useNfcPatrolSettingsRepository() {
@@ -41307,7 +41331,7 @@ function useNfcPatrolSettingsRepository() {
   }
   const namespace_collection = "site.nfc-patrol-settings";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache } = useCache56(namespace_collection);
+  const { delNamespace, setCache, getCache } = useCache55(namespace_collection);
   async function createIndexes() {
     try {
       await collection.createIndexes([{ key: { site: 1 }, unique: true }]);
@@ -41334,7 +41358,7 @@ function useNfcPatrolSettingsRepository() {
       throw new BadRequestError167("Invalid nfc patrol settings site ID format.");
     }
     const query = { site };
-    const cacheKey = makeCacheKey54(namespace_collection, {
+    const cacheKey = makeCacheKey53(namespace_collection, {
       site: site.toString()
     });
     if (!session) {
@@ -41549,11 +41573,11 @@ import {
   BadRequestError as BadRequestError170,
   InternalServerError as InternalServerError57,
   logger as logger147,
-  makeCacheKey as makeCacheKey55,
+  makeCacheKey as makeCacheKey54,
   NotFoundError as NotFoundError46,
   paginate as paginate47,
   useAtlas as useAtlas93,
-  useCache as useCache57
+  useCache as useCache56
 } from "@7365admin1/node-server-utils";
 
 // src/models/occurrence-subject.model.ts
@@ -41630,7 +41654,7 @@ function useOccurrenceSubjectRepo() {
   }
   const namespace_collection = "occurrence-subjects";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache57(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache56(namespace_collection);
   async function add(value, session) {
     try {
       value = MOccurrenceSubject(value);
@@ -41682,7 +41706,7 @@ function useOccurrenceSubjectRepo() {
       query.$text = { $search: search };
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey55(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey54(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger147.info(`Cache hit for key: ${cacheKey}`);
@@ -42202,11 +42226,11 @@ import {
   BadRequestError as BadRequestError172,
   InternalServerError as InternalServerError58,
   logger as logger149,
-  makeCacheKey as makeCacheKey56,
+  makeCacheKey as makeCacheKey55,
   NotFoundError as NotFoundError47,
   paginate as paginate48,
   useAtlas as useAtlas95,
-  useCache as useCache58
+  useCache as useCache57
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId112 } from "mongodb";
 function useOnlineFormRepo() {
@@ -42216,7 +42240,7 @@ function useOnlineFormRepo() {
   }
   const namespace_collection = "online-forms";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache58(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache57(namespace_collection);
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -42283,7 +42307,7 @@ function useOnlineFormRepo() {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
     }
-    const cacheKey = makeCacheKey56(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey55(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger149.info(`Cache hit for key: ${cacheKey}`);
@@ -42324,7 +42348,7 @@ function useOnlineFormRepo() {
     } catch (error) {
       throw new BadRequestError172("Invalid online form ID format.");
     }
-    const cacheKey = makeCacheKey56(namespace_collection, { _id });
+    const cacheKey = makeCacheKey55(namespace_collection, { _id });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger149.info(`Cache hit for key: ${cacheKey}`);
@@ -42445,7 +42469,7 @@ function useOnlineFormRepo() {
       cacheOptions.search = search;
     }
     cacheOptions.site = site;
-    const cacheKey = makeCacheKey56(namespace_collection, { site });
+    const cacheKey = makeCacheKey55(namespace_collection, { site });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger149.info(`Cache hit for key: ${cacheKey}`);
@@ -42959,10 +42983,10 @@ import {
   BadRequestError as BadRequestError176,
   InternalServerError as InternalServerError59,
   logger as logger153,
-  makeCacheKey as makeCacheKey57,
+  makeCacheKey as makeCacheKey56,
   paginate as paginate49,
   useAtlas as useAtlas97,
-  useCache as useCache59
+  useCache as useCache58
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId114 } from "mongodb";
 function useNfcPatrolLogRepo() {
@@ -42972,7 +42996,7 @@ function useNfcPatrolLogRepo() {
   }
   const namespace_collection = "nfc-patrol-logs";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache59(namespace_collection);
+  const { delNamespace, getCache, setCache } = useCache58(namespace_collection);
   async function createIndexes() {
     try {
       await collection.createIndexes([
@@ -43046,7 +43070,7 @@ function useNfcPatrolLogRepo() {
     if (route?.startTime) {
       cacheOptions.routeStartTime = route?.startTime;
     }
-    const cacheKey = makeCacheKey57(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey56(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger153.info(`Cache hit for key: ${cacheKey}`);
@@ -43200,10 +43224,10 @@ import {
   BadRequestError as BadRequestError179,
   InternalServerError as InternalServerError60,
   logger as logger156,
-  makeCacheKey as makeCacheKey58,
+  makeCacheKey as makeCacheKey57,
   toObjectId as toObjectId15,
   useAtlas as useAtlas99,
-  useCache as useCache60
+  useCache as useCache59
 } from "@7365admin1/node-server-utils";
 var Period = /* @__PURE__ */ ((Period2) => {
   Period2["TODAY"] = "today";
@@ -43289,7 +43313,7 @@ function useNewDashboardRepo() {
   if (!db) {
     throw new InternalServerError60("Unable to connect to server.");
   }
-  const { delNamespace, getCache, setCache } = useCache60(
+  const { delNamespace, getCache, setCache } = useCache59(
     securityDashboardCollection
   );
   async function getMetric(collectionString, siteId, period) {
@@ -43334,7 +43358,7 @@ function useNewDashboardRepo() {
       visitor,
       incident
     };
-    const cacheKey = makeCacheKey58(securityDashboardCollection, cacheOptions);
+    const cacheKey = makeCacheKey57(securityDashboardCollection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger156.info(`Cache hit for key: ${cacheKey}`);
@@ -43413,7 +43437,7 @@ function useNewDashboardRepo() {
       visitor,
       incident
     };
-    const cacheKey = makeCacheKey58(PMDashboardCollection, cacheOptions);
+    const cacheKey = makeCacheKey57(PMDashboardCollection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger156.info(`Cache hit for key: ${cacheKey}`);
@@ -43494,7 +43518,7 @@ function useNewDashboardRepo() {
       feedback,
       workOrder
     };
-    const cacheKey = makeCacheKey58(pestDashboardCollection, cacheOptions);
+    const cacheKey = makeCacheKey57(pestDashboardCollection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger156.info(`Cache hit for key: ${cacheKey}`);
@@ -43531,7 +43555,7 @@ function useNewDashboardRepo() {
       feedback,
       workOrder
     };
-    const cacheKey = makeCacheKey58(poolDashboardCollection, cacheOptions);
+    const cacheKey = makeCacheKey57(poolDashboardCollection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger156.info(`Cache hit for key: ${cacheKey}`);
@@ -43568,7 +43592,7 @@ function useNewDashboardRepo() {
       feedback,
       workOrder
     };
-    const cacheKey = makeCacheKey58(mAndEDashboardCollection, cacheOptions);
+    const cacheKey = makeCacheKey57(mAndEDashboardCollection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger156.info(`Cache hit for key: ${cacheKey}`);
@@ -43605,7 +43629,7 @@ function useNewDashboardRepo() {
       feedback,
       workOrder
     };
-    const cacheKey = makeCacheKey58(landscapeDashboardCollection, cacheOptions);
+    const cacheKey = makeCacheKey57(landscapeDashboardCollection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger156.info(`Cache hit for key: ${cacheKey}`);
@@ -43943,6 +43967,8 @@ var MManpowerMonitoring = class {
 // src/repositories/manpower-monitoring.repo.ts
 import {
   BadRequestError as BadRequestError181,
+  InternalServerError as InternalServerError61,
+  logger as logger158,
   paginate as paginate51,
   useAtlas as useAtlas100
 } from "@7365admin1/node-server-utils";
@@ -44405,6 +44431,25 @@ function useManpowerMonitoringRepo() {
   const namespace_collection = "manpower-settings";
   const collection = db.collection(namespace_collection);
   const serviceProviderCollection = db.collection("site.service-providers");
+  async function createIndexes() {
+    try {
+      await collection.createIndexes([
+        {
+          key: { siteId: 1 }
+        },
+        { key: { createdAt: 1 } }
+      ]);
+      return `Successfully created indexes for ${namespace_collection}.`;
+    } catch (error) {
+      logger158.log({
+        level: "error",
+        message: error.message
+      });
+      throw new InternalServerError61(
+        "Failed to create general indexes on manpower monitoring."
+      );
+    }
+  }
   async function createManpowerMonitoringSettings(value, session) {
     try {
       value = new MManpowerMonitoring(value);
@@ -44581,7 +44626,8 @@ function useManpowerMonitoringRepo() {
     getManpowerSettingsBySiteId,
     updateManpowerMonitoringSettings,
     multipleManpowerMonitoringSettings,
-    getAllSites
+    getAllSites,
+    createIndexes
   };
 }
 
@@ -44595,6 +44641,8 @@ import {
 // src/repositories/manpower-remarks.repo.ts
 import {
   BadRequestError as BadRequestError182,
+  InternalServerError as InternalServerError62,
+  logger as logger159,
   paginate as paginate52,
   useAtlas as useAtlas101
 } from "@7365admin1/node-server-utils";
@@ -44652,6 +44700,25 @@ function useManpowerRemarksRepo() {
   }
   const namespace_collection = "manpower-remarks";
   const collection = db.collection(namespace_collection);
+  async function createIndexes() {
+    try {
+      await collection.createIndexes([
+        {
+          key: { siteId: 1 }
+        },
+        { key: { createdAt: 1 } }
+      ]);
+      return `Successfully created indexes for ${namespace_collection}.`;
+    } catch (error) {
+      logger159.log({
+        level: "error",
+        message: error.message
+      });
+      throw new InternalServerError62(
+        "Failed to create general indexes on manpower remarks."
+      );
+    }
+  }
   async function createManpowerRemarks(value, session) {
     try {
       value = new MManpowerRemarks(value);
@@ -44774,7 +44841,8 @@ function useManpowerRemarksRepo() {
     getManpowerRemarksAllSite,
     getManpowerRemarksBySiteId,
     updateManpowerRemarks,
-    updateRemarksStatus
+    updateRemarksStatus,
+    createIndexes
   };
 }
 
@@ -44786,7 +44854,6 @@ function useManpowerMonitoringSrvc() {
   } = useManpowerMonitoringRepo();
   const { createManpowerRemarks: _createManpowerRemarks } = useManpowerRemarksRepo();
   async function createManpowerMonitoringSettings(payload) {
-    console.log("Im here now at service");
     const session = useAtlas102.getClient()?.startSession();
     if (!session) {
       throw new BadRequestError183("Database session not available.");
@@ -44802,7 +44869,6 @@ function useManpowerMonitoringSrvc() {
     const afternoonAlertTime = afternoonCheckInTime ? moment3.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
     const nightAlertTime = moment3.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
     const nowSGT = moment3().tz("Asia/Singapore");
-    console.log("im done preparing the payload");
     try {
       const remarksPayload = {
         siteId: payload.siteId,
@@ -44961,7 +45027,6 @@ function useManpowerMonitoringCtrl() {
       });
       const _id = req.params.id;
       const payload = { ...req.body };
-      console.log("_id", _id);
       const { error } = validation.validate({ _id, ...payload });
       if (error) {
         next(new BadRequestError184(error.message));
@@ -45056,6 +45121,8 @@ var MManpowerDesignations = class {
 
 // src/repositories/manpower-designations.repo.ts
 import {
+  InternalServerError as InternalServerError63,
+  logger as logger162,
   useAtlas as useAtlas103
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId120 } from "mongodb";
@@ -45066,6 +45133,25 @@ function useManpowerDesignationRepo() {
   }
   const namespace_collection = "manpower-designations";
   const collection = db.collection(namespace_collection);
+  async function createIndexes() {
+    try {
+      await collection.createIndexes([
+        {
+          key: { siteId: 1 }
+        },
+        { key: { createdAt: 1 } }
+      ]);
+      return `Successfully created indexes for ${namespace_collection}.`;
+    } catch (error) {
+      logger162.log({
+        level: "error",
+        message: error.message
+      });
+      throw new InternalServerError63(
+        "Failed to create general indexes on manpower designations."
+      );
+    }
+  }
   async function createManpowerDesignations(value) {
     try {
       value = new MManpowerDesignations(value);
@@ -45121,7 +45207,8 @@ function useManpowerDesignationRepo() {
   return {
     createManpowerDesignations,
     getManpowerDesignationsBySiteId,
-    updateManpowerDesignations
+    updateManpowerDesignations,
+    createIndexes
   };
 }
 
@@ -45270,10 +45357,10 @@ function MOvernightParkingApprovalHours(value) {
 import {
   InternalServerError as InternalServerError64,
   logger as logger164,
-  makeCacheKey as makeCacheKey62,
+  makeCacheKey as makeCacheKey61,
   toObjectId as toObjectId16,
   useAtlas as useAtlas104,
-  useCache as useCache64
+  useCache as useCache63
 } from "@7365admin1/node-server-utils";
 var overnight_parking_namespace_collection = "site.overnight-parking";
 function useOvernightParkingRepo() {
@@ -45282,7 +45369,7 @@ function useOvernightParkingRepo() {
     throw new InternalServerError64("Unable to connect to server.");
   }
   const collection = db.collection(overnight_parking_namespace_collection);
-  const { delNamespace, setCache, getCache } = useCache64(
+  const { delNamespace, setCache, getCache } = useCache63(
     overnight_parking_namespace_collection
   );
   async function createIndexes() {
@@ -45351,7 +45438,7 @@ function useOvernightParkingRepo() {
   }
   async function getSiteOvernightParking(site) {
     const siteId = toObjectId16(site);
-    const cacheKey = makeCacheKey62(overnight_parking_namespace_collection, {
+    const cacheKey = makeCacheKey61(overnight_parking_namespace_collection, {
       site
     });
     const cachedData = await getCache(cacheKey);
@@ -45498,11 +45585,11 @@ import {
   BadRequestError as BadRequestError189,
   InternalServerError as InternalServerError65,
   logger as logger166,
-  makeCacheKey as makeCacheKey63,
+  makeCacheKey as makeCacheKey62,
   paginate as paginate55,
   toObjectId as toObjectId18,
   useAtlas as useAtlas105,
-  useCache as useCache65
+  useCache as useCache64
 } from "@7365admin1/node-server-utils";
 var overnight_parking_requests_namespace_collection = "site.overnight-parking-requests";
 function useOvernightParkingRequestRepo() {
@@ -45513,7 +45600,7 @@ function useOvernightParkingRequestRepo() {
   const collection = db.collection(
     overnight_parking_requests_namespace_collection
   );
-  const { delNamespace, getCache, setCache } = useCache65(
+  const { delNamespace, getCache, setCache } = useCache64(
     overnight_parking_requests_namespace_collection
   );
   async function createIndexes() {
@@ -45580,7 +45667,7 @@ function useOvernightParkingRequestRepo() {
       sort: JSON.stringify(sort),
       ...status && { status }
     };
-    const cacheKey = makeCacheKey63(
+    const cacheKey = makeCacheKey62(
       overnight_parking_requests_namespace_collection,
       cacheOptions
     );
@@ -45610,7 +45697,7 @@ function useOvernightParkingRequestRepo() {
   }
   async function getOvernightParkingRequestById(id) {
     try {
-      const cacheKey = makeCacheKey63(
+      const cacheKey = makeCacheKey62(
         overnight_parking_requests_namespace_collection,
         { id }
       );
@@ -48720,7 +48807,7 @@ import {
   comparePassword as comparePassword3,
   InternalServerError as InternalServerError71,
   NotFoundError as NotFoundError53,
-  useCache as useCache68
+  useCache as useCache67
 } from "@7365admin1/node-server-utils";
 import { v4 as uuidv42 } from "uuid";
 
@@ -48734,8 +48821,8 @@ import {
   paginate as paginate58,
   NotFoundError as NotFoundError52,
   AppError as AppError28,
-  useCache as useCache67,
-  makeCacheKey as makeCacheKey65,
+  useCache as useCache66,
+  makeCacheKey as makeCacheKey64,
   toObjectId as toObjectId19
 } from "@7365admin1/node-server-utils";
 function useUserRepoV2() {
@@ -48748,7 +48835,7 @@ function useUserRepoV2() {
   }
   const namespace_collection = "users";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache, delCache } = useCache67(namespace_collection);
+  const { delNamespace, setCache, getCache, delCache } = useCache66(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndexes([{ key: { email: 1 } }]);
@@ -48796,7 +48883,7 @@ function useUserRepoV2() {
   }
   async function getUserByEmail(email) {
     try {
-      const cacheKey = makeCacheKey65(namespace_collection, { email });
+      const cacheKey = makeCacheKey64(namespace_collection, { email });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
         logger180.info(`Cache hit for key: ${cacheKey}`);
@@ -48815,7 +48902,7 @@ function useUserRepoV2() {
   }
   async function getUserByEmailStatus(email) {
     try {
-      const cacheKey = makeCacheKey65(namespace_collection, {
+      const cacheKey = makeCacheKey64(namespace_collection, {
         email,
         status: "complete" /* COMPLETE */
       });
@@ -48839,7 +48926,7 @@ function useUserRepoV2() {
   async function getUserById(id) {
     const _id = toObjectId19(id);
     try {
-      const cacheKey = makeCacheKey65(namespace_collection, { id });
+      const cacheKey = makeCacheKey64(namespace_collection, { id });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
         logger180.info(`Cache hit for key: ${cacheKey}`);
@@ -48878,7 +48965,7 @@ function useUserRepoV2() {
   }
   async function getUserByReferralCode(referralCode) {
     try {
-      const cacheKey = makeCacheKey65(namespace_collection, { referralCode });
+      const cacheKey = makeCacheKey64(namespace_collection, { referralCode });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
         logger180.info(`Cache hit for key: ${cacheKey}`);
@@ -48895,7 +48982,7 @@ function useUserRepoV2() {
   }
   async function getByEmailApp(email, app) {
     try {
-      const cacheKey = makeCacheKey65(namespace_collection, { email, app });
+      const cacheKey = makeCacheKey64(namespace_collection, { email, app });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
         logger180.info(`Cache hit for key: ${cacheKey}`);
@@ -48951,7 +49038,7 @@ function useUserRepoV2() {
         err
       );
     });
-    const cacheKey = makeCacheKey65(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey64(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger180.info(`Cache hit for key: ${cacheKey}`);
@@ -49015,7 +49102,7 @@ function useUserRepoV2() {
         err
       )
     );
-    const cacheKey = makeCacheKey65(namespace_collection, cacheOptions);
+    const cacheKey = makeCacheKey64(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger180.info(`Cache hit for key: ${cacheKey}`);
@@ -49041,7 +49128,7 @@ function useUserRepoV2() {
     }
   }
   async function updatePasswordById({ _id, password }, session) {
-    const cacheKey = makeCacheKey65(namespace_collection, { _id });
+    const cacheKey = makeCacheKey64(namespace_collection, { _id });
     _id = toObjectId19(_id);
     try {
       const result = await collection.updateOne(
@@ -49105,7 +49192,7 @@ function useUserRepoV2() {
         // Dynamically set the field
         { session }
       );
-      const cacheKey = makeCacheKey65(namespace_collection, { _id });
+      const cacheKey = makeCacheKey64(namespace_collection, { _id });
       delCache(cacheKey).then(() => {
         logger180.info(`Cache deleted for key: ${cacheKey}`);
       }).catch((err) => {
@@ -49140,7 +49227,7 @@ function useUserRepoV2() {
         },
         { session }
       );
-      const cacheKey = makeCacheKey65(namespace_collection, { _id });
+      const cacheKey = makeCacheKey64(namespace_collection, { _id });
       delCache(cacheKey).then(() => {
         logger180.info(`Cache deleted for key: ${cacheKey}`);
       }).catch((err) => {
@@ -49163,7 +49250,7 @@ function useUserRepoV2() {
         { $set: { password, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
         { session }
       );
-      const cacheKey = makeCacheKey65(namespace_collection, { _id });
+      const cacheKey = makeCacheKey64(namespace_collection, { _id });
       delCache(cacheKey).then(() => {
         logger180.info(`Cache deleted for key: ${cacheKey}`);
       }).catch((err) => {
@@ -49195,7 +49282,7 @@ function useUserRepoV2() {
 function useAuthServiceV2() {
   const { getUserByEmail, getUserById: _getUserById } = useUserRepoV2();
   const expiresIn = "15m";
-  const { setCache, delCache } = useCache68("sessions");
+  const { setCache, delCache } = useCache67("sessions");
   const { getByUserIdType } = useMemberRepo();
   async function login({
     email,
@@ -49963,7 +50050,7 @@ import {
   InternalServerError as InternalServerError73,
   useAtlas as useAtlas116,
   logger as logger184,
-  useCache as useCache69
+  useCache as useCache68
 } from "@7365admin1/node-server-utils";
 function useRoleRepoV2() {
   const db = useAtlas116.getDb();
@@ -50000,7 +50087,7 @@ function useRoleRepoV2() {
       throw new InternalServerError73("Failed to create unique index on role.");
     }
   }
-  const { delNamespace } = useCache69(namespace_collection);
+  const { delNamespace } = useCache68(namespace_collection);
   async function addRole(value, session) {
     value = new MRoleV2(value);
     try {