@7365admin1/core 2.41.0 → 2.43.0

package/dist/index.js

@@ -842,7 +842,6 @@ function useFeedbackRepo() {
       cacheOptions.from = from;
       cacheOptions.to = to;
     }
-    console.log("query", JSON.stringify(query));
     const cacheKey = (0, import_node_server_utils5.makeCacheKey)(feedbacks_namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -2293,7 +2292,6 @@ function useOccurrenceEntryRepo() {
         throw new Error("Invalid incident report ID.");
       }
     }
-    console.log("Updating occurrence entry:", _id, value);
     try {
       const res = await collection.updateOne(
         { _id },
@@ -5158,7 +5156,10 @@ function useSiteRepo() {
       throw error;
     }
   }
-  async function siteInformation({ id, payload }) {
+  async function siteInformation({
+    id,
+    payload
+  }) {
     try {
       const siteId = new import_mongodb17.ObjectId(id);
       const res = await collection.updateOne(
@@ -5178,6 +5179,48 @@ function useSiteRepo() {
       throw error;
     }
   }
+  async function getAllSitesForResidentCreation({
+    search = "",
+    page = 1,
+    limit = 10
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const query = {
+      status: { $ne: "deleted" }
+    };
+    const cacheOptions = {
+      status: { $ne: "deleted" },
+      page,
+      limit
+    };
+    if (search) {
+      query.$or = [{ name: { $regex: search, $options: "i" } }];
+      cacheOptions.search = search;
+    }
+    const cacheKey = (0, import_node_server_utils19.makeCacheKey)(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      import_node_server_utils19.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const items = await collection.aggregate([
+        { $match: query },
+        { $skip: page * limit },
+        { $limit: limit }
+      ]).toArray();
+      const length = await collection.countDocuments(query);
+      const data = (0, import_node_server_utils19.paginate)(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        import_node_server_utils19.logger.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils19.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createIndexes,
     createSite,
@@ -5192,7 +5235,8 @@ function useSiteRepo() {
     updateSiteIncidentCounter,
     updateSiteById,
     getAllSitesUnpaginated,
-    siteInformation
+    siteInformation,
+    getAllSitesForResidentCreation
   };
 }
 
@@ -10577,7 +10621,6 @@ function useSubscriptionService() {
         subscription.nextBillingDate,
         "pending"
       );
-      console.log("dueInvoice", dueInvoice);
       if (value.promoCode) {
         const promoCode = await getByCode(value.promoCode);
         if (!promoCode) {
@@ -11597,11 +11640,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) {
       import_node_server_utils57.logger.log({ level: "error", message: error.message });
@@ -12302,7 +12342,7 @@ function useServiceProviderController() {
     const validation = import_joi30.default.object({
       search: import_joi30.default.string().optional().allow("", null),
       page: import_joi30.default.number().integer().min(1).allow("", null).default(1),
-      limit: import_joi30.default.number().integer().min(1).max(100).allow("", null).default(10),
+      limit: import_joi30.default.number().integer().min(1).max(1e3).allow("", null).default(10),
       orgId: import_joi30.default.string().hex().optional().allow("", null),
       siteId: import_joi30.default.string().hex().optional().allow("", null),
       serviceProviderOrgId: import_joi30.default.string().hex().optional().allow("", null),
@@ -13501,7 +13541,9 @@ var schemaPerson = import_joi35.default.object({
   plates: import_joi35.default.array().items(schemaPlate).optional().allow(null),
   isOwner: import_joi35.default.boolean().required(),
   files: import_joi35.default.array().items(schemaFiles).optional().allow(null),
-  password: import_joi35.default.string().optional().allow(null, "")
+  password: import_joi35.default.string().optional().allow(null, ""),
+  plateNumber: import_joi35.default.string().optional().allow(null, ""),
+  platform: import_joi35.default.string().valid("web", "mobile").optional().allow(null, "")
 });
 var schemaUpdatePerson = import_joi35.default.object({
   _id: import_joi35.default.string().hex().required(),
@@ -13521,12 +13563,14 @@ var schemaUpdatePerson = import_joi35.default.object({
   plates: import_joi35.default.array().items(schemaFiles).optional().allow(null, ""),
   isOwner: import_joi35.default.boolean().optional().allow(null, ""),
   files: import_joi35.default.array().items(schemaFiles).optional().allow(null),
-  password: import_joi35.default.string().optional().allow(null, "")
+  password: import_joi35.default.string().optional().allow(null, ""),
+  plateNumber: import_joi35.default.string().optional().allow(null, ""),
+  platform: import_joi35.default.string().valid("web", "mobile").optional().allow(null, "")
 });
 function MPerson(value) {
   const { error } = schemaPerson.validate(value);
   if (error) {
-    throw new Error(error.details[0].message);
+    throw new import_node_server_utils68.BadRequestError(error.details[0].message);
   }
   if (value._id && typeof value._id === "string") {
     try {
@@ -13591,6 +13635,8 @@ function MPerson(value) {
     plates: value.plates ?? [],
     isOwner: value.isOwner ?? false,
     files: value.files ?? [],
+    plateNumber: value.plateNumber ?? "",
+    platForm: value.platform ?? "",
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: value.updatedAt,
     deletedAt: value.deletedAt
@@ -13629,8 +13675,8 @@ var schemaVisitorTransaction = import_joi36.default.object({
   contact: import_joi36.default.string().optional().allow(null, ""),
   plateNumber: import_joi36.default.string().optional().allow(null, ""),
   recNo: import_joi36.default.string().optional().allow(null, ""),
-  checkIn: import_joi36.default.date().optional().allow(null, ""),
-  checkOut: import_joi36.default.date().optional().allow(null, ""),
+  checkIn: import_joi36.default.date().iso().optional().allow(null),
+  checkOut: import_joi36.default.date().iso().optional().allow(null),
   deliveryType: import_joi36.default.string().optional().allow(null, ""),
   status: import_joi36.default.string().optional().valid(...Object.values(VisitorStatus)).default("registered" /* REGISTERED */),
   remarks: import_joi36.default.string().optional().allow(null, ""),
@@ -13694,8 +13740,8 @@ var schemaUpdateVisTrans = import_joi36.default.object({
   contact: import_joi36.default.string().optional().allow(null, ""),
   plateNumber: import_joi36.default.string().optional().allow(null, ""),
   recNo: import_joi36.default.string().optional().allow(null, ""),
-  checkIn: import_joi36.default.date().optional().allow(null, ""),
-  checkOut: import_joi36.default.date().optional().allow(null, ""),
+  checkIn: import_joi36.default.date().iso().optional().allow(null),
+  checkOut: import_joi36.default.date().iso().optional().allow(null),
   deliveryType: import_joi36.default.string().optional().allow(null, ""),
   status: import_joi36.default.string().optional().allow(null, ""),
   remarks: import_joi36.default.string().optional().allow(null, ""),
@@ -13924,7 +13970,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 }];
@@ -14397,8 +14442,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 ?? "",
@@ -14414,8 +14459,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 ?? "",
@@ -14544,10 +14589,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 },
@@ -15107,7 +15153,7 @@ function useVehicleRepo() {
       throw error;
     }
   }
-  async function bulkUpsertVehicles(values, session) {
+  async function bulkUpsertVehicles(values) {
     try {
       if (!Array.isArray(values) || values.length === 0) {
         return {
@@ -15116,7 +15162,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;
@@ -15124,7 +15170,7 @@ function useVehicleRepo() {
         return {
           updateOne: {
             filter: {
-              site: vehicle.site,
+              site: new import_mongodb43.ObjectId(vehicle.site),
               plateNumber,
               $or: [
                 { deletedAt: "" },
@@ -15135,6 +15181,9 @@ function useVehicleRepo() {
             update: {
               $set: {
                 ...rest,
+                site: new import_mongodb43.ObjectId(vehicle.site),
+                unit: vehicle.unit ? new import_mongodb43.ObjectId(vehicle.unit) : null,
+                org: vehicle.org ? new import_mongodb43.ObjectId(vehicle.org) : null,
                 plateNumber,
                 updatedAt: now
               },
@@ -15146,10 +15195,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,
@@ -15272,7 +15318,7 @@ function usePersonRepo() {
       ]
     } : void 0;
     const query = {
-      status,
+      ...status && status !== "all" ? { status } : { status: { $nin: ["deleted", "rejected"] } },
       ...start && { start },
       ...end,
       ...search && {
@@ -15310,12 +15356,29 @@ function usePersonRepo() {
       return cachedData;
     }
     try {
-      const basePipeline = [
-        { $match: query },
-        { $sort: sort },
-        { $skip: page * limit },
-        { $limit: limit }
-      ];
+      const basePipeline = [{ $match: query }];
+      if (status && status == "all") {
+        basePipeline.push(
+          {
+            $addFields: {
+              sortPriority: {
+                $cond: [{ $eq: ["$status", "pending"] }, 1, 2]
+              }
+            }
+          },
+          {
+            $sort: {
+              sortPriority: 1,
+              ...sort
+            }
+          }
+        );
+      } else {
+        basePipeline.push({
+          $sort: sort
+        });
+      }
+      basePipeline.push({ $skip: page * limit }, { $limit: limit });
       const [items, countResult] = await Promise.all([
         collection.aggregate(basePipeline, { session }).toArray(),
         collection.aggregate([{ $match: query }, { $count: "total" }], { session }).toArray()
@@ -17218,15 +17281,11 @@ function useVehicleService() {
     }
   }
   async function bulkUpsertVehicles(values, site, org) {
-    const session = import_node_server_utils75.useAtlas.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;
@@ -17241,7 +17300,7 @@ function useVehicleService() {
             ...item,
             org,
             site,
-            start: item.start ?? now,
+            start: now.toISOString(),
             unit: unitId,
             plateNumber: typeof plateNumber === "string" ? plateNumber.trim().toUpperCase() : plateNumber
           };
@@ -17271,33 +17330,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 {
@@ -18086,7 +18148,8 @@ function useSiteController() {
     getSites: _getSites,
     getSiteById: _getSiteById,
     updateSiteBlock: _updateSiteBlock,
-    deleteSite: _deleteSite
+    deleteSite: _deleteSite,
+    getAllSitesForResidentCreation: _getAllSitesForResidentCreation
   } = useSiteRepo();
   const { updateGuardPostById, siteInformation: _siteInformation } = useSiteService();
   async function createSite(req, res, next) {
@@ -18271,14 +18334,13 @@ function useSiteController() {
         id: import_joi42.default.string().hex().required(),
         bgImage: import_joi42.default.string().optional().allow("", null),
         description: import_joi42.default.string().optional().allow("", null),
-        docs: import_joi42.default.array().items(import_joi42.default.object({
-          id: import_joi42.default.string().hex().optional().allow("", null),
-          name: import_joi42.default.string().optional().allow("", null)
-        })).optional().allow("", null)
-      }).validate(
-        { id, ...payload },
-        { abortEarly: false }
-      );
+        docs: import_joi42.default.array().items(
+          import_joi42.default.object({
+            id: import_joi42.default.string().hex().optional().allow("", null),
+            name: import_joi42.default.string().optional().allow("", null)
+          })
+        ).optional().allow("", null)
+      }).validate({ id, ...payload }, { abortEarly: false });
       if (error) {
         import_node_server_utils78.logger.log({ level: "error", message: error.message });
         next(new import_node_server_utils78.BadRequestError(error.message));
@@ -18294,6 +18356,36 @@ function useSiteController() {
       return;
     }
   }
+  async function getAllSitesForResidentCreation(req, res, next) {
+    const validation = import_joi42.default.object({
+      search: import_joi42.default.string().optional().allow("", null),
+      page: import_joi42.default.number().integer().min(1).allow("", null).default(1),
+      limit: import_joi42.default.number().integer().min(1).max(100).allow("", null).default(10)
+    });
+    const query = { ...req.query };
+    const { error } = validation.validate(query);
+    if (error) {
+      import_node_server_utils78.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils78.BadRequestError(error.message));
+      return;
+    }
+    const search = req.query.search ?? "";
+    const page = parseInt(req.query.page ?? "1");
+    const limit = parseInt(req.query.limit ?? "10");
+    try {
+      const data = await _getAllSitesForResidentCreation({
+        search,
+        page,
+        limit
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils78.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     createSite,
     getSites,
@@ -18302,7 +18394,8 @@ function useSiteController() {
     deleteSite,
     updateById,
     updateGuardPostsById,
-    siteInformation
+    siteInformation,
+    getAllSitesForResidentCreation
   };
 }
 
@@ -19331,6 +19424,7 @@ function useBuildingUnitController() {
 var import_node_server_utils87 = require("@7365admin1/node-server-utils");
 var import_joi46 = __toESM(require("joi"));
 var import_exceljs = __toESM(require("exceljs"));
+var import_csv_parser = __toESM(require("csv-parser"));
 var import_fs2 = __toESM(require("fs"));
 function useVehicleController() {
   const {
@@ -19375,8 +19469,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,
@@ -19396,19 +19497,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 import_node_server_utils87.BadRequestError("Excel file is required."));
-        return;
-      }
-      if (!req.file.originalname.toLowerCase().endsWith(".xlsx")) {
-        next(new import_node_server_utils87.BadRequestError("Only .xlsx files are allowed."));
+        next(new import_node_server_utils87.BadRequestError("Spreadsheet file is required."));
         return;
       }
+      const { originalname, path: path4 } = req.file;
+      const lowerName = originalname.toLowerCase();
       const rowSchema = import_joi46.default.object({
         fullName: import_joi46.default.string().trim().required(),
         userType: import_joi46.default.string().trim().required(),
@@ -19420,7 +19519,11 @@ function useVehicleController() {
         plateNumber: import_joi46.default.string().trim().uppercase().required(),
         vehicleModel: import_joi46.default.string().trim().allow("", null).optional(),
         vehicleColor: import_joi46.default.string().trim().allow("", null).optional(),
-        subscriptionExpiry: import_joi46.default.string().trim().allow("", null).optional()
+        subscriptionExpiry: import_joi46.default.alternatives().try(
+          import_joi46.default.date().iso(),
+          // ISO format
+          import_joi46.default.string().pattern(/^\d{1,2}-[A-Za-z]{3}-\d{2}$/)
+        ).allow("", null).optional()
       });
       const querySchema = import_joi46.default.object({
         site: import_joi46.default.string().hex().length(24).required(),
@@ -19428,10 +19531,7 @@ function useVehicleController() {
       });
       const { error: queryError, value: queryValue } = querySchema.validate(
         req.query,
-        {
-          abortEarly: false,
-          convert: true
-        }
+        { abortEarly: false, convert: true }
       );
       if (queryError) {
         next(
@@ -19442,30 +19542,43 @@ function useVehicleController() {
         return;
       }
       const { site, org } = queryValue;
-      const workbook = new import_exceljs.default.Workbook();
-      await workbook.xlsx.readFile(req.file.path);
-      const worksheet = workbook.worksheets[0];
-      if (!worksheet) {
-        next(new import_node_server_utils87.BadRequestError("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 import_exceljs.default.Workbook();
+        await workbook.xlsx.readFile(path4);
+        const worksheet = workbook.worksheets[0];
+        if (!worksheet) {
+          next(
+            new import_node_server_utils87.BadRequestError("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);
+          }
+        });
+      } else if (lowerName.endsWith(".csv")) {
+        rows = await new Promise((resolve, reject) => {
+          const parsed = [];
+          import_fs2.default.createReadStream(path4).pipe((0, import_csv_parser.default)()).on("data", (row) => parsed.push(row)).on("end", () => resolve(parsed)).on("error", reject);
         });
-        const hasValue = Object.values(rowData).some(
-          (value) => value !== null && value !== void 0 && value !== ""
+      } else {
+        next(
+          new import_node_server_utils87.BadRequestError("Only .xlsx, .xls, or .csv files are allowed.")
         );
-        if (hasValue) {
-          rows.push(rowData);
-        }
-      });
+        return;
+      }
       const validRows = [];
       const invalidRows = [];
       rows.forEach((row, index) => {
@@ -19479,9 +19592,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 = {};
@@ -19489,15 +19602,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
       });
-      import_fs2.default.unlink(req.file.path, () => {
+      import_fs2.default.unlink(path4, () => {
       });
     } catch (error) {
       import_node_server_utils87.logger.log({ level: "error", message: error.message });
@@ -19839,8 +19952,7 @@ function useVehicleController() {
     getVehiclesByNRIC,
     reactivateVehicleById,
     getAllVehiclesByUnitId,
-    // uploadCsvVehicles,
-    uploadExcelVehicles
+    uploadSpreadsheetVehicles
   };
 }
 
@@ -22249,11 +22361,6 @@ var KeyRepo = class {
     } else if (organization) {
       defaultQuery = { organization };
     }
-    console.log("key-query: ", {
-      ...defaultQuery,
-      ...searchQuery,
-      ...dateFilter
-    });
     try {
       const result = await this.collection().aggregate([
         {
@@ -22766,14 +22873,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 import_node_server_utils102.BadRequestError("This plate number is blocklisted");
         const dahuaQuery = {
           host,
           username,
           password,
           plateNumber: _plateNumber,
-          mode
+          mode: redlist
         };
         const raw = await _getPlateNumber(dahuaQuery);
         const parsed = parseDahuaFind(raw);
@@ -22783,7 +22904,7 @@ function useVisitorTransactionService() {
             username,
             password,
             plateNumber: _plateNumber,
-            mode,
+            mode: redlist,
             start: startDahuaDate,
             end: endDahuaDate,
             owner: value.name ?? "",
@@ -22819,7 +22940,7 @@ function useVisitorTransactionService() {
             password,
             plateNumber: _plateNumber,
             recno: parsed.recNo,
-            mode,
+            mode: redlist,
             start: startDahuaDate,
             end: endDahuaDate,
             owner: value.name ?? "",
@@ -22928,6 +23049,14 @@ function useVisitorTransactionService() {
         }
         value.passKeys = keptPassKeys;
       }
+      if (value.checkIn) {
+        const parsed = new Date(value.checkIn);
+        value.checkIn = isNaN(parsed.getTime()) ? null : parsed;
+      }
+      if (value.checkOut) {
+        const parsed = new Date(value.checkOut);
+        value.checkOut = isNaN(parsed.getTime()) ? null : parsed;
+      }
       await _updateVisitorTansactionById(id, value, session);
       await session?.commitTransaction();
       return "Successfully updated visitor transaction.";
@@ -23927,10 +24056,11 @@ function usePersonService() {
           email: value.email,
           password: hashedPassword,
           name: value.name,
+          status: value.platform == "mobile" ? "deleted" : "active",
           defaultOrg: value.org?.toString() || ""
         };
         const userId = await addUser(user, session);
-        value.user = userId;
+        value.user = userId.toString();
         let org = null;
         if (userId) {
           if (value?.org) {
@@ -24231,7 +24361,6 @@ function usePersonController() {
   }
   async function getPeopleByUnit(req, res, next) {
     const PERSON_TYPES3 = Object.values(PersonTypes);
-    console.log(req.query);
     try {
       const schema2 = import_joi58.default.object({
         unit: import_joi58.default.string().required(),
@@ -29512,7 +29641,7 @@ function useBulletinBoardController() {
       page: import_joi76.default.number().integer().min(1).allow("", null).default(1),
       limit: import_joi76.default.number().integer().min(1).max(100).allow("", null).default(10),
       sort: import_joi76.default.string().valid(...Object.values(BulletinSort)).default("_id" /* ID */),
-      order: import_joi76.default.string().valid(...Object.values(SortOrder)).default("asc" /* ASC */),
+      order: import_joi76.default.string().valid(...Object.values(SortOrder)).default("desc" /* DESC */),
       site: import_joi76.default.string().hex().length(24).required(),
       status: import_joi76.default.string().valid(...Object.values(BuildingStatus)).optional().default("active" /* ACTIVE */),
       recipients: import_joi76.default.alternatives().try(
@@ -32834,7 +32963,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,
@@ -32855,8 +32988,6 @@ async function removeAccessGroup({ cardNo, staffNo, url }) {
     });
     const response = await sendCommand(commands, url);
     const result = await (0, import_xml2js.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.");
     }
@@ -38569,7 +38700,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;
@@ -44209,6 +44339,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) {
+      import_node_server_utils197.logger.log({
+        level: "error",
+        message: error.message
+      });
+      throw new import_node_server_utils197.InternalServerError(
+        "Failed to create general indexes on manpower monitoring."
+      );
+    }
+  }
   async function createManpowerMonitoringSettings(value, session) {
     try {
       value = new MManpowerMonitoring(value);
@@ -44385,7 +44534,8 @@ function useManpowerMonitoringRepo() {
     getManpowerSettingsBySiteId,
     updateManpowerMonitoringSettings,
     multipleManpowerMonitoringSettings,
-    getAllSites
+    getAllSites,
+    createIndexes
   };
 }
 
@@ -44448,6 +44598,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) {
+      import_node_server_utils198.logger.log({
+        level: "error",
+        message: error.message
+      });
+      throw new import_node_server_utils198.InternalServerError(
+        "Failed to create general indexes on manpower remarks."
+      );
+    }
+  }
   async function createManpowerRemarks(value, session) {
     try {
       value = new MManpowerRemarks(value);
@@ -44570,7 +44739,8 @@ function useManpowerRemarksRepo() {
     getManpowerRemarksAllSite,
     getManpowerRemarksBySiteId,
     updateManpowerRemarks,
-    updateRemarksStatus
+    updateRemarksStatus,
+    createIndexes
   };
 }
 
@@ -44582,7 +44752,6 @@ function useManpowerMonitoringSrvc() {
   } = useManpowerMonitoringRepo();
   const { createManpowerRemarks: _createManpowerRemarks } = useManpowerRemarksRepo();
   async function createManpowerMonitoringSettings(payload) {
-    console.log("Im here now at service");
     const session = import_node_server_utils199.useAtlas.getClient()?.startSession();
     if (!session) {
       throw new import_node_server_utils199.BadRequestError("Database session not available.");
@@ -44598,7 +44767,6 @@ function useManpowerMonitoringSrvc() {
     const afternoonAlertTime = afternoonCheckInTime ? import_moment_timezone3.default.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
     const nightAlertTime = import_moment_timezone3.default.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
     const nowSGT = (0, import_moment_timezone3.default)().tz("Asia/Singapore");
-    console.log("im done preparing the payload");
     try {
       const remarksPayload = {
         siteId: payload.siteId,
@@ -44757,7 +44925,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 import_node_server_utils200.BadRequestError(error.message));
@@ -44860,6 +45027,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) {
+      import_node_server_utils201.logger.log({
+        level: "error",
+        message: error.message
+      });
+      throw new import_node_server_utils201.InternalServerError(
+        "Failed to create general indexes on manpower designations."
+      );
+    }
+  }
   async function createManpowerDesignations(value) {
     try {
       value = new MManpowerDesignations(value);
@@ -44915,7 +45101,8 @@ function useManpowerDesignationRepo() {
   return {
     createManpowerDesignations,
     getManpowerDesignationsBySiteId,
-    updateManpowerDesignations
+    updateManpowerDesignations,
+    createIndexes
   };
 }