@7365admin1/core 2.29.0 → 2.30.1

package/dist/index.mjs

@@ -1419,7 +1419,7 @@ import {
 import { ObjectId as ObjectId6 } from "mongodb";
 import Joi5 from "joi";
 var schemaOccurrenceEntry = Joi5.object({
-  site: Joi5.string().hex().required(),
+  site: Joi5.string().hex().length(24).required(),
   dailyOccurrenceBookId: Joi5.string().hex().optional().allow(null, ""),
   serialNumber: Joi5.string().optional().allow(null, ""),
   date: Joi5.date().iso().optional().allow(null, ""),
@@ -1431,14 +1431,14 @@ var schemaOccurrenceEntry = Joi5.object({
   createdByName: Joi5.string().optional().allow(null, "")
 });
 var schemaUpdateOccurrenceEntry = Joi5.object({
-  _id: Joi5.string().hex().required(),
+  _id: Joi5.string().hex().length(24).required(),
   serialNumber: Joi5.string().optional().allow(null, ""),
   date: Joi5.date().iso().optional().allow(null, ""),
   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, ""),
-  eSignature: Joi5.string().required(),
+  eSignature: Joi5.string().hex().length(24).optional().allow(null, ""),
   createdByName: Joi5.string().optional().allow(null, "")
 });
 function MOccurrenceEntry(value) {
@@ -1484,6 +1484,13 @@ function MOccurrenceEntry(value) {
       throw new Error("Invalid incident report ID.");
     }
   }
+  if (value.eSignature && typeof value.eSignature === "string") {
+    try {
+      value.eSignature = new ObjectId6(value.eSignature);
+    } catch {
+      throw new Error("Invalid incident report ID.");
+    }
+  }
   return {
     _id: value._id ?? new ObjectId6(),
     site: value.site,
@@ -1840,32 +1847,16 @@ function useOccurrenceEntryRepo() {
       throw error;
     }
   }
-  async function getOccurrenceEntryByBookId(dailyOccurrenceBookId, session) {
+  async function getOccurrenceEntryByBookId(dailyOccurrenceBookId) {
     try {
       dailyOccurrenceBookId = new ObjectId7(dailyOccurrenceBookId);
     } catch (error) {
       throw new BadRequestError7("Invalid occurrence entry ID format.");
     }
-    const cacheKey = makeCacheKey4(namespace_collection, {
-      dailyOccurrenceBookId
-    });
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger6.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
+    const query = { dailyOccurrenceBookId };
     try {
-      const data = await collection.findOne(
-        { dailyOccurrenceBookId },
-        {
-          sort: { _id: -1 },
-          session
-        }
-      );
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger6.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger6.error(`Failed to set cache for key: ${cacheKey}`, err);
+      const data = await collection.findOne(query, {
+        sort: { _id: -1 }
       });
       return data;
     } catch (error) {
@@ -12876,12 +12867,9 @@ import Joi40 from "joi";
 import {
   BadRequestError as BadRequestError66,
   InternalServerError as InternalServerError23,
-  logger as logger47,
-  makeCacheKey as makeCacheKey22,
   paginate as paginate17,
   toObjectId as toObjectId6,
-  useAtlas as useAtlas30,
-  useCache as useCache23
+  useAtlas as useAtlas30
 } from "@7365admin1/node-server-utils";
 
 // src/models/visitor-transactions.model.ts
@@ -12901,6 +12889,7 @@ var PersonTypes = /* @__PURE__ */ ((PersonTypes3) => {
   PersonTypes3["GUEST"] = "guest";
   PersonTypes3["TENANT"] = "tenant";
   PersonTypes3["RESIDENT"] = "resident";
+  PersonTypes3["VISITOR"] = "visitor";
   return PersonTypes3;
 })(PersonTypes || {});
 var PersonStatus = /* @__PURE__ */ ((PersonStatus2) => {
@@ -13088,7 +13077,6 @@ var schemaVisitorTransaction = Joi36.object({
       contact: Joi36.string().optional().allow(null, "")
     })
   ).optional().allow(null),
-  visitorPass: Joi36.string().optional().allow(null, ""),
   unitName: Joi36.string().optional().allow(null, ""),
   expiredAt: Joi36.date().iso().optional().allow(null, ""),
   arrivalTime: Joi36.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().allow(null, "").messages({
@@ -13097,7 +13085,15 @@ var schemaVisitorTransaction = Joi36.object({
   duration: Joi36.number().integer().optional().allow(null),
   isOvernightParking: Joi36.boolean().optional().default(false),
   email: Joi36.string().email().optional().allow(null, ""),
-  numberOfPassengers: Joi36.number().integer().optional().allow(null, "")
+  numberOfPassengers: Joi36.number().integer().optional().allow(null, ""),
+  visitorPass: Joi36.array().items(
+    Joi36.string().hex().length(24).optional().allow(null)
+  ),
+  passKeys: Joi36.array().items(
+    Joi36.string().hex().length(24).optional().allow(null)
+  ),
+  checkInRemarks: Joi36.string().optional().allow("", null),
+  checkOutRemarks: Joi36.string().optional().allow("", null)
 });
 var schemaUpdateVisTrans = Joi36.object({
   _id: Joi36.string().hex().length(24).required(),
@@ -13123,7 +13119,15 @@ var schemaUpdateVisTrans = Joi36.object({
   status: Joi36.string().optional().allow(null, ""),
   remarks: Joi36.string().optional().allow(null, ""),
   manualCheckout: Joi36.boolean().optional().allow(null),
-  expiredAt: Joi36.date().iso().optional().allow(null, "")
+  expiredAt: Joi36.date().iso().optional().allow(null, ""),
+  visitorPass: Joi36.array().items(
+    Joi36.string().hex().length(24).optional().allow(null)
+  ),
+  passKeys: Joi36.array().items(
+    Joi36.string().hex().length(24).optional().allow(null)
+  ),
+  checkInRemarks: Joi36.string().optional().allow("", null),
+  checkOutRemarks: Joi36.string().optional().allow("", null)
 });
 function MVisitorTransaction(value) {
   const { error } = schemaVisitorTransaction.validate(value, {
@@ -13167,6 +13171,14 @@ function MVisitorTransaction(value) {
       throw new Error("Invalid type for manualCheckout key.");
     }
   }
+  if (value.visitorPass && Array.isArray(value.visitorPass) && value.visitorPass.length > 0)
+    value.visitorPass = value.visitorPass.map(
+      (v) => typeof v === "string" ? new ObjectId39(v) : v
+    );
+  if (value.passKeys && Array.isArray(value.passKeys) && value.passKeys.length > 0)
+    value.passKeys = value.passKeys.map(
+      (p) => typeof p === "string" ? new ObjectId39(p) : p
+    );
   const newDate = (/* @__PURE__ */ new Date()).toISOString();
   return {
     _id: value._id,
@@ -13193,7 +13205,10 @@ function MVisitorTransaction(value) {
     contractorType: value.contractorType,
     manualCheckout: value.manualCheckout ?? false,
     direction: value.direction,
-    visitorPass: value.visitorPass,
+    visitorPass: value.visitorPass ?? [],
+    passKeys: value.passKeys ?? [],
+    checkInRemarks: value.checkInRemarks,
+    checkOutRemarks: value.checkOutRemarks,
     unitName: value.unitName,
     expiredAt: value.expiredAt ?? null,
     createdAt: value.createdAt ?? newDate,
@@ -13211,9 +13226,6 @@ function useVisitorTransactionRepo() {
     throw new InternalServerError23("Unable to connect to server.");
   }
   const collection = db.collection(visitors_namespace_collection);
-  const { delNamespace, getCache, setCache } = useCache23(
-    visitors_namespace_collection
-  );
   async function createTextIndex() {
     try {
       await collection.createIndex({
@@ -13234,16 +13246,6 @@ function useVisitorTransactionRepo() {
     try {
       value = MVisitorTransaction(value);
       const res = await collection.insertOne(value, { session });
-      delNamespace().then(() => {
-        logger47.info(
-          `Cache cleared for namespace: ${visitors_namespace_collection}`
-        );
-      }).catch((err) => {
-        logger47.error(
-          `Failed to clear cache for namespace: ${visitors_namespace_collection}`,
-          err
-        );
-      });
       return res.insertedId;
     } catch (error) {
       const isDuplicated = error.message.includes("duplicate");
@@ -13266,7 +13268,7 @@ function useVisitorTransactionRepo() {
     type = "",
     checkedOut,
     plateNumber = ""
-  }, session) {
+  }) {
     page = page > 0 ? page - 1 : 0;
     const skip = page * limit;
     let checkOutFilter;
@@ -13301,26 +13303,6 @@ function useVisitorTransactionRepo() {
       ...plateNumber && { plateNumber }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
-    const cacheOptions = {
-      status,
-      page,
-      limit,
-      sort: JSON.stringify(sort),
-      ...search && { search },
-      ...query.org && { org: query.org.toString() },
-      ...query.site && { site: query.site.toString() },
-      ...checkIn && { checkIn: JSON.stringify(checkIn) },
-      ...checkOutFilter && { checkOut: JSON.stringify(checkOutFilter) },
-      ...type && (Array.isArray(type) ? { type: JSON.stringify(type) } : { type }),
-      ...checkedOut !== void 0 && { checkedOut },
-      ...plateNumber && { plateNumber }
-    };
-    const cacheKey = makeCacheKey22(visitors_namespace_collection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger47.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
     try {
       const basePipeline = [{ $match: query }];
       const [items, countResult] = await Promise.all([
@@ -13364,23 +13346,12 @@ function useVisitorTransactionRepo() {
       ]);
       const totalCount = countResult[0]?.total || 0;
       const data = paginate17(items, page, limit, totalCount);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger47.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger47.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error) {
       throw error;
     }
   }
   async function getVisitorTransactionById(id) {
-    const cacheKey = makeCacheKey22(visitors_namespace_collection, { id });
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger47.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
     const _id = toObjectId6(id);
     try {
       const basePipeline = [{ $match: { _id } }];
@@ -13417,38 +13388,20 @@ function useVisitorTransactionRepo() {
           }
         }
       ]).toArray();
-      setCache(cacheKey, result, 15 * 60).then(() => {
-        logger47.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger47.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return result;
     } catch (error) {
       throw error;
     }
   }
   async function getOpenByPlateNumber(plateNumber, site) {
-    const _site = typeof site === "string" ? site : toObjectId6(site);
-    const cacheKey = makeCacheKey22(visitors_namespace_collection, {
+    const _site = typeof site === "string" ? toObjectId6(site) : site;
+    const query = {
       plateNumber,
-      key: "get-open-transaction-plate-number",
-      site
-    });
+      site: _site,
+      checkOut: null
+    };
     try {
-      const cacheData = await getCache(cacheKey);
-      if (cacheData) {
-        logger47.info(`Cache hit for key: ${cacheKey}`);
-        return cacheData;
-      }
-      const data = await collection.findOne(
-        { plateNumber, site: _site, checkOut: null },
-        { sort: { _id: -1 } }
-      );
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger47.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger47.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
+      const data = await collection.findOne(query);
       return data;
     } catch (error) {
       throw new InternalServerError23(
@@ -13472,16 +13425,6 @@ function useVisitorTransactionRepo() {
         { $set: value },
         { session }
       );
-      delNamespace().then(() => {
-        logger47.info(
-          `Cache cleared for namespace: ${visitors_namespace_collection}`
-        );
-      }).catch((err) => {
-        logger47.error(
-          `Failed to clear cache for namespace: ${visitors_namespace_collection}`,
-          err
-        );
-      });
       return result;
     } catch (error) {
       throw error;
@@ -13503,16 +13446,6 @@ function useVisitorTransactionRepo() {
       if (res.modifiedCount === 0) {
         throw new InternalServerError23("Unable to delete visitor transaction.");
       }
-      delNamespace().then(() => {
-        logger47.info(
-          `Cache cleared for namespace: ${visitors_namespace_collection}`
-        );
-      }).catch((err) => {
-        logger47.error(
-          `Failed to clear cache for namespace: ${visitors_namespace_collection}`,
-          err
-        );
-      });
       return res.modifiedCount;
     } catch (error) {
       throw error;
@@ -13578,16 +13511,6 @@ function useVisitorTransactionRepo() {
         },
         { session }
       );
-      delNamespace().then(() => {
-        logger47.info(
-          `Cache cleared for namespace: ${visitors_namespace_collection}`
-        );
-      }).catch((err) => {
-        logger47.error(
-          `Failed to clear cache for namespace: ${visitors_namespace_collection}`,
-          err
-        );
-      });
       return res;
     } catch (error) {
       throw error;
@@ -13619,6 +13542,7 @@ var VehicleType = /* @__PURE__ */ ((VehicleType2) => {
 var VehicleCategory = /* @__PURE__ */ ((VehicleCategory2) => {
   VehicleCategory2["RESIDENT"] = "resident";
   VehicleCategory2["VISITOR"] = "visitor";
+  VehicleCategory2["GUEST"] = "guest";
   return VehicleCategory2;
 })(VehicleCategory || {});
 var VehicleStatus = /* @__PURE__ */ ((VehicleStatus2) => {
@@ -13663,7 +13587,7 @@ var vehicleSchema = Joi37.object({
     return value;
   }).required(),
   type: Joi37.string().required().valid(...Object.values(VehicleType)),
-  category: Joi37.string().required().valid(...Object.values(VehicleCategory)),
+  category: Joi37.string().required().valid(...Object.values(PersonTypes)),
   name: Joi37.string().required(),
   phoneNumber: Joi37.string().optional().allow("", null),
   recNo: Joi37.string().optional().allow("", null),
@@ -13801,12 +13725,10 @@ import {
   BadRequestError as BadRequestError68,
   InternalServerError as InternalServerError24,
   logger as logger49,
-  makeCacheKey as makeCacheKey23,
   NotFoundError as NotFoundError17,
   paginate as paginate18,
   toObjectId as toObjectId7,
-  useAtlas as useAtlas31,
-  useCache as useCache24
+  useAtlas as useAtlas31
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId42 } from "mongodb";
 import Joi38 from "joi";
@@ -13818,9 +13740,6 @@ function useVehicleRepo() {
     throw new InternalServerError24("Unable to connect to server.");
   }
   const collection = db.collection(vehicles_namespace_collection);
-  const { delNamespace, setCache, getCache } = useCache24(
-    vehicles_namespace_collection
-  );
   async function createIndex() {
     try {
       await collection.createIndexes([
@@ -13852,16 +13771,6 @@ function useVehicleRepo() {
     try {
       value = MVehicle(value);
       const res = await collection.insertOne(value, { session });
-      delNamespace().then(() => {
-        logger49.info(
-          `Cache cleared for namespace: ${vehicles_namespace_collection}`
-        );
-      }).catch((err) => {
-        logger49.error(
-          `Failed to clear cache for namespace: ${vehicles_namespace_collection}`,
-          err
-        );
-      });
       return res.insertedId;
     } catch (error) {
       logger49.log({
@@ -13886,29 +13795,12 @@ function useVehicleRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     const baseQuery = {
-      ...status && { status },
-      ...type && { type },
-      ...category && { category }
-    };
-    let query = { ...baseQuery };
-    const cacheOptions = {
       ...status && { status },
       ...type && { type },
       ...category && { category },
-      page: String(page),
-      limit: String(limit),
-      sort: JSON.stringify(sort)
+      ...search && { $text: { search } }
     };
-    if (search) {
-      query.$text = { $search: search };
-      cacheOptions.search = search;
-    }
-    const cacheKey = makeCacheKey23(vehicles_namespace_collection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger49.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
+    let query = { ...baseQuery };
     const escapeRegex = (input) => input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const buildGroupedPipeline = (matchQuery) => [
       { $match: matchQuery },
@@ -14066,9 +13958,6 @@ function useVehicleRepo() {
         length = regexCountResult[0]?.total || 0;
       }
       const data = paginate18(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => logger49.info(`Cache set for key: ${cacheKey}`)).catch(
-        (err) => logger49.error(`Failed to set cache for key: ${cacheKey}`, err)
-      );
       return data;
     } catch (error) {
       throw error;
@@ -14080,14 +13969,6 @@ function useVehicleRepo() {
     } catch (error) {
       throw new BadRequestError68("Invalid site ID format.");
     }
-    const cacheKey = makeCacheKey23(vehicles_namespace_collection, {
-      site,
-      type: "season-pass-type-as-options"
-    });
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      return cachedData;
-    }
     try {
       const categories = await collection.aggregate([
         { $match: { site } },
@@ -14107,17 +13988,6 @@ function useVehicleRepo() {
         },
         { $sort: { title: 1 } }
       ]).toArray();
-      setCache(cacheKey, categories).then(() => {
-        logger49.log({
-          level: "info",
-          message: `Cache set for get season pass type: ${cacheKey}`
-        });
-      }).catch((err) => {
-        logger49.log({
-          level: "error",
-          message: `Failed to set cache for season pass type: ${err.message}`
-        });
-      });
       return categories;
     } catch (error) {
       if (error instanceof BadRequestError68) {
@@ -14133,12 +14003,6 @@ function useVehicleRepo() {
       throw new BadRequestError68("Invalid vehicle ID format.");
     }
     try {
-      const cacheKey = makeCacheKey23(vehicles_namespace_collection, { _id });
-      const cachedData = await getCache(cacheKey);
-      if (cachedData) {
-        logger49.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
-      }
       const data = await collection.aggregate([
         { $match: { _id } },
         { $limit: 1 },
@@ -14308,11 +14172,6 @@ function useVehicleRepo() {
         throw new NotFoundError17("Vehicle not found.");
       }
       const result = data[0];
-      setCache(cacheKey, result, 15 * 60).then(() => {
-        logger49.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger49.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return result;
     } catch (error) {
       throw error;
@@ -14324,15 +14183,6 @@ function useVehicleRepo() {
       throw new BadRequestError68(error.details[0].message);
     }
     try {
-      const cacheKey = makeCacheKey23(vehicles_namespace_collection, {
-        plateNumber: value,
-        status: "active"
-      });
-      const cachedData = await getCache(cacheKey);
-      if (cachedData) {
-        logger49.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
-      }
       const data = await collection.findOne({
         plateNumber: value,
         status: "active"
@@ -14340,11 +14190,6 @@ function useVehicleRepo() {
       if (!data) {
         throw new NotFoundError17("Vehicle not found.");
       }
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger49.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger49.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error2) {
       throw error2;
@@ -14369,16 +14214,6 @@ function useVehicleRepo() {
       if (res.modifiedCount === 0) {
         throw new InternalServerError24("Unable to update vehicle.");
       }
-      delNamespace().then(() => {
-        logger49.info(
-          `Cache cleared for namespace: ${vehicles_namespace_collection}`
-        );
-      }).catch((err) => {
-        logger49.error(
-          `Failed to clear cache for namespace: ${vehicles_namespace_collection}`,
-          err
-        );
-      });
       return res.modifiedCount;
     } catch (error) {
       throw error;
@@ -14402,16 +14237,6 @@ function useVehicleRepo() {
       );
       if (res.modifiedCount === 0)
         throw new InternalServerError24("Unable to delete vehicle.");
-      delNamespace().then(() => {
-        logger49.info(
-          `Cache cleared for namespace: ${vehicles_namespace_collection}`
-        );
-      }).catch((err) => {
-        logger49.error(
-          `Failed to clear cache for namespace: ${vehicles_namespace_collection}`,
-          err
-        );
-      });
       return res.modifiedCount;
     } catch (error) {
       throw error;
@@ -14422,25 +14247,11 @@ function useVehicleRepo() {
     if (error) {
       throw new BadRequestError68(error.details[0].message);
     }
-    const cacheKey = makeCacheKey23(vehicles_namespace_collection, {
-      plateNumber,
-      status: "active"
-    });
     try {
-      const cacheData = await getCache(cacheKey);
-      if (cacheData) {
-        logger49.info(`Cache hit for key: ${cacheKey}`);
-        return cacheData;
-      }
       const data = await collection.findOne(
         { plateNumber, status: "active" },
         { sort: { _id: -1 } }
       );
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger49.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger49.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error2) {
       throw new InternalServerError24(
@@ -14464,19 +14275,6 @@ function useVehicleRepo() {
       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 = makeCacheKey23(vehicles_namespace_collection, cacheOptions);
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger49.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
     try {
       const items = await collection.aggregate([
         { $match: query },
@@ -14497,9 +14295,6 @@ function useVehicleRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate18(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => logger49.info(`Cache set for key: ${cacheKey}`)).catch(
-        (err) => logger49.error(`Failed to set cache for key: ${cacheKey}`, err)
-      );
       return data;
     } catch (error) {
       throw error;
@@ -14514,19 +14309,9 @@ function useVehicleRepo() {
           end: { $exists: true, $lte: now }
           // check only end
         },
-        { $set: { status: "deleted", deletedAt: now } },
+        { $set: { status: "deleted", deletedAt: now, isDeletedInDahua: true } },
         { session }
       );
-      delNamespace().then(() => {
-        logger49.info(
-          `Cache cleared for namespace: ${vehicles_namespace_collection}`
-        );
-      }).catch((err) => {
-        logger49.error(
-          `Failed to clear cache for namespace: ${vehicles_namespace_collection}`,
-          err
-        );
-      });
       return res.modifiedCount;
     } catch (error) {
       throw error;
@@ -14545,21 +14330,6 @@ function useVehicleRepo() {
       const query = {
         unit
       };
-      const cacheOptions = {
-        unit: unitId,
-        page,
-        limit,
-        sort: JSON.stringify(sort)
-      };
-      const cacheKey = makeCacheKey23(
-        vehicles_namespace_collection,
-        cacheOptions
-      );
-      const cachedData = await getCache(cacheKey);
-      if (cachedData) {
-        logger49.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
-      }
       const items = await collection.find(query, {
         projection: {
           createdAt: 0,
@@ -14572,14 +14342,24 @@ function useVehicleRepo() {
       }).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate18(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => logger49.info(`Cache set for key: ${cacheKey}`)).catch(
-        (err) => logger49.error(`Failed to set cache for key: ${cacheKey}`, err)
-      );
       return data;
     } catch (error) {
       throw error;
     }
   }
+  async function getAllExpiredVehicles() {
+    try {
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const query = {
+        end: { $lte: now },
+        status: { $ne: "deleted" }
+      };
+      const items = await collection.find(query).toArray();
+      return items;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -14593,7 +14373,8 @@ function useVehicleRepo() {
     getVehicleByPlateNumber,
     getVehiclesByNRIC,
     deleteExpiredVehicles,
-    getAllVehiclesByUnitId
+    getAllVehiclesByUnitId,
+    getAllExpiredVehicles
   };
 }
 
@@ -15220,18 +15001,32 @@ function formatDahuaDate(date) {
     date.getSeconds()
   )}`;
 }
+function parseDahuaFind(text) {
+  const found = Number(text.match(/found=(\d+)/)?.[1] || 0);
+  if (!found) {
+    return { exists: false };
+  }
+  return {
+    exists: true,
+    recNo: text.match(/records\[0\]\.RecNo=(.*)/)?.[1]?.trim(),
+    plateNumber: text.match(/records\[0\]\.PlateNumber=(.*)/)?.[1]?.trim()
+  };
+}
 function useVehicleService() {
   const {
     add: _add,
     deleteVehicle: _deleteVehicle,
     updateVehicleById: _updateVehicleById,
     getVehicleById: _getVehicleById,
-    deleteExpiredVehicles: _deleteExpiredVehicles
+    deleteExpiredVehicles: _deleteExpiredVehicles,
+    getVehicleByPlateNumber: _getVehicleByPlateNumber,
+    getAllExpiredVehicles: _getAllExpiredVehicles
   } = useVehicleRepo();
   const {
     addPlateNumber: _addPlateNumber,
     removePlateNumber: _removePlateNumber,
-    updatePlateNumber: _updatePlateNumber
+    updatePlateNumber: _updatePlateNumber,
+    getPlateNumber: _getPlateNumber
   } = useDahuaService();
   const { getAllCameraWithPassword: _getAllSiteCameras } = useSiteCameraRepo();
   const { getById: _getById } = useOrgRepo();
@@ -15242,9 +15037,15 @@ function useVehicleService() {
     if (!session) {
       throw new Error("Unable to start session for vehicle service.");
     }
-    const org = await _getById(value.org);
+    const [_vehiclePlateNumber] = value.plateNumber;
+    const [existingPlateNumber, org] = await Promise.all([
+      _getVehicleByPlateNumber(_vehiclePlateNumber),
+      _getById(value.org)
+    ]);
     if (!org)
       throw new BadRequestError70("Org not found");
+    if (existingPlateNumber)
+      throw new BadRequestError70("Vehicle plate number already exists");
     if (!Object.values(OrgNature).includes(org.nature)) {
       throw new BadRequestError70(
         "This organization is not allowed to add vehicles."
@@ -15324,29 +15125,61 @@ function useVehicleService() {
         if (vehicleValue.status && vehicleValue.status !== "pending" /* PENDING */) {
           for (const camera of siteCameras) {
             const { host, username, password } = camera;
-            const dahuaPayload = {
+            const plateNumber2 = vehicleValue.plateNumber;
+            const dahuaQuery = {
               host,
               username,
               password,
-              plateNumber,
-              mode: _mode,
-              owner,
-              ...startDateDahua ? { start: startDateDahua } : {},
-              ...endDateDahua ? { end: endDateDahua } : {}
+              plateNumber: plateNumber2,
+              mode: _mode
             };
-            const dahuaResponse = await _addPlateNumber(dahuaPayload);
-            if (dahuaResponse?.statusCode !== 200) {
-              throw new BadRequestError70(
-                `Failed to add plate number to ANPR ${_type}`
-              );
+            const raw = await _getPlateNumber(dahuaQuery);
+            const parsed = parseDahuaFind(raw);
+            if (!parsed.exists) {
+              const dahuaPayload = {
+                host,
+                username,
+                password,
+                plateNumber: plateNumber2,
+                mode: _mode,
+                owner,
+                ...startDateDahua ? { start: startDateDahua } : {},
+                ...endDateDahua ? { end: endDateDahua } : {}
+              };
+              const dahuaResponse = await _addPlateNumber(dahuaPayload);
+              if (dahuaResponse?.statusCode !== 200) {
+                throw new BadRequestError70(
+                  `Failed to add plate number to ANPR ${_type}`
+                );
+              }
+              const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
+              vehicleValue.recNo = responseData.split("=")[1]?.trim();
+            } else {
+              const dahuaPayload = {
+                host,
+                username,
+                password,
+                plateNumber: plateNumber2,
+                recno: parsed.recNo,
+                mode: _mode,
+                ...startDateDahua ? { start: startDateDahua } : {},
+                ...endDateDahua ? { end: endDateDahua } : {},
+                owner,
+                isOpenGate: true
+              };
+              const dahuaResponse = await _updatePlateNumber(dahuaPayload);
+              if (dahuaResponse?.statusCode !== 200) {
+                throw new BadRequestError70(
+                  `Failed to update plate number to ANPR ${_type}`
+                );
+              }
+              vehicleValue.recNo = parsed.recNo;
             }
-            const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
-            vehicleValue.recNo = responseData.split("=")[1]?.trim();
             if (value.peopleId && vehicleValue.recNo) {
               await _pushVehicleById(
                 value.peopleId,
                 {
-                  plateNumber,
+                  plateNumber: plateNumber2,
                   recNo: vehicleValue.recNo
                 },
                 session
@@ -15537,6 +15370,43 @@ function useVehicleService() {
     }
     try {
       session.startTransaction();
+      const vehicles = await _getAllExpiredVehicles();
+      let siteCameras = [];
+      for (const vehicle of vehicles) {
+        const site = vehicle.site;
+        const recno = vehicle.recNo;
+        let page = 1;
+        let pages = 1;
+        const limit = 20;
+        do {
+          const siteCameraReq = await _getAllSiteCameras({
+            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 BadRequestError70("No site cameras found.");
+        }
+        for (const camera of siteCameras) {
+          const host = camera.host;
+          const username = camera.username;
+          const password = camera.password;
+          const dahuaPayload = {
+            host,
+            username,
+            password,
+            recno,
+            mode: "TrafficRedList" /* TRAFFIC_REDLIST */
+          };
+          await _removePlateNumber(dahuaPayload);
+        }
+      }
       await _deleteExpiredVehicles();
       await session.commitTransaction();
       return `Expired Vehicle plate numbers deleted successfully.`;
@@ -15927,21 +15797,21 @@ function useDahuaService() {
             org,
             status: "unregistered" /* UNREGISTERED */
           };
-          const typesForAutoRegister = [
-            "guest" /* GUEST */,
-            "resident" /* RESIDENT */,
-            "tenant" /* TENANT */
-          ];
+          const typesForAutoRegister = Object.values(PersonTypes);
+          let startDate = vehicle?.start ? new Date(vehicle?.start) : /* @__PURE__ */ new Date();
+          let endDate = vehicle?.end ? new Date(vehicle?.end) : new Date(startDate.getTime() + 60 * 60 * 1e3);
           if (vehicle && typeof vehicle.category === "string" && typesForAutoRegister.includes(vehicle.category)) {
             visitorTransaction.name = vehicle.name;
             visitorTransaction.nric = vehicle.nric;
             visitorTransaction.contact = vehicle.phoneNumber;
             visitorTransaction.block = Number(vehicle.block);
             visitorTransaction.level = vehicle.level;
-            visitorTransaction.unit = vehicle.unit;
+            visitorTransaction.unit = vehicle.unit?.toString();
             visitorTransaction.unitName = vehicle.unitName;
             visitorTransaction.type = vehicle.category;
             visitorTransaction.status = "registered" /* REGISTERED */;
+            visitorTransaction.recNo = vehicle.recNo;
+            visitorTransaction.expiredAt = vehicle.end;
           }
           const dahuaPayload = {
             host,
@@ -15951,13 +15821,15 @@ function useDahuaService() {
             mode: "TrafficRedList" /* TRAFFIC_REDLIST */,
             owner: vehicle?.name ?? ""
           };
+          dahuaPayload.start = formatDahuaDate(startDate);
+          dahuaPayload.end = formatDahuaDate(endDate);
           const shouldHaveTimeLimit = visitorTransaction.type === "guest" /* GUEST */ || visitorTransaction.status === "unregistered" /* UNREGISTERED */;
           if (shouldHaveTimeLimit) {
-            const startDate = /* @__PURE__ */ new Date();
-            const endDate = new Date(startDate.getTime() + 15 * 60 * 1e3);
-            dahuaPayload.start = formatDahuaDate(startDate);
-            dahuaPayload.end = formatDahuaDate(endDate);
-            visitorTransaction.expiredAt = endDate.toISOString();
+            const startDate2 = /* @__PURE__ */ new Date();
+            const endDate2 = new Date(startDate2.getTime() + 60 * 60 * 1e3);
+            dahuaPayload.start = formatDahuaDate(startDate2);
+            dahuaPayload.end = formatDahuaDate(endDate2);
+            visitorTransaction.expiredAt = endDate2.toISOString();
           }
           try {
             await addPlateNumber(dahuaPayload);
@@ -16206,14 +16078,14 @@ function useDahuaService() {
       start: Joi39.string().isoDate().optional().allow("", null),
       end: Joi39.string().isoDate().optional().allow("", null),
       owner: Joi39.string().optional().allow("", null),
-      openGate: Joi39.boolean().optional().allow(null)
+      isOpenGate: Joi39.boolean().optional().allow(null)
     });
     const { error } = validation.validate(value);
     if (error) {
       throw new BadRequestError71(`Validation error: ${error.message}`);
     }
     value.owner = String(value.owner ?? "").substring(0, 15) || "unknown";
-    const _openGate = String(value.openGate);
+    const _openGate = String(value.isOpenGate);
     const isOpenGateString = _openGate && _openGate !== "undefined" ? _openGate : "true";
     const endpoint = `/cgi-bin/recordUpdater.cgi?action=insert&name=${value.mode}&PlateNumber=${value.plateNumber}&BeginTime=${value.start}&CancelTime=${value.end}&+OpenGate=${isOpenGateString}&MasterOfCar=${value.owner}`;
     try {
@@ -16274,7 +16146,7 @@ function useDahuaService() {
       username: Joi39.string().required(),
       password: Joi39.string().required(),
       recno: Joi39.string().required(),
-      mode: Joi39.string().valid("TrafficBlackList", "TrafficRedList").required()
+      mode: Joi39.string().valid(...Object.values(ANPRMode)).required()
     });
     const { error } = validation.validate(value);
     if (error) {
@@ -16292,12 +16164,39 @@ function useDahuaService() {
       logger52.error(`[${value.host}] Error removing plate number:`, error2);
     }
   }
+  async function getPlateNumber(value) {
+    const validation = Joi39.object({
+      host: Joi39.string().required(),
+      username: Joi39.string().required(),
+      password: Joi39.string().required(),
+      plateNumber: Joi39.string().required(),
+      mode: Joi39.string().valid(...Object.values(ANPRMode)).required()
+    });
+    const { error } = validation.validate(value);
+    if (error) {
+      throw new BadRequestError71(`Validation error: ${error.message}`);
+    }
+    try {
+      const response = await useDahuaDigest({
+        host: value.host,
+        username: value.username,
+        password: value.password,
+        endpoint: `/cgi-bin/recordFinder.cgi?action=find&name=${value.mode}&condition.PlateNumber=${encodeURIComponent(value.plateNumber)}`
+      });
+      const text = response?.data?.toString?.("utf-8");
+      return text;
+    } catch (error2) {
+      logger52.error(`[${value.host}] Error finding plate number:`, error2);
+      throw error2;
+    }
+  }
   return {
     getSnapshot,
     getTrafficJunction,
     addPlateNumber,
     removePlateNumber,
-    updatePlateNumber
+    updatePlateNumber,
+    getPlateNumber
   };
 }
 
@@ -20630,10 +20529,13 @@ function useVisitorTransactionService() {
   const { getSiteById: _getSiteById } = useSiteRepo();
   const {
     addPlateNumber: _addPlateNumber,
-    removePlateNumber: _removePlateNumber
+    removePlateNumber: _removePlateNumber,
+    getPlateNumber: _getPlateNumber,
+    updatePlateNumber: _updatePlateNumber
   } = useDahuaService();
   const { getAllSites: _getAllSites } = useSiteRepo();
   const { getByUserId: _getByUserId } = usePersonRepo();
+  const { add: addVehicle } = useVehicleRepo();
   async function add(value) {
     const session = useAtlas47.getClient()?.startSession();
     const allowedPersonTypes = [
@@ -20650,12 +20552,12 @@ function useVisitorTransactionService() {
       let site;
       if (value.site) {
         [camera, site] = await Promise.all([
-          _getBySite(value.site, { type: "anpr" }),
+          _getBySite(value.site, { type: "anpr" /* ANPR */ }),
           _getSiteById(value.site)
         ]);
       }
-      const minutesExpiration = site?.dahuaTimeExpiration ? site?.dahuaTimeExpiration : 60;
-      const end = value.checkOut ? new Date(value.checkOut) : new Date(start.getTime() + minutesExpiration * 60 * 1e3);
+      const hourExpiration = site?.dahuaTimeExpiration ? site?.dahuaTimeExpiration : 24 * 60;
+      const end = value.checkOut ? new Date(value.checkOut) : new Date(start.getTime() + hourExpiration * 60 * 1e3);
       const startString = start.toISOString();
       const endString = end.toISOString();
       const startDahuaDate = formatDahuaDate(start);
@@ -20731,27 +20633,76 @@ function useVisitorTransactionService() {
         }
       }
       if (camera && value.plateNumber && camera.host && camera.username && camera.password) {
-        const dahuaPayload = {
-          host: camera.host,
-          username: camera.username,
-          password: camera.password,
-          plateNumber: value.plateNumber,
-          mode: "TrafficRedList" /* TRAFFIC_REDLIST */,
-          start: startDahuaDate,
-          end: endDahuaDate,
-          owner: value.name ?? "",
-          openGate: site?.isOpenGate ?? true
+        const host = camera.host;
+        const username = camera.username;
+        const password = camera.password;
+        const mode = "TrafficRedList" /* TRAFFIC_REDLIST */;
+        const _plateNumber = value.plateNumber;
+        const dahuaQuery = {
+          host,
+          username,
+          password,
+          plateNumber: _plateNumber,
+          mode
         };
-        const dahuaResponse = await _addPlateNumber(dahuaPayload);
-        if (dahuaResponse?.statusCode !== 200) {
-          throw new BadRequestError96(
-            `Failed to add plate number to ANPR whitelist`
-          );
+        const raw = await _getPlateNumber(dahuaQuery);
+        const parsed = parseDahuaFind(raw);
+        if (!parsed.exists) {
+          const dahuaPayload = {
+            host,
+            username,
+            password,
+            plateNumber: _plateNumber,
+            mode,
+            start: startDahuaDate,
+            end: endDahuaDate,
+            owner: value.name ?? "",
+            isOpenGate: site?.isOpenGate ?? true
+          };
+          const dahuaResponse = await _addPlateNumber(dahuaPayload);
+          if (dahuaResponse?.statusCode !== 200) {
+            throw new BadRequestError96(
+              `Failed to add plate number to ANPR whitelist`
+            );
+          }
+          const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
+          value.recNo = responseData.split("=")[1]?.trim();
+          value.checkIn = startString;
+          value.expiredAt = endString;
+          const vehiclePayload = {
+            name: value.name ?? "",
+            category: value.type,
+            org: value.org,
+            site: value.site,
+            plateNumber: value.plateNumber,
+            type: "whitelist" /* WHITELIST */,
+            nric: value.nric,
+            start: startString,
+            end: endString,
+            recNo: value.recNo
+          };
+          await addVehicle(vehiclePayload);
+        } else {
+          const dahuaPayload = {
+            host,
+            username,
+            password,
+            plateNumber: _plateNumber,
+            recno: parsed.recNo,
+            mode,
+            start: startDahuaDate,
+            end: endDahuaDate,
+            owner: value.name ?? "",
+            isOpenGate: site?.isOpenGate ?? true
+          };
+          const dahuaResponse = await _updatePlateNumber(dahuaPayload);
+          if (dahuaResponse?.statusCode !== 200) {
+            throw new BadRequestError96(
+              `Failed to update plate number to ANPR ${"whitelist" /* WHITELIST */}`
+            );
+          }
+          value.recNo = parsed.recNo;
         }
-        const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
-        value.recNo = responseData.split("=")[1]?.trim();
-        value.checkIn = startString;
-        value.expiredAt = endString;
       }
       const result = await _add(value, session);
       await session?.commitTransaction();
@@ -21085,7 +21036,6 @@ function useVisitorTransactionController() {
     }
   }
   async function inviteVisitor(req, res, next) {
-    const inviter = req.params.inviterId;
     const schema2 = Joi55.object({
       name: Joi55.string().required(),
       contact: Joi55.string().required(),
@@ -39091,8 +39041,7 @@ function useOccurrenceEntryController() {
     getLatestSerialNumber: _getLatestSerialNumber
   } = useOccurrenceEntryRepo();
   async function add(req, res, next) {
-    const payload = { ...req.body };
-    const { error } = schemaOccurrenceEntry.validate(payload, {
+    const { error, value } = schemaOccurrenceEntry.validate(req.body, {
       abortEarly: false
     });
     if (error) {
@@ -39102,7 +39051,7 @@ function useOccurrenceEntryController() {
       return;
     }
     try {
-      const data = await _add(payload);
+      const data = await _add(value);
       res.status(201).json(data);
       return;
     } catch (error2) {
@@ -39184,9 +39133,8 @@ function useOccurrenceEntryController() {
     }
   }
   async function updateOccurrenceEntryById(req, res, next) {
-    const _id = req.params.id;
-    const payload = { _id, ...req.body };
-    const { error } = schemaUpdateOccurrenceEntry.validate(payload, {
+    const payload = { _id: req.params.id, ...req.body };
+    const { error, value } = schemaUpdateOccurrenceEntry.validate(payload, {
       abortEarly: false
     });
     if (error) {
@@ -39195,8 +39143,9 @@ function useOccurrenceEntryController() {
       next(new BadRequestError170(messages));
       return;
     }
+    const { _id, ...rest } = value;
     try {
-      const result = await _updateOccurrenceEntryById(_id, req.body);
+      const result = await _updateOccurrenceEntryById(_id, rest);
       res.status(200).json({ message: result });
       return;
     } catch (error2) {
@@ -45503,12 +45452,6 @@ function useVerificationRepoV2() {
           err
         );
       });
-      const cacheKey = makeCacheKey64(namespace_collection, { _id });
-      delCache(cacheKey).then(() => {
-        logger175.info(`Cache deleted for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger175.error(`Failed to delete cache for key: ${cacheKey}`, err);
-      });
       return result;
     } catch (error) {
       throw new InternalServerError68("Error updating verification status.");
@@ -45924,9 +45867,12 @@ function useVerificationControllerV2() {
   async function verify(req, res, next) {
     try {
       const schema2 = Joi126.object({ verificationCode: Joi126.string().required() });
-      const { error, value } = schema2.validate({
-        verificationCode: req.params.verificationCode
-      });
+      const { error, value } = schema2.validate(
+        {
+          verificationCode: req.params.verificationCode
+        },
+        { abortEarly: false }
+      );
       if (error) {
         const messages = error.details.map((d) => d.message).join(", ");
         logger177.log({ level: "error", message: messages });
@@ -45952,7 +45898,7 @@ function useVerificationControllerV2() {
       siteId: Joi126.string().hex().length(24).optional().allow("", null),
       siteName: Joi126.string().optional().allow("", null)
     });
-    const { error, value } = schema2.validate(req.body);
+    const { error, value } = schema2.validate(req.body, { abortEarly: false });
     if (error) {
       const messages = error.details.map((d) => d.message).join(", ");
       logger177.log({ level: "error", message: messages });
@@ -45987,7 +45933,7 @@ function useVerificationControllerV2() {
       siteId: Joi126.string().hex().length(24).required(),
       siteName: Joi126.string().required()
     });
-    const { error, value } = schema2.validate(req.body);
+    const { error, value } = schema2.validate(req.body, { abortEarly: false });
     if (error) {
       const messages = error.details.map((d) => d.message).join(", ");
       logger177.log({ level: "error", message: messages });
@@ -46013,7 +45959,7 @@ function useVerificationControllerV2() {
     const schema2 = Joi126.object({
       email: Joi126.string().email().lowercase().required()
     });
-    const { error, value } = schema2.validate(req.body);
+    const { error, value } = schema2.validate(req.body, { abortEarly: false });
     if (error) {
       const messages = error.details.map((d) => d.message).join(", ");
       logger177.log({ level: "error", message: messages });
@@ -46043,7 +45989,7 @@ function useVerificationControllerV2() {
 
 // src/controllers/auth-v2.controller.ts
 import Joi127 from "joi";
-import { BadRequestError as BadRequestError200, logger as logger179 } from "@7365admin1/node-server-utils";
+import { BadRequestError as BadRequestError201, logger as logger180 } from "@7365admin1/node-server-utils";
 
 // src/services/auth-v2.service.ts
 import {
@@ -46056,11 +46002,13 @@ import {
 import { v4 as uuidv42 } from "uuid";
 
 // src/repositories/user-v2.repo.ts
+import { ObjectId as ObjectId123 } from "mongodb";
 import {
   useAtlas as useAtlas113,
   InternalServerError as InternalServerError70,
   logger as logger178,
   BadRequestError as BadRequestError198,
+  paginate as paginate58,
   NotFoundError as NotFoundError52,
   AppError as AppError27,
   useCache as useCache67,
@@ -46077,6 +46025,7 @@ function useUserRepoV2() {
   }
   const namespace_collection = "users";
   const collection = db.collection(namespace_collection);
+  const { delNamespace, setCache, getCache, delCache } = useCache67(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndexes([{ key: { email: 1 } }]);
@@ -46086,10 +46035,7 @@ function useUserRepoV2() {
   }
   async function createTextIndex() {
     try {
-      await collection.createIndex({
-        name: "text",
-        email: "text"
-      });
+      await collection.createIndex({ name: "text", email: "text" });
     } catch (error) {
       throw new InternalServerError70("Failed to create text index on user.");
     }
@@ -46104,24 +46050,22 @@ function useUserRepoV2() {
       throw new InternalServerError70("Failed to create unique index on user.");
     }
   }
-  const { delNamespace, setCache, getCache, delCache } = useCache67(namespace_collection);
   async function createUser(value, session) {
     try {
       value = MUser(value);
       const res = await collection.insertOne(value, { session });
-      delNamespace().then(() => {
-        logger178.info(`Cache cleared for namespace: ${namespace_collection}`);
-      }).catch((err) => {
-        logger178.error(
+      delNamespace().then(
+        () => logger178.info(`Cache cleared for namespace: ${namespace_collection}`)
+      ).catch(
+        (err) => logger178.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
-        );
-      });
+        )
+      );
       return res.insertedId;
     } catch (error) {
       logger178.log({ level: "error", message: `${error}` });
-      const isDuplicated = error.message.includes("duplicate");
-      if (isDuplicated) {
+      if (error.message.includes("duplicate")) {
         throw new BadRequestError198("User already exists.");
       }
       throw error;
@@ -46138,11 +46082,9 @@ function useUserRepoV2() {
       const data = await collection.findOne({
         email: { $regex: `^${email}$`, $options: "i" }
       });
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger178.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger178.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
+      setCache(cacheKey, data, 15 * 60).then(() => logger178.info(`Cache set for key: ${cacheKey}`)).catch(
+        (err) => logger178.error(`Failed to set cache for key: ${cacheKey}`, err)
+      );
       return data;
     } catch (error) {
       throw new InternalServerError70("Failed to get user by email.");
@@ -46150,26 +46092,22 @@ function useUserRepoV2() {
   }
   async function getUserByEmailStatus(email) {
     try {
-      const cacheOptions = {
+      const cacheKey = makeCacheKey65(namespace_collection, {
         email,
         status: "complete" /* COMPLETE */
-      };
-      const cacheKey = makeCacheKey65(namespace_collection, cacheOptions);
+      });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
         logger178.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
-      const query = {
+      const data = await collection.findOne({
         email: { $regex: `^${email}$`, $options: "i" },
         status: "complete" /* COMPLETE */
-      };
-      const data = await collection.findOne(query);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger178.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger178.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
+      setCache(cacheKey, data, 15 * 60).then(() => logger178.info(`Cache set for key: ${cacheKey}`)).catch(
+        (err) => logger178.error(`Failed to set cache for key: ${cacheKey}`, err)
+      );
       return data;
     } catch (error) {
       throw new InternalServerError70("Failed to get user by email.");
@@ -46192,17 +46130,10 @@ function useUserRepoV2() {
             let: { userOrgId: "$defaultOrg" },
             pipeline: [
               {
-                $match: {
-                  $expr: { $eq: ["$orgId", "$$userOrgId"] }
-                }
+                $match: { $expr: { $eq: ["$orgId", "$$userOrgId"] } }
               },
               {
-                $project: {
-                  _id: 1,
-                  name: 1,
-                  type: 1,
-                  siteId: 1
-                }
+                $project: { _id: 1, name: 1, type: 1, siteId: 1 }
               }
             ],
             as: "serviceProviders"
@@ -46210,9 +46141,117 @@ function useUserRepoV2() {
         }
       ]).toArray();
       const data = results.length > 0 ? results[0] : null;
-      if (!data) {
+      if (!data)
         throw new NotFoundError52("User not found.");
+      setCache(cacheKey, data, 15 * 60).then(() => logger178.info(`Cache set for key: ${cacheKey}`)).catch(
+        (err) => logger178.error(`Failed to set cache for key: ${cacheKey}`, err)
+      );
+      return data;
+    } catch (error) {
+      if (error instanceof AppError27)
+        throw error;
+      throw new InternalServerError70("Failed to get user by id.");
+    }
+  }
+  async function getUserByReferralCode(referralCode) {
+    try {
+      const cacheKey = makeCacheKey65(namespace_collection, { referralCode });
+      const cachedData = await getCache(cacheKey);
+      if (cachedData) {
+        logger178.info(`Cache hit for key: ${cacheKey}`);
+        return cachedData;
+      }
+      const data = await collection.findOne({ referralCode });
+      setCache(cacheKey, data, 15 * 60).then(() => logger178.info(`Cache set for key: ${cacheKey}`)).catch(
+        (err) => logger178.error(`Failed to set cache for key: ${cacheKey}`, err)
+      );
+      return data;
+    } catch (error) {
+      throw new InternalServerError70("Failed to get user by referral code.");
+    }
+  }
+  async function getByEmailApp(email, app) {
+    try {
+      const cacheKey = makeCacheKey65(namespace_collection, { email, app });
+      const cachedData = await getCache(cacheKey);
+      if (cachedData) {
+        logger178.info(`Cache hit for key: ${cacheKey}`);
+        return cachedData;
       }
+      const data = await collection.findOne({
+        email,
+        "roles.app": app
+      });
+      setCache(cacheKey, data, 15 * 60).then(() => logger178.info(`Cache set for key: ${cacheKey}`)).catch(
+        (err) => logger178.error(`Failed to set cache for key: ${cacheKey}`, err)
+      );
+      return data;
+    } catch (error) {
+      throw new InternalServerError70("Failed to get user by email and app.");
+    }
+  }
+  async function getUsersByOrgId({
+    organization = "",
+    search = "",
+    page = 1,
+    limit = 10,
+    sort = {},
+    type = "",
+    status = "active"
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const query = { status };
+    const cacheOptions = { status };
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    cacheOptions.sort = JSON.stringify(sort);
+    if (search) {
+      query.$text = { $search: search };
+      cacheOptions.search = search;
+    }
+    if (type) {
+      query.type = type;
+      cacheOptions.type = type;
+    }
+    if (organization) {
+      try {
+        query.defaultOrg = new ObjectId123(organization);
+        cacheOptions.organization = organization.toString();
+      } catch (error) {
+        throw new BadRequestError198("Invalid organization ID format.");
+      }
+    }
+    delNamespace().then(() => {
+      logger178.info(`Cache cleared for namespace: ${namespace_collection}`);
+    }).catch((err) => {
+      logger178.error(
+        `Failed to clear cache for namespace: ${namespace_collection}`,
+        err
+      );
+    });
+    const cacheKey = makeCacheKey65(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger178.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const items = await collection.aggregate([
+        { $match: query },
+        { $sort: sort },
+        { $skip: page * limit },
+        { $limit: limit },
+        {
+          $project: {
+            _id: 1,
+            name: 1,
+            email: 1,
+            type: 1,
+            status: 1
+          }
+        }
+      ]).toArray();
+      const length = await collection.countDocuments(query);
+      const data = paginate58(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
         logger178.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
@@ -46220,12 +46259,197 @@ function useUserRepoV2() {
       });
       return data;
     } catch (error) {
-      if (error instanceof AppError27) {
+      logger178.log({ level: "error", message: `${error}` });
+      throw error;
+    }
+  }
+  async function getUsers({
+    search = "",
+    page = 1,
+    limit = 10,
+    sort = {},
+    type = "",
+    status = "active"
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const query = { status };
+    const cacheOptions = { status };
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    cacheOptions.sort = JSON.stringify(sort);
+    if (search) {
+      query.$text = { $search: search };
+      cacheOptions.search = search;
+    }
+    if (type) {
+      query.type = type;
+      cacheOptions.type = type;
+    }
+    delNamespace().then(
+      () => logger178.info(`Cache cleared for namespace: ${namespace_collection}`)
+    ).catch(
+      (err) => logger178.error(
+        `Failed to clear cache for namespace: ${namespace_collection}`,
+        err
+      )
+    );
+    const cacheKey = makeCacheKey65(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger178.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const items = await collection.aggregate([
+        { $match: query },
+        { $sort: sort },
+        { $skip: page * limit },
+        { $limit: limit },
+        { $project: { _id: 1, name: 1, email: 1, type: 1, status: 1 } }
+      ]).toArray();
+      const length = await collection.countDocuments(query);
+      const data = paginate58(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => logger178.info(`Cache set for key: ${cacheKey}`)).catch(
+        (err) => logger178.error(`Failed to set cache for key: ${cacheKey}`, err)
+      );
+      return data;
+    } catch (error) {
+      logger178.log({ level: "error", message: `${error}` });
+      throw error;
+    }
+  }
+  async function updatePasswordById({ _id, password }, session) {
+    const cacheKey = makeCacheKey65(namespace_collection, { _id });
+    _id = toObjectId18(_id);
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        { $set: { password, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      delCache(cacheKey).then(() => {
+        logger178.info(`Cache deleted for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger178.error(`Failed to delete cache for key: ${cacheKey}`, err);
+      });
+      return result;
+    } catch (error) {
+      throw new InternalServerError70("Failed to update user password.");
+    }
+  }
+  async function updateUserFieldById({ _id, field, value } = {}, session) {
+    const allowedFields = [
+      "name",
+      "email",
+      "contact",
+      "nric",
+      "dateOfBirth",
+      "profile",
+      "gender",
+      "defaultOrg"
+    ];
+    if (!allowedFields.includes(field)) {
+      throw new BadRequestError198(
+        `Field "${field}" is not allowed to be updated.`
+      );
+    }
+    try {
+      _id = new ObjectId123(_id);
+    } catch (error) {
+      throw new BadRequestError198("Invalid ID.");
+    }
+    if (field === "defaultOrg") {
+      try {
+        value = new ObjectId123(value);
+      } catch (error) {
+        throw new BadRequestError198("Invalid organization ID.");
+      }
+    }
+    if (field === "name") {
+      try {
+        await Promise.all([
+          updateFeedbackCreatedByName(_id, value, session),
+          updateWorkOrderCreatedByName(_id, value, session),
+          updateUserNameBySignatureId(_id, value, session)
+        ]);
+      } catch (error) {
         throw error;
-      } else {
-        throw new InternalServerError70("Failed to get user by email.");
       }
     }
+    try {
+      await collection.updateOne(
+        { _id },
+        { $set: { [field]: value, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        // Dynamically set the field
+        { session }
+      );
+      const cacheKey = makeCacheKey65(namespace_collection, { _id });
+      delCache(cacheKey).then(() => {
+        logger178.info(`Cache deleted for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger178.error(`Failed to delete cache for key: ${cacheKey}`, err);
+      });
+      return `Successfully updated user ${field}.`;
+    } catch (error) {
+      throw new InternalServerError70(`Failed to update user ${field}.`);
+    }
+  }
+  async function updateBirthday({
+    _id,
+    month,
+    day,
+    year
+  }, session) {
+    try {
+      _id = new ObjectId123(_id);
+    } catch (error) {
+      throw new BadRequestError198("Invalid user ID format.");
+    }
+    try {
+      await collection.updateOne(
+        { _id },
+        {
+          $set: {
+            birthMonth: month,
+            birthDay: day,
+            birthYear: year,
+            updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+          }
+        },
+        { session }
+      );
+      const cacheKey = makeCacheKey65(namespace_collection, { _id });
+      delCache(cacheKey).then(() => {
+        logger178.info(`Cache deleted for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger178.error(`Failed to delete cache for key: ${cacheKey}`, err);
+      });
+      return "Successfully updated user birthday.";
+    } catch (error) {
+      throw new InternalServerError70("Failed to update user birthday.");
+    }
+  }
+  async function updatePassword({ _id, password }, session) {
+    try {
+      _id = new ObjectId123(_id);
+    } catch (error) {
+      throw new BadRequestError198("Invalid user ID format.");
+    }
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        { $set: { password, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      const cacheKey = makeCacheKey65(namespace_collection, { _id });
+      delCache(cacheKey).then(() => {
+        logger178.info(`Cache deleted for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger178.error(`Failed to delete cache for key: ${cacheKey}`, err);
+      });
+      return result;
+    } catch (error) {
+      throw new InternalServerError70("Failed to update user password.");
+    }
   }
   return {
     createIndex,
@@ -46234,7 +46458,13 @@ function useUserRepoV2() {
     createUser,
     getUserByEmail,
     getUserByEmailStatus,
-    getUserById
+    getUserById,
+    getUsers,
+    getUsersByOrgId,
+    updatePasswordById,
+    updateUserFieldById,
+    updateBirthday,
+    updatePassword
   };
 }
 
@@ -46301,10 +46531,220 @@ function useAuthServiceV2() {
   };
 }
 
+// src/services/user-v2.service.ts
+import {
+  BadRequestError as BadRequestError200,
+  comparePassword as comparePassword4,
+  hashPassword as hashPassword5,
+  InternalServerError as InternalServerError72,
+  NotFoundError as NotFoundError54,
+  useAtlas as useAtlas114,
+  useS3 as useS33
+} from "@7365admin1/node-server-utils";
+import "multer";
+function useUserServiceV2() {
+  const {
+    createUser: _createUser,
+    getUserByEmail: _getUserByEmail,
+    updatePasswordById: _updatePasswordById,
+    updateUserFieldById: _updateUserFieldById,
+    getUserById,
+    updatePassword
+  } = useUserRepoV2();
+  const { getRoleByName, addRole } = useRoleRepo();
+  const { add: addMember } = useMemberRepo();
+  const { getById: getOrgById } = useOrgRepo();
+  const { getSiteById } = useSiteRepo();
+  const {
+    getVerificationById: _getVerificationById,
+    updateVerificationStatusById: _updateVerificationStatusById
+  } = useVerificationRepoV2();
+  const { verify: _verify } = useVerificationServiceV2();
+  const { createFile, deleteFileById } = useFileRepo();
+  async function createUserBySignUp({
+    id = "",
+    name = ""
+  }) {
+    const session = useAtlas114.getClient()?.startSession();
+    session?.startTransaction();
+    try {
+      const signUp = await _getVerificationById(id);
+      if (!signUp)
+        throw new BadRequestError200("Invalid sign up link.");
+      if (signUp.status === "complete" /* COMPLETE */)
+        throw new BadRequestError200(
+          "You have already an account created using this link."
+        );
+      const expired = signUp.expireAt < (/* @__PURE__ */ new Date()).toISOString();
+      if (signUp.status === "expired" || expired)
+        throw new BadRequestError200("Sign up link expired.");
+      const email = signUp.email;
+      const _user = await _getUserByEmail(email);
+      if (_user)
+        throw new BadRequestError200(`User already exists: ${email}.`);
+      let org = null;
+      if (signUp.metadata?.org) {
+        org = await getOrgById(signUp.metadata.org);
+        if (!org)
+          signUp.metadata.org = "";
+      }
+      if (signUp.metadata?.siteId)
+        await getSiteById(signUp.metadata?.siteId);
+      const user = {
+        email,
+        password: signUp.metadata?.password,
+        name,
+        defaultOrg: org?._id?.toString() || ""
+      };
+      const userId = await _createUser(user, session);
+      if (org?._id) {
+        await addMember(
+          {
+            org: org?._id?.toString() || "",
+            orgName: org?.name || "",
+            user: userId.toString(),
+            name,
+            role: signUp.metadata?.role?.toString() || "",
+            type: signUp.metadata?.app ?? "organization",
+            siteId: signUp.metadata?.siteId?.toString() || "",
+            siteName: signUp.metadata?.siteName || ""
+          },
+          session
+        );
+      }
+      await _updateVerificationStatusById(
+        id,
+        "complete" /* COMPLETE */,
+        session
+      );
+      await session?.commitTransaction();
+      return userId;
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
+  async function resetPassword(id, newPassword, passwordConfirmation) {
+    if (newPassword !== passwordConfirmation) {
+      throw new BadRequestError200("Passwords do not match.");
+    }
+    let hashedPassword;
+    const session = useAtlas114.getClient()?.startSession();
+    session?.startTransaction();
+    try {
+      hashedPassword = await hashPassword5(newPassword);
+    } catch (error) {
+      throw new InternalServerError72(`Error hashing password: ${error}`);
+    }
+    try {
+      const otpDoc = await _getVerificationById(id);
+      if (!otpDoc) {
+        throw new NotFoundError54("You are using an invalid reset link.");
+      }
+      if (otpDoc.status === "complete" /* COMPLETE */) {
+        throw new BadRequestError200("This link has already been invalidated.");
+      }
+      const user = await _getUserByEmail(otpDoc.email);
+      if (!user) {
+        throw new NotFoundError54("User not found.");
+      }
+      if (!user._id) {
+        throw new InternalServerError72("Invalid user ID.");
+      }
+      await Promise.all([
+        _updateVerificationStatusById(id, "complete" /* COMPLETE */, session),
+        _updatePasswordById(
+          { _id: user._id.toString(), password: hashedPassword },
+          session
+        )
+      ]);
+      await session?.commitTransaction();
+      return "Successfully reset password.";
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
+  const s3 = new useS33({
+    accessKeyId: SPACES_ACCESS_KEY,
+    secretAccessKey: SPACES_SECRET_KEY,
+    endpoint: SPACES_ENDPOINT,
+    region: SPACES_REGION,
+    bucket: SPACES_BUCKET,
+    forcePathStyle: false
+  });
+  async function updateUserProfile({
+    file,
+    user,
+    previousProfile
+  }) {
+    const session = useAtlas114.getClient()?.startSession();
+    session?.startTransaction();
+    const _file = {
+      name: file.originalname,
+      createdAt: (/* @__PURE__ */ new Date()).toISOString()
+    };
+    try {
+      const id = await createFile(_file, session);
+      await s3.uploadObject({
+        key: id,
+        body: file.buffer,
+        contentType: file.mimetype
+      });
+      if (previousProfile) {
+        await deleteFileById(previousProfile, session);
+        await s3.deleteObject(previousProfile);
+      }
+      await _updateUserFieldById(
+        { _id: user, field: "profile", value: id },
+        session
+      );
+      await session?.commitTransaction();
+      return id;
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
+  async function updatePasswordById(id, currentPassword, newPassword, passwordConfirmation) {
+    let hashedPassword;
+    const user = await getUserById(id);
+    const isPasswordValid = await comparePassword4(
+      currentPassword,
+      user.password
+    );
+    if (!isPasswordValid)
+      throw new BadRequestError200("Invalid current password.");
+    if (newPassword !== passwordConfirmation)
+      throw new BadRequestError200("Passwords do not match.");
+    try {
+      hashedPassword = await hashPassword5(newPassword);
+      if (!hashedPassword)
+        throw new InternalServerError72("Error hashing password.");
+      return await updatePassword({ _id: id, password: hashedPassword });
+    } catch (error) {
+      throw error;
+    }
+  }
+  return {
+    createUserBySignUp,
+    resetPassword,
+    updateUserProfile,
+    updatePasswordById
+  };
+}
+
 // src/controllers/auth-v2.controller.ts
 function useAuthControllerV2() {
   const { signUp: _signUp } = useVerificationServiceV2();
   const { login: _login, logout: _logout } = useAuthServiceV2();
+  const { resetPassword: _resetPassword } = useUserServiceV2();
   async function signUp(req, res, next) {
     try {
       const validation = Joi127.object({
@@ -46318,8 +46758,8 @@ function useAuthControllerV2() {
       });
       if (error) {
         const messages = error.details.map((d) => d.message);
-        logger179.log({ level: "error", message: messages.join(", ") });
-        next(new BadRequestError200(messages.join(", ")));
+        logger180.log({ level: "error", message: messages.join(", ") });
+        next(new BadRequestError201(messages.join(", ")));
         return;
       }
       const { email, password, country, orgName } = value;
@@ -46335,7 +46775,7 @@ function useAuthControllerV2() {
       return;
     } catch (error) {
       console.log(error);
-      logger179.log({ level: "error", message: error.message });
+      logger180.log({ level: "error", message: error.message });
       next(error);
       return;
     }
@@ -46353,8 +46793,8 @@ function useAuthControllerV2() {
       });
       if (error) {
         const messages = error.details.map((d) => d.message);
-        logger179.log({ level: "error", message: messages.join(", ") });
-        next(new BadRequestError200(messages.join(", ")));
+        logger180.log({ level: "error", message: messages.join(", ") });
+        next(new BadRequestError201(messages.join(", ")));
         return;
       }
       const session = await _login(value);
@@ -46366,7 +46806,7 @@ function useAuthControllerV2() {
       res.cookie("sid", session.sid, cookieOptions).cookie("user", session.user, cookieOptions).json(session);
       return;
     } catch (error) {
-      logger179.log({ level: "error", message: error.message });
+      logger180.log({ level: "error", message: error.message });
       next(error);
       return;
     }
@@ -46374,7 +46814,7 @@ function useAuthControllerV2() {
   async function logout(req, res, next) {
     const sid = req.headers["authorization"] ?? "";
     if (!sid) {
-      next(new BadRequestError200("Session ID is required"));
+      next(new BadRequestError201("Session ID is required"));
       return;
     }
     try {
@@ -46382,130 +46822,170 @@ function useAuthControllerV2() {
       res.json({ message: "Logged out successfully" });
       return;
     } catch (error) {
-      logger179.log({ level: "error", message: error.message });
+      logger180.log({ level: "error", message: error.message });
       next(error);
       return;
     }
   }
-  return {
-    signUp,
-    login,
-    logout
-  };
-}
-
-// src/services/user-v2.service.ts
-import {
-  BadRequestError as BadRequestError201,
-  useAtlas as useAtlas114
-} from "@7365admin1/node-server-utils";
-import "multer";
-function useUserServiceV2() {
-  const { createUser: _createUser, getUserByEmail } = useUserRepoV2();
-  const { getRoleByName, addRole } = useRoleRepo();
-  const { add: addMember } = useMemberRepo();
-  const { getById: getOrgById } = useOrgRepo();
-  const { getSiteById } = useSiteRepo();
-  const {
-    getVerificationById: _getVerificationById,
-    updateVerificationStatusById: _updateVerificationStatusById
-  } = useVerificationRepoV2();
-  const { verify } = useVerificationService();
-  const { createFile, deleteFileById } = useFileRepo();
-  async function createUserBySignUp({
-    id = "",
-    name = ""
-  }) {
-    const session = useAtlas114.getClient()?.startSession();
-    session?.startTransaction();
+  async function resetPassword(req, res, next) {
+    const validation = Joi127.object({
+      otp: Joi127.string().hex().required(),
+      newPassword: Joi127.string().required().min(8),
+      passwordConfirmation: Joi127.string().required().min(8)
+    });
+    const { error, value } = validation.validate(req.body, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message);
+      logger180.log({ level: "error", message: messages.join(", ") });
+      next(new BadRequestError201(messages.join(", ")));
+      return;
+    }
+    const { otp, newPassword, passwordConfirmation } = value;
     try {
-      const signUp = await _getVerificationById(id);
-      if (!signUp)
-        throw new BadRequestError201("Invalid sign up link.");
-      if (signUp.status === "complete")
-        throw new BadRequestError201(
-          "You have already an account created using this link."
-        );
-      const expired = signUp.expireAt < (/* @__PURE__ */ new Date()).toISOString();
-      if (signUp.status === "expired" || expired)
-        throw new BadRequestError201("Sign up link expired.");
-      const email = signUp.email;
-      const _user = await getUserByEmail(email);
-      if (_user)
-        throw new BadRequestError201(`User already exists: ${email}.`);
-      let org = null;
-      if (signUp.metadata?.org) {
-        org = await getOrgById(signUp.metadata.org);
-        if (!org)
-          signUp.metadata.org = "";
-      }
-      if (signUp.metadata?.siteId)
-        await getSiteById(signUp.metadata?.siteId);
-      const user = {
-        email,
-        password: signUp.metadata?.password,
-        name,
-        defaultOrg: org?._id?.toString() || ""
-      };
-      const userId = await _createUser(user, session);
-      if (org?._id) {
-        await addMember(
-          {
-            org: org?._id?.toString() || "",
-            orgName: org?.name || "",
-            user: userId.toString(),
-            name,
-            role: signUp.metadata?.role?.toString() || "",
-            type: signUp.metadata?.app ?? "organization",
-            siteId: signUp.metadata?.siteId?.toString() || "",
-            siteName: signUp.metadata?.siteName || ""
-          },
-          session
-        );
-      }
-      await _updateVerificationStatusById(
-        id,
-        "complete" /* COMPLETE */,
-        session
+      const message = await _resetPassword(
+        otp,
+        newPassword,
+        passwordConfirmation
       );
-      await session?.commitTransaction();
-      return userId;
-    } catch (error) {
-      await session?.abortTransaction();
-      throw error;
-    } finally {
-      session?.endSession();
+      res.json({ message });
+      return;
+    } catch (error2) {
+      logger180.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
     }
   }
   return {
-    createUserBySignUp
+    signUp,
+    login,
+    logout,
+    resetPassword
   };
 }
 
 // src/controllers/user-v2.controller.ts
 import Joi128 from "joi";
+import "multer";
 import { BadRequestError as BadRequestError202, logger as logger181 } from "@7365admin1/node-server-utils";
 function useUserControllerV2() {
-  const { createUserBySignUp: _createUserBySignUp } = useUserServiceV2();
+  const {
+    updateBirthday: _updateBirthday,
+    getUserById: _getUserById,
+    getUserByEmail: _getUserByEmail,
+    getUserById: _getById,
+    getUsers: _getUsers,
+    getUsersByOrgId: _getUsersByOrgId,
+    updateUserFieldById: _updateUserFieldById
+  } = useUserRepoV2();
+  const { createUserBySignUp, updateUserProfile: _updateUserProfile, updatePasswordById: _updatePasswordById } = useUserServiceV2();
+  function rejectValidation(error, next) {
+    const message = error.details.map((d) => d.message).join(", ");
+    logger181.log({ level: "error", message });
+    next(new BadRequestError202(message));
+  }
+  async function getById(req, res, next) {
+    const validation = Joi128.string().hex().required();
+    const _id = req.params.id;
+    const { error, value } = validation.validate(_id);
+    if (error) {
+      logger181.log({ level: "error", message: `${error.message}` });
+      next(new BadRequestError202(error.message));
+      return;
+    }
+    try {
+      const user = await _getById(value);
+      res.json(user);
+      return;
+    } catch (error2) {
+      logger181.log({ level: "error", message: `${error2.message}` });
+      next(error2);
+      return;
+    }
+  }
+  async function getByEmail(req, res, next) {
+    const { error, value } = Joi128.string().email().required().validate(req.params.email);
+    if (error)
+      return rejectValidation(error, next);
+    try {
+      const user = await _getUserByEmail(value);
+      res.json(user);
+      return;
+    } catch (err) {
+      logger181.log({ level: "error", message: `${err.message}` });
+      next(err);
+      return;
+    }
+  }
+  async function getUsers(req, res, next) {
+    const { search = "", page = 1, limit = 10, sort = {}, type = "", status = "active" } = req.query;
+    const { error, value } = Joi128.object({
+      search: Joi128.string().optional().allow("", null),
+      page: Joi128.number().integer().min(1).allow("", null).default(1),
+      limit: Joi128.number().integer().min(1).allow("", null).default(10),
+      sort: Joi128.object().optional().allow("", null).default({}),
+      type: Joi128.string().optional().allow("", null).default(""),
+      status: Joi128.string().optional().allow("", null).default("active" /* ACTIVE */)
+    }).validate({ search, page, limit, sort, type, status });
+    if (error)
+      return rejectValidation(error, next);
+    try {
+      const users = await _getUsers({
+        search: value.search ?? "",
+        page: value.page,
+        limit: value.limit,
+        sort: value.sort,
+        type: value.type,
+        status: value.status
+      });
+      res.json(users);
+      return;
+    } catch (err) {
+      next(err);
+    }
+  }
+  async function getUsersByOrgId(req, res, next) {
+    const { search, page, status, organization } = req.query;
+    const { error, value } = Joi128.object({
+      search: Joi128.string().optional().allow("", null),
+      page: Joi128.number().integer().min(1).allow("", null).default(1),
+      status: Joi128.string().required(),
+      organization: Joi128.string().required()
+    }).validate({ search, page, status, organization });
+    if (error)
+      return rejectValidation(error, next);
+    try {
+      res.json(
+        await _getUsersByOrgId({
+          search: value.search ?? "",
+          page: value.page,
+          status: value.status,
+          organization: value.organization
+        })
+      );
+    } catch (err) {
+      next(err);
+    }
+  }
   async function createUserByVerification(req, res, next) {
-    const schema2 = Joi128.object({
-      id: Joi128.string().hex().length(24).required(),
+    const allowedTypes = ["user-sign-up" /* USER_SIGN_UP */, "user-invite" /* USER_INVITE */];
+    const validation = Joi128.object({
+      id: Joi128.string().hex().required(),
       name: Joi128.string().required(),
-      type: Joi128.string().required().valid("user-sign-up" /* USER_SIGN_UP */, "user-invite" /* USER_INVITE */)
-    });
-    const { error, value } = schema2.validate({
-      id: req.params.id,
-      ...req.body
+      password: Joi128.string().required(),
+      type: Joi128.string().required().valid(...allowedTypes)
     });
+    const id = req.params.id;
+    const payload = { ...req.body };
+    const { error, value } = validation.validate({ id, ...payload });
     if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      logger181.log({ level: "error", message: messages });
-      next(new BadRequestError202(messages));
+      logger181.log({ level: "error", message: `${error.message}` });
+      next(new BadRequestError202(error.message));
       return;
     }
-    const { id, name } = value;
     try {
-      await _createUserBySignUp({ id, name });
+      await createUserBySignUp({ id: value.id, name: value.name });
       res.status(201).json({ message: "Successfully created account." });
       return;
     } catch (error2) {
@@ -46514,8 +46994,148 @@ function useUserControllerV2() {
       return;
     }
   }
+  async function updateUserProfile(req, res, next) {
+    if (!req.file) {
+      next(new BadRequestError202("File is required!"));
+      return;
+    }
+    const validation = Joi128.object({
+      previousProfile: Joi128.string().hex().optional().allow("", null)
+    });
+    const payload = { ...req.body };
+    const { error, value } = validation.validate(payload);
+    if (error) {
+      logger181.log({ level: "error", message: `${error.message}` });
+      next(new BadRequestError202(error.message));
+      return;
+    }
+    const user = req.headers.user ?? "";
+    try {
+      await _updateUserProfile({
+        file: req.file,
+        user,
+        ...value
+      });
+      res.json({ message: "Successfully updated profile picture." });
+      return;
+    } catch (error2) {
+      logger181.log({ level: "error", message: `${error2.message}` });
+      next(error2);
+      return;
+    }
+  }
+  async function updateBirthday(req, res, next) {
+    const MONTHS = [
+      "January",
+      "February",
+      "March",
+      "April",
+      "May",
+      "June",
+      "July",
+      "August",
+      "September",
+      "October",
+      "November",
+      "December"
+    ];
+    const validation = Joi128.object({
+      _id: Joi128.string().hex().required(),
+      month: Joi128.string().valid(...MONTHS).required(),
+      day: Joi128.number().integer().min(1).max(31).required(),
+      year: Joi128.number().integer().min(1900).max((/* @__PURE__ */ new Date()).getFullYear()).required()
+    });
+    const _id = req.params.id;
+    const payload = { ...req.body };
+    const { error } = validation.validate({ _id, ...payload });
+    if (error) {
+      logger181.log({ level: "error", message: `${error.message}` });
+      next(new BadRequestError202(error.message));
+      return;
+    }
+    try {
+      const message = await _updateBirthday({ _id, ...payload });
+      res.json({ message });
+      return;
+    } catch (error2) {
+      logger181.log({ level: "error", message: `${error2.message}` });
+      next(error2);
+      return;
+    }
+  }
+  async function updateUserFieldById(req, res, next) {
+    const FIELDS = ["name", "email", "contact", "nric", "dateOfBirth", "profile", "gender", "defaultOrg"];
+    const validation = Joi128.object({
+      _id: Joi128.string().hex().required(),
+      field: Joi128.string().valid(...FIELDS).required(),
+      value: Joi128.when("field", {
+        switch: [
+          { is: "email", then: Joi128.string().email().required() },
+          { is: "defaultOrg", then: Joi128.string().hex().required() }
+        ],
+        otherwise: Joi128.string().required()
+      })
+    });
+    const _id = req.params.id;
+    const payload = { ...req.body };
+    const { error } = validation.validate({ _id, ...payload });
+    if (error) {
+      logger181.log({ level: "error", message: `${error.message}` });
+      next(new BadRequestError202(error.message));
+      return;
+    }
+    try {
+      const message = await _updateUserFieldById({ _id, ...payload });
+      res.json({ message });
+      return;
+    } catch (error2) {
+      logger181.log({ level: "error", message: `${error2.message}` });
+      next(error2);
+      return;
+    }
+  }
+  async function updatePasswordById(req, res, next) {
+    const validation = Joi128.object({
+      _id: Joi128.string().hex().required(),
+      currentPassword: Joi128.string().required().min(8),
+      newPassword: Joi128.string().required().min(8),
+      passwordConfirmation: Joi128.string().required().min(8)
+    });
+    const _id = req.params.id;
+    const payload = { ...req.body };
+    const { error } = validation.validate({
+      _id,
+      ...payload
+    });
+    if (error) {
+      next(new BadRequestError202(error.message));
+      return;
+    }
+    const currentPassword = req.body.currentPassword ?? "";
+    const newPassword = req.body.newPassword ?? "";
+    const passwordConfirmation = req.body.passwordConfirmation ?? "";
+    try {
+      await _updatePasswordById(
+        _id,
+        currentPassword,
+        newPassword,
+        passwordConfirmation
+      );
+      res.json({ message: "Successfully updated password." });
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
-    createUserByVerification
+    getById,
+    getByEmail,
+    getUsersByOrgId,
+    getUsers,
+    createUserByVerification,
+    updateUserProfile,
+    updateBirthday,
+    updateUserFieldById,
+    updatePasswordById
   };
 }
 export {
@@ -46657,6 +47277,7 @@ export {
   occurrence_book_namespace_collection,
   orgSchema,
   overnight_parking_requests_namespace_collection,
+  parseDahuaFind,
   pestDashboardCollection,
   poolDashboardCollection,
   promoCodeSchema,