@7365admin1/core 2.42.0 → 2.44.0

package/dist/index.js

@@ -44,6 +44,8 @@ __export(src_exports, {
   EAccessCardTypes: () => EAccessCardTypes,
   EAccessCardUserTypes: () => EAccessCardUserTypes,
   EmailSender: () => EmailSender,
+  EntryOrder: () => EntryOrder,
+  EntrySort: () => EntrySort,
   FacilitySort: () => FacilitySort,
   FacilityStatus: () => FacilityStatus,
   GuestSort: () => GuestSort,
@@ -125,6 +127,8 @@ __export(src_exports, {
   SortFields: () => SortFields,
   SortOrder: () => SortOrder,
   Status: () => Status,
+  SubjectOrder: () => SubjectOrder,
+  SubjectSort: () => SubjectSort,
   SubscriptionType: () => SubscriptionType,
   UseAccessManagementRepo: () => UseAccessManagementRepo,
   UserStatus: () => UserStatus,
@@ -180,6 +184,7 @@ __export(src_exports, {
   robotSchema: () => robotSchema,
   schema: () => schema,
   schemaApprovedBy: () => schemaApprovedBy,
+  schemaApprover: () => schemaApprover,
   schemaBilling: () => schemaBilling,
   schemaBillingConfiguration: () => schemaBillingConfiguration,
   schemaBillingItem: () => schemaBillingItem,
@@ -1832,6 +1837,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, ""),
@@ -5156,7 +5172,10 @@ function useSiteRepo() {
       throw error;
     }
   }
-  async function siteInformation({ id, payload }) {
+  async function siteInformation({
+    id,
+    payload
+  }) {
     try {
       const siteId = new import_mongodb17.ObjectId(id);
       const res = await collection.updateOne(
@@ -5176,6 +5195,48 @@ function useSiteRepo() {
       throw error;
     }
   }
+  async function getAllSitesForResidentCreation({
+    search = "",
+    page = 1,
+    limit = 10
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    const query = {
+      status: { $ne: "deleted" }
+    };
+    const cacheOptions = {
+      status: { $ne: "deleted" },
+      page,
+      limit
+    };
+    if (search) {
+      query.$or = [{ name: { $regex: search, $options: "i" } }];
+      cacheOptions.search = search;
+    }
+    const cacheKey = (0, import_node_server_utils19.makeCacheKey)(namespace_collection, cacheOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      import_node_server_utils19.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const items = await collection.aggregate([
+        { $match: query },
+        { $skip: page * limit },
+        { $limit: limit }
+      ]).toArray();
+      const length = await collection.countDocuments(query);
+      const data = (0, import_node_server_utils19.paginate)(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        import_node_server_utils19.logger.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils19.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createIndexes,
     createSite,
@@ -5190,7 +5251,8 @@ function useSiteRepo() {
     updateSiteIncidentCounter,
     updateSiteById,
     getAllSitesUnpaginated,
-    siteInformation
+    siteInformation,
+    getAllSitesForResidentCreation
   };
 }
 
@@ -12296,7 +12358,7 @@ function useServiceProviderController() {
     const validation = import_joi30.default.object({
       search: import_joi30.default.string().optional().allow("", null),
       page: import_joi30.default.number().integer().min(1).allow("", null).default(1),
-      limit: import_joi30.default.number().integer().min(1).max(100).allow("", null).default(10),
+      limit: import_joi30.default.number().integer().min(1).max(1e3).allow("", null).default(10),
       orgId: import_joi30.default.string().hex().optional().allow("", null),
       siteId: import_joi30.default.string().hex().optional().allow("", null),
       serviceProviderOrgId: import_joi30.default.string().hex().optional().allow("", null),
@@ -13473,6 +13535,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, ""),
@@ -13496,7 +13562,9 @@ var schemaPerson = import_joi35.default.object({
   isOwner: import_joi35.default.boolean().required(),
   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, "")
+  plateNumber: import_joi35.default.string().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(),
@@ -13517,12 +13585,14 @@ var schemaUpdatePerson = import_joi35.default.object({
   isOwner: import_joi35.default.boolean().optional().allow(null, ""),
   files: import_joi35.default.array().items(schemaFiles).optional().allow(null),
   password: import_joi35.default.string().optional().allow(null, ""),
-  plateNumber: 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, ""),
+  approvedBy: schemaApprover.optional().allow(null, "")
 });
 function MPerson(value) {
   const { error } = schemaPerson.validate(value);
   if (error) {
-    throw new Error(error.details[0].message);
+    throw new import_node_server_utils68.BadRequestError(error.details[0].message);
   }
   if (value._id && typeof value._id === "string") {
     try {
@@ -13588,6 +13658,8 @@ function MPerson(value) {
     isOwner: value.isOwner ?? false,
     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
@@ -13626,8 +13698,8 @@ var schemaVisitorTransaction = import_joi36.default.object({
   contact: import_joi36.default.string().optional().allow(null, ""),
   plateNumber: import_joi36.default.string().optional().allow(null, ""),
   recNo: import_joi36.default.string().optional().allow(null, ""),
-  checkIn: import_joi36.default.date().optional().allow(null, ""),
-  checkOut: import_joi36.default.date().optional().allow(null, ""),
+  checkIn: import_joi36.default.date().iso().optional().allow(null),
+  checkOut: import_joi36.default.date().iso().optional().allow(null),
   deliveryType: import_joi36.default.string().optional().allow(null, ""),
   status: import_joi36.default.string().optional().valid(...Object.values(VisitorStatus)).default("registered" /* REGISTERED */),
   remarks: import_joi36.default.string().optional().allow(null, ""),
@@ -13691,8 +13763,8 @@ var schemaUpdateVisTrans = import_joi36.default.object({
   contact: import_joi36.default.string().optional().allow(null, ""),
   plateNumber: import_joi36.default.string().optional().allow(null, ""),
   recNo: import_joi36.default.string().optional().allow(null, ""),
-  checkIn: import_joi36.default.date().optional().allow(null, ""),
-  checkOut: import_joi36.default.date().optional().allow(null, ""),
+  checkIn: import_joi36.default.date().iso().optional().allow(null),
+  checkOut: import_joi36.default.date().iso().optional().allow(null),
   deliveryType: import_joi36.default.string().optional().allow(null, ""),
   status: import_joi36.default.string().optional().allow(null, ""),
   remarks: import_joi36.default.string().optional().allow(null, ""),
@@ -15269,7 +15341,7 @@ function usePersonRepo() {
       ]
     } : void 0;
     const query = {
-      status,
+      ...status && status !== "all" ? { status } : { status: { $nin: ["deleted", "rejected"] } },
       ...start && { start },
       ...end,
       ...search && {
@@ -15307,12 +15379,29 @@ function usePersonRepo() {
       return cachedData;
     }
     try {
-      const basePipeline = [
-        { $match: query },
-        { $sort: sort },
-        { $skip: page * limit },
-        { $limit: limit }
-      ];
+      const basePipeline = [{ $match: query }];
+      if (status && status == "all") {
+        basePipeline.push(
+          {
+            $addFields: {
+              sortPriority: {
+                $cond: [{ $eq: ["$status", "pending"] }, 1, 2]
+              }
+            }
+          },
+          {
+            $sort: {
+              sortPriority: 1,
+              ...sort
+            }
+          }
+        );
+      } else {
+        basePipeline.push({
+          $sort: sort
+        });
+      }
+      basePipeline.push({ $skip: page * limit }, { $limit: limit });
       const [items, countResult] = await Promise.all([
         collection.aggregate(basePipeline, { session }).toArray(),
         collection.aggregate([{ $match: query }, { $count: "total" }], { session }).toArray()
@@ -15761,6 +15850,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,
@@ -15778,7 +15898,8 @@ function usePersonRepo() {
     getPeopleByNRIC,
     pushVehicleById,
     pullVehicleByRecNo,
-    getByUserId
+    getByUserId,
+    reviewResidentPerson
   };
 }
 
@@ -18082,7 +18203,8 @@ function useSiteController() {
     getSites: _getSites,
     getSiteById: _getSiteById,
     updateSiteBlock: _updateSiteBlock,
-    deleteSite: _deleteSite
+    deleteSite: _deleteSite,
+    getAllSitesForResidentCreation: _getAllSitesForResidentCreation
   } = useSiteRepo();
   const { updateGuardPostById, siteInformation: _siteInformation } = useSiteService();
   async function createSite(req, res, next) {
@@ -18267,14 +18389,13 @@ function useSiteController() {
         id: import_joi42.default.string().hex().required(),
         bgImage: import_joi42.default.string().optional().allow("", null),
         description: import_joi42.default.string().optional().allow("", null),
-        docs: import_joi42.default.array().items(import_joi42.default.object({
-          id: import_joi42.default.string().hex().optional().allow("", null),
-          name: import_joi42.default.string().optional().allow("", null)
-        })).optional().allow("", null)
-      }).validate(
-        { id, ...payload },
-        { abortEarly: false }
-      );
+        docs: import_joi42.default.array().items(
+          import_joi42.default.object({
+            id: import_joi42.default.string().hex().optional().allow("", null),
+            name: import_joi42.default.string().optional().allow("", null)
+          })
+        ).optional().allow("", null)
+      }).validate({ id, ...payload }, { abortEarly: false });
       if (error) {
         import_node_server_utils78.logger.log({ level: "error", message: error.message });
         next(new import_node_server_utils78.BadRequestError(error.message));
@@ -18290,6 +18411,36 @@ function useSiteController() {
       return;
     }
   }
+  async function getAllSitesForResidentCreation(req, res, next) {
+    const validation = import_joi42.default.object({
+      search: import_joi42.default.string().optional().allow("", null),
+      page: import_joi42.default.number().integer().min(1).allow("", null).default(1),
+      limit: import_joi42.default.number().integer().min(1).max(100).allow("", null).default(10)
+    });
+    const query = { ...req.query };
+    const { error } = validation.validate(query);
+    if (error) {
+      import_node_server_utils78.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils78.BadRequestError(error.message));
+      return;
+    }
+    const search = req.query.search ?? "";
+    const page = parseInt(req.query.page ?? "1");
+    const limit = parseInt(req.query.limit ?? "10");
+    try {
+      const data = await _getAllSitesForResidentCreation({
+        search,
+        page,
+        limit
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils78.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     createSite,
     getSites,
@@ -18298,7 +18449,8 @@ function useSiteController() {
     deleteSite,
     updateById,
     updateGuardPostsById,
-    siteInformation
+    siteInformation,
+    getAllSitesForResidentCreation
   };
 }
 
@@ -22574,6 +22726,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;
@@ -22658,6 +22811,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);
@@ -22952,6 +23109,14 @@ function useVisitorTransactionService() {
         }
         value.passKeys = keptPassKeys;
       }
+      if (value.checkIn) {
+        const parsed = new Date(value.checkIn);
+        value.checkIn = isNaN(parsed.getTime()) ? null : parsed;
+      }
+      if (value.checkOut) {
+        const parsed = new Date(value.checkOut);
+        value.checkOut = isNaN(parsed.getTime()) ? null : parsed;
+      }
       await _updateVisitorTansactionById(id, value, session);
       await session?.commitTransaction();
       return "Successfully updated visitor transaction.";
@@ -23904,13 +24069,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();
@@ -23951,10 +24118,11 @@ function usePersonService() {
           email: value.email,
           password: hashedPassword,
           name: value.name,
+          status: value.platform == "mobile" ? "deleted" : "active",
           defaultOrg: value.org?.toString() || ""
         };
         const userId = await addUser(user, session);
-        value.user = userId;
+        value.user = userId.toString();
         let org = null;
         if (userId) {
           if (value?.org) {
@@ -24067,9 +24235,31 @@ function usePersonService() {
     }
     return { start: "", end: "" };
   }
+  async function reviewResidentPerson(id, value) {
+    const session = import_node_server_utils107.useAtlas.getClient()?.startSession();
+    session?.startTransaction();
+    try {
+      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;
+      }
+      await _reviewResidentPerson(id, value, session);
+      await session?.commitTransaction();
+      return `Successfully ${value.status} person`;
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
   return {
     add,
-    updateById
+    updateById,
+    reviewResidentPerson
   };
 }
 
@@ -24086,7 +24276,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, {
@@ -24401,6 +24595,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,
@@ -24412,7 +24638,8 @@ function usePersonController() {
     getCompany,
     getPeopleByPlateNumber,
     getPeopleByNRIC,
-    getPersonByUserId
+    getPersonByUserId,
+    reviewResidentPerson
   };
 }
 
@@ -29535,7 +29762,7 @@ function useBulletinBoardController() {
       page: import_joi76.default.number().integer().min(1).allow("", null).default(1),
       limit: import_joi76.default.number().integer().min(1).max(100).allow("", null).default(10),
       sort: import_joi76.default.string().valid(...Object.values(BulletinSort)).default("_id" /* ID */),
-      order: import_joi76.default.string().valid(...Object.values(SortOrder)).default("asc" /* ASC */),
+      order: import_joi76.default.string().valid(...Object.values(SortOrder)).default("desc" /* DESC */),
       site: import_joi76.default.string().hex().length(24).required(),
       status: import_joi76.default.string().valid(...Object.values(BuildingStatus)).optional().default("active" /* ACTIVE */),
       recipients: import_joi76.default.alternatives().try(
@@ -32702,7 +32929,7 @@ var MAccessCard = class {
     accessType = "Normal" /* NORMAL */,
     cardNo,
     pin,
-    qrData,
+    qrData = null,
     startDate,
     endDate,
     isActivated,
@@ -33035,10 +33262,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;
@@ -33100,10 +33323,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,
@@ -33153,10 +33372,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,
@@ -34298,7 +34513,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,
@@ -41421,6 +41635,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(),
@@ -41529,7 +41754,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 };
@@ -41538,12 +41764,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) {
@@ -41622,11 +41845,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;
@@ -41813,62 +42047,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,
@@ -41879,69 +42100,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;
     }
   }
@@ -42578,61 +42803,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,
@@ -42642,50 +42854,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;
     }
   }
@@ -49893,6 +50109,8 @@ function useRoleControllerV2() {
   EAccessCardTypes,
   EAccessCardUserTypes,
   EmailSender,
+  EntryOrder,
+  EntrySort,
   FacilitySort,
   FacilityStatus,
   GuestSort,
@@ -49974,6 +50192,8 @@ function useRoleControllerV2() {
   SortFields,
   SortOrder,
   Status,
+  SubjectOrder,
+  SubjectSort,
   SubscriptionType,
   UseAccessManagementRepo,
   UserStatus,
@@ -50029,6 +50249,7 @@ function useRoleControllerV2() {
   robotSchema,
   schema,
   schemaApprovedBy,
+  schemaApprover,
   schemaBilling,
   schemaBillingConfiguration,
   schemaBillingItem,