@7365admin1/core 2.14.0 → 2.16.0

package/dist/index.mjs

@@ -1388,7 +1388,9 @@ var schemaOccurrenceEntry = Joi5.object({
   subject: Joi5.string().hex().optional().allow(null, ""),
   occurrence: Joi5.string().optional().allow(null, ""),
   signature: Joi5.string().hex().optional().allow(null, ""),
-  incidentReportId: Joi5.string().hex().optional().allow(null, "")
+  incidentReportId: Joi5.string().hex().optional().allow(null, ""),
+  eSignature: Joi5.string().required(),
+  createdByName: Joi5.string().optional().allow(null, "")
 });
 var schemaUpdateOccurrenceEntry = Joi5.object({
   _id: Joi5.string().hex().required(),
@@ -1397,7 +1399,9 @@ var schemaUpdateOccurrenceEntry = Joi5.object({
   subject: Joi5.string().hex().optional().allow(null, ""),
   occurrence: Joi5.string().optional().allow(null, ""),
   signature: Joi5.string().hex().optional().allow(null, ""),
-  incidentReportId: Joi5.string().hex().optional().allow(null, "")
+  incidentReportId: Joi5.string().hex().optional().allow(null, ""),
+  eSignature: Joi5.string().required(),
+  createdByName: Joi5.string().optional().allow(null, "")
 });
 function MOccurrenceEntry(value) {
   if (value._id && typeof value._id === "string") {
@@ -1454,6 +1458,8 @@ function MOccurrenceEntry(value) {
     incidentReportId: value.incidentReportId,
     signature: value.signature,
     userName: value.userName,
+    eSignature: value.eSignature,
+    createdByName: value.createdByName,
     date: value.date,
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: value.updatedAt,
@@ -6424,12 +6430,12 @@ function useUserController() {
     }
   }
   async function createUserByVerification(req, res, next) {
-    const allowedTypes2 = ["user-sign-up", "user-invite"];
+    const allowedTypes = ["user-sign-up", "user-invite"];
     const validation = Joi14.object({
       id: Joi14.string().hex().required(),
       name: Joi14.string().required(),
       password: Joi14.string().required(),
-      type: Joi14.string().required().valid(...allowedTypes2)
+      type: Joi14.string().required().valid(...allowedTypes)
     });
     const id = req.params.id;
     const payload = { ...req.body };
@@ -10900,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 });
@@ -11264,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 });
@@ -15065,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() {
@@ -15459,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,
@@ -15468,11 +15517,12 @@ function usePersonRepo() {
     createTextIndex,
     getPersonByPlateNumber,
     getByNRIC,
-    createIndex,
+    createIndexes,
     getPersonByPhoneNumber,
     getPeopleByUnit,
     getCompany,
-    getPeopleByPlateNumber
+    getPeopleByPlateNumber,
+    getPeopleByNRIC
   };
 }
 
@@ -15493,12 +15543,45 @@ import {
 import { BadRequestError as BadRequestError77, logger as logger61 } from "@7365admin1/node-server-utils";
 import Joi43 from "joi";
 import { ObjectId as ObjectId45 } from "mongodb";
-var allowedTypes = ["whitelist", "blacklist"];
-var allowedCategories = ["resident", "visitor"];
+var VehicleType = /* @__PURE__ */ ((VehicleType2) => {
+  VehicleType2["WHITELIST"] = "whitelist";
+  VehicleType2["BLOCKLIST"] = "blocklist";
+  return VehicleType2;
+})(VehicleType || {});
+var VehicleCategory = /* @__PURE__ */ ((VehicleCategory2) => {
+  VehicleCategory2["RESIDENT"] = "resident";
+  VehicleCategory2["VISITOR"] = "visitor";
+  return VehicleCategory2;
+})(VehicleCategory || {});
+var VehicleStatus = /* @__PURE__ */ ((VehicleStatus2) => {
+  VehicleStatus2["PENDING"] = "pending";
+  VehicleStatus2["ACTIVE"] = "active";
+  VehicleStatus2["INACTIVE"] = "inactive";
+  VehicleStatus2["DELETED"] = "deleted";
+  return VehicleStatus2;
+})(VehicleStatus || {});
+var OrgNature = /* @__PURE__ */ ((OrgNature2) => {
+  OrgNature2["PROPERTY_MANAGEMENT_AGENCY"] = "property_management_agency";
+  OrgNature2["SECURITY_AGENCY"] = "security_agency";
+  return OrgNature2;
+})(OrgNature || {});
+var ANPRMode = /* @__PURE__ */ ((ANPRMode2) => {
+  ANPRMode2["TRAFFIC_REDLIST"] = "TrafficRedList";
+  ANPRMode2["TRAFFIC_BLACKLIST"] = "TrafficBlackList";
+  return ANPRMode2;
+})(ANPRMode || {});
 var vehicleSchema = Joi43.object({
-  plateNumber: Joi43.string().required(),
-  type: Joi43.string().required().allow(...allowedTypes),
-  category: Joi43.string().required().allow(...allowedCategories),
+  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(),
   phoneNumber: Joi43.string().optional().allow("", null),
   recNo: Joi43.string().optional().allow("", null),
@@ -15512,7 +15595,8 @@ var vehicleSchema = Joi43.object({
   seasonPassType: Joi43.string().optional().allow("", null),
   start: Joi43.date().optional().allow("", null),
   end: Joi43.date().optional().allow("", null),
-  unitName: Joi43.string().optional().allow("", null)
+  unitName: Joi43.string().optional().allow("", null),
+  status: Joi43.string().optional().valid(...Object.values(VehicleStatus)).allow("")
 });
 function MVehicle(value) {
   const { error } = vehicleSchema.validate(value);
@@ -15541,6 +15625,11 @@ function MVehicle(value) {
       throw new BadRequestError77("Invalid building unit ID format.");
     }
   }
+  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();
   return {
     plateNumber: value.plateNumber ?? "",
     type: value.type ?? "",
@@ -15556,11 +15645,11 @@ function MVehicle(value) {
     nric: value.nric ?? "",
     remarks: value.remarks ?? "",
     seasonPassType: value.seasonPassType ?? "",
-    start: value.start ?? "",
-    end: value.end ?? "",
-    status: value.status ?? "active",
+    start: value.start ?? createdAt,
+    end: value.end ?? expiredAt,
+    status: value.status ?? "active" /* ACTIVE */,
     unitName: value.unitName ?? "",
-    createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
+    createdAt,
     updatedAt: value.updatedAt ?? "",
     deletedAt: value.deletedAt ?? ""
   };
@@ -15618,7 +15707,7 @@ function useVehicleRepo() {
   }
   const namespace_collection = "vehicles";
   const collection = db.collection(namespace_collection);
-  const { delNamespace, setCache, getCache, delCache } = useCache28(namespace_collection);
+  const { delNamespace, setCache, getCache } = useCache28(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -15630,6 +15719,22 @@ function useVehicleRepo() {
       throw new InternalServerError28("Failed to create index on vehicle.");
     }
   }
+  async function createTextIndex() {
+    try {
+      await collection.createIndex({
+        name: "text",
+        plateNumber: "text",
+        level: "text",
+        unitName: "text",
+        phoneNumber: "text",
+        nric: "text"
+      });
+    } catch (error) {
+      throw new InternalServerError28(
+        "Failed to create text index on visitor transaction."
+      );
+    }
+  }
   async function add(value, session) {
     try {
       value = MVehicle(value);
@@ -15661,73 +15766,178 @@ function useVehicleRepo() {
     search = "",
     sort = {},
     type = "",
-    category = ""
+    category = "",
+    status = ""
   }) {
     page = page > 0 ? page - 1 : 0;
-    const query = { status: "active" };
+    const baseQuery = {
+      ...status && { status },
+      ...type && { type },
+      ...category && { category }
+    };
+    let query = { ...baseQuery };
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
-      status: "active",
+      ...status && { status },
+      ...type && { type },
+      ...category && { category },
       page: String(page),
-      limit: String(limit)
+      limit: String(limit),
+      sort: JSON.stringify(sort)
     };
-    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
-    cacheOptions.sort = JSON.stringify(sort);
     if (search) {
-      query.$or = [{ name: { $regex: search, $options: "i" } }];
+      query.$text = { $search: search };
       cacheOptions.search = search;
     }
-    if (type) {
-      query.type = type;
-      cacheOptions.type = type;
-    }
-    if (category) {
-      query.category = category;
-      cacheOptions.category = category;
-    }
     const cacheKey = makeCacheKey26(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger62.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
-    try {
-      const 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 escapeRegex = (input) => input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    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
+        }
+      },
+      {
+        $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();
-      const 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,
+          $or: [
+            { name: { $regex: escaped, $options: "i" } },
+            { plateNumber: { $regex: escaped, $options: "i" } },
+            { company: { $regex: escaped, $options: "i" } },
+            { level: { $regex: escaped, $options: "i" } },
+            { unitName: { $regex: escaped, $options: "i" } },
+            { contact: { $regex: escaped, $options: "i" } },
+            { nric: { $regex: escaped, $options: "i" } }
+          ]
+        };
+        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((err) => {
-        logger62.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
+      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)
+      );
       return data;
     } catch (error) {
       throw error;
@@ -15800,40 +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
+            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;
     }
@@ -15870,7 +16216,7 @@ function useVehicleRepo() {
       throw error2;
     }
   }
-  async function updateVehicle(_id, value) {
+  async function updateVehicle(_id, value, session) {
     try {
       _id = new ObjectId46(_id);
     } catch (error) {
@@ -15881,7 +16227,11 @@ function useVehicleRepo() {
         ...value,
         updatedAt: (/* @__PURE__ */ new Date()).toISOString()
       };
-      const res = await collection.updateOne({ _id }, { $set: updateValue });
+      const res = await collection.updateOne(
+        { _id },
+        { $set: updateValue },
+        { session }
+      );
       if (res.modifiedCount === 0) {
         throw new InternalServerError28("Unable to update vehicle.");
       }
@@ -15960,8 +16310,94 @@ function useVehicleRepo() {
       );
     }
   }
+  async function getVehiclesByNRIC({
+    page = 1,
+    limit = 10,
+    nric = "",
+    sort = {}
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    if (!nric) {
+      throw new BadRequestError78("NRIC is required.");
+    }
+    const _nric = nric.trim();
+    const query = {
+      deletedAt: "",
+      nric: _nric
+    };
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    const cacheOptions = {
+      deletedAt: "",
+      nric: _nric,
+      page: String(page),
+      limit: String(limit),
+      sort: JSON.stringify(sort)
+    };
+    const cacheKey = makeCacheKey26(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger62.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const items = await collection.aggregate([
+        { $match: query },
+        { $sort: sort },
+        { $skip: page * limit },
+        { $limit: limit },
+        {
+          $project: {
+            name: 1,
+            phoneNumber: 1,
+            plateNumber: 1,
+            recNo: 1,
+            nric: 1,
+            status: 1,
+            type: 1
+          }
+        }
+      ]).toArray();
+      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)
+      );
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function deleteExpiredVehicles(session) {
+    try {
+      const tenYearsAgo = /* @__PURE__ */ new Date();
+      tenYearsAgo.setFullYear(tenYearsAgo.getFullYear() - 10);
+      const res = await collection.updateMany(
+        {
+          status: { $ne: "deleted" },
+          end: { $exists: true, $lte: tenYearsAgo }
+          // check only end
+        },
+        { $set: { status: "deleted", deletedAt: /* @__PURE__ */ new Date() } },
+        { session }
+      );
+      if (res.modifiedCount === 0)
+        throw new InternalServerError28("Unable to delete vehicle.");
+      delNamespace().then(() => {
+        logger62.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger62.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return res.modifiedCount;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createIndex,
+    createTextIndex,
     add,
     getVehicles,
     getSeasonPassTypes,
@@ -15969,7 +16405,9 @@ function useVehicleRepo() {
     updateVehicle,
     deleteVehicle,
     getByPlaceNumber,
-    getVehicleByPlateNumber
+    getVehicleByPlateNumber,
+    getVehiclesByNRIC,
+    deleteExpiredVehicles
   };
 }
 
@@ -16355,7 +16793,7 @@ function useDahuaService() {
       username: Joi45.string().required(),
       password: Joi45.string().required(),
       plateNumber: Joi45.string().required(),
-      mode: Joi45.string().valid("TrafficBlackList", "TrafficRedList").required(),
+      mode: Joi45.string().valid(...Object.values(ANPRMode)).required(),
       start: Joi45.string().isoDate().optional().allow("", null),
       end: Joi45.string().isoDate().optional().allow("", null),
       owner: Joi45.string().optional().allow("", null)
@@ -16427,18 +16865,154 @@ import {
   logger as logger64,
   useAtlas as useAtlas39
 } from "@7365admin1/node-server-utils";
+function formatDahuaDate(date) {
+  const pad = (n) => String(n).padStart(2, "0");
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(
+    date.getDate()
+  )} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(
+    date.getSeconds()
+  )}`;
+}
 function useVehicleService() {
-  const { add: _add, deleteVehicle: _deleteVehicle } = useVehicleRepo();
+  const {
+    add: _add,
+    deleteVehicle: _deleteVehicle,
+    updateVehicle: _updateVehicle,
+    getVehicleById: _getVehicleById,
+    deleteExpiredVehicles: _deleteExpiredVehicles
+  } = useVehicleRepo();
   const {
     addPlateNumber: _addPlateNumber,
     removePlateNumber: _removePlateNumber
   } = useDahuaService();
   const { getAllCameraWithPassword: _getAllSiteCameras } = useSiteCameraRepo();
+  const { getById: _getById } = useOrgRepo();
   async function add(value) {
     const session = useAtlas39.getClient()?.startSession();
     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");
+    if (!Object.values(OrgNature).includes(org.nature)) {
+      throw new BadRequestError80(
+        "This organization is not allowed to add vehicles."
+      );
+    }
+    value.status = "active" /* ACTIVE */;
+    const addedBySecurity = org.nature === "security_agency" /* SECURITY_AGENCY */;
+    const addedByPM = org.nature === "property_management_agency" /* PROPERTY_MANAGEMENT_AGENCY */;
+    if (addedBySecurity)
+      value.status = "pending" /* PENDING */;
+    const isBlocklist = value.type === "blocklist" /* BLOCKLIST */;
+    if (isBlocklist)
+      value.status = "inactive" /* INACTIVE */;
+    const _type = value.type;
+    const _mode = isBlocklist ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */;
+    const hasStart = typeof value.start === "string" ? value.start.trim() !== "" : !!value.start;
+    const hasEnd = typeof value.end === "string" ? value.end.trim() !== "" : !!value.end;
+    let startDate = null;
+    let endDate = null;
+    let start = "";
+    let end = "";
+    let startDateDahua;
+    let endDateDahua;
+    if (addedByPM && !hasStart && !hasEnd) {
+      startDate = /* @__PURE__ */ new Date();
+      endDate = new Date(startDate);
+      endDate.setFullYear(endDate.getFullYear() + 10);
+      start = startDate.toISOString();
+      end = endDate.toISOString();
+      startDateDahua = formatDahuaDate(startDate);
+      endDateDahua = formatDahuaDate(endDate);
+    } else {
+      if (hasStart) {
+        startDate = new Date(value.start);
+        start = startDate.toISOString();
+        startDateDahua = formatDahuaDate(startDate);
+      }
+      if (hasEnd) {
+        endDate = new Date(value.end);
+        end = endDate.toISOString();
+        endDateDahua = formatDahuaDate(endDate);
+      }
+    }
+    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 */) {
+        let page = 1;
+        let pages = 1;
+        const limit = 20;
+        do {
+          const siteCameraReq = await _getAllSiteCameras({
+            site: value.site,
+            type: "anpr",
+            direction: ["both", "entry"],
+            page,
+            limit
+          });
+          pages = siteCameraReq.pages || 1;
+          siteCameras.push(...siteCameraReq.items);
+          page++;
+        } while (page <= pages);
+        if (!siteCameras.length) {
+          throw new BadRequestError80("No site cameras found.");
+        }
+      }
+      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();
+          }
+          message = `Vehicle plate number added to ${_type} successfully.`;
+        }
+        await _add(vehicleValue, session);
+      }
+      await session.commitTransaction();
+      return message;
+    } catch (error) {
+      logger64.error("Error in vehicle service add:", error);
+      await session.abortTransaction();
+      throw error;
+    } finally {
+      session.endSession();
+    }
+  }
+  async function deleteVehicle(_id, recno, site, type, bypass = false) {
+    const session = useAtlas39.getClient()?.startSession();
+    if (!session) {
+      throw new Error("Unable to start session for vehicle service.");
+    }
+    const _mode = type !== "whitelist" /* WHITELIST */ ? "TrafficBlackList" /* TRAFFIC_BLACKLIST */ : "TrafficRedList" /* TRAFFIC_REDLIST */;
     try {
       session.startTransaction();
       const siteCameras = [];
@@ -16447,9 +17021,8 @@ function useVehicleService() {
       const limit = 20;
       do {
         const siteCameraReq = await _getAllSiteCameras({
-          site: value.site,
+          site,
           type: "anpr",
-          direction: ["both", "entry"],
           page,
           limit
         });
@@ -16461,55 +17034,82 @@ function useVehicleService() {
         throw new BadRequestError80("No site cameras found.");
       }
       for (const camera of siteCameras) {
-        const { host, username, password } = camera;
+        const host = camera.host;
+        const username = camera.username;
+        const password = camera.password;
         const dahuaPayload = {
           host,
           username,
           password,
-          plateNumber: value.plateNumber,
-          mode: "TrafficRedList",
-          start: value.start ? new Date(value.start).toISOString() : "",
-          end: value.end ? new Date(value.end).toISOString() : "",
-          owner: value.name
+          recno,
+          mode: _mode
         };
-        const dahuaResponse = await _addPlateNumber(dahuaPayload);
-        if (dahuaResponse?.statusCode !== 200) {
-          throw new BadRequestError80("Failed to add plate number to ANPR");
+        const dahuaResponse = await _removePlateNumber(dahuaPayload);
+        if (!bypass && dahuaResponse?.statusCode !== 200) {
+          throw new BadRequestError80(
+            `Failed to remove plate number to ANPR from ${type}`
+          );
         }
-        const responseData = dahuaResponse?.data.toString("utf-8");
-        value.recNo = responseData.split("=")[1]?.trim();
-        const formattedValue = {
-          ...value,
-          start: value.start ? new Date(value.start).toISOString() : "",
-          end: value.end ? new Date(value.end).toISOString() : ""
-        };
-        await _add(formattedValue, session);
       }
+      await _deleteVehicle(_id, session);
       await session.commitTransaction();
-      return "Vehicle plate number added successfully.";
+      return `Vehicle plate number deleted from ${type} record successfully.`;
     } catch (error) {
-      logger64.error("Error in vehicle service add:", error);
       await session.abortTransaction();
-      throw error;
+      if (error instanceof AppError14)
+        throw error;
+      throw new InternalServerError29("Failed to delete vehicle");
     } finally {
       session.endSession();
     }
   }
-  async function deleteVehicle(_id, recno, site, bypass = false) {
+  async function approveVehicleById(id, orgId, siteId) {
     const session = useAtlas39.getClient()?.startSession();
     if (!session) {
       throw new Error("Unable to start session for vehicle service.");
     }
+    const org = await _getById(orgId);
+    if (!org)
+      throw new BadRequestError80("Org not found");
+    const allowedNatures2 = ["property_management_agency"];
+    if (!allowedNatures2.includes(org.nature)) {
+      throw new BadRequestError80(
+        "Only property management can approve vehicles."
+      );
+    }
+    const vehicle = await _getVehicleById(id);
+    if (!vehicle) {
+      throw new BadRequestError80("Vehicle not found");
+    }
+    const owner = vehicle.name.substring(0, 15);
+    const hasStart = typeof vehicle.start === "string" ? vehicle.start.trim() !== "" : !!vehicle.start;
+    const hasEnd = typeof vehicle.end === "string" ? vehicle.end.trim() !== "" : !!vehicle.end;
+    let startDate = null;
+    let endDate = null;
+    if (!hasStart && !hasEnd) {
+      startDate = /* @__PURE__ */ new Date();
+      endDate = new Date(startDate);
+      endDate.setFullYear(endDate.getFullYear() + 10);
+    } else {
+      startDate = hasStart ? new Date(vehicle.start) : null;
+      endDate = hasEnd ? new Date(vehicle.end) : null;
+    }
+    const startIso = startDate ? startDate.toISOString() : "";
+    const endIso = endDate ? endDate.toISOString() : "";
+    const startDahua = startDate ? formatDahuaDate(startDate) : "";
+    const endDahua = endDate ? formatDahuaDate(endDate) : "";
     try {
       session.startTransaction();
       const siteCameras = [];
       let page = 1;
       let pages = 1;
       const limit = 20;
+      let value = {};
       do {
         const siteCameraReq = await _getAllSiteCameras({
-          site,
+          site: siteId,
           type: "anpr",
+          direction: ["both", "entry"],
           page,
           limit
         });
@@ -16521,24 +17121,51 @@ function useVehicleService() {
         throw new BadRequestError80("No site cameras found.");
       }
       for (const camera of siteCameras) {
-        const host = camera.host;
-        const username = camera.username;
-        const password = camera.password;
+        const { host, username, password } = camera;
         const dahuaPayload = {
           host,
           username,
           password,
-          recno,
-          mode: "TrafficRedList"
+          plateNumber: vehicle.plateNumber,
+          mode: "TrafficRedList" /* TRAFFIC_REDLIST */,
+          start: startDahua,
+          end: endDahua,
+          owner
         };
-        const dahuaResponse = await _removePlateNumber(dahuaPayload);
-        if (!bypass && dahuaResponse?.statusCode !== 200) {
-          throw new BadRequestError80("Failed to remove plate number to ANPR");
+        const dahuaResponse = await _addPlateNumber(dahuaPayload);
+        if (dahuaResponse?.statusCode !== 200) {
+          throw new BadRequestError80("Failed to add plate number to ANPR");
         }
+        const responseData = dahuaResponse?.data.toString("utf-8");
+        value.recNo = responseData.split("=")[1]?.trim();
       }
-      await _deleteVehicle(_id, session);
+      value.status = "active";
+      const formattedValue = {
+        ...value,
+        start: startIso,
+        end: endIso
+      };
+      await _updateVehicle(id, formattedValue, session);
       await session.commitTransaction();
-      return "Vehicle plate number deleted successfully.";
+      return "Vehicle plate number approved and added successfully.";
+    } catch (error) {
+      logger64.error("Error in vehicle service add:", error);
+      await session.abortTransaction();
+      throw error;
+    } finally {
+      session.endSession();
+    }
+  }
+  async function processDeletingExpiredVehicles() {
+    const session = useAtlas39.getClient()?.startSession();
+    if (!session) {
+      throw new Error("Unable to start session for vehicle service.");
+    }
+    try {
+      session.startTransaction();
+      await _deleteExpiredVehicles();
+      await session.commitTransaction();
+      return `Expired Vehicle plate numbers deleted successfully.`;
     } catch (error) {
       await session.abortTransaction();
       if (error instanceof AppError14)
@@ -16550,7 +17177,9 @@ function useVehicleService() {
   }
   return {
     add,
-    deleteVehicle
+    deleteVehicle,
+    approveVehicleById,
+    processDeletingExpiredVehicles
   };
 }
 
@@ -16558,23 +17187,28 @@ function useVehicleService() {
 import { BadRequestError as BadRequestError81, logger as logger65 } from "@7365admin1/node-server-utils";
 import Joi46 from "joi";
 function useVehicleController() {
-  const { add: _add, deleteVehicle: _deleteVehicle } = useVehicleService();
+  const {
+    add: _add,
+    deleteVehicle: _deleteVehicle,
+    approveVehicleById: _approveVehicleById
+  } = useVehicleService();
   const {
     getSeasonPassTypes: _getSeasonPassTypes,
     getVehicles: _getVehicles,
     getVehicleById: _getVehicleById,
-    updateVehicle: _updateVehicle
+    updateVehicle: _updateVehicle,
+    getVehiclesByNRIC: _getVehiclesByNRIC
   } = 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
@@ -16594,8 +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().allow("", ...allowedTypes),
-      category: Joi46.string().optional().allow("", ...allowedCategories)
+      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);
@@ -16609,6 +17244,7 @@ function useVehicleController() {
     const limit = parseInt(req.query.limit ?? "10");
     const type = req.query.type ?? "";
     const category = req.query.category ?? "";
+    const status = req.query.status ?? "";
     const sortObj = {};
     const sortFields = String(req.query.sort).split(",");
     const sortOrders = String(req.query.order).split(",");
@@ -16625,7 +17261,8 @@ function useVehicleController() {
         limit,
         sort: sortObj,
         type,
-        category
+        category,
+        status
       });
       res.json(data);
       return;
@@ -16681,7 +17318,8 @@ function useVehicleController() {
       block: Joi46.number().integer().optional().allow(0, null),
       level: Joi46.string().optional().allow("", null),
       unit: Joi46.string().optional().allow("", null),
-      plateNumber: Joi46.string().optional().allow("", null)
+      plateNumber: Joi46.string().optional().allow("", null),
+      nric: Joi46.string().optional().allow("", null)
     });
     const _id = req.params.id;
     const payload = { ...req.body };
@@ -16702,23 +17340,23 @@ function useVehicleController() {
     }
   }
   async function deleteVehicle(req, res, next) {
-    const site = req.params.site ?? "";
-    const _id = req.params.id ?? "";
-    const recno = req.params.recno ?? "";
-    const bypass = req.query.bypass === "true";
+    const _id = req.params.id;
     const deleteVehicleSchema = Joi46.object({
-      _id: Joi46.string().hex().required(),
+      _id: Joi46.string().hex().length(24).required(),
       recno: Joi46.string().required(),
-      bypass: Joi46.boolean().optional()
+      site: Joi46.string().hex().length(24).required(),
+      type: Joi46.string().valid("whitelist", "blocklist").required(),
+      bypass: Joi46.boolean().optional().default(true)
     });
-    const { error } = deleteVehicleSchema.validate({ _id, recno, bypass });
+    const { error, value } = deleteVehicleSchema.validate({ _id, ...req.body });
     if (error) {
       logger65.log({ level: "error", message: error.message });
       next(new BadRequestError81(error.message));
       return;
     }
+    const { recno, site, type, bypass } = value;
     try {
-      const data = await _deleteVehicle(_id, recno, site, bypass);
+      const data = await _deleteVehicle(_id, recno, site, type, bypass);
       res.json({
         message: "Vehicle deleted successfully.",
         data
@@ -16729,13 +17367,83 @@ function useVehicleController() {
       return;
     }
   }
+  async function approveVehicleById(req, res, next) {
+    const validation = Joi46.object({
+      _id: Joi46.string().hex().length(24).required(),
+      org: Joi46.string().hex().length(24).required(),
+      site: Joi46.string().hex().length(24).required()
+    });
+    const _id = req.params.id;
+    const payload = { ...req.body };
+    const { error, value } = validation.validate({ _id, ...payload });
+    if (error) {
+      logger65.log({ level: "error", message: error.message });
+      next(new BadRequestError81(error.message));
+      return;
+    }
+    try {
+      await _approveVehicleById(value._id, value.org, value.site);
+      res.json({ message: "Successfully approved and updated vehicle." });
+      return;
+    } catch (error2) {
+      logger65.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getVehiclesByNRIC(req, res, next) {
+    const allowedFields = ["start", "end"];
+    const allowedOrder = ["asc", "desc"];
+    const validation = Joi46.object({
+      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),
+      order: Joi46.string().pattern(/^(asc|desc)(,(asc|desc))*$/).optional().allow("", ...allowedOrder)
+    });
+    const query = { ...req.query };
+    const { error } = validation.validate(query);
+    if (error) {
+      logger65.log({ level: "error", message: error.message });
+      next(new BadRequestError81(error.message));
+      return;
+    }
+    const nric = req.query.nric ?? "";
+    const page = parseInt(req.query.page ?? "1");
+    const limit = parseInt(req.query.limit ?? "10");
+    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 _getVehiclesByNRIC({
+        nric,
+        page,
+        limit,
+        sort: sortObj
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger65.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getVehicles,
     getSeasonPassTypes,
     getVehicleById,
     updateVehicle,
-    deleteVehicle
+    deleteVehicle,
+    approveVehicleById,
+    getVehiclesByNRIC
   };
 }
 
@@ -16837,7 +17545,7 @@ function useSiteCameraController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const allowedTypes2 = ["ip", "exit", "entry", "both"];
+    const allowedTypes = ["ip", "exit", "entry", "both"];
     const validation = Joi47.object({
       type: Joi47.string().optional(),
       site: Joi47.string().optional(),
@@ -19363,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: "" };
   }
@@ -19400,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) {
@@ -19635,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,
@@ -19644,7 +20390,8 @@ function usePersonController() {
     getPersonByPhoneNumber,
     getPeopleByUnit,
     getCompany,
-    getPeopleByPlateNumber
+    getPeopleByPlateNumber,
+    getPeopleByNRIC
   };
 }
 
@@ -24322,20 +25069,19 @@ function useDocumentManagementController() {
 // src/models/bulletin-board.model.ts
 import Joi75 from "joi";
 import { ObjectId as ObjectId71 } from "mongodb";
+var BULLETIN_RECIPIENTS = [
+  "resident",
+  "security_agency",
+  "cleaning_services",
+  "mechanical_electrical",
+  "property_management_agency"
+];
+var STATUS_VALUES = ["active", "expired", "deleted"];
 var schemaBulletinBoard = Joi75.object({
   _id: Joi75.string().hex().optional().allow("", null),
   site: Joi75.string().hex().optional().allow("", null),
   orgId: Joi75.string().hex().optional().allow("", null),
-  recipients: Joi75.array().items(
-    Joi75.string().valid(
-      "admin",
-      "organization",
-      "site",
-      "service-provider",
-      "service-provider-member",
-      "resident"
-    )
-  ).optional(),
+  recipients: Joi75.array().items(Joi75.string().valid(...BULLETIN_RECIPIENTS)).unique().optional(),
   title: Joi75.string().optional().allow("", null),
   content: Joi75.string().optional().allow("", null),
   file: Joi75.array().items(
@@ -24348,23 +25094,14 @@ var schemaBulletinBoard = Joi75.object({
   noExpiration: Joi75.boolean().optional(),
   startDate: Joi75.date().optional().allow("", null),
   endDate: Joi75.date().optional().allow("", null),
-  status: Joi75.string().optional().allow("", null),
+  status: Joi75.string().valid(...STATUS_VALUES).optional(),
   createdAt: Joi75.date().optional().allow(null),
   updatedAt: Joi75.date().optional().allow(null),
   deletedAt: Joi75.date().optional().allow(null)
 });
 var schemaUpdateBulletinBoard = Joi75.object({
   _id: Joi75.string().hex().required(),
-  recipients: Joi75.array().items(
-    Joi75.string().valid(
-      "admin",
-      "organization",
-      "site",
-      "service-provider",
-      "service-provider-member",
-      "resident"
-    )
-  ).optional(),
+  recipients: Joi75.array().items(Joi75.string().valid(...BULLETIN_RECIPIENTS)).unique().optional(),
   title: Joi75.string().optional().allow("", null),
   content: Joi75.string().optional().allow("", null),
   file: Joi75.array().items(
@@ -24377,7 +25114,7 @@ var schemaUpdateBulletinBoard = Joi75.object({
   noExpiration: Joi75.boolean().optional(),
   startDate: Joi75.date().optional().allow("", null),
   endDate: Joi75.date().optional().allow("", null),
-  status: Joi75.string().optional().allow("", null)
+  status: Joi75.string().valid(...STATUS_VALUES).optional()
 });
 function MBulletinBoard(value) {
   const { error } = schemaBulletinBoard.validate(value);
@@ -24477,7 +25214,8 @@ function useBulletinBoardRepo() {
     limit = 10,
     sort = {},
     site = "",
-    status = "active"
+    status = "active",
+    recipients = []
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
@@ -24487,7 +25225,9 @@ function useBulletinBoardRepo() {
     }
     const query = {
       site,
-      status
+      status,
+      ...search && { $text: { $search: search } },
+      ...recipients?.length && { recipients: { $in: recipients } }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
@@ -24495,12 +25235,10 @@ function useBulletinBoardRepo() {
       status,
       sort: JSON.stringify(sort),
       page,
-      limit
+      limit,
+      ...search && { search },
+      ...recipients?.length && { recipients: recipients.sort().join(",") }
     };
-    if (search) {
-      query.$text = { $search: search };
-      cacheOptions.search = search;
-    }
     const cacheKey = makeCacheKey39(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -24592,7 +25330,7 @@ function useBulletinBoardRepo() {
       throw error;
     }
   }
-  async function deleteBulletinBoardById(_id) {
+  async function deleteBulletinBoardById(_id, session) {
     try {
       _id = new ObjectId72(_id);
     } catch (error) {
@@ -24604,7 +25342,11 @@ function useBulletinBoardRepo() {
         updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
         deletedAt: (/* @__PURE__ */ new Date()).toISOString()
       };
-      const res = await collection.updateOne({ _id }, { $set: updateValue });
+      const res = await collection.updateOne(
+        { _id },
+        { $set: updateValue },
+        { session }
+      );
       if (res.modifiedCount === 0) {
         throw new InternalServerError42("Unable to delete bulletin board.");
       }
@@ -24670,8 +25412,11 @@ function useBulletinBoardService() {
   const {
     add: _add,
     updateBulletinBoardById: _updateBulletinBoardById,
-    processExpiredBulletinBoards: _processExpiredBulletinBoards
+    processExpiredBulletinBoards: _processExpiredBulletinBoards,
+    deleteBulletinBoardById: _deleteBulletinBoardById,
+    getBulletinBoardById: _getBulletinBoardById
   } = useBulletinBoardRepo();
+  const { deleteFileById: _deleteFileById } = useFileRepo();
   async function add(value) {
     const session = useAtlas65.getClient()?.startSession();
     session?.startTransaction();
@@ -24714,10 +25459,31 @@ function useBulletinBoardService() {
       session?.endSession();
     }
   }
+  async function deleteBulletinBoardById(id) {
+    const session = useAtlas65.getClient()?.startSession();
+    session?.startTransaction();
+    try {
+      const existingBulletinBoard = await _getBulletinBoardById(id);
+      if (Array.isArray(existingBulletinBoard.file)) {
+        for (const file of existingBulletinBoard.file) {
+          await _deleteFileById(file, session);
+        }
+      }
+      await _deleteBulletinBoardById(id, session);
+      await session?.commitTransaction();
+      return "Successfully deleted bulletin board.";
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
   return {
     add,
     updateBulletinBoardById,
-    processExpiredBulletinBoards
+    processExpiredBulletinBoards,
+    deleteBulletinBoardById
   };
 }
 
@@ -24725,12 +25491,12 @@ function useBulletinBoardService() {
 import { BadRequestError as BadRequestError123, logger as logger104 } from "@7365admin1/node-server-utils";
 import Joi76 from "joi";
 function useBulletinBoardController() {
-  const { add: _add, updateBulletinBoardById: _updateBulletinBoardById } = useBulletinBoardService();
   const {
-    getAll: _getAll,
-    getBulletinBoardById: _getBulletinBoardById,
+    add: _add,
+    updateBulletinBoardById: _updateBulletinBoardById,
     deleteBulletinBoardById: _deleteBulletinBoardById
-  } = useBulletinBoardRepo();
+  } = useBulletinBoardService();
+  const { getAll: _getAll, getBulletinBoardById: _getBulletinBoardById } = useBulletinBoardRepo();
   async function add(req, res, next) {
     const payload = { ...req.body };
     const { error } = schemaBulletinBoard.validate(payload, {
@@ -24762,12 +25528,23 @@ function useBulletinBoardController() {
       sort: Joi76.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
       order: Joi76.string().pattern(/^(asc|desc)(,(asc|desc))*$/).optional().allow("", ...allowedOrder),
       site: Joi76.string().hex().required(),
-      status: Joi76.string().optional().allow(null, "")
+      status: Joi76.string().optional().allow(null, ""),
+      recipients: Joi76.string().optional().allow("", null).custom((value, helpers) => {
+        const parsed = value.split(",").map((v) => v.trim()).filter(Boolean);
+        for (const r of parsed) {
+          if (!BULLETIN_RECIPIENTS.includes(r)) {
+            return helpers.error("any.only");
+          }
+        }
+        return value;
+      }).messages({
+        "any.only": `Recipients must be one of: ${BULLETIN_RECIPIENTS.join(
+          ", "
+        )}`
+      })
     });
     const query = { ...req.query };
-    const { error } = validation.validate(query, {
-      abortEarly: false
-    });
+    const { error } = validation.validate(query, { abortEarly: false });
     if (error) {
       const messages = error.details.map((d) => d.message).join(", ");
       logger104.log({ level: "error", message: messages });
@@ -24779,9 +25556,15 @@ function useBulletinBoardController() {
     const limit = parseInt(req.query.limit ?? "10");
     const site = req.query.site ?? "";
     const status = req.query.status ?? "active";
+    const recipientsRaw = req.query.recipients ?? "";
+    const recipients = recipientsRaw && typeof recipientsRaw === "string" ? Array.from(
+      new Set(
+        recipientsRaw.split(",").map((r) => r.trim()).filter(Boolean)
+      )
+    ) : [];
     const sortObj = {};
-    const sortFields = String(req.query.sort).split(",");
-    const sortOrders = String(req.query.order).split(",");
+    const sortFields = String(req.query.sort ?? "").split(",").filter(Boolean);
+    const sortOrders = String(req.query.order ?? "").split(",").filter(Boolean);
     sortFields.forEach((field, index) => {
       if (allowedFields.includes(field)) {
         const order = sortOrders[index] === "asc" ? 1 : -1;
@@ -24795,7 +25578,8 @@ function useBulletinBoardController() {
         limit,
         sort: sortObj,
         site,
-        status
+        status,
+        recipients
       });
       res.status(200).json(data);
       return;
@@ -24878,6 +25662,16 @@ function useBulletinBoardController() {
 import { BadRequestError as BadRequestError124, logger as logger105 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId73 } from "mongodb";
 import Joi77 from "joi";
+
+// src/types/enums/billing-frequency.enum.ts
+var EBillingFrequency = /* @__PURE__ */ ((EBillingFrequency2) => {
+  EBillingFrequency2["MONTHLY"] = "monthly";
+  EBillingFrequency2["QAURTERLY"] = "quarterly";
+  EBillingFrequency2["ANNUALLY"] = "annually";
+  return EBillingFrequency2;
+})(EBillingFrequency || {});
+
+// src/models/site-billing-item.model.ts
 var schemaUnits = Joi77.object({
   _id: Joi77.string().hex().optional(),
   name: Joi77.string().optional()
@@ -24888,7 +25682,7 @@ var schemaBillingItem = Joi77.object({
   org: Joi77.string().hex().required(),
   name: Joi77.string().required(),
   amount: Joi77.number().required(),
-  frequency: Joi77.string().valid("month", "quarter", "annual").required(),
+  frequency: Joi77.string().valid(...Object.values(EBillingFrequency)).required(),
   billingType: Joi77.string().valid("recurring", "non-recurring").required(),
   dueInDays: Joi77.number().optional().allow(null, ""),
   date: Joi77.string().required(),
@@ -24913,7 +25707,7 @@ var schemaUpdateSiteBillingItem = Joi77.object({
   org: Joi77.string().hex().optional().allow(null, ""),
   name: Joi77.string().optional().allow(null, ""),
   amount: Joi77.number().optional().allow(null, ""),
-  frequency: Joi77.string().valid("month", "quarter", "annual").optional().allow(null, ""),
+  frequency: Joi77.string().valid(...Object.values(EBillingFrequency)).optional().allow(null, ""),
   billingType: Joi77.string().valid("recurring", "non-recurring").optional().allow(null, ""),
   dueInDays: Joi77.number().optional().allow(null, ""),
   date: Joi77.string().optional().allow(null, ""),
@@ -25067,7 +25861,16 @@ function useSiteBillingItemRepo() {
       ...search && {
         $or: [
           { name: { $regex: search, $options: "i" } },
-          { frequency: { $regex: search, $options: "i" } }
+          { frequency: { $regex: search, $options: "i" } },
+          {
+            $expr: {
+              $regexMatch: {
+                input: { $toString: "$totalAmount" },
+                regex: search,
+                options: "i"
+              }
+            }
+          }
         ]
       },
       ...ObjectId74.isValid(site) && { site: new ObjectId74(site) }
@@ -26243,7 +27046,8 @@ function useEventManagementRepo() {
     sort = {},
     site = "",
     status = "",
-    type = ""
+    type = "",
+    date = ""
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
@@ -26254,7 +27058,13 @@ function useEventManagementRepo() {
     const baseQuery = {
       site,
       status: status ? status : { $ne: "deleted" },
-      ...type && { type }
+      ...type && { type },
+      ...date && {
+        dateTime: {
+          $gte: `${date}T00:00:00.000Z`,
+          $lt: `${date}T23:59:59.999Z`
+        }
+      }
     };
     let query = { ...baseQuery };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
@@ -26552,7 +27362,8 @@ function useEventManagementController() {
       order: Joi82.string().pattern(/^(asc|desc)(,(asc|desc))*$/).optional().allow("", ...allowedOrder),
       site: Joi82.string().hex().required(),
       status: Joi82.string().optional(),
-      type: Joi82.string().optional().valid("TASK", "EVENT").allow(null, "")
+      type: Joi82.string().optional().valid("TASK", "EVENT").allow(null, ""),
+      date: Joi82.string().optional().allow(null, "")
     });
     const query = { ...req.query };
     const { error } = validation.validate(query, {
@@ -26570,6 +27381,7 @@ function useEventManagementController() {
     const site = req.query.site ?? "";
     const status = req.query.status ?? "";
     const type = req.query.type ?? "";
+    const date = req.query.date ?? "";
     const sortObj = {};
     const sortFields = String(req.query.sort).split(",");
     const sortOrders = String(req.query.order).split(",");
@@ -26587,7 +27399,8 @@ function useEventManagementController() {
         sort: sortObj,
         site,
         status,
-        type
+        type,
+        date
       });
       res.status(200).json(data);
       return;
@@ -26913,6 +27726,7 @@ function useSiteUnitBillingRepo() {
         }
       };
     }
+    const unitSearchRegex = search ? search.trim().replace(/\s+/g, "").replace(/\//g, "\\s*/\\s*") : null;
     const query = {
       paymentStatus,
       status,
@@ -26920,7 +27734,16 @@ function useSiteUnitBillingRepo() {
         $or: [
           { unitOwner: { $regex: search, $options: "i" } },
           { billName: { $regex: search, $options: "i" } },
-          { unit: { $regex: search, $options: "i" } }
+          { unit: { $regex: unitSearchRegex, $options: "i" } },
+          {
+            $expr: {
+              $regexMatch: {
+                input: { $toString: "$amountPaid" },
+                regex: search,
+                options: "i"
+              }
+            }
+          }
         ]
       },
       ...ObjectId80.isValid(site) && { site: new ObjectId80(site) },
@@ -27347,14 +28170,14 @@ function useSiteUnitBillingService() {
   function isBillingChecker(billing_item, todayMonth, todayDate) {
     const billingMonth = Number(billing_item.month);
     const billingDay = Number(billing_item.date);
-    if (billing_item.frequency === "month") {
+    if (billing_item.frequency === "monthly" /* MONTHLY */) {
       return todayDate === billingDay;
     }
-    if (billing_item.frequency === "quarter") {
+    if (billing_item.frequency === "quarterly" /* QAURTERLY */) {
       const monthDiff = todayMonth - billingMonth;
       return monthDiff % 3 === 0 && todayDate === billingDay;
     }
-    if (billing_item.frequency === "annual") {
+    if (billing_item.frequency === "annually" /* ANNUALLY */) {
       return todayMonth === billingMonth && todayDate === billingDay;
     }
     return false;
@@ -28150,7 +28973,7 @@ function UseAccessManagementRepo() {
         {
           $match: {
             ...defaultQuery,
-            status: { $ne: "deleted" }
+            status: { $eq: "active" }
           }
         },
         // ✅ Only project needed fields before heavy lookups
@@ -28270,7 +29093,7 @@ function UseAccessManagementRepo() {
                         userType
                       }
                     },
-                    { $project: { _id: 1, userId: 1, type: 1, cardNo: 1, isActivated: 1 } }
+                    { $project: { _id: 1, userId: 1, type: 1, cardNo: 1, isActivated: 1, replacementStatus: 1 } }
                   ],
                   as: "accessCards"
                 }
@@ -28289,7 +29112,21 @@ function UseAccessManagementRepo() {
                     $filter: {
                       input: "$accessCards",
                       as: "card",
-                      cond: { $ne: ["$$card.userId", null] }
+                      cond: { $and: [{ $ne: ["$$card.userId", null] }, { $eq: ["$$card.isActivated", true] }] }
+                    }
+                  },
+                  f_replaced: {
+                    $filter: {
+                      input: "$accessCards",
+                      as: "card",
+                      cond: { $and: [{ $eq: ["$$card.isActivated", false] }, { $ne: ["$$card.replacementStatus", null] }] }
+                    }
+                  },
+                  f_deleted: {
+                    $filter: {
+                      input: "$accessCards",
+                      as: "card",
+                      cond: { $and: [{ $eq: ["$$card.isActivated", false] }, { $eq: ["$$card.replacementStatus", null] }] }
                     }
                   }
                 }
@@ -28321,6 +29158,14 @@ function UseAccessManagementRepo() {
                       non_physical: { $size: { $filter: { input: { $ifNull: ["$f_Assigned", []] }, as: "c", cond: { $eq: ["$$c.type", "QRCODE" /* QR */] } } } }
                     }
                   },
+                  replaced: {
+                    physical: { $filter: { input: "$f_replaced", as: "c", cond: { $eq: ["$$c.type", "NFC" /* NFC */] } } },
+                    non_physical: { $filter: { input: "$f_replaced", as: "c", cond: { $eq: ["$$c.type", "QRCODE" /* QR */] } } }
+                  },
+                  deleted: {
+                    physical: { $filter: { input: "$f_deleted", as: "c", cond: { $eq: ["$$c.type", "NFC" /* NFC */] } } },
+                    non_physical: { $filter: { input: "$f_deleted", as: "c", cond: { $eq: ["$$c.type", "QRCODE" /* QR */] } } }
+                  },
                   totalCardCount: {
                     $add: [
                       { $size: { $filter: { input: { $ifNull: ["$f_Available", []] }, as: "c", cond: { $eq: ["$$c.type", "NFC" /* NFC */] } } } },
@@ -28777,16 +29622,26 @@ function UseAccessManagementRepo() {
   async function cardReplacementRepo(params) {
     const session = useAtlas74.getClient()?.startSession();
     try {
-      const { cardId, remarks } = params;
+      const { cardId, remarks, issuedCardId, unitId, userId } = params;
       const id = new ObjectId83(cardId);
+      const newCardId = new ObjectId83(issuedCardId);
+      const unit = new ObjectId83(unitId);
+      const user = new ObjectId83(userId);
       session?.startTransaction();
-      const card = await collection().findOneAndUpdate(
-        { _id: id },
-        { $set: { remarks, replacementStatus: "Pending", requestDate: /* @__PURE__ */ new Date(), isActivated: false } },
-        { returnDocument: "after", session }
-      );
+      const sessionResult = await Promise.all([
+        await collection().findOneAndUpdate(
+          { _id: id },
+          { $set: { remarks, replacementStatus: "Complete", requestDate: /* @__PURE__ */ new Date(), isActivated: false } },
+          { returnDocument: "after", session }
+        ),
+        await collection().findOneAndUpdate(
+          { _id: newCardId },
+          { $set: { updatedAt: /* @__PURE__ */ new Date(), assignedUnit: unit, userId: user } },
+          { returnDocument: "after", session }
+        )
+      ]);
       await session?.commitTransaction();
-      return card;
+      return sessionResult;
     } catch (error) {
       await session?.abortTransaction();
       throw new Error(error.message);
@@ -28804,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" } }];
@@ -28812,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([
         {
@@ -29035,7 +29891,8 @@ function UseAccessManagementRepo() {
         rawItems.map(async (item) => {
           const date = new Date(item["startDate (format MM/DD/YYYY)"]);
           const endDate = new Date(date.setFullYear(date.getFullYear() + 10));
-          const cardNumber = item["cardNo (number 0-65535 ex. 301)"].toString().padStart(10, "0");
+          const cardNumber = String(Number(item["cardNo (number 0-65535 ex. 301)"] || 0)).padStart(6, "0");
+          const facilityCode = String(Number(item["facilityCode (number 0-255 ex. 11)"] || 0)).padStart(4, "0");
           const pin = item["pin (number 6 digits only)"] ? item["pin (number 6 digits only)"].toString().padStart(6, "0") : "123456";
           const match = item["accessLevel (number ex. 1)"];
           const accessLevel = match ? match : null;
@@ -29049,9 +29906,9 @@ function UseAccessManagementRepo() {
             accessLevel,
             accessGroup,
             accessType: "Normal" /* NORMAL */,
-            cardNo: cardNumber,
+            cardNo: `${facilityCode}${cardNumber}`,
             pin,
-            qrData: await createQrData({ cardNumber }),
+            qrData: await createQrData({ cardNumber: `${facilityCode}${cardNumber}` }),
             startDate: new Date(item["startDate (format MM/DD/YYYY)"]),
             endDate: new Date(item["endDate (format MM/DD/YYYY)"] || endDate),
             isActivated: true,
@@ -29125,6 +29982,112 @@ function UseAccessManagementRepo() {
       session?.endSession();
     }
   }
+  async function deleteCardRepo(params) {
+    try {
+      const { cardId, remarks } = params;
+      const id = new ObjectId83(cardId);
+      const result = await collection().findOneAndUpdate({ _id: id }, { $set: { isActivated: false, updatedAt: /* @__PURE__ */ new Date(), remarks, requestDate: /* @__PURE__ */ new Date() } }, { returnDocument: "after" });
+      return result;
+    } catch (error) {
+      throw new Error(error.message);
+    }
+  }
+  async function getCardDetailsRepo(params) {
+    try {
+      const { siteId, cardId } = params;
+      const convertedSiteId = new ObjectId83(siteId);
+      const convertedCardId = new ObjectId83(cardId);
+      const card = await collection().findOne(
+        {
+          _id: convertedCardId,
+          site: convertedSiteId,
+          type: "NFC" /* NFC */,
+          userType: "Visitor/Resident" /* DEFAULT */
+        },
+        {
+          projection: {
+            userId: 1,
+            site: 1,
+            type: 1,
+            userType: 1,
+            cardNo: 1,
+            isActivated: 1,
+            replacementStatus: 1,
+            vmsRemarks: 1,
+            remarks: 1,
+            requestDate: 1,
+            createdAt: 1,
+            updatedAt: 1
+          }
+        }
+      );
+      if (!card)
+        return null;
+      const site = await collectionName("sites").findOne(
+        { _id: card.site },
+        { projection: { name: 1, status: 1 } }
+      );
+      const user = card.userId ? await collectionName("users").findOne(
+        { _id: card.userId },
+        { projection: { name: 1, email: 1 } }
+      ) : null;
+      const status = card.userId === null && card.isActivated === true ? "available" : card.userId !== null && card.isActivated === true ? "assigned" : card.isActivated === false && card.replacementStatus !== null ? "replaced" : "deleted";
+      return {
+        ...card,
+        status,
+        site,
+        user
+      };
+    } catch (error) {
+      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,
@@ -29145,7 +30108,10 @@ function UseAccessManagementRepo() {
     getCardReplacementRepo,
     getAccessManagementSettingsRepo,
     bulkPhysicalAccessCardRepo,
-    assignAccessCardToUnitRepo
+    assignAccessCardToUnitRepo,
+    deleteCardRepo,
+    getCardDetailsRepo,
+    addQrTagRepo
   };
 }
 
@@ -29177,7 +30143,10 @@ function useAccessManagementSvc() {
     getCardReplacementRepo,
     getAccessManagementSettingsRepo,
     bulkPhysicalAccessCardRepo,
-    assignAccessCardToUnitRepo
+    assignAccessCardToUnitRepo,
+    deleteCardRepo,
+    getCardDetailsRepo,
+    addQrTagRepo
   } = UseAccessManagementRepo();
   const addPhysicalCardSvc = async (payload) => {
     try {
@@ -29425,6 +30394,30 @@ function useAccessManagementSvc() {
       throw new Error(err.message);
     }
   };
+  const deleteCardSvc = async (params) => {
+    try {
+      const response = await deleteCardRepo({ ...params });
+      return response;
+    } catch (err) {
+      throw new Error(err.message);
+    }
+  };
+  const getCardDetailsSvc = async (params) => {
+    try {
+      const response = await getCardDetailsRepo({ ...params });
+      return response;
+    } catch (err) {
+      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,
@@ -29449,7 +30442,10 @@ function useAccessManagementSvc() {
     getAccessManagementSettingsSvc,
     convertBufferFile,
     bulkPhysicalAccessCardSvc,
-    assignAccessCardToUnitSvc
+    assignAccessCardToUnitSvc,
+    deleteCardSvc,
+    getCardDetailsSvc,
+    addQrTagSvc
   };
 }
 
@@ -29481,7 +30477,10 @@ function useAccessManagementController() {
     getAccessManagementSettingsSvc,
     convertBufferFile,
     bulkPhysicalAccessCardSvc,
-    assignAccessCardToUnitSvc
+    assignAccessCardToUnitSvc,
+    deleteCardSvc,
+    getCardDetailsSvc,
+    addQrTagSvc
   } = useAccessManagementSvc();
   const addPhysicalCard = async (req, res) => {
     try {
@@ -29710,11 +30709,24 @@ function useAccessManagementController() {
         userType: Joi85.string().optional().allow("", null),
         type: Joi85.string().optional().allow("", null)
       });
+      const user = req.cookies?.sid;
       const { error } = schema2.validate({ site, userType, type });
       if (error) {
         return res.status(400).json({ message: error.message });
       }
+      const key = `${namespace2}:${user}:available-access-cards`;
+      const listKey = `${namespace2}:${user}:list`;
+      const { redis } = useCache48(key);
+      const cachedData = await getCache({ key, redis });
+      if (cachedData) {
+        console.log("\u26A1 Cache hit:", key);
+        redis.expire(key, 60).catch(console.error);
+        redis.lrem(listKey, 0, key).then(() => redis.lpush(listKey, key)).then(() => redis.ltrim(listKey, 0, 9)).catch(console.error);
+        return res.status(200).json({ message: "Success", data: cachedData });
+      }
       const result = await availableAccessCardsSvc({ site, userType, type });
+      await setCache({ key, data: result, ttlSeconds: 60, redis });
+      redis.lrem(listKey, 0, key).then(() => redis.lpush(listKey, key)).then(() => redis.ltrim(listKey, 0, 9)).catch(console.error);
       return res.status(200).json({ message: "Success", data: result });
     } catch (error) {
       return res.status(400).json({
@@ -29896,16 +30908,19 @@ function useAccessManagementController() {
   };
   const cardReplacement = async (req, res) => {
     try {
-      const { cardId, remarks } = req.body;
+      const { cardId, remarks, unitId, issuedCardId, userId } = req.body;
       const schema2 = Joi85.object({
         cardId: Joi85.string().required(),
-        remarks: Joi85.string().optional().allow("", null)
+        remarks: Joi85.string().optional().allow("", null),
+        unitId: Joi85.string().hex().required(),
+        issuedCardId: Joi85.string().required(),
+        userId: Joi85.string().hex().required()
       });
-      const { error } = schema2.validate({ cardId, remarks });
+      const { error } = schema2.validate({ cardId, remarks, unitId, issuedCardId, userId });
       if (error) {
         return res.status(400).json({ message: error.message });
       }
-      const result = await cardReplacementSvc({ cardId, remarks });
+      const result = await cardReplacementSvc({ cardId, remarks, unitId, issuedCardId, userId });
       return res.status(200).json({ message: "Success", data: result });
     } catch (error) {
       return res.status(500).json({
@@ -30036,6 +31051,74 @@ function useAccessManagementController() {
       });
     }
   };
+  const deleteCard = async (req, res) => {
+    try {
+      const { cardId, remarks } = req.body;
+      const schema2 = Joi85.object({
+        cardId: Joi85.string().hex().required(),
+        remarks: Joi85.string().optional().allow("", null)
+      });
+      const { error } = schema2.validate({ cardId, remarks });
+      if (error) {
+        return res.status(400).json({ message: error.message });
+      }
+      const result = await deleteCardSvc({ cardId, remarks });
+      return res.status(200).json({ message: "Success", data: result });
+    } catch (error) {
+      return res.status(500).json({
+        data: null,
+        message: error.message
+      });
+    }
+  };
+  const getCardDetails = async (req, res) => {
+    try {
+      const { siteId, cardId } = req.query;
+      const schema2 = Joi85.object({
+        siteId: Joi85.string().hex().required(),
+        cardId: Joi85.string().hex().required()
+      });
+      const { error } = schema2.validate({ siteId, cardId });
+      if (error) {
+        return res.status(400).json({ message: error.message });
+      }
+      const result = await getCardDetailsSvc({ siteId, cardId });
+      return res.status(200).json({ message: "Success", data: result });
+    } catch (error) {
+      return res.status(500).json({
+        data: null,
+        message: error.message
+      });
+    }
+  };
+  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,
@@ -30057,7 +31140,10 @@ function useAccessManagementController() {
     getCardReplacement,
     getAccessManagementSettings,
     bulkPhysicalAccessCard,
-    assignAccessCardToUnit
+    assignAccessCardToUnit,
+    deleteCard,
+    getCardDetails,
+    addQrTag
   };
 }
 
@@ -31809,9 +32895,9 @@ function useStatementOfAccountRepo() {
     page = page > 0 ? page - 1 : 0;
     let dateExpr = {};
     if (dateFrom && dateTo) {
-      const startDate = new Date(dateFrom);
+      let startDate = new Date(dateFrom);
       startDate.setHours(0, 0, 0, 0);
-      const endDate = new Date(dateTo);
+      let endDate = new Date(dateTo);
       endDate.setHours(23, 59, 59, 999);
       dateExpr = {
         $expr: {
@@ -31822,13 +32908,15 @@ function useStatementOfAccountRepo() {
         }
       };
     }
+    const unitSearchRegex = search ? search.trim().replace(/\s+/g, "").replace(/\//g, "\\s*/\\s*") : null;
     const query = {
       ...status && status !== "all" && { status },
       ...search && {
         $or: [
           { unitOwner: { $regex: search, $options: "i" } },
-          { unit: { $regex: search, $options: "i" } },
-          { email: { $regex: search, $options: "i" } }
+          { unit: { $regex: unitSearchRegex, $options: "i" } },
+          { email: { $regex: search, $options: "i" } },
+          { category: { $regex: search, $options: "i" } }
         ]
       },
       ...ObjectId91.isValid(site) && { site: new ObjectId91(site) },
@@ -34122,6 +35210,9 @@ function useIncidentReportRepo() {
               $regex: search,
               $options: "i"
             }
+          },
+          {
+            approvedByName: { $regex: search, $options: "i" }
           }
         ]
       },
@@ -36677,7 +37768,9 @@ function useNfcPatrolLogController() {
   };
 }
 export {
+  ANPRMode,
   AccessTypeProps,
+  BULLETIN_RECIPIENTS,
   DEVICE_STATUS,
   EAccessCardTypes,
   EAccessCardUserTypes,
@@ -36736,12 +37829,15 @@ export {
   MVerification,
   MVisitorTransaction,
   MWorkOrder,
+  OrgNature,
   PERSON_TYPES,
+  STATUS_VALUES,
   UseAccessManagementRepo,
-  allowedCategories,
+  VehicleCategory,
+  VehicleStatus,
+  VehicleType,
   allowedFieldsSite,
   allowedNatures,
-  allowedTypes,
   attendanceSchema,
   attendanceSettingsSchema,
   chatSchema,