@7365admin1/core 2.43.0 → 2.45.0

package/dist/index.js

@@ -37,6 +37,8 @@ __export(src_exports, {
   BulletinRecipient: () => BulletinRecipient,
   BulletinSort: () => BulletinSort,
   BulletinStatus: () => BulletinStatus,
+  BulletinVideoOrder: () => BulletinVideoOrder,
+  BulletinVideoSort: () => BulletinVideoSort,
   CameraType: () => CameraType,
   DEVICE_STATUS: () => DEVICE_STATUS,
   DOBStatus: () => DOBStatus,
@@ -44,6 +46,8 @@ __export(src_exports, {
   EAccessCardTypes: () => EAccessCardTypes,
   EAccessCardUserTypes: () => EAccessCardUserTypes,
   EmailSender: () => EmailSender,
+  EntryOrder: () => EntryOrder,
+  EntrySort: () => EntrySort,
   FacilitySort: () => FacilitySort,
   FacilityStatus: () => FacilityStatus,
   GuestSort: () => GuestSort,
@@ -125,6 +129,8 @@ __export(src_exports, {
   SortFields: () => SortFields,
   SortOrder: () => SortOrder,
   Status: () => Status,
+  SubjectOrder: () => SubjectOrder,
+  SubjectSort: () => SubjectSort,
   SubscriptionType: () => SubscriptionType,
   UseAccessManagementRepo: () => UseAccessManagementRepo,
   UserStatus: () => UserStatus,
@@ -180,6 +186,7 @@ __export(src_exports, {
   robotSchema: () => robotSchema,
   schema: () => schema,
   schemaApprovedBy: () => schemaApprovedBy,
+  schemaApprover: () => schemaApprover,
   schemaBilling: () => schemaBilling,
   schemaBillingConfiguration: () => schemaBillingConfiguration,
   schemaBillingItem: () => schemaBillingItem,
@@ -1832,6 +1839,17 @@ var import_node_server_utils8 = require("@7365admin1/node-server-utils");
 // src/models/occurrence-entry.model.ts
 var import_mongodb6 = require("mongodb");
 var import_joi5 = __toESM(require("joi"));
+var EntrySort = /* @__PURE__ */ ((EntrySort2) => {
+  EntrySort2["CREATED_AT"] = "createdAt";
+  EntrySort2["NAME"] = "name";
+  EntrySort2["ID"] = "_id";
+  return EntrySort2;
+})(EntrySort || {});
+var EntryOrder = /* @__PURE__ */ ((EntryOrder2) => {
+  EntryOrder2["ASC"] = "asc";
+  EntryOrder2["DESC"] = "desc";
+  return EntryOrder2;
+})(EntryOrder || {});
 var schemaOccurrenceEntry = import_joi5.default.object({
   site: import_joi5.default.string().hex().length(24).required(),
   dailyOccurrenceBookId: import_joi5.default.string().hex().optional().allow(null, ""),
@@ -2996,7 +3014,8 @@ function useUserRepo() {
       "dateOfBirth",
       "profile",
       "gender",
-      "defaultOrg"
+      "defaultOrg",
+      "status"
     ];
     if (!allowedFields.includes(field)) {
       throw new import_node_server_utils10.BadRequestError(
@@ -13519,6 +13538,10 @@ var schemaFiles = import_joi35.default.object({
   id: import_joi35.default.string().hex().required(),
   name: import_joi35.default.string().optional().allow(null, "")
 });
+var schemaApprover = import_joi35.default.object({
+  id: import_joi35.default.string().hex().required(),
+  name: import_joi35.default.string().optional().allow(null, "")
+});
 var schemaPerson = import_joi35.default.object({
   _id: import_joi35.default.string().hex().optional().allow("", null),
   user: import_joi35.default.string().hex().length(24).optional().allow(null, ""),
@@ -13543,7 +13566,8 @@ var schemaPerson = import_joi35.default.object({
   files: import_joi35.default.array().items(schemaFiles).optional().allow(null),
   password: import_joi35.default.string().optional().allow(null, ""),
   plateNumber: import_joi35.default.string().optional().allow(null, ""),
-  platform: import_joi35.default.string().valid("web", "mobile").optional().allow(null, "")
+  platform: import_joi35.default.string().valid("web", "mobile").optional().allow(null, ""),
+  approvedBy: schemaApprover.optional().allow(null, "")
 });
 var schemaUpdatePerson = import_joi35.default.object({
   _id: import_joi35.default.string().hex().required(),
@@ -13565,7 +13589,8 @@ var schemaUpdatePerson = import_joi35.default.object({
   files: import_joi35.default.array().items(schemaFiles).optional().allow(null),
   password: import_joi35.default.string().optional().allow(null, ""),
   plateNumber: import_joi35.default.string().optional().allow(null, ""),
-  platform: import_joi35.default.string().valid("web", "mobile").optional().allow(null, "")
+  platform: import_joi35.default.string().valid("web", "mobile").optional().allow(null, ""),
+  approvedBy: schemaApprover.optional().allow(null, "")
 });
 function MPerson(value) {
   const { error } = schemaPerson.validate(value);
@@ -13637,6 +13662,7 @@ function MPerson(value) {
     files: value.files ?? [],
     plateNumber: value.plateNumber ?? "",
     platForm: value.platform ?? "",
+    approvedBy: value.approvedBy ?? { id: "", name: "" },
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: value.updatedAt,
     deletedAt: value.deletedAt
@@ -15827,6 +15853,37 @@ function usePersonRepo() {
       }
     }
   }
+  async function reviewResidentPerson(_id, value, session) {
+    value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    try {
+      _id = new import_mongodb44.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils72.BadRequestError("Invalid ID format.");
+    }
+    try {
+      const res = await collection.updateOne(
+        { _id },
+        { $set: value },
+        { session }
+      );
+      if (res.modifiedCount === 0) {
+        throw new import_node_server_utils72.InternalServerError(`Unable to ${value.status}   person.`);
+      }
+      delNamespace().then(() => {
+        import_node_server_utils72.logger.info(
+          `Cache cleared for namespace: ${site_people_namespace_collection}`
+        );
+      }).catch((err) => {
+        import_node_server_utils72.logger.error(
+          `Failed to clear cache for namespace: ${site_people_namespace_collection}`,
+          err
+        );
+      });
+      return res;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     add,
     getAll,
@@ -15844,7 +15901,8 @@ function usePersonRepo() {
     getPeopleByNRIC,
     pushVehicleById,
     pullVehicleByRecNo,
-    getByUserId
+    getByUserId,
+    reviewResidentPerson
   };
 }
 
@@ -16675,10 +16733,13 @@ function useVehicleService() {
     pullVehicleByRecNo: _pullVehicleByRecNo
   } = usePersonRepo();
   const { getUnitByBlockLevelUnitNumber: _getUnitByBlockLevelUnitNumber } = useBuildingUnitRepo();
-  async function add(value) {
-    const session = import_node_server_utils75.useAtlas.getClient()?.startSession();
+  async function add(value, session) {
+    const isExternalSession = !!session;
     if (!session) {
-      throw new Error("Unable to start session for vehicle service.");
+      session = await import_node_server_utils75.useAtlas.getClient()?.startSession();
+      if (!session) {
+        throw new Error("Unable to start session for vehicle service.");
+      }
     }
     const [_vehiclePlateNumber] = value.plateNumber;
     const [existingPlateNumber, org] = await Promise.all([
@@ -16735,7 +16796,9 @@ function useVehicleService() {
     const owner = value.name;
     const plateNumbers = value.plateNumber;
     try {
-      session.startTransaction();
+      if (!isExternalSession) {
+        session.startTransaction();
+      }
       let message = "Vehicle plate number needs approval from property management.";
       let siteCameras = [];
       if (value.status && value.status !== "pending" /* PENDING */) {
@@ -16833,14 +16896,20 @@ function useVehicleService() {
         }
         await _add(vehicleValue, session);
       }
-      await session.commitTransaction();
+      if (!isExternalSession) {
+        await session.commitTransaction();
+      }
       return message;
     } catch (error) {
       import_node_server_utils75.logger.error("Error in vehicle service add:", error);
-      await session.abortTransaction();
+      if (!isExternalSession) {
+        await session.abortTransaction();
+      }
       throw error;
     } finally {
-      session.endSession();
+      if (!isExternalSession) {
+        session.endSession();
+      }
     }
   }
   async function deleteVehicle(_id, recno, site, type, bypass = false) {
@@ -22671,6 +22740,7 @@ function useVisitorTransactionService() {
   const { getAllSites: _getAllSites } = useSiteRepo();
   const { getByUserId: _getByUserId } = usePersonRepo();
   const { add: addVehicle } = useVehicleRepo();
+  const { getById: _getUnitById } = useBuildingUnitRepo();
   function extractKeyId(item) {
     if (!item)
       return null;
@@ -22755,6 +22825,10 @@ function useVisitorTransactionService() {
           _getSiteById(value.site)
         ]);
       }
+      if (!value.unitName && value.unit) {
+        const unit = await _getUnitById(value.unit);
+        value.unitName = unit?.name;
+      }
       const hourExpiration = site?.dahuaTimeExpiration ? site?.dahuaTimeExpiration : 24 * 60;
       const end = value.checkOut ? new Date(value.checkOut) : new Date(start.getTime() + hourExpiration * 60 * 1e3);
       const startDahuaDate = formatDahuaDate(start);
@@ -24009,13 +24083,15 @@ function usePersonService() {
     add: _add,
     getById: _getById,
     updateById: _updateById,
-    getByUserId: _getByUserId
+    getByUserId: _getByUserId,
+    reviewResidentPerson: _reviewResidentPerson
   } = usePersonRepo();
   const { addPlateNumber: _addPlateNumber } = useDahuaService();
   const {
     createUser: addUser,
     getUserByEmail,
-    updateUserFieldById: _updateUserFieldById
+    updateUserFieldById: _updateUserFieldById,
+    getUserById
   } = useUserRepo();
   const { add: addMember } = useMemberRepo();
   const { getById: _getUnitById, updateById: updateUnitById } = useBuildingUnitRepo();
@@ -24023,6 +24099,7 @@ function usePersonService() {
   const { updateStatusById } = useFileRepo();
   const { getById: getOrgById } = useOrgRepo();
   const { getSiteById } = useSiteRepo();
+  const { add: addVehicle } = useVehicleService();
   async function add(value) {
     const session = import_node_server_utils107.useAtlas.getClient()?.startSession();
     if (!session) {
@@ -24056,7 +24133,7 @@ function usePersonService() {
           email: value.email,
           password: hashedPassword,
           name: value.name,
-          status: value.platform == "mobile" ? "deleted" : "active",
+          status: value.platform == "mobile" ? "pending" : "active",
           defaultOrg: value.org?.toString() || ""
         };
         const userId = await addUser(user, session);
@@ -24173,9 +24250,76 @@ function usePersonService() {
     }
     return { start: "", end: "" };
   }
+  async function reviewResidentPerson(id, value) {
+    const session = import_node_server_utils107.useAtlas.getClient()?.startSession();
+    session?.startTransaction();
+    try {
+      const person = await _getById(id.toString());
+      if (!person)
+        throw new import_node_server_utils107.BadRequestError("Person not found.");
+      if (value.approvedBy) {
+        const approvedBy = await getUserById(value.approvedBy.id);
+        if (!approvedBy || !approvedBy.name)
+          throw new import_node_server_utils107.BadRequestError("Created by not found.");
+        value.approvedBy.name = approvedBy.name;
+        value.approvedBy.id = approvedBy._id;
+      }
+      const vehicle = {
+        plateNumber: person.plateNumber || "",
+        type: "whitelist",
+        category: person.type || "",
+        name: person.name,
+        phoneNumber: person.contact,
+        org: person.org.toString(),
+        site: person.site.toString(),
+        block: person.block,
+        level: person.level,
+        unit: person.unit.toString(),
+        nric: person.nric,
+        status: "active",
+        peopleId: person._id?.toString()
+      };
+      const reviewStatus = value.status;
+      if (reviewStatus === "approved") {
+        value.status = "active";
+      }
+      await _reviewResidentPerson(id, value, session);
+      if (person.user) {
+        let userStatus;
+        switch (reviewStatus) {
+          case "approved":
+            userStatus = "active";
+            if (person.plateNumber && person.plateNumber.trim() !== "") {
+              await addVehicle(vehicle, session);
+            }
+            break;
+          case "resubmit":
+            userStatus = "resubmit";
+            break;
+          case "rejected":
+            userStatus = "rejected";
+            break;
+          default:
+            throw new Error("Invalid review status");
+        }
+        await _updateUserFieldById(
+          { _id: person.user.toString(), field: "status", value: userStatus },
+          session
+        );
+      }
+      await session?.commitTransaction();
+      return `Successfully ${reviewStatus} person`;
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
   return {
     add,
-    updateById
+    updateById,
+    reviewResidentPerson
   };
 }
 
@@ -24192,7 +24336,11 @@ function usePersonController() {
     getPeopleByNRIC: _getPeopleByNRIC,
     getByUserId: _getByUserId
   } = usePersonRepo();
-  const { add: _add, updateById: _updateById } = usePersonService();
+  const {
+    add: _add,
+    updateById: _updateById,
+    reviewResidentPerson: _reviewResidentPerson
+  } = usePersonService();
   async function add(req, res, next) {
     const payload = { ...req.body };
     const { error } = schemaPerson.validate(payload, {
@@ -24507,6 +24655,38 @@ function usePersonController() {
       return;
     }
   }
+  async function reviewResidentPerson(req, res, next) {
+    const cookies = req.headers.cookie?.split(";").map((cookie) => cookie.trim().split("=")).reduce(
+      (acc, [key, value]) => ({ ...acc, [key]: value }),
+      {}
+    );
+    req.body.approvedBy = cookies?.["user"] ? cookies["user"].toString() : req.body.approvedBy;
+    const _id = req.params.id;
+    const payload = { _id, ...req.body };
+    const schema2 = import_joi58.default.object({
+      _id: import_joi58.default.string().hex().required(),
+      status: import_joi58.default.string().valid("approved", "rejected", "resubmit").required(),
+      approvedBy: import_joi58.default.string().required(),
+      remarks: import_joi58.default.string().optional().allow("", null)
+    });
+    const { error } = schema2.validate(payload);
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils108.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils108.BadRequestError(messages));
+      return;
+    }
+    try {
+      req.body.approvedBy = { id: req.body.approvedBy, name: "" };
+      const result = await _reviewResidentPerson(_id, req.body);
+      res.status(200).json({ message: result });
+      return;
+    } catch (error2) {
+      import_node_server_utils108.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
@@ -24518,7 +24698,8 @@ function usePersonController() {
     getCompany,
     getPeopleByPlateNumber,
     getPeopleByNRIC,
-    getPersonByUserId
+    getPersonByUserId,
+    reviewResidentPerson
   };
 }
 
@@ -29703,21 +29884,23 @@ function useBulletinBoardController() {
     }
   }
   async function getBulletinBoardById(req, res, next) {
-    const validation = import_joi76.default.string().hex().required();
-    const _id = req.params.id;
-    const { error } = validation.validate(_id);
-    if (error) {
-      import_node_server_utils137.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils137.BadRequestError(error.message));
-      return;
-    }
     try {
+      const schema2 = import_joi76.default.object({
+        _id: import_joi76.default.string().hex().length(24).required()
+      });
+      const { error, value } = schema2.validate({ _id: req.params.id });
+      if (error) {
+        import_node_server_utils137.logger.log({ level: "error", message: error.message });
+        next(new import_node_server_utils137.BadRequestError(error.message));
+        return;
+      }
+      const { _id } = value;
       const data = await _getBulletinBoardById(_id);
       res.status(200).json(data);
       return;
-    } catch (error2) {
-      import_node_server_utils137.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils137.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
@@ -31025,7 +31208,7 @@ var schemaEventManagement = import_joi81.default.object({
   site: import_joi81.default.string().required(),
   title: import_joi81.default.string().required(),
   description: import_joi81.default.string().optional().allow(""),
-  dateTime: import_joi81.default.alternatives().try(import_joi81.default.string(), import_joi81.default.date()).required(),
+  dateTime: import_joi81.default.date().iso().required(),
   status: import_joi81.default.string().optional().default("planned"),
   type: import_joi81.default.string().optional().default("TASK")
 });
@@ -31033,7 +31216,7 @@ var schemaUpdateEventManagement = import_joi81.default.object({
   _id: import_joi81.default.string().hex().required(),
   title: import_joi81.default.string().optional().allow(null, ""),
   description: import_joi81.default.string().optional().allow(null, ""),
-  dateTime: import_joi81.default.alternatives().try(import_joi81.default.string(), import_joi81.default.date()).optional().allow(null, ""),
+  dateTime: import_joi81.default.date().iso().optional().allow(null, ""),
   status: import_joi81.default.string().optional().allow(null, ""),
   type: import_joi81.default.string().optional().allow(null, "")
 });
@@ -31057,10 +31240,10 @@ function MEventManagement(value) {
     site: value.site,
     title: value.title,
     description: value.description ?? "",
-    dateTime: value.dateTime,
+    dateTime: new Date(value.dateTime),
     status: value.status ?? "planned",
     type: value.type ?? "TASK",
-    createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+    createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt,
     deletedAt: value.deletedAt
   };
@@ -31238,7 +31421,7 @@ function useEventManagementRepo() {
     }
   }
   async function updateEventManagementById(_id, value, session) {
-    value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    value.updatedAt = /* @__PURE__ */ new Date();
     try {
       _id = new import_mongodb85.ObjectId(_id);
     } catch (error) {
@@ -31284,8 +31467,7 @@ function useEventManagementRepo() {
     try {
       const updateValue = {
         status: "deleted",
-        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-        deletedAt: (/* @__PURE__ */ new Date()).toISOString()
+        deletedAt: /* @__PURE__ */ new Date()
       };
       const res = await collection.updateOne({ _id }, { $set: updateValue });
       if (res.modifiedCount === 0) {
@@ -31378,7 +31560,12 @@ function useEventManagementService() {
     const session = import_node_server_utils147.useAtlas.getClient()?.startSession();
     session?.startTransaction();
     try {
-      await _updateEventManagementById(id, value, session);
+      const updatedValue = {
+        ...value.dateTime && { dateTime: new Date(value.dateTime) },
+        ...value.title && { title: value.title },
+        ...value.description && { description: value.description }
+      };
+      await _updateEventManagementById(id, updatedValue, session);
       await session?.commitTransaction();
       return "Successfully updated event.";
     } catch (error) {
@@ -32808,7 +32995,7 @@ var MAccessCard = class {
     accessType = "Normal" /* NORMAL */,
     cardNo,
     pin,
-    qrData,
+    qrData = null,
     startDate,
     endDate,
     isActivated,
@@ -32890,7 +33077,7 @@ var minifyXml = (xml) => {
 };
 var readTemplate = (name, params) => {
   const template = import_fs3.default.readFileSync(
-    import_path.default.join(__dirname, `../src/public/xml-templates/${name}.xml`),
+    import_path.default.join(__dirname, `../dist/public/xml-templates/${name}.xml`),
     "utf-8"
   );
   if (!params)
@@ -33141,10 +33328,6 @@ function UseAccessManagementRepo() {
       payload.updatedAt = new Date(payload.updatedAt);
       payload.assignedUnit = payload.unit?.map((id) => new import_mongodb90.ObjectId(id));
       delete payload.unit;
-      payload.qrData = await createQrData({
-        cardNumber: payload.cardNo,
-        facilityCode: parseInt(payload.cardNo.slice(0, 4), 10)
-      });
       const accessCardObj = new MAccessCard(payload);
       const result = await collection().insertOne(accessCardObj);
       return result.insertedId;
@@ -33206,10 +33389,6 @@ function UseAccessManagementRepo() {
                 cardNo,
                 accessType: "Normal" /* NORMAL */,
                 pin: "123456",
-                qrData: await createQrData({
-                  cardNumber: cardNo,
-                  facilityCode: parseInt(cardNo.slice(0, 4), 10)
-                }),
                 startDate: /* @__PURE__ */ new Date(),
                 endDate,
                 isActivated: true,
@@ -33259,10 +33438,6 @@ function UseAccessManagementRepo() {
               cardNo,
               accessType: "Normal" /* NORMAL */,
               pin: "123456",
-              qrData: await createQrData({
-                cardNumber: cardNo,
-                facilityCode: parseInt(cardNo.slice(0, 4), 10)
-              }),
               startDate: /* @__PURE__ */ new Date(),
               endDate,
               isActivated: true,
@@ -34404,7 +34579,6 @@ function UseAccessManagementRepo() {
             accessType: "Normal" /* NORMAL */,
             cardNo: `${facilityCode}${cardNumber}`,
             pin,
-            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,
@@ -37323,6 +37497,17 @@ function useOccurrenceBookController() {
 // src/models/bulletin-video.model.ts
 var import_mongodb95 = require("mongodb");
 var import_joi90 = __toESM(require("joi"));
+var BulletinVideoSort = /* @__PURE__ */ ((BulletinVideoSort2) => {
+  BulletinVideoSort2["CREATED_AT"] = "createdAt";
+  BulletinVideoSort2["NAME"] = "name";
+  BulletinVideoSort2["ID"] = "_id";
+  return BulletinVideoSort2;
+})(BulletinVideoSort || {});
+var BulletinVideoOrder = /* @__PURE__ */ ((BulletinVideoOrder2) => {
+  BulletinVideoOrder2["ASC"] = "asc";
+  BulletinVideoOrder2["DESC"] = "desc";
+  return BulletinVideoOrder2;
+})(BulletinVideoOrder || {});
 var schemaBulletinVideo = import_joi90.default.object({
   site: import_joi90.default.string().hex().required(),
   title: import_joi90.default.string().optional().allow(null, ""),
@@ -37651,39 +37836,35 @@ function useBulletinVideoController() {
     deleteBulletinVideoById: _deleteBulletinVideoById
   } = useBulletinVideoRepo();
   async function add(req, res, next) {
-    const payload = { ...req.body };
-    const { error } = schemaBulletinVideo.validate(payload, {
-      abortEarly: false
-    });
-    if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils163.logger.log({ level: "error", message: messages });
-      next(new import_node_server_utils163.BadRequestError(messages));
-      return;
-    }
     try {
-      const data = await _add(payload);
+      const { error, value } = schemaBulletinVideo.validate(req.body, {
+        abortEarly: false
+      });
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils163.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils163.BadRequestError(messages));
+        return;
+      }
+      const data = await _add(value);
       res.status(201).json(data);
       return;
-    } catch (error2) {
-      import_node_server_utils163.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils163.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
   async function getAll(req, res, next) {
-    const allowedFields = ["createdAt", "name"];
-    const allowedOrder = ["asc", "desc"];
     const validation = import_joi91.default.object({
       search: import_joi91.default.string().optional().allow("", null),
       page: import_joi91.default.number().integer().min(1).allow("", null).default(1),
       limit: import_joi91.default.number().integer().min(1).max(100).allow("", null).default(10),
-      sort: import_joi91.default.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
-      order: import_joi91.default.string().pattern(/^(asc|desc)(,(asc|desc))*$/).optional().allow("", ...allowedOrder),
-      site: import_joi91.default.string().hex().required()
+      sort: import_joi91.default.string().valid(...Object.values(BulletinVideoSort)).default("_id" /* ID */),
+      order: import_joi91.default.string().valid(...Object.values(BulletinVideoOrder)).default("desc" /* DESC */),
+      site: import_joi91.default.string().hex().length(24).required()
     });
-    const query = { ...req.query };
-    const { error } = validation.validate(query, {
+    const { error, value } = validation.validate(req.query, {
       abortEarly: false
     });
     if (error) {
@@ -37692,19 +37873,10 @@ function useBulletinVideoController() {
       next(new import_node_server_utils163.BadRequestError(messages));
       return;
     }
-    const search = req.query.search ?? "";
-    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;
-      }
-    });
+    const { search, page, limit, site, sort, order } = value;
+    const sortObj = {
+      [sort ?? "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
+    };
     try {
       const data = await _getAll({
         search,
@@ -37722,21 +37894,23 @@ function useBulletinVideoController() {
     }
   }
   async function getBulletinVideoById(req, res, next) {
-    const validation = import_joi91.default.string().hex().required();
-    const _id = req.params.id;
-    const { error } = validation.validate(_id);
-    if (error) {
-      import_node_server_utils163.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils163.BadRequestError(error.message));
-      return;
-    }
     try {
+      const schema2 = import_joi91.default.object({
+        _id: import_joi91.default.string().hex().length(24).required()
+      });
+      const { error, value } = schema2.validate({ _id: req.params.id });
+      if (error) {
+        import_node_server_utils163.logger.log({ level: "error", message: error.message });
+        next(new import_node_server_utils163.BadRequestError(error.message));
+        return;
+      }
+      const { _id } = value;
       const data = await _getBulletinVideoById(_id);
       res.status(200).json(data);
       return;
-    } catch (error2) {
-      import_node_server_utils163.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils163.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
@@ -37763,21 +37937,23 @@ function useBulletinVideoController() {
     }
   }
   async function deleteBulletinVideoById(req, res, next) {
-    const validation = import_joi91.default.string().hex().required();
-    const _id = req.params.id;
-    const { error } = validation.validate(_id);
-    if (error) {
-      import_node_server_utils163.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils163.BadRequestError(error.message));
-      return;
-    }
     try {
+      const schema2 = import_joi91.default.object({
+        _id: import_joi91.default.string().hex().length(24).required()
+      });
+      const { error, value } = schema2.validate({ _id: req.params.id });
+      if (error) {
+        import_node_server_utils163.logger.log({ level: "error", message: error.message });
+        next(new import_node_server_utils163.BadRequestError(error.message));
+        return;
+      }
+      const { _id } = value;
       await _deleteBulletinVideoById(_id);
       res.status(200).json({ message: "Successfully deleted bulletin video." });
       return;
-    } catch (error2) {
-      import_node_server_utils163.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils163.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
@@ -41527,6 +41703,17 @@ var import_node_server_utils184 = require("@7365admin1/node-server-utils");
 // src/models/occurrence-subject.model.ts
 var import_mongodb108 = require("mongodb");
 var import_joi103 = __toESM(require("joi"));
+var SubjectSort = /* @__PURE__ */ ((SubjectSort2) => {
+  SubjectSort2["CREATED_AT"] = "createdAt";
+  SubjectSort2["NAME"] = "name";
+  SubjectSort2["ID"] = "_id";
+  return SubjectSort2;
+})(SubjectSort || {});
+var SubjectOrder = /* @__PURE__ */ ((SubjectOrder2) => {
+  SubjectOrder2["ASC"] = "asc";
+  SubjectOrder2["DESC"] = "desc";
+  return SubjectOrder2;
+})(SubjectOrder || {});
 var schemaOccurrenceSubject = import_joi103.default.object({
   site: import_joi103.default.string().hex().required(),
   subject: import_joi103.default.string().required(),
@@ -41635,7 +41822,8 @@ function useOccurrenceSubjectRepo() {
     }
     const baseQuery = {
       site,
-      status: { $ne: "deleted" }
+      status: { $ne: "deleted" },
+      ...search && { $text: { $search: search } }
     };
     let query = { ...baseQuery };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
@@ -41644,12 +41832,9 @@ function useOccurrenceSubjectRepo() {
       sort: JSON.stringify(sort),
       page,
       limit,
-      status: { $ne: "deleted" }
+      status: { $ne: "deleted" },
+      ...search && { search }
     };
-    if (search) {
-      query.$text = { $search: search };
-      cacheOptions.search = search;
-    }
     const cacheKey = (0, import_node_server_utils184.makeCacheKey)(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -41728,11 +41913,22 @@ function useOccurrenceSubjectRepo() {
     } catch (error) {
       throw new import_node_server_utils184.BadRequestError("Invalid occurrence subject ID format.");
     }
+    const cacheKey = (0, import_node_server_utils184.makeCacheKey)(namespace_collection, { _id });
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      import_node_server_utils184.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
     try {
       const data = await collection.findOne({ _id }, { session });
       if (!data) {
         throw new import_node_server_utils184.NotFoundError("Occurrence subject not found.");
       }
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        import_node_server_utils184.logger.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils184.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
       return data;
     } catch (error) {
       throw error;
@@ -41919,62 +42115,49 @@ function useOccurrenceEntryController() {
     getLatestSerialNumber: _getLatestSerialNumber
   } = useOccurrenceEntryRepo();
   async function add(req, res, next) {
-    const { error, value } = schemaOccurrenceEntry.validate(req.body, {
-      abortEarly: false
-    });
-    if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils186.logger.log({ level: "error", message: messages });
-      next(new import_node_server_utils186.BadRequestError(messages));
-      return;
-    }
     try {
+      const { error, value } = schemaOccurrenceEntry.validate(req.body, {
+        abortEarly: false
+      });
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils186.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils186.BadRequestError(messages));
+        return;
+      }
       const data = await _add(value);
       res.status(201).json(data);
       return;
-    } catch (error2) {
-      import_node_server_utils186.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils186.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
   async function getAll(req, res, next) {
-    const allowedFields = ["createdAt", "name"];
-    const allowedOrder = ["asc", "desc"];
-    const validation = import_joi104.default.object({
-      search: import_joi104.default.string().optional().allow("", null),
-      page: import_joi104.default.number().integer().min(1).allow("", null).default(1),
-      limit: import_joi104.default.number().integer().min(1).max(100).allow("", null).default(10),
-      sort: import_joi104.default.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
-      order: import_joi104.default.string().pattern(/^(asc|desc)(,(asc|desc))*$/).optional().allow("", ...allowedOrder),
-      site: import_joi104.default.string().hex().required(),
-      dailyOccurrenceBookId: import_joi104.default.string().optional().allow("", null)
-    });
-    const query = { ...req.query };
-    const { error } = validation.validate(query, {
-      abortEarly: false
-    });
-    if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils186.logger.log({ level: "error", message: messages });
-      next(new import_node_server_utils186.BadRequestError(messages));
-      return;
-    }
-    const search = req.query.search ?? "";
-    const page = parseInt(req.query.page ?? "1");
-    const limit = parseInt(req.query.limit ?? "10");
-    const site = req.query.site ?? "";
-    const dailyOccurrenceBookId = req.query.dailyOccurrenceBookId ?? "";
-    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 schema2 = import_joi104.default.object({
+        search: import_joi104.default.string().optional().allow("", null),
+        page: import_joi104.default.number().integer().min(1).allow("", null).default(1),
+        limit: import_joi104.default.number().integer().min(1).max(100).allow("", null).default(10),
+        sort: import_joi104.default.string().valid(...Object.values(EntrySort)).default("_id" /* ID */),
+        order: import_joi104.default.string().valid(...Object.values(EntryOrder)).default("desc" /* DESC */),
+        site: import_joi104.default.string().hex().required(),
+        dailyOccurrenceBookId: import_joi104.default.string().hex().length(24).optional().allow("", null)
+      });
+      const { error, value } = schema2.validate(req.query, {
+        abortEarly: false
+      });
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils186.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils186.BadRequestError(messages));
+        return;
+      }
+      const { search, page, limit, site, dailyOccurrenceBookId, sort, order } = value;
+      const sortObj = {
+        [sort ? sort : "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
+      };
       const data = await _getAll({
         search,
         page,
@@ -41985,69 +42168,73 @@ function useOccurrenceEntryController() {
       });
       res.status(200).json(data);
       return;
-    } catch (error2) {
-      import_node_server_utils186.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils186.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
   async function getOccurrenceEntryById(req, res, next) {
-    const validation = import_joi104.default.string().hex().required();
-    const _id = req.params.id;
-    const { error } = validation.validate(_id);
-    if (error) {
-      import_node_server_utils186.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils186.BadRequestError(error.message));
-      return;
-    }
     try {
+      const schema2 = import_joi104.default.object({
+        _id: import_joi104.default.string().hex().length(24).required()
+      });
+      const { error, value } = schema2.validate({ _id: req.params.id });
+      if (error) {
+        import_node_server_utils186.logger.log({ level: "error", message: error.message });
+        next(new import_node_server_utils186.BadRequestError(error.message));
+        return;
+      }
+      const { _id } = value;
       const data = await _getOccurrenceEntryById(_id);
       res.status(200).json(data);
       return;
-    } catch (error2) {
-      import_node_server_utils186.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils186.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
   async function updateOccurrenceEntryById(req, res, next) {
-    const payload = { _id: req.params.id, ...req.body };
-    const { error, value } = schemaUpdateOccurrenceEntry.validate(payload, {
-      abortEarly: false
-    });
-    if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils186.logger.log({ level: "error", message: messages });
-      next(new import_node_server_utils186.BadRequestError(messages));
-      return;
-    }
-    const { _id, ...rest } = value;
     try {
+      const payload = { _id: req.params.id, ...req.body };
+      const { error, value } = schemaUpdateOccurrenceEntry.validate(payload, {
+        abortEarly: false
+      });
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils186.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils186.BadRequestError(messages));
+        return;
+      }
+      const { _id, ...rest } = value;
       const result = await _updateOccurrenceEntryById(_id, rest);
       res.status(200).json({ message: result });
       return;
-    } catch (error2) {
-      import_node_server_utils186.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils186.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
   async function deleteOccurrenceEntryById(req, res, next) {
-    const validation = import_joi104.default.string().hex().required();
-    const _id = req.params.id;
-    const { error } = validation.validate(_id);
-    if (error) {
-      import_node_server_utils186.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils186.BadRequestError(error.message));
-      return;
-    }
     try {
+      const schema2 = import_joi104.default.object({
+        _id: import_joi104.default.string().hex().length(24).required()
+      });
+      const { error, value } = schema2.validate({ _id: req.params.id });
+      if (error) {
+        import_node_server_utils186.logger.log({ level: "error", message: error.message });
+        next(new import_node_server_utils186.BadRequestError(error.message));
+        return;
+      }
+      const { _id } = value;
       await _deleteOccurrenceEntryById(_id);
       res.status(200).json({ message: "Successfully deleted occurrence entry." });
       return;
-    } catch (error2) {
-      import_node_server_utils186.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils186.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
@@ -42684,61 +42871,48 @@ function useOccurrenceSubjectController() {
     deleteOccurrenceSubjectById: _deleteOccurrenceSubjectById
   } = useOccurrenceSubjectRepo();
   async function add(req, res, next) {
-    const payload = { ...req.body };
-    const { error } = schemaOccurrenceSubject.validate(payload, {
-      abortEarly: false
-    });
-    if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils190.logger.log({ level: "error", message: messages });
-      next(new import_node_server_utils190.BadRequestError(messages));
-      return;
-    }
     try {
-      const data = await _add(payload);
+      const { error, value } = schemaOccurrenceSubject.validate(req.body, {
+        abortEarly: false
+      });
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils190.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils190.BadRequestError(messages));
+        return;
+      }
+      const data = await _add(value);
       res.status(201).json(data);
       return;
-    } catch (error2) {
-      import_node_server_utils190.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils190.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
   async function getAll(req, res, next) {
-    const allowedFields = ["createdAt", "name"];
-    const allowedOrder = ["asc", "desc"];
-    const validation = import_joi107.default.object({
-      search: import_joi107.default.string().optional().allow("", null),
-      page: import_joi107.default.number().integer().min(1).allow("", null).default(1),
-      limit: import_joi107.default.number().integer().min(1).max(100).allow("", null).default(10),
-      sort: import_joi107.default.string().pattern(/^([a-zA-Z0-9_]+)(,[a-zA-Z0-9_]+)*$/).optional().allow("", ...allowedFields),
-      order: import_joi107.default.string().pattern(/^(asc|desc)(,(asc|desc))*$/).optional().allow("", ...allowedOrder),
-      site: import_joi107.default.string().hex().required()
-    });
-    const query = { ...req.query };
-    const { error } = validation.validate(query, {
-      abortEarly: false
-    });
-    if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils190.logger.log({ level: "error", message: messages });
-      next(new import_node_server_utils190.BadRequestError(messages));
-      return;
-    }
-    const search = req.query.search ?? "";
-    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 validation = import_joi107.default.object({
+        search: import_joi107.default.string().optional().allow("", null),
+        page: import_joi107.default.number().integer().min(1).allow("", null).default(1),
+        limit: import_joi107.default.number().integer().min(1).max(100).allow("", null).default(10),
+        sort: import_joi107.default.string().valid(...Object.values(SubjectSort)).default("_id" /* ID */),
+        order: import_joi107.default.string().valid(...Object.values(SubjectOrder)).default("desc" /* DESC */),
+        site: import_joi107.default.string().hex().length(24).required()
+      });
+      const { error, value } = validation.validate(req.query, {
+        abortEarly: false
+      });
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils190.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils190.BadRequestError(messages));
+        return;
+      }
+      const { search, page, limit, site, sort, order } = value;
+      const sortObj = {
+        [sort ? sort : "_id" /* ID */]: order === "asc" /* ASC */ ? 1 : -1
+      };
       const data = await _getAll({
         search,
         page,
@@ -42748,50 +42922,54 @@ function useOccurrenceSubjectController() {
       });
       res.status(200).json(data);
       return;
-    } catch (error2) {
-      import_node_server_utils190.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils190.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
   async function getOccurrenceSubjectById(req, res, next) {
-    const validation = import_joi107.default.string().hex().required();
-    const _id = req.params.id;
-    const { error } = validation.validate(_id);
-    if (error) {
-      import_node_server_utils190.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils190.BadRequestError(error.message));
-      return;
-    }
     try {
+      const schema2 = import_joi107.default.object({
+        _id: import_joi107.default.string().hex().length(24).required()
+      });
+      const { error, value } = schema2.validate({ _id: req.params.id });
+      if (error) {
+        import_node_server_utils190.logger.log({ level: "error", message: error.message });
+        next(new import_node_server_utils190.BadRequestError(error.message));
+        return;
+      }
+      const { _id } = value;
       const data = await _getOccurrenceSubjectById(_id);
       res.status(200).json(data);
       return;
-    } catch (error2) {
-      import_node_server_utils190.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils190.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
   async function updateOccurrenceSubjectById(req, res, next) {
-    const _id = req.params.id;
-    const payload = { _id, ...req.body };
-    const { error } = schemaUpdateOccurrenceSubject.validate(payload, {
-      abortEarly: false
-    });
-    if (error) {
-      const messages = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils190.logger.log({ level: "error", message: messages });
-      next(new import_node_server_utils190.BadRequestError(messages));
-      return;
-    }
     try {
-      const result = await _updateOccurrenceSubjectById(_id, req.body);
+      const { error, value } = schemaUpdateOccurrenceSubject.validate(
+        { _id: req.params.id, ...req.body },
+        {
+          abortEarly: false
+        }
+      );
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils190.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils190.BadRequestError(messages));
+        return;
+      }
+      const { _id, ...rest } = value;
+      const result = await _updateOccurrenceSubjectById(_id, rest);
       res.status(200).json({ message: result });
       return;
-    } catch (error2) {
-      import_node_server_utils190.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils190.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
@@ -49992,6 +50170,8 @@ function useRoleControllerV2() {
   BulletinRecipient,
   BulletinSort,
   BulletinStatus,
+  BulletinVideoOrder,
+  BulletinVideoSort,
   CameraType,
   DEVICE_STATUS,
   DOBStatus,
@@ -49999,6 +50179,8 @@ function useRoleControllerV2() {
   EAccessCardTypes,
   EAccessCardUserTypes,
   EmailSender,
+  EntryOrder,
+  EntrySort,
   FacilitySort,
   FacilityStatus,
   GuestSort,
@@ -50080,6 +50262,8 @@ function useRoleControllerV2() {
   SortFields,
   SortOrder,
   Status,
+  SubjectOrder,
+  SubjectSort,
   SubscriptionType,
   UseAccessManagementRepo,
   UserStatus,
@@ -50135,6 +50319,7 @@ function useRoleControllerV2() {
   robotSchema,
   schema,
   schemaApprovedBy,
+  schemaApprover,
   schemaBilling,
   schemaBillingConfiguration,
   schemaBillingItem,