@7365admin1/core 3.10.0 → 3.11.0

package/dist/index.mjs

@@ -20897,7 +20897,8 @@ var schemaUpdateVisTrans = Joi37.object({
       ).optional().allow(null),
       contact: Joi37.string().optional().allow(null, "")
     })
-  ).optional().allow(null)
+  ).optional().allow(null),
+  updatedBy: Joi37.string().hex().length(24).optional()
 });
 function MVisitorTransaction(value) {
   const { error } = schemaVisitorTransaction.validate(value, {
@@ -21547,10 +21548,44 @@ function useVisitorTransactionRepo() {
       value.manualCheckout = true;
     }
     try {
+      const updateFields = {};
+      const arrayFilters = [];
+      Object.keys(value).forEach((key) => {
+        if (key !== "visitorPass" && key !== "passKeys") {
+          const typedKey = key;
+          updateFields[key] = value[typedKey];
+        }
+      });
+      if (Array.isArray(value.visitorPass)) {
+        value.visitorPass.forEach((item, index) => {
+          const elementKey = `vElem${index}`;
+          Object.keys(item).forEach((itemKey) => {
+            if (itemKey !== "keyId") {
+              const typedItemKey = itemKey;
+              let itemValue = item[typedItemKey];
+              updateFields[`visitorPass.$[${elementKey}].${itemKey}`] = itemValue;
+            }
+          });
+          arrayFilters.push({ [`${elementKey}.keyId`]: new ObjectId41(item.keyId) });
+        });
+      }
+      if (Array.isArray(value.passKeys)) {
+        value.passKeys.forEach((item, index) => {
+          const elementKey = `pElem${index}`;
+          Object.keys(item).forEach((itemKey) => {
+            if (itemKey !== "keyId") {
+              const typedItemKey = itemKey;
+              let itemValue = item[typedItemKey];
+              updateFields[`passKeys.$[${elementKey}].${itemKey}`] = itemValue;
+            }
+          });
+          arrayFilters.push({ [`${elementKey}.keyId`]: new ObjectId41(item.keyId) });
+        });
+      }
       const result = await collection.updateOne(
-        { _id },
-        { $set: value },
-        { session }
+        { _id: new ObjectId41(_id) },
+        { $set: updateFields },
+        { arrayFilters, session }
       );
       return result;
     } catch (error) {
@@ -33351,10 +33386,12 @@ var KeyRepo = class {
       return Promise.reject("Server internal error.");
     }
   }
-  static async updateKeyById(keyId, key, site, session, isChild) {
+  static async updateKeyById(keyId, key, site, session, isChild, visitorId) {
     keyId = await convertObjectIdUtil2(keyId, "keyId");
     if (site)
       site = await convertObjectIdUtil2(site, "Site");
+    if (visitorId)
+      visitorId = await convertObjectIdUtil2(visitorId, "visitor Id");
     if (key.updatedBy)
       key.updatedBy = await convertObjectIdUtil2(key.updatedBy, "Updated By");
     if (!key.status)
@@ -33371,7 +33408,6 @@ var KeyRepo = class {
         { session }
       );
       let setKeys = [];
-      console.log("updateKeyById result", result);
       if (result.modifiedCount > 0) {
         const updatedDocs = await this.collection().find(find).toArray();
         if (Array.isArray(updatedDocs) && updatedDocs.length > 0) {
@@ -33380,6 +33416,10 @@ var KeyRepo = class {
             keyItem["passOrKeyId"] = item?._id;
             keyItem["_id"] = new ObjectId61();
             keyItem["previousStatus"] = item?.status;
+            if (visitorId) {
+              console.log("visitorId true key.repo");
+              keyItem["visitorId"] = visitorId;
+            }
             setKeys.push(keyItem);
           });
         }
@@ -33614,7 +33654,7 @@ var NotificationService = class {
         status: payload.status,
         module: "onlineForm",
         screen,
-        params: JSON.stringify(params)
+        params
       },
       false,
       "iservice365-resident-mobile-app"
@@ -33675,6 +33715,14 @@ var NotificationService = class {
   }
 };
 
+// src/utils/valid-values.ts
+var VALID_STATUSES = /* @__PURE__ */ new Set([
+  "In Use",
+  "Available",
+  "Damaged",
+  "Lost"
+]);
+
 // src/services/visitor-transaction.service.ts
 function useVisitorTransactionService() {
   const MailerConfig = {
@@ -33863,48 +33911,26 @@ function useVisitorTransactionService() {
           const chunk = value.members.slice(i, i + chunkSize);
           for (const member of chunk) {
             await KeyRepo.checkPassKeyAvailability(member.visitorPass, member.passKeys);
-            if (Array.isArray(member.visitorPass)) {
-              for (const item of member.visitorPass) {
-                console.log("Type of keyId:", typeof item.keyId);
-                console.log("item visitorPass", item);
-                await KeyRepo.updateKeyById(
-                  item.keyId,
-                  {
-                    status: "In Use" /* IN_USE */,
-                    updatedBy: value.createdBy
-                  },
-                  value.site,
-                  session
-                );
-                item.receivedDate = /* @__PURE__ */ new Date();
-                item.status = "Not Returned" /* NOT_RETURNED */;
-                item.lastUpdate = null;
-                item.remarks = "";
-              }
-            }
-            if (Array.isArray(member.passKeys)) {
-              for (const item of member.passKeys) {
-                await KeyRepo.updateKeyById(
-                  item.keyId,
-                  {
-                    status: "In Use" /* IN_USE */,
-                    updatedBy: value.createdBy
-                  },
-                  value.site,
-                  session
-                );
-                item.receivedDate = /* @__PURE__ */ new Date();
-                item.status = "Not Returned" /* NOT_RETURNED */;
-                item.lastUpdate = null;
-                item.remarks = "";
-              }
-            }
           }
           await Promise.all(
-            chunk.map((member) => {
+            chunk.map(async (member) => {
               const clonedMember = structuredClone(member);
               const { visitorPass, passKeys } = clonedMember;
-              return _add(
+              const preparedVisitorPass = Array.isArray(visitorPass) ? visitorPass.map((item) => ({
+                ...item,
+                receivedDate: /* @__PURE__ */ new Date(),
+                status: "Not Returned" /* NOT_RETURNED */,
+                lastUpdate: null,
+                remarks: ""
+              })) : [];
+              const preparedPassKeys = Array.isArray(passKeys) ? passKeys.map((item) => ({
+                ...item,
+                receivedDate: /* @__PURE__ */ new Date(),
+                status: "Not Returned" /* NOT_RETURNED */,
+                lastUpdate: null,
+                remarks: ""
+              })) : [];
+              const visitorId = await _add(
                 {
                   ...clonedMember,
                   block,
@@ -33918,13 +33944,38 @@ function useVisitorTransactionService() {
                   remarks,
                   contractorType,
                   checkIn: start,
-                  // expiredAt: end,
-                  visitorPass: visitorPass ?? [],
-                  passKeys: passKeys ?? [],
+                  visitorPass: preparedVisitorPass,
+                  passKeys: preparedPassKeys,
                   status: "registered" /* REGISTERED */
                 },
                 session
               );
+              console.log("visitorId service", visitorId);
+              for (const item of preparedVisitorPass) {
+                await KeyRepo.updateKeyById(
+                  item.keyId,
+                  {
+                    status: "In Use" /* IN_USE */,
+                    updatedBy: value.createdBy
+                  },
+                  value.site,
+                  session,
+                  void 0,
+                  visitorId
+                );
+              }
+              for (const item of preparedPassKeys) {
+                await KeyRepo.updateKeyById(
+                  item.keyId,
+                  {
+                    status: "In Use" /* IN_USE */,
+                    updatedBy: value.createdBy,
+                    visitorId
+                  },
+                  value.site,
+                  session
+                );
+              }
             })
           );
         }
@@ -33953,6 +34004,7 @@ function useVisitorTransactionService() {
           throw new BadRequestError100("This plate number is blocklisted");
       }
       await KeyRepo.checkPassKeyAvailability(value.visitorPass, value.passKeys);
+      const result = await _add(value, session);
       if (Array.isArray(value.visitorPass)) {
         for (const item of value.visitorPass) {
           await KeyRepo.updateKeyById(
@@ -33962,7 +34014,9 @@ function useVisitorTransactionService() {
               updatedBy: value.createdBy
             },
             value.site,
-            session
+            session,
+            void 0,
+            result
           );
           item.receivedDate = /* @__PURE__ */ new Date();
           item.status = "Not Returned" /* NOT_RETURNED */;
@@ -33979,7 +34033,9 @@ function useVisitorTransactionService() {
               updatedBy: value.createdBy
             },
             value.site,
-            session
+            session,
+            void 0,
+            result
           );
           item.receivedDate = /* @__PURE__ */ new Date();
           item.status = "Not Returned" /* NOT_RETURNED */;
@@ -33987,7 +34043,6 @@ function useVisitorTransactionService() {
           item.remarks = "";
         }
       }
-      const result = await _add(value, session);
       await session?.commitTransaction();
       let openBarrier = null;
       const isOpenBarrier = allowedPersonTypes.includes(value?.type) || camera?.ANPRSwitches?.openBarrierPickUpDropOff == true;
@@ -34061,52 +34116,6 @@ function useVisitorTransactionService() {
         if (found === 1)
           throw new BadRequestError100("This plate number is blocklisted");
       }
-      if (Array.isArray(value.visitorPass) && value.visitorPass.length > 0) {
-        const keptVisitorPass = [];
-        for (const vp of value.visitorPass) {
-          const updatePayload = {
-            ...vp.status && { status: vp.status },
-            ...vp.remarks && { remarks: vp.remarks }
-          };
-          const visitorPassId = typeof vp === "string" || vp instanceof ObjectId62 ? vp : vp.keyId;
-          await KeyRepo.updateKeyById(
-            visitorPassId,
-            updatePayload,
-            value.site
-          );
-          if (typeof vp !== "string" && !(vp instanceof ObjectId62)) {
-            keptVisitorPass.push({
-              keyId: new ObjectId62(visitorPassId)
-            });
-          }
-        }
-        value.visitorPass = keptVisitorPass;
-      }
-      if (value.passKeys && Array.isArray(value.passKeys) && value.passKeys.length > 0) {
-        const keptPassKeys = [];
-        for (const pk of value.passKeys) {
-          try {
-            const updatePayload = {
-              ...pk.status && { status: pk.status },
-              ...pk.remarks && { remarks: pk.remarks }
-            };
-            const passKeyId = typeof pk === "string" || pk instanceof ObjectId62 ? pk : pk.keyId;
-            await KeyRepo.updateKeyById(
-              passKeyId,
-              updatePayload,
-              value.site
-            );
-            if (typeof pk !== "string" && !(pk instanceof ObjectId62)) {
-              keptPassKeys.push({
-                keyId: new ObjectId62(passKeyId)
-              });
-            }
-          } catch (error) {
-            throw error;
-          }
-        }
-        value.passKeys = keptPassKeys;
-      }
       if (value.checkIn) {
         const parsed = new Date(value.checkIn);
         value.checkIn = isNaN(parsed.getTime()) ? null : parsed;
@@ -34123,6 +34132,61 @@ function useVisitorTransactionService() {
         const unit = await _getUnitById(value.unit);
         value.unitName = unit?.name;
       }
+      if (value.updatedBy) {
+        value.updatedBy = await convertObjectIdUtil2(value.updatedBy, "updatedBy Id");
+      }
+      if (Array.isArray(value.visitorPass)) {
+        for (const item of value.visitorPass) {
+          let status = "Invalid";
+          if (item?.status == "Returned" /* RETURNED */) {
+            status = "Available" /* AVAILABLE */;
+          } else if (item?.status == "Not Returned" /* NOT_RETURNED */) {
+            status = "In Use" /* IN_USE */;
+          } else if (item?.status && VALID_STATUSES.has(item.status)) {
+            status = item.status;
+          } else {
+            throw new Error("Invalid Visitor Pass Status");
+          }
+          await KeyRepo.updateKeyById(
+            item.keyId,
+            {
+              status,
+              updatedBy: value.updatedBy
+            },
+            value.site,
+            session,
+            void 0,
+            id
+          );
+          item.lastUpdate = /* @__PURE__ */ new Date();
+        }
+      }
+      if (Array.isArray(value.passKeys)) {
+        for (const item of value.passKeys) {
+          let status = "Invalid";
+          if (item?.status == "Returned" /* RETURNED */) {
+            status = "Available" /* AVAILABLE */;
+          } else if (item?.status == "Not Returned" /* NOT_RETURNED */) {
+            status = "In Use" /* IN_USE */;
+          } else if (item?.status && VALID_STATUSES.has(item.status)) {
+            status = item.status;
+          } else {
+            throw new Error("Invalid Visitor Pass Status");
+          }
+          await KeyRepo.updateKeyById(
+            item.keyId,
+            {
+              status,
+              updatedBy: value.updatedBy
+            },
+            value.site,
+            session,
+            void 0,
+            id
+          );
+          item.lastUpdate = /* @__PURE__ */ new Date();
+        }
+      }
       await _updateVisitorTansactionById(id, value, session);
       const allowedPersonTypes = [
         "contractor" /* CONTRACTOR */,
@@ -60782,7 +60846,6 @@ function useHrmLabsAttendanceSrvc() {
       };
     } catch (error) {
       logger171.error(error.message || error);
-      console.log("Error fetching attendance data:", error);
       return { success: false, message: error?.message || "Internal Server Error!", items: [], pages: 0, pageRange: "0-0 of 0", count: {} };
     }
   }
@@ -60896,7 +60959,6 @@ function useHrmLabsAttendanceSrvc() {
       return { totalCount };
     } catch (error) {
       logger171.error(error.message || error);
-      console.log("Error fetching attendance data count:", error);
       return { success: false, message: error?.message || "Internal Server Error!", totalCount: null };
     }
   }
@@ -61068,7 +61130,6 @@ function useHrmLabsAttendanceSrvc() {
       };
     } catch (error) {
       logger171.error(error.message || error);
-      console.log("Error fetching attendance data:", error);
       return { success: false, message: error?.message || "Internal Server Error!", items: [], count: {}, countPerJobTitle: {}, totalCount: null, countPerStatus: {} };
     }
   }
@@ -61175,7 +61236,6 @@ function useHrmLabsAttendanceSrvc() {
       };
     } catch (error) {
       logger171.error(error.message || error);
-      console.log("Error fetching attendance data:", error);
       return { success: false, message: error?.message || "Internal Server Error!", chartCount: null };
     }
   }
@@ -67050,13 +67110,14 @@ var BidStatus = /* @__PURE__ */ ((BidStatus3) => {
 var schemaBidPreloved = Joi145.object({
   type: Joi145.string().valid(...Object.values(BidType)).required(),
   postId: Joi145.string().hex().length(24).required(),
+  receiverId: Joi145.string().hex().length(24).required(),
+  buyerId: Joi145.string().hex().length(24).required(),
   price: Joi145.when("type", {
     is: "bid" /* BID */,
     then: Joi145.number().required(),
     otherwise: Joi145.number().optional().allow(null)
   }),
   message: Joi145.string().optional().allow("", null),
-  buyerId: Joi145.string().hex().length(24).optional().allow("", null),
   status: Joi145.string().valid(...Object.values(BidStatus)).optional().default("pending" /* PENDING */)
 });
 var schemaUpdateBidPreloved = Joi145.object({
@@ -67131,12 +67192,74 @@ function useBidPrelovedRepo() {
 // src/controllers/bid-preloved.controller.ts
 import { BadRequestError as BadRequestError224, logger as logger194 } from "@7365admin1/node-server-utils";
 import Joi146 from "joi";
+
+// src/services/bid-preloved.service.ts
+import { InternalServerError as InternalServerError83, useAtlas as useAtlas128 } from "@7365admin1/node-server-utils";
+function useBidPrelovedService() {
+  const { add: _addBid } = useBidPrelovedRepo();
+  const { add: _addChannel, getByParticipants: _getByParticipants } = useChannelPrelovedRepo();
+  const { add: _addChat } = useChatPrelovedRepo();
+  async function createBid(value) {
+    const client = useAtlas128.getClient();
+    if (!client)
+      throw new InternalServerError83("Unable to connect to server.");
+    const buyerId = value.buyerId;
+    const receiverId = value.receiverId;
+    const postId = value.postId;
+    const messageText = value.message || "";
+    const session = client.startSession();
+    session.startTransaction();
+    try {
+      const bidId = await _addBid(value, session);
+      const existingChannel = await _getByParticipants(
+        buyerId,
+        receiverId,
+        postId
+      );
+      let channelId;
+      if (existingChannel) {
+        channelId = existingChannel._id.toString();
+      } else {
+        const newChannelId = await _addChannel(
+          {
+            senderId: buyerId,
+            receiverId,
+            postId
+          },
+          session
+        );
+        channelId = newChannelId.toString();
+      }
+      await _addChat(
+        {
+          channelId,
+          senderId: buyerId,
+          postId,
+          bidId: bidId.toString(),
+          message: {
+            text: messageText,
+            date: (/* @__PURE__ */ new Date()).toISOString(),
+            senderId: buyerId
+          }
+        },
+        session
+      );
+      await session.commitTransaction();
+      return { bidId };
+    } catch (error) {
+      await session.abortTransaction();
+      throw error;
+    } finally {
+      session.endSession();
+    }
+  }
+  return { createBid };
+}
+
+// src/controllers/bid-preloved.controller.ts
 function useBidPrelovedController() {
-  const {
-    add: _add,
-    getById: _getById,
-    updateStatus: _updateStatus
-  } = useBidPrelovedRepo();
+  const { createBid: _createBid } = useBidPrelovedService();
+  const { getById: _getById, updateStatus: _updateStatus } = useBidPrelovedRepo();
   async function add(req, res, next) {
     const { error, value } = schemaBidPreloved.validate(req.body, {
       abortEarly: false
@@ -67148,9 +67271,10 @@ function useBidPrelovedController() {
       return;
     }
     try {
-      const data = await _add(value);
+      const data = await _createBid(value);
       res.status(201).json(data);
     } catch (error2) {
+      console.log("error", error2);
       logger194.log({ level: "error", message: error2.message });
       next(error2);
     }
@@ -67335,20 +67459,20 @@ var residentFormEntry = Joi147.object({
 // src/repositories/online-forms-v2.repository.ts
 import {
   BadRequestError as BadRequestError225,
-  InternalServerError as InternalServerError83,
+  InternalServerError as InternalServerError84,
   logger as logger195,
   makeCacheKey as makeCacheKey65,
   NotFoundError as NotFoundError62,
   paginate as paginate64,
-  useAtlas as useAtlas128,
+  useAtlas as useAtlas129,
   useCache as useCache69
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId152 } from "mongodb";
 var online_forms_namespace_collection = "online-forms";
 function useFormEntryRepo() {
-  const db = useAtlas128.getDb();
+  const db = useAtlas129.getDb();
   if (!db) {
-    throw new InternalServerError83("Unable to connect to server.");
+    throw new InternalServerError84("Unable to connect to server.");
   }
   const collection = db.collection(online_forms_namespace_collection);
   const { delNamespace, getCache, setCache } = useCache69(
@@ -67361,7 +67485,7 @@ function useFormEntryRepo() {
         name: "text"
       });
     } catch (error) {
-      throw new InternalServerError83(
+      throw new InternalServerError84(
         "Failed to create text index on online form."
       );
     }
@@ -67370,16 +67494,6 @@ function useFormEntryRepo() {
     try {
       value = MFormEntry(value);
       const res = await collection.insertOne(value, { session });
-      delNamespace().then(() => {
-        logger195.info(
-          `Cache cleared for namespace: ${online_forms_namespace_collection}`
-        );
-      }).catch((err) => {
-        logger195.error(
-          `Failed to clear cache for namespace: ${online_forms_namespace_collection}`,
-          err
-        );
-      });
       return res.insertedId;
     } catch (error) {
       const isDuplicated = error.message.includes("duplicate");
@@ -67402,18 +67516,10 @@ function useFormEntryRepo() {
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     site = new ObjectId152(site);
     org = new ObjectId152(org);
-    const cacheOptions = {
-      page,
-      limit,
-      status,
-      sort: JSON.stringify(sort),
-      site,
-      ...search && { search }
-    };
     const query = {
       site,
-      status,
-      org
+      status
+      // org,
     };
     if (search && search !== "") {
       query.$or = [
@@ -67421,15 +67527,6 @@ function useFormEntryRepo() {
         { unitNumber: { $regex: search, $options: "i" } }
       ];
     }
-    const cacheKey = makeCacheKey65(
-      online_forms_namespace_collection,
-      cacheOptions
-    );
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger195.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
     try {
       const items = await collection.aggregate([
         { $match: query },
@@ -67455,23 +67552,12 @@ function useFormEntryRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate64(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger195.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger195.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error) {
       throw error;
     }
   }
   async function getFormEntryById(_id) {
-    const cacheKey = makeCacheKey65(online_forms_namespace_collection, { _id });
-    const cachedData = await getCache(cacheKey);
-    if (cachedData) {
-      logger195.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
-    }
     try {
       _id = new ObjectId152(_id);
     } catch (error) {
@@ -67483,11 +67569,6 @@ function useFormEntryRepo() {
       if (!data) {
         throw new NotFoundError62("Document not found.");
       }
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger195.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger195.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error) {
       throw error;
@@ -67506,7 +67587,7 @@ function useFormEntryRepo() {
       };
       const res = await collection.updateOne({ _id }, { $set: updateValue });
       if (res.modifiedCount === 0) {
-        throw new InternalServerError83("Unable to update online form.");
+        throw new InternalServerError84("Unable to update online form.");
       }
       const onlineFormRequest = await collection.findOne({ _id });
       if (!onlineFormRequest) {
@@ -67520,23 +67601,7 @@ function useFormEntryRepo() {
       await NotificationService.onlineFormRequestStatusUpdated({
         to: userId,
         onlineFormId: onlineFormRequest._id,
-        // typeOfForm: onlineFormRequest.typeOfForm,
-        // unitNumber: onlineFormRequest.unitNumber,
         status: onlineFormRequest.status
-        // createdAt: onlineFormRequest.createdAt ?? "",
-        // fields: onlineFormRequest.fields ?? {},
-        // remarks: onlineFormRequest.remarks ?? "",
-        // managementValuesJson: onlineFormRequest.managementValues ?? {},
-      });
-      delNamespace().then(() => {
-        logger195.info(
-          `Cache cleared for namespace: ${online_forms_namespace_collection}`
-        );
-      }).catch((err) => {
-        logger195.error(
-          `Failed to clear cache for namespace: ${online_forms_namespace_collection}`,
-          err
-        );
       });
       return res.modifiedCount;
     } catch (error) {
@@ -67561,18 +67626,8 @@ function useFormEntryRepo() {
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new InternalServerError83("Unable to delete online form.");
+        throw new InternalServerError84("Unable to delete online form.");
       }
-      delNamespace().then(() => {
-        logger195.info(
-          `Cache cleared for namespace: ${online_forms_namespace_collection}`
-        );
-      }).catch((err) => {
-        logger195.error(
-          `Failed to clear cache for namespace: ${online_forms_namespace_collection}`,
-          err
-        );
-      });
       return res.modifiedCount;
     } catch (error) {
       throw new Error(error.message);
@@ -67584,16 +67639,6 @@ function useFormEntryRepo() {
       value.org = new ObjectId152(value.org);
       value.userId = new ObjectId152(value.userId);
       const res = await collection.insertOne(value, { session });
-      delNamespace().then(() => {
-        logger195.info(
-          `Cache cleared for namespace: ${online_forms_namespace_collection}`
-        );
-      }).catch((err) => {
-        logger195.error(
-          `Failed to clear cache for namespace: ${online_forms_namespace_collection}`,
-          err
-        );
-      });
       return res.insertedId;
     } catch (error) {
       const isDuplicated = error.message.includes("duplicate");
@@ -67606,22 +67651,61 @@ function useFormEntryRepo() {
   async function residentForm({
     userId,
     site,
-    org
+    org,
+    search = "",
+    page = 1,
+    limit = 10,
+    sort = {}
   }) {
+    page = page > 0 ? page - 1 : 0;
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    const user = new ObjectId152(userId);
+    const siteId = new ObjectId152(site);
+    const orgId = new ObjectId152(org);
+    const cacheOptions = {
+      page,
+      limit,
+      sort: JSON.stringify(sort),
+      userId: user,
+      site: siteId,
+      org: orgId,
+      ...search && { search }
+    };
+    const query = {
+      userId: user,
+      site: siteId,
+      org: orgId
+    };
+    if (search && search !== "") {
+      query.$or = [
+        { typeOfForm: { $regex: search, $options: "i" } },
+        { unitNumber: { $regex: search, $options: "i" } }
+      ];
+    }
+    const cacheKey = makeCacheKey65(
+      online_forms_namespace_collection,
+      cacheOptions
+    );
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger195.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
     try {
-      const user = new ObjectId152(userId);
-      const siteId = new ObjectId152(site);
-      const orgId = new ObjectId152(org);
-      const res = await collection.aggregate([
-        {
-          $match: {
-            userId: user,
-            site: siteId,
-            org: orgId
-          }
-        }
+      const items = await collection.aggregate([
+        { $match: query },
+        { $sort: sort },
+        { $skip: page * limit },
+        { $limit: limit }
       ]).toArray();
-      return res;
+      const length = await collection.countDocuments(query);
+      const data = paginate64(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        logger195.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger195.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
     } catch (error) {
       throw error;
     }
@@ -67853,20 +67937,25 @@ function useFormEntryController() {
   }
   async function residentForm(req, res, next) {
     try {
-      const { site, userId, org } = req.query;
       const residentFormPayload = Joi148.object({
         org: Joi148.string().hex().required(),
         site: Joi148.string().hex().required(),
-        userId: Joi148.string().hex().required()
+        userId: Joi148.string().hex().required(),
+        search: Joi148.string().optional().allow("", null),
+        page: Joi148.number().integer().min(1).allow("", null).default(1),
+        limit: Joi148.number().integer().min(1).max(100).allow("", null).default(10)
+      });
+      const { error, value } = residentFormPayload.validate(req.query, {
+        abortEarly: true
       });
-      const { error } = residentFormPayload.validate({ site, userId, org }, { abortEarly: true });
       if (error) {
         const messages = error.details.map((d) => d.message).join(", ");
         logger196.log({ level: "error", message: messages });
         next(new BadRequestError226(messages));
         return;
       }
-      const result = await _residentForm({ userId, site, org });
+      const { site, userId, org, search, page, limit } = value;
+      const result = await _residentForm({ userId, site, org, search, page, limit });
       res.json(result);
     } catch (error) {
       logger196.log({ level: "error", message: error.message });
@@ -67887,11 +67976,11 @@ function useFormEntryController() {
 }
 
 // src/services/building-level.service.ts
-import { useAtlas as useAtlas129 } from "@7365admin1/node-server-utils";
+import { useAtlas as useAtlas130 } from "@7365admin1/node-server-utils";
 function useBuildingLevelService() {
   const { add: _add, updateLevelById: _updateLevelById } = useBuildingLevelRepo();
   async function add(value) {
-    const session = useAtlas129.getClient()?.startSession();
+    const session = useAtlas130.getClient()?.startSession();
     try {
       session?.startTransaction();
       await _add(value, session);
@@ -67905,7 +67994,7 @@ function useBuildingLevelService() {
     }
   }
   async function updateLevelById(_id, value) {
-    const session = useAtlas129.getClient()?.startSession();
+    const session = useAtlas130.getClient()?.startSession();
     try {
       session?.startTransaction();
       await _updateLevelById(_id, value, session);
@@ -68391,17 +68480,17 @@ function MHidAmicoIdentity(value) {
 // src/repositories/hid-amico.repo.ts
 import {
   BadRequestError as BadRequestError229,
-  InternalServerError as InternalServerError84,
+  InternalServerError as InternalServerError85,
   logger as logger199,
   paginate as paginate65,
-  useAtlas as useAtlas130
+  useAtlas as useAtlas131
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId154 } from "mongodb";
 function useHidAmicoRepo() {
   function db() {
-    const instance = useAtlas130.getDb();
+    const instance = useAtlas131.getDb();
     if (!instance) {
-      throw new InternalServerError84("Unable to connect to server.");
+      throw new InternalServerError85("Unable to connect to server.");
     }
     return instance;
   }