@7365admin1/core 2.15.0 → 2.16.0

package/dist/index.mjs

@@ -10906,7 +10906,7 @@ function useFeedbackController() {
   }
   async function deleteFeedback(req, res, next) {
     const validation = Joi28.string().hex().required();
-    const _id = req.query.id;
+    const _id = req.params.id;
     const { error } = validation.validate(_id);
     if (error) {
       logger39.log({ level: "error", message: error.message });
@@ -11270,8 +11270,7 @@ function useWorkOrderController() {
   }
   async function deleteWorkOrder(req, res, next) {
     const validation = Joi29.string().hex().required();
-    const _id = req.query.id;
-    console.log(_id);
+    const _id = req.params.id;
     const { error } = validation.validate(_id);
     if (error) {
       logger40.log({ level: "error", message: error.message });
@@ -15071,11 +15070,14 @@ function usePersonRepo() {
   const namespace_collection = "site.people";
   const collection = db.collection(namespace_collection);
   const { delNamespace, getCache, setCache } = useCache27(namespace_collection);
-  async function createIndex() {
+  async function createIndexes() {
     try {
-      await collection.createIndex([{ nric: 1 }, { contact: 1 }]);
+      await collection.createIndexes([
+        { key: { contact: 1 } },
+        { key: { nric: 1 } }
+      ]);
     } catch (error) {
-      throw new InternalServerError27("Failed to create index.");
+      throw new InternalServerError27("Failed to create index on site people.");
     }
   }
   async function createTextIndex() {
@@ -15465,6 +15467,47 @@ function usePersonRepo() {
       throw new InternalServerError27("Failed to fetch people by plate number.");
     }
   }
+  async function getPeopleByNRIC({
+    page = 1,
+    limit = 10,
+    nric = "",
+    sort = {},
+    site = ""
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const normalizedNric = nric.trim();
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    const query = {
+      ...nric && { nric: normalizedNric },
+      site: typeof site === "string" ? new ObjectId44(site) : site
+    };
+    const cacheOptions = {
+      site,
+      ...nric && { nric: normalizedNric },
+      page: String(page),
+      limit: String(limit),
+      sort: JSON.stringify(sort)
+    };
+    try {
+      const cacheKey = makeCacheKey25(namespace_collection, cacheOptions);
+      const cachedData = await getCache(cacheKey);
+      if (cachedData) {
+        logger60.info(`Cache hit for key: ${cacheKey}`);
+        return cachedData;
+      }
+      const items = await collection.find(query).sort(sort).skip(page * limit).limit(limit).toArray();
+      const length = await collection.countDocuments(query);
+      const data = paginate20(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        logger60.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger60.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw new InternalServerError27("Failed to retrieve person by NRIC.");
+    }
+  }
   return {
     add,
     getAll,
@@ -15474,11 +15517,12 @@ function usePersonRepo() {
     createTextIndex,
     getPersonByPlateNumber,
     getByNRIC,
-    createIndex,
+    createIndexes,
     getPersonByPhoneNumber,
     getPeopleByUnit,
     getCompany,
-    getPeopleByPlateNumber
+    getPeopleByPlateNumber,
+    getPeopleByNRIC
   };
 }
 
@@ -15527,7 +15571,15 @@ var ANPRMode = /* @__PURE__ */ ((ANPRMode2) => {
   return ANPRMode2;
 })(ANPRMode || {});
 var vehicleSchema = Joi43.object({
-  plateNumber: Joi43.string().required(),
+  plateNumber: Joi43.alternatives().try(
+    Joi43.array().items(Joi43.string().trim().min(1)).min(1),
+    Joi43.string().trim().min(1)
+  ).custom((value) => {
+    if (typeof value === "string") {
+      return value.split(",").map((p) => p.trim()).filter(Boolean);
+    }
+    return value;
+  }).required(),
   type: Joi43.string().required().valid(...Object.values(VehicleType)),
   category: Joi43.string().required().valid(...Object.values(VehicleCategory)),
   name: Joi43.string().required(),
@@ -15661,19 +15713,9 @@ function useVehicleRepo() {
       await collection.createIndexes([
         { key: { status: 1 } },
         { key: { type: 1 } },
-        { key: { category: 1 } },
-        {
-          key: { nric: 1 },
-          name: "uniq_nric_not_deleted_nonempty",
-          unique: true,
-          partialFilterExpression: {
-            nric: { $type: "string", $gt: "" },
-            deletedAt: ""
-          }
-        }
+        { key: { category: 1 } }
       ]);
     } catch (error) {
-      console.error("createIndexes error:", error);
       throw new InternalServerError28("Failed to create index on vehicle.");
     }
   }
@@ -15731,14 +15773,14 @@ function useVehicleRepo() {
     const baseQuery = {
       ...status && { status },
       ...type && { type },
-      ...type && { type }
+      ...category && { category }
     };
     let query = { ...baseQuery };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
       ...status && { status },
       ...type && { type },
-      ...type && { type },
+      ...category && { category },
       page: String(page),
       limit: String(limit),
       sort: JSON.stringify(sort)
@@ -15754,47 +15796,130 @@ function useVehicleRepo() {
       return cachedData;
     }
     const escapeRegex = (input) => input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    try {
-      let items = [];
-      let length = 0;
-      items = await collection.aggregate([
-        { $match: query },
-        { $sort: sort },
-        { $skip: page * limit },
-        { $limit: limit },
-        {
-          $lookup: {
-            from: "building-units",
-            localField: "unit",
-            foreignField: "_id",
-            as: "units",
-            pipeline: [{ $project: { name: 1 } }]
+    const buildGroupedPipeline = (matchQuery) => [
+      { $match: matchQuery },
+      {
+        $lookup: {
+          from: "building-units",
+          localField: "unit",
+          foreignField: "_id",
+          as: "units",
+          pipeline: [{ $project: { name: 1 } }]
+        }
+      },
+      { $unwind: { path: "$units", preserveNullAndEmptyArrays: true } },
+      {
+        $project: {
+          _id: 1,
+          name: 1,
+          type: 1,
+          category: 1,
+          status: 1,
+          phoneNumber: 1,
+          block: 1,
+          level: 1,
+          unit: "$units.name",
+          recNo: 1,
+          nric: 1,
+          plateNumber: 1
+        }
+      },
+      {
+        $group: {
+          _id: {
+            $cond: [
+              {
+                $and: [{ $ne: ["$nric", null] }, { $ne: ["$nric", ""] }]
+              },
+              {
+                nric: "$nric",
+                block: "$block",
+                level: "$level",
+                unit: "$unit"
+              },
+              "$_id"
+            ]
+          },
+          vehicleId: { $first: "$_id" },
+          name: { $first: "$name" },
+          category: { $first: "$category" },
+          phoneNumber: { $first: "$phoneNumber" },
+          block: { $first: "$block" },
+          level: { $first: "$level" },
+          unit: { $first: "$unit" },
+          nric: { $first: "$nric" },
+          plates: {
+            $addToSet: {
+              plateNumber: "$plateNumber",
+              recNo: "$recNo",
+              status: "$status",
+              type: "$type"
+            }
           }
-        },
-        { $unwind: { path: "$units", preserveNullAndEmptyArrays: true } },
-        {
-          $project: {
-            name: 1,
-            type: 1,
-            category: 1,
-            status: 1,
-            phoneNumber: 1,
-            block: 1,
-            level: 1,
-            unit: "$units.name",
-            plateNumber: 1,
-            recNo: 1,
-            nric: 1
+        }
+      },
+      {
+        $project: {
+          _id: "$vehicleId",
+          name: 1,
+          type: 1,
+          category: 1,
+          status: 1,
+          phoneNumber: 1,
+          block: 1,
+          level: 1,
+          unit: 1,
+          nric: 1,
+          plates: {
+            $filter: {
+              input: "$plates",
+              as: "plate",
+              cond: {
+                $and: [
+                  { $ne: ["$$plate.plateNumber", null] },
+                  { $ne: ["$$plate.plateNumber", ""] }
+                ]
+              }
+            }
           }
         }
-      ]).toArray();
-      length = await collection.countDocuments(query);
+      },
+      { $sort: sort },
+      { $skip: page * limit },
+      { $limit: limit }
+    ];
+    const buildGroupedCountPipeline = (matchQuery) => [
+      { $match: matchQuery },
+      {
+        $group: {
+          _id: {
+            $cond: [
+              {
+                $and: [{ $ne: ["$nric", null] }, { $ne: ["$nric", ""] }]
+              },
+              {
+                nric: "$nric",
+                block: "$block",
+                level: "$level",
+                unit: "$unit"
+              },
+              "$_id"
+            ]
+          }
+        }
+      },
+      { $count: "total" }
+    ];
+    try {
+      let items = [];
+      let length = 0;
+      items = await collection.aggregate(buildGroupedPipeline(query)).toArray();
+      const countResult = await collection.aggregate(buildGroupedCountPipeline(query)).toArray();
+      length = countResult[0]?.total || 0;
       if ((!items || items.length === 0) && search) {
         const escaped = escapeRegex(search);
         const regexQuery = {
           ...baseQuery,
-          ...type && { type },
-          ...category && { category },
           $or: [
             { name: { $regex: escaped, $options: "i" } },
             { plateNumber: { $regex: escaped, $options: "i" } },
@@ -15805,38 +15930,9 @@ function useVehicleRepo() {
             { nric: { $regex: escaped, $options: "i" } }
           ]
         };
-        items = await collection.aggregate([
-          { $match: regexQuery },
-          { $sort: sort },
-          { $skip: page * limit },
-          { $limit: limit },
-          {
-            $lookup: {
-              from: "building-units",
-              localField: "unit",
-              foreignField: "_id",
-              as: "units",
-              pipeline: [{ $project: { name: 1 } }]
-            }
-          },
-          { $unwind: { path: "$units", preserveNullAndEmptyArrays: true } },
-          {
-            $project: {
-              name: 1,
-              type: 1,
-              category: 1,
-              status: 1,
-              phoneNumber: 1,
-              block: 1,
-              level: 1,
-              unit: "$units.name",
-              plateNumber: 1,
-              recNo: 1,
-              nric: 1
-            }
-          }
-        ]).toArray();
-        length = await collection.countDocuments(regexQuery);
+        items = await collection.aggregate(buildGroupedPipeline(regexQuery)).toArray();
+        const regexCountResult = await collection.aggregate(buildGroupedCountPipeline(regexQuery)).toArray();
+        length = regexCountResult[0]?.total || 0;
       }
       const data = paginate21(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => logger62.info(`Cache set for key: ${cacheKey}`)).catch(
@@ -15914,43 +16010,176 @@ function useVehicleRepo() {
       }
       const data = await collection.aggregate([
         { $match: { _id } },
+        { $limit: 1 },
+        {
+          $project: {
+            _id: 1,
+            nric: 1,
+            block: 1,
+            level: 1,
+            unit: 1
+          }
+        },
         {
           $lookup: {
-            from: "building-units",
-            localField: "unit",
-            foreignField: "_id",
-            as: "units",
-            pipeline: [{ $project: { name: 1 } }]
+            from: collection.collectionName,
+            let: {
+              vehicleId: "$_id",
+              vehicleNric: "$nric",
+              vehicleBlock: "$block",
+              vehicleLevel: "$level",
+              vehicleUnit: "$unit"
+            },
+            pipeline: [
+              {
+                $match: {
+                  $expr: {
+                    $cond: [
+                      {
+                        $and: [
+                          { $ne: ["$$vehicleNric", null] },
+                          { $ne: ["$$vehicleNric", ""] }
+                        ]
+                      },
+                      {
+                        $and: [
+                          { $eq: ["$nric", "$$vehicleNric"] },
+                          { $eq: ["$block", "$$vehicleBlock"] },
+                          { $eq: ["$level", "$$vehicleLevel"] },
+                          { $eq: ["$unit", "$$vehicleUnit"] }
+                        ]
+                      },
+                      { $eq: ["$_id", "$$vehicleId"] }
+                    ]
+                  }
+                }
+              },
+              {
+                $lookup: {
+                  from: "building-units",
+                  localField: "unit",
+                  foreignField: "_id",
+                  as: "units",
+                  pipeline: [{ $project: { name: 1 } }]
+                }
+              },
+              {
+                $unwind: { path: "$units", preserveNullAndEmptyArrays: true }
+              },
+              {
+                $project: {
+                  _id: 1,
+                  name: 1,
+                  phoneNumber: 1,
+                  plateNumber: 1,
+                  nric: 1,
+                  block: 1,
+                  level: 1,
+                  rawUnit: "$unit",
+                  unit: "$units.name",
+                  type: 1,
+                  category: 1,
+                  status: 1,
+                  recNo: 1,
+                  start: 1,
+                  end: 1,
+                  seasonPassType: 1
+                }
+              },
+              {
+                $group: {
+                  _id: {
+                    $cond: [
+                      {
+                        $and: [
+                          { $ne: ["$nric", null] },
+                          { $ne: ["$nric", ""] }
+                        ]
+                      },
+                      {
+                        nric: "$nric",
+                        block: "$block",
+                        level: "$level",
+                        unit: "$unit"
+                      },
+                      "$_id"
+                    ]
+                  },
+                  vehicleId: { $first: "$_id" },
+                  name: { $first: "$name" },
+                  category: { $first: "$category" },
+                  phoneNumber: { $first: "$phoneNumber" },
+                  block: { $first: "$block" },
+                  level: { $first: "$level" },
+                  unit: { $first: "$unit" },
+                  nric: { $first: "$nric" },
+                  start: { $first: "$start" },
+                  end: { $first: "$end" },
+                  seasonPassType: { $first: "$seasonPassType" },
+                  plates: {
+                    $addToSet: {
+                      plateNumber: "$plateNumber",
+                      recNo: "$recNo",
+                      status: "$status",
+                      type: "$type"
+                    }
+                  }
+                }
+              },
+              {
+                $project: {
+                  _id: "$vehicleId",
+                  name: 1,
+                  phoneNumber: 1,
+                  nric: 1,
+                  block: 1,
+                  level: 1,
+                  unit: 1,
+                  type: 1,
+                  category: 1,
+                  status: 1,
+                  start: 1,
+                  end: 1,
+                  seasonPassType: 1,
+                  plates: {
+                    $filter: {
+                      input: "$plates",
+                      as: "plate",
+                      cond: {
+                        $and: [
+                          { $ne: ["$$plate.plateNumber", null] },
+                          { $ne: ["$$plate.plateNumber", ""] }
+                        ]
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            as: "vehicle"
           }
         },
-        { $unwind: { path: "$units", preserveNullAndEmptyArrays: true } },
         {
           $project: {
-            name: 1,
-            phoneNumber: 1,
-            plateNumber: 1,
-            block: 1,
-            level: 1,
-            unit: "$units.name",
-            type: 1,
-            category: 1,
-            status: 1,
-            recNo: 1,
-            start: 1,
-            end: 1,
-            seasonPassType: 1
+            vehicle: { $arrayElemAt: ["$vehicle", 0] }
+          }
+        },
+        {
+          $replaceRoot: {
+            newRoot: "$vehicle"
           }
         }
       ]).toArray();
       if (!data || !data.length) {
         throw new NotFoundError19("Vehicle not found.");
       }
-      setCache(cacheKey, data[0], 15 * 60).then(() => {
+      const result = data[0];
+      setCache(cacheKey, result, 15 * 60).then(() => {
         logger62.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
         logger62.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
-      return data[0];
+      return result;
     } catch (error) {
       throw error;
     }
@@ -16084,36 +16313,34 @@ function useVehicleRepo() {
   async function getVehiclesByNRIC({
     page = 1,
     limit = 10,
-    search = "",
+    nric = "",
     sort = {}
   }) {
     page = page > 0 ? page - 1 : 0;
-    const baseQuery = {
-      deletedAt: ""
+    if (!nric) {
+      throw new BadRequestError78("NRIC is required.");
+    }
+    const _nric = nric.trim();
+    const query = {
+      deletedAt: "",
+      nric: _nric
     };
-    let query = { ...baseQuery };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
       deletedAt: "",
+      nric: _nric,
       page: String(page),
       limit: String(limit),
       sort: JSON.stringify(sort)
     };
-    if (search) {
-      query.$text = { $search: search };
-      cacheOptions.search = search;
-    }
     const cacheKey = makeCacheKey26(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger62.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
-    const escapeRegex = (input) => input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     try {
-      let items = [];
-      let length = 0;
-      items = await collection.aggregate([
+      const items = await collection.aggregate([
         { $match: query },
         { $sort: sort },
         { $skip: page * limit },
@@ -16130,37 +16357,7 @@ function useVehicleRepo() {
           }
         }
       ]).toArray();
-      length = await collection.countDocuments(query);
-      if ((!items || items.length === 0) && search) {
-        const escaped = escapeRegex(search);
-        const regexQuery = {
-          ...baseQuery,
-          $or: [
-            { name: { $regex: escaped, $options: "i" } },
-            { plateNumber: { $regex: escaped, $options: "i" } },
-            { level: { $regex: escaped, $options: "i" } },
-            { nric: { $regex: escaped, $options: "i" } }
-          ]
-        };
-        items = await collection.aggregate([
-          { $match: regexQuery },
-          { $sort: sort },
-          { $skip: page * limit },
-          { $limit: limit },
-          {
-            $project: {
-              name: 1,
-              phoneNumber: 1,
-              plateNumber: 1,
-              recNo: 1,
-              nric: 1,
-              status: 1,
-              type: 1
-            }
-          }
-        ]).toArray();
-        length = await collection.countDocuments(regexQuery);
-      }
+      const length = await collection.countDocuments(query);
       const data = paginate21(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => logger62.info(`Cache set for key: ${cacheKey}`)).catch(
         (err) => logger62.error(`Failed to set cache for key: ${cacheKey}`, err)
@@ -16620,7 +16817,7 @@ function useDahuaService() {
         host: value.host,
         username: value.username,
         password: value.password,
-        endpoint: `/cgi-bin/recordUpdater.cgi?action=insert&name=${value.mode}&PlateNumber=${value.plateNumber}&BeginTime=${value.start}&CancelTime=${value.end}&OpenGate=true&MasterOfCar=${value.owner}`
+        endpoint: `/cgi-bin/recordUpdater.cgi?action=insert&name=${value.mode}&PlateNumber=${value.plateNumber}&BeginTime=${value.start}&CancelTime=${value.end}&+OpenGate=true&MasterOfCar=${value.owner}`
       });
       return response;
     } catch (error2) {
@@ -16692,8 +16889,9 @@ function useVehicleService() {
   const { getById: _getById } = useOrgRepo();
   async function add(value) {
     const session = useAtlas39.getClient()?.startSession();
-    if (!session)
+    if (!session) {
       throw new Error("Unable to start session for vehicle service.");
+    }
     const org = await _getById(value.org);
     if (!org)
       throw new BadRequestError80("Org not found");
@@ -16741,11 +16939,12 @@ function useVehicleService() {
       }
     }
     const owner = String(value.name ?? "").substring(0, 15);
+    const plateNumbers = value.plateNumber;
     try {
       session.startTransaction();
       let message = "Vehicle plate number needs approval from property management.";
+      let siteCameras = [];
       if (value.status && value.status !== "pending" /* PENDING */) {
-        const siteCameras = [];
         let page = 1;
         let pages = 1;
         const limit = 20;
@@ -16760,40 +16959,44 @@ function useVehicleService() {
           pages = siteCameraReq.pages || 1;
           siteCameras.push(...siteCameraReq.items);
           page++;
-        } while (page < pages);
-        if (!siteCameras.length)
+        } while (page <= pages);
+        if (!siteCameras.length) {
           throw new BadRequestError80("No site cameras found.");
-        for (const camera of siteCameras) {
-          const { host, username, password } = camera;
-          const dahuaPayload = {
-            host,
-            username,
-            password,
-            plateNumber: value.plateNumber,
-            mode: _mode,
-            owner,
-            ...startDateDahua ? { start: startDateDahua } : "",
-            ...endDateDahua ? { end: endDateDahua } : ""
-          };
-          const dahuaResponse = await _addPlateNumber(dahuaPayload);
-          if (dahuaResponse?.statusCode !== 200) {
-            throw new BadRequestError80(
-              `Failed to add plate number to ANPR ${_type}`
-            );
+        }
+      }
+      for (const plateNumber of plateNumbers) {
+        const vehicleValue = {
+          ...value,
+          plateNumber,
+          start,
+          end
+        };
+        if (vehicleValue.status && vehicleValue.status !== "pending" /* PENDING */) {
+          for (const camera of siteCameras) {
+            const { host, username, password } = camera;
+            const dahuaPayload = {
+              host,
+              username,
+              password,
+              plateNumber,
+              mode: _mode,
+              owner,
+              ...startDateDahua ? { start: startDateDahua } : {},
+              ...endDateDahua ? { end: endDateDahua } : {}
+            };
+            const dahuaResponse = await _addPlateNumber(dahuaPayload);
+            if (dahuaResponse?.statusCode !== 200) {
+              throw new BadRequestError80(
+                `Failed to add plate number to ANPR ${_type}`
+              );
+            }
+            const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
+            vehicleValue.recNo = responseData.split("=")[1]?.trim();
           }
-          const responseData = dahuaResponse?.data.toString("utf-8");
-          value.recNo = responseData.split("=")[1]?.trim();
           message = `Vehicle plate number added to ${_type} successfully.`;
         }
+        await _add(vehicleValue, session);
       }
-      const formattedValue = {
-        ...value,
-        start,
-        // ISO string or ""
-        end
-        // ISO string or ""
-      };
-      await _add(formattedValue, session);
       await session.commitTransaction();
       return message;
     } catch (error) {
@@ -16998,14 +17201,14 @@ function useVehicleController() {
   } = useVehicleRepo();
   async function add(req, res, next) {
     const payload = req.body;
-    const { error } = vehicleSchema.validate(payload);
+    const { error, value } = vehicleSchema.validate(payload);
     if (error) {
       logger65.log({ level: "error", message: error.message });
       next(new BadRequestError81(error.message));
       return;
     }
     try {
-      const data = await _add(payload);
+      const data = await _add(value);
       res.status(201).json({
         message: "Vehicle added successfully.",
         data
@@ -17025,9 +17228,9 @@ function useVehicleController() {
       limit: Joi46.number().integer().min(1).max(100).allow("", null).default(10),
       sort: Joi46.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
       order: Joi46.string().pattern(/^(asc|desc)(,(asc|desc))*$/).optional().allow("", ...allowedOrder),
-      type: Joi46.string().optional().valid(...Object.values(VehicleType)),
-      category: Joi46.string().optional().valid(...Object.values(VehicleCategory)),
-      status: Joi46.string().optional().valid(...Object.values(VehicleStatus)).allow("")
+      type: Joi46.string().optional().valid(...Object.values(VehicleType)).allow(null, ""),
+      category: Joi46.string().optional().valid(...Object.values(VehicleCategory)).allow(null, ""),
+      status: Joi46.string().optional().valid(...Object.values(VehicleStatus)).allow(null, "")
     });
     const query = { ...req.query };
     const { error } = validation.validate(query);
@@ -17192,7 +17395,7 @@ function useVehicleController() {
     const allowedFields = ["start", "end"];
     const allowedOrder = ["asc", "desc"];
     const validation = Joi46.object({
-      search: Joi46.string().optional().allow("", null),
+      nric: Joi46.string().optional().allow("", null),
       page: Joi46.number().integer().min(1).allow("", null).default(1),
       limit: Joi46.number().integer().min(1).max(100).allow("", null).default(10),
       sort: Joi46.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
@@ -17205,7 +17408,7 @@ function useVehicleController() {
       next(new BadRequestError81(error.message));
       return;
     }
-    const search = req.query.search ?? "";
+    const nric = req.query.nric ?? "";
     const page = parseInt(req.query.page ?? "1");
     const limit = parseInt(req.query.limit ?? "10");
     const sortObj = {};
@@ -17219,7 +17422,7 @@ function useVehicleController() {
     });
     try {
       const data = await _getVehiclesByNRIC({
-        search,
+        nric,
         page,
         limit,
         sort: sortObj
@@ -19868,25 +20071,15 @@ function usePersonService() {
   }
   async function plateValidity(value) {
     const now = /* @__PURE__ */ new Date();
-    if (value.type !== "resident" && value.type !== "tenant") {
-      return { start: "", end: "" };
-    }
-    if (value.type === "resident") {
+    if (["resident" /* RESIDENT */, "tenant" /* TENANT */].includes(
+      value?.type
+    )) {
       const end = new Date(now);
       end.setFullYear(end.getFullYear() + 10);
-      return { start: now.toISOString(), end: end.toISOString() };
-    }
-    if (value.type == "tenant") {
-      const unit = await _getUnitById(value.unit?.toString() || "");
-      if (!unit) {
-        throw new BadRequestError97("Building unit not found for tenant.");
-      }
-      if (unit.leaseStart && unit.leaseEnd) {
-        return {
-          start: new Date(unit.leaseStart).toISOString(),
-          end: new Date(unit.leaseEnd).toISOString()
-        };
-      }
+      return {
+        start: now.toISOString(),
+        end: end.toISOString()
+      };
     }
     return { start: "", end: "" };
   }
@@ -19905,7 +20098,8 @@ function usePersonController() {
     getPersonByPhoneNumber: _getPersonByPhoneNumber,
     getPeopleByUnit: _getPeopleByUnit,
     getCompany: _getCompany,
-    getPeopleByPlateNumber: _getPeopleByPlateNumber
+    getPeopleByPlateNumber: _getPeopleByPlateNumber,
+    getPeopleByNRIC: _getPeopleByNRIC
   } = usePersonRepo();
   const { add: _add, updateById: _updateById } = usePersonService();
   async function add(req, res, next) {
@@ -20140,6 +20334,53 @@ function usePersonController() {
       return;
     }
   }
+  async function getPeopleByNRIC(req, res, next) {
+    const allowedFields = ["start", "end"];
+    const allowedOrder = ["asc", "desc"];
+    const validation = Joi58.object({
+      nric: Joi58.string().optional().allow("", null),
+      page: Joi58.number().integer().min(1).allow("", null).default(1),
+      limit: Joi58.number().integer().min(1).max(100).allow("", null).default(10),
+      sort: Joi58.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
+      order: Joi58.string().pattern(/^(asc|desc)(,(asc|desc))*$/).optional().allow("", ...allowedOrder),
+      site: Joi58.string().hex().length(24).required()
+    });
+    const query = { ...req.query };
+    const { error } = validation.validate(query);
+    if (error) {
+      logger81.log({ level: "error", message: error.message });
+      next(new BadRequestError98(error.message));
+      return;
+    }
+    const nric = req.query.nric ?? "";
+    const page = parseInt(req.query.page ?? "1");
+    const limit = parseInt(req.query.limit ?? "10");
+    const site = req.query.site ?? "";
+    const sortObj = {};
+    const sortFields = String(req.query.sort).split(",");
+    const sortOrders = String(req.query.order).split(",");
+    sortFields.forEach((field, index) => {
+      if (allowedFields.includes(field)) {
+        const order = sortOrders[index] === "asc" ? 1 : -1;
+        sortObj[field] = order;
+      }
+    });
+    try {
+      const data = await _getPeopleByNRIC({
+        nric,
+        page,
+        limit,
+        sort: sortObj,
+        site
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger81.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
@@ -20149,7 +20390,8 @@ function usePersonController() {
     getPersonByPhoneNumber,
     getPeopleByUnit,
     getCompany,
-    getPeopleByPlateNumber
+    getPeopleByPlateNumber,
+    getPeopleByNRIC
   };
 }
 
@@ -29417,7 +29659,8 @@ function UseAccessManagementRepo() {
       const query = {
         site: siteId,
         assignedUnit: { $ne: null },
-        type: "NFC" /* NFC */
+        type: "NFC" /* NFC */,
+        isActivated: true
       };
       if (search) {
         query.$or = [{ accessLevel: { $regex: search, $options: "i" } }, { cardNo: { $regex: search, $options: "i" } }];
@@ -29425,7 +29668,7 @@ function UseAccessManagementRepo() {
       if (type) {
         query.userType = type;
       } else {
-        query.userType = { $ne: "Resident/Tenant" /* RESIDENT */ };
+        query.userType = { $ne: "Visitor/Resident" /* DEFAULT */ };
       }
       const res = await collection().aggregate([
         {
@@ -29799,6 +30042,52 @@ function UseAccessManagementRepo() {
       throw new Error(error.message);
     }
   }
+  async function addQrTagRepo(params) {
+    try {
+      const { site, payload } = params;
+      const id = new ObjectId83(site);
+      const highestCardNo = await collection().aggregate([
+        { $match: { site: id, type: "NFC" /* NFC */, userType: "Visitor/Resident" /* DEFAULT */ } },
+        {
+          $addFields: {
+            qrTagCardNoNumeric: { $toInt: "$qrTagCardNo" }
+            // Convert string to integer
+          }
+        },
+        {
+          $sort: { qrTagCardNoNumeric: -1 }
+          // Sort in descending order
+        },
+        {
+          $limit: 1
+          // Get the highest
+        }
+      ]).toArray();
+      let start = 0;
+      if (highestCardNo.length > 0) {
+        start = highestCardNo[0].qrTagCardNoNumeric || 0;
+      }
+      const nextCardNumbers = Array.from({ length: payload.length }, (_, i) => String(start + i + 1).padStart(5, "0"));
+      const bulkOps = await Promise.all(
+        payload.map(async (doc, index) => {
+          const id2 = new ObjectId83(doc._id);
+          return {
+            updateOne: {
+              filter: { _id: id2 },
+              update: { $set: { qrTag: doc.qrTag, qrTagCardNo: nextCardNumbers[index] } }
+            }
+          };
+        })
+      );
+      let result;
+      if (bulkOps.length > 0) {
+        result = await collection().bulkWrite(bulkOps);
+      }
+      return result;
+    } catch (error) {
+      throw new Error(error.message);
+    }
+  }
   return {
     createIndexes,
     createIndexForEntrypass,
@@ -29821,7 +30110,8 @@ function UseAccessManagementRepo() {
     bulkPhysicalAccessCardRepo,
     assignAccessCardToUnitRepo,
     deleteCardRepo,
-    getCardDetailsRepo
+    getCardDetailsRepo,
+    addQrTagRepo
   };
 }
 
@@ -29855,7 +30145,8 @@ function useAccessManagementSvc() {
     bulkPhysicalAccessCardRepo,
     assignAccessCardToUnitRepo,
     deleteCardRepo,
-    getCardDetailsRepo
+    getCardDetailsRepo,
+    addQrTagRepo
   } = UseAccessManagementRepo();
   const addPhysicalCardSvc = async (payload) => {
     try {
@@ -30119,6 +30410,14 @@ function useAccessManagementSvc() {
       throw new Error(err.message);
     }
   };
+  const addQrTagSvc = async (params) => {
+    try {
+      const response = await addQrTagRepo({ ...params });
+      return response;
+    } catch (err) {
+      throw new Error(err.message);
+    }
+  };
   return {
     addPhysicalCardSvc,
     addNonPhysicalCardSvc,
@@ -30145,7 +30444,8 @@ function useAccessManagementSvc() {
     bulkPhysicalAccessCardSvc,
     assignAccessCardToUnitSvc,
     deleteCardSvc,
-    getCardDetailsSvc
+    getCardDetailsSvc,
+    addQrTagSvc
   };
 }
 
@@ -30179,7 +30479,8 @@ function useAccessManagementController() {
     bulkPhysicalAccessCardSvc,
     assignAccessCardToUnitSvc,
     deleteCardSvc,
-    getCardDetailsSvc
+    getCardDetailsSvc,
+    addQrTagSvc
   } = useAccessManagementSvc();
   const addPhysicalCard = async (req, res) => {
     try {
@@ -30790,6 +31091,34 @@ function useAccessManagementController() {
       });
     }
   };
+  const addQrTag = async (req, res) => {
+    try {
+      const payload = req.body;
+      const site = req.params.site;
+      const schema2 = Joi85.object({
+        site: Joi85.string().hex().required(),
+        payload: Joi85.array().items(
+          Joi85.object({
+            _id: Joi85.string().hex().required(),
+            cardNo: Joi85.string().required(),
+            qrTag: Joi85.string().required(),
+            qrTagCardNo: Joi85.string().required()
+          })
+        ).required()
+      });
+      const { error } = schema2.validate({ site, payload });
+      if (error) {
+        return res.status(400).json({ message: error.message });
+      }
+      const result = await addQrTagSvc({ payload, site });
+      return res.status(200).json({ message: "Success", data: result });
+    } catch (error) {
+      return res.status(500).json({
+        data: null,
+        message: error.message
+      });
+    }
+  };
   return {
     addPhysicalCard,
     addNonPhysicalCard,
@@ -30813,7 +31142,8 @@ function useAccessManagementController() {
     bulkPhysicalAccessCard,
     assignAccessCardToUnit,
     deleteCard,
-    getCardDetails
+    getCardDetails,
+    addQrTag
   };
 }