@7365admin1/core 2.76.0 → 2.77.0

package/dist/index.js

@@ -3737,6 +3737,20 @@ function useMemberRepo() {
         { $sort: { _id: -1 } },
         { $skip: page * limit },
         { $limit: limit },
+        {
+          $lookup: {
+            from: "organizations",
+            localField: "org",
+            foreignField: "_id",
+            as: "orgData"
+          }
+        },
+        {
+          $unwind: {
+            path: "$orgData",
+            preserveNullAndEmptyArrays: true
+          }
+        },
         {
           $lookup: {
             from: "organizations",
@@ -3756,7 +3770,16 @@ function useMemberRepo() {
             _id: "$org",
             text: { $first: "$orgName" },
             value: { $first: "$org" },
-            defaultSite: { $first: "$defaultSite.defaultSite" }
+            defaultSite: { $first: "$defaultSite.defaultSite" },
+            onboardingRequired: {
+              $first: "$orgData.onboardingRequired"
+            },
+            onboardingCompleted: {
+              $first: "$orgData.onboardingCompleted"
+            },
+            onboardingCompletedAt: {
+              $first: "$orgData.onboardingCompletedAt"
+            }
           }
         },
         {
@@ -3764,15 +3787,16 @@ function useMemberRepo() {
             _id: 0,
             text: 1,
             value: 1,
-            defaultSite: 1
+            defaultSite: 1,
+            onboardingRequired: 1,
+            onboardingCompleted: 1,
+            onboardingCompletedAt: 1
           }
         }
       ]).toArray();
       const length = await collection.distinct("org", query).then((orgs) => orgs.length);
       const data = (0, import_node_server_utils12.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils12.logger.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
+      setCache(cacheKey, data, 15 * 60).catch((err) => {
         import_node_server_utils12.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
@@ -4620,6 +4644,9 @@ var orgSchema = import_joi8.default.object({
   busInst: import_joi8.default.string().optional().allow("", null),
   status: import_joi8.default.string().optional().allow("", null),
   defaultSite: import_joi8.default.string().hex().optional().allow("", null),
+  onboardingRequired: import_joi8.default.boolean().optional(),
+  onboardingCompleted: import_joi8.default.boolean().optional(),
+  onboardingCompletedAt: import_joi8.default.date().optional().allow(null),
   terms: import_joi8.default.string().optional().allow("", null),
   policies: import_joi8.default.string().optional().allow("", null),
   createdAt: import_joi8.default.string().optional().allow("", null),
@@ -4649,6 +4676,9 @@ function MOrg(value) {
     busInst: value.busInst,
     status: value.status || "active",
     defaultSite: value.defaultSite,
+    onboardingRequired: value.onboardingRequired || false,
+    onboardingCompleted: value.onboardingCompleted || false,
+    onboardingCompletedAt: value.onboardingCompletedAt || null,
     terms: value.terms ?? "",
     policies: value.policies ?? "",
     createdAt: value.createdAt || /* @__PURE__ */ new Date(),
@@ -9350,7 +9380,7 @@ function useOrgController() {
       return;
     }
     try {
-      const _id = await _add(req.body);
+      const _id = await _add({ ...req.body, onboardingRequired: true, onboardingCompleted: false, onboardingCompletedAt: null });
       const data = await _getById(_id);
       res.status(201).json({
         message: "Successfully created organization.",
@@ -15639,10 +15669,10 @@ var import_node_server_utils71 = require("@7365admin1/node-server-utils");
 var import_node_server_utils70 = require("@7365admin1/node-server-utils");
 var import_joi38 = __toESM(require("joi"));
 var import_mongodb41 = require("mongodb");
-var VehicleType = /* @__PURE__ */ ((VehicleType2) => {
-  VehicleType2["WHITELIST"] = "whitelist";
-  VehicleType2["BLOCKLIST"] = "blocklist";
-  return VehicleType2;
+var VehicleType = /* @__PURE__ */ ((VehicleType3) => {
+  VehicleType3["WHITELIST"] = "whitelist";
+  VehicleType3["BLOCKLIST"] = "blocklist";
+  return VehicleType3;
 })(VehicleType || {});
 var VehicleCategory = /* @__PURE__ */ ((VehicleCategory2) => {
   VehicleCategory2["RESIDENT"] = "resident";
@@ -16702,6 +16732,77 @@ function useDahuaDigest({
     streaming
   });
 }
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+function isDahuaInvalidAuthority(value) {
+  const text = String(value || "").toLowerCase();
+  return text.includes("invalid authority");
+}
+function getDahuaResponseText(response) {
+  return response?.data?.toString?.("utf-8") ?? "";
+}
+function getDahuaStatusCode(response) {
+  return response?.statusCode || response?.status || response?.res?.status;
+}
+async function useDahuaDigestWithRetry({
+  host,
+  username,
+  password,
+  endpoint,
+  method = "GET",
+  headers = {},
+  timeout = 1e4,
+  streaming = false,
+  retries = 3,
+  retryDelayMs = 0
+}) {
+  let lastError;
+  for (let attempt = 1; attempt <= retries; attempt++) {
+    try {
+      const response = await useDahuaDigest({
+        host,
+        username,
+        password,
+        endpoint,
+        method,
+        headers,
+        timeout,
+        streaming
+      });
+      const text = getDahuaResponseText(response);
+      const statusCode = getDahuaStatusCode(response);
+      const isOk = statusCode === 200 && text.includes("OK");
+      if (isOk) {
+        return response;
+      }
+      const shouldRetry = isDahuaInvalidAuthority(text);
+      if (shouldRetry && attempt < retries) {
+        loggerDahua.warn(
+          `[${host}] Dahua Invalid Authority. Retrying ${attempt}/${retries}`
+        );
+        if (retryDelayMs > 0) {
+          await sleep(retryDelayMs);
+        }
+        continue;
+      }
+      throw new Error(`Dahua response: ${text || `HTTP ${statusCode}`}`);
+    } catch (error) {
+      lastError = error;
+      const message = error?.message || String(error);
+      const shouldRetry = isDahuaInvalidAuthority(message);
+      if (shouldRetry && attempt < retries) {
+        loggerDahua.warn(
+          `[${host}] Dahua Invalid Authority error. Retrying ${attempt}/${retries}`
+        );
+        if (retryDelayMs > 0) {
+          await sleep(retryDelayMs);
+        }
+        continue;
+      }
+      throw error;
+    }
+  }
+  throw lastError;
+}
 function createFileNameFromEvent(utcSeconds, utcMilliseconds) {
   const date = new Date(utcSeconds * 1e3 + utcMilliseconds);
   const year = date.getUTCFullYear();
@@ -17352,6 +17453,50 @@ function useDahuaService() {
       );
     }
   }
+  async function openBarrier(value) {
+    const validation = import_joi40.default.object({
+      host: import_joi40.default.string().required(),
+      username: import_joi40.default.string().required(),
+      password: import_joi40.default.string().required(),
+      plateNumber: import_joi40.default.string().required(),
+      channel: import_joi40.default.number().integer().min(1).default(1)
+    });
+    const { error, value: payload } = validation.validate(value, {
+      stripUnknown: true
+    });
+    if (error) {
+      throw new import_node_server_utils72.BadRequestError(`Validation error: ${error.message}`);
+    }
+    try {
+      const query = new URLSearchParams({
+        action: "openStrobe",
+        channel: String(payload.channel),
+        "info.openType": "Normal",
+        "info.plateNumber": payload.plateNumber || "VISITOR"
+      });
+      const endpoint = `/cgi-bin/trafficSnap.cgi?${query.toString()}`;
+      const response = await useDahuaDigestWithRetry({
+        host: payload.host,
+        username: payload.username,
+        password: payload.password,
+        endpoint,
+        retries: 10,
+        retryDelayMs: 0
+      });
+      const text = response?.data?.toString?.("utf-8") ?? "";
+      if (!text.includes("OK")) {
+        throw new Error(`Failed to open barrier. Dahua response: ${text}`);
+      }
+      return {
+        success: true,
+        message: "Barrier opened successfully",
+        raw: text
+      };
+    } catch (error2) {
+      loggerDahua.error(`[${value.host}] Error opening barrier:`, error2);
+      throw error2;
+    }
+  }
   return {
     getSnapshot,
     listenToCamera,
@@ -17359,7 +17504,8 @@ function useDahuaService() {
     removePlateNumber,
     updatePlateNumber,
     getPlateNumber,
-    bulkInsertPlateNumber
+    bulkInsertPlateNumber,
+    openBarrier
   };
 }
 
@@ -17566,6 +17712,43 @@ function useSiteCameraRepo() {
       throw new import_node_server_utils73.BadRequestError("Failed to retrieve site cameras.");
     }
   }
+  async function getVisitorsInBySite(site) {
+    try {
+      const pipeline = [
+        { $match: { site: (0, import_node_server_utils73.toObjectId)(site), type: "anpr", status: "active", direction: { $in: ["visitors", "entry", "both"] } } },
+        { $limit: 1 },
+        {
+          $lookup: {
+            from: "anpr-settings",
+            localField: "site",
+            foreignField: "site",
+            as: "anprSettingsDetails"
+          }
+        },
+        {
+          $unwind: {
+            path: "$anprSettingsDetails",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $addFields: {
+            ANPRSwitches: "$anprSettingsDetails.ANPRSwitches"
+          }
+        },
+        {
+          $project: { anprSettingsDetails: 0 }
+        }
+      ];
+      const cameras = await collection.aggregate(pipeline).toArray();
+      return cameras?.find((cam) => cam.direction === "visitors" || cam.direction === "entry" || cam.direction === "both");
+    } catch (error) {
+      if (error instanceof import_node_server_utils73.BadRequestError) {
+        throw error;
+      }
+      throw new import_node_server_utils73.BadRequestError("Failed to retrieve site cameras.");
+    }
+  }
   async function getBySiteGuardPost(site, guardPost) {
     try {
       site = new import_mongodb43.ObjectId(site);
@@ -17920,6 +18103,7 @@ function useSiteCameraRepo() {
     getAll,
     findSiteCameras,
     getBySite,
+    getVisitorsInBySite,
     getBySites,
     delCachedData,
     getBySiteGuardPost,
@@ -26114,13 +26298,14 @@ function useVisitorTransactionService() {
     getByNRIC,
     updateById: _updateById
   } = usePersonRepo();
-  const { getBySite: _getBySite } = useSiteCameraRepo();
+  const { getBySite: _getBySite, getVisitorsInBySite: _getVisitorsInBySite } = useSiteCameraRepo();
   const { getSiteById: _getSiteById } = useSiteRepo();
   const {
     addPlateNumber: _addPlateNumber,
     removePlateNumber: _removePlateNumber,
     getPlateNumber: _getPlateNumber,
-    updatePlateNumber: _updatePlateNumber
+    updatePlateNumber: _updatePlateNumber,
+    openBarrier: _openBarrier
   } = useDahuaService();
   const { getAllSites: _getAllSites } = useSiteRepo();
   const { getByUserId: _getByUserId } = usePersonRepo();
@@ -26196,28 +26381,30 @@ function useVisitorTransactionService() {
       "contractor" /* CONTRACTOR */,
       "walk-in" /* WALK_IN */,
       "guest" /* GUEST */,
-      "delivery" /* DELIVERY */,
-      "pick-up" /* PICK_UP */
+      "delivery" /* DELIVERY */
+      // PersonTypes.PICK_UP,
     ];
     const start = value.checkIn ? new Date(value.checkIn) : /* @__PURE__ */ new Date();
     try {
       session?.startTransaction();
       let camera;
-      let site;
-      if (value.site) {
-        [camera, site] = await Promise.all([
-          _getBySite(value.site, { type: "anpr" /* ANPR */ }),
-          _getSiteById(value.site)
-        ]);
+      if (value.site && value.plateNumber) {
+        try {
+          camera = await _getVisitorsInBySite(value.site);
+          if (!camera) {
+            import_node_server_utils106.logger.warn(`No camera document found for site: ${value.site}`);
+          }
+        } catch (error) {
+          import_node_server_utils106.logger.error(
+            `Error _getVisitorsInBySite camera for site ${value.site}:`,
+            error
+          );
+        }
       }
       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);
-      const endDahuaDate = formatDahuaDate(end);
       if (allowedPersonTypes.includes(value?.type)) {
         const nric = value?.nric || "";
         const person = await getByNRIC(nric);
@@ -26254,7 +26441,7 @@ function useVisitorTransactionService() {
           block,
           level,
           unit,
-          site: site2,
+          site,
           org,
           type,
           company,
@@ -26310,14 +26497,14 @@ function useVisitorTransactionService() {
                   level,
                   unit,
                   unitName,
-                  site: site2,
+                  site,
                   org,
                   type,
                   company,
                   remarks,
                   contractorType,
                   checkIn: start,
-                  expiredAt: end,
+                  // expiredAt: end,
                   visitorPass: visitorPass ?? [],
                   passKeys: passKeys ?? [],
                   status: "registered" /* REGISTERED */
@@ -26328,11 +26515,13 @@ function useVisitorTransactionService() {
           );
         }
       }
+      let host;
+      let username;
+      let password;
       if (camera && value.plateNumber && camera.host && camera.username && camera.password) {
-        const host = camera.host;
-        const username = camera.username;
-        const password = camera.password;
-        const redlist = "TrafficRedList" /* TRAFFIC_REDLIST */;
+        host = camera.host;
+        username = camera.username;
+        password = camera.password;
         const blacklist = "TrafficBlackList" /* TRAFFIC_BLACKLIST */;
         const _plateNumber = value.plateNumber;
         const dahuaBlocklistQuery = {
@@ -26348,74 +26537,6 @@ function useVisitorTransactionService() {
         const found = foundMatch ? Number(foundMatch[1]) : 0;
         if (found === 1)
           throw new import_node_server_utils106.BadRequestError("This plate number is blocklisted");
-        const dahuaQuery = {
-          host,
-          username,
-          password,
-          plateNumber: _plateNumber,
-          mode: redlist
-        };
-        const raw = await _getPlateNumber(dahuaQuery);
-        const parsed = parseDahuaFind(raw);
-        if (!parsed.exists) {
-          const dahuaPayload = {
-            host,
-            username,
-            password,
-            plateNumber: _plateNumber,
-            mode: redlist,
-            start: startDahuaDate,
-            end: endDahuaDate,
-            owner: value.name ?? "",
-            isOpenGate: site?.isOpenGate ?? true
-          };
-          const dahuaResponse = await _addPlateNumber(dahuaPayload);
-          if (dahuaResponse?.statusCode !== 200) {
-            throw new import_node_server_utils106.BadRequestError(
-              `Failed to add plate number to ANPR whitelist`
-            );
-          }
-          const responseData = dahuaResponse?.data?.toString("utf-8") ?? "";
-          value.recNo = responseData.split("=")[1]?.trim();
-          value.checkIn = start;
-          value.expiredAt = end;
-          const vehiclePayload = {
-            name: value.name ?? "",
-            category: value.type,
-            org: value.org,
-            site: value.site,
-            plateNumber: value.plateNumber,
-            type: "whitelist" /* WHITELIST */,
-            nric: value.nric,
-            start,
-            end,
-            recNo: value.recNo,
-            ...value.block && { block: value.block },
-            ...value.level && { level: value.level },
-            ...value.unit && { unit: value.unit }
-          };
-          await addVehicle(vehiclePayload);
-        } else {
-          const dahuaPayload = {
-            host,
-            username,
-            password,
-            plateNumber: _plateNumber,
-            recno: parsed.recNo,
-            mode: redlist,
-            start: startDahuaDate,
-            end: endDahuaDate,
-            owner: value.name ?? "",
-            isOpenGate: site?.isOpenGate ?? true
-          };
-          const dahuaResponse = await _updatePlateNumber(dahuaPayload);
-          if (dahuaResponse?.statusCode !== 200) {
-            throw new import_node_server_utils106.BadRequestError(
-              `Failed to update plate number to ANPR ${"whitelist" /* WHITELIST */}`
-            );
-          }
-          value.recNo = parsed.recNo;
-        }
       }
       if (value.visitorPass && Array.isArray(value.visitorPass) && value.visitorPass.length > 0 && value.visitorPass) {
         for (const vp of value.visitorPass) {
@@ -26453,6 +26574,27 @@ function useVisitorTransactionService() {
       }
       const result = await _add(value, session);
       await session?.commitTransaction();
+      let openBarrier = null;
+      const isOpenBarrier = allowedPersonTypes.includes(value?.type) || camera?.ANPRSwitches?.openBarrierPickUpDropOff == true;
+      if (isOpenBarrier && value.plateNumber && host && username && password) {
+        try {
+          import_node_server_utils106.logger.info(`Attempting to open barrier at host: ${host}`);
+          openBarrier = await _openBarrier({
+            host,
+            username,
+            password,
+            plateNumber: value?.plateNumber
+          });
+          import_node_server_utils106.logger.info(`Barrier command sent successfully to ${host}`, { response: openBarrier });
+        } catch (error) {
+          import_node_server_utils106.logger.error(
+            `Failed to open barrier at host ${host}. Critical system error:`,
+            error
+          );
+          openBarrier = { success: false, error: error?.message };
+        }
+      }
+      console.log("Open barrier response:", openBarrier);
       return result;
     } catch (error) {
       await session?.abortTransaction();
@@ -26465,6 +26607,43 @@ function useVisitorTransactionService() {
     const session = import_node_server_utils106.useAtlas.getClient()?.startSession();
     session?.startTransaction();
     try {
+      let camera;
+      let host;
+      let username;
+      let password;
+      if (value.site && value.plateNumber) {
+        try {
+          camera = await _getVisitorsInBySite(value.site);
+          if (!camera) {
+            import_node_server_utils106.logger.warn(`No camera document found for site: ${value.site}`);
+          }
+        } catch (error) {
+          import_node_server_utils106.logger.error(
+            `Error _getVisitorsInBySite camera for site ${value.site}:`,
+            error
+          );
+        }
+      }
+      if (camera && value.plateNumber && camera.host && camera.username && camera.password) {
+        host = camera.host;
+        username = camera.username;
+        password = camera.password;
+        const blacklist = "TrafficBlackList" /* TRAFFIC_BLACKLIST */;
+        const _plateNumber = value.plateNumber;
+        const dahuaBlocklistQuery = {
+          host,
+          username,
+          password,
+          plateNumber: _plateNumber,
+          mode: blacklist
+        };
+        const isBlocklistedRaw = await _getPlateNumber(dahuaBlocklistQuery);
+        const rawString = isBlocklistedRaw?.toString?.("utf-8") ?? String(isBlocklistedRaw);
+        const foundMatch = rawString.match(/found=(\d+)/);
+        const found = foundMatch ? Number(foundMatch[1]) : 0;
+        if (found === 1)
+          throw new import_node_server_utils106.BadRequestError("This plate number is blocklisted");
+      }
       if (Array.isArray(value.visitorPass) && value.visitorPass.length > 0) {
         const keptVisitorPass = [];
         for (const vp of value.visitorPass) {
@@ -26528,6 +26707,34 @@ function useVisitorTransactionService() {
         value.unitName = unit?.name;
       }
       await _updateVisitorTansactionById(id, value, session);
+      const allowedPersonTypes = [
+        "contractor" /* CONTRACTOR */,
+        "walk-in" /* WALK_IN */,
+        "guest" /* GUEST */,
+        "delivery" /* DELIVERY */
+        // PersonTypes.PICK_UP,
+      ];
+      let openBarrier = null;
+      const isOpenBarrier = allowedPersonTypes.includes(value?.type) || camera?.ANPRSwitches?.openBarrierPickUpDropOff == true;
+      if (isOpenBarrier && value.plateNumber && host && username && password) {
+        try {
+          import_node_server_utils106.logger.info(`Attempting to open barrier at host: ${host}`);
+          openBarrier = await _openBarrier({
+            host,
+            username,
+            password,
+            plateNumber: value?.plateNumber
+          });
+          import_node_server_utils106.logger.info(`Barrier command sent successfully to ${host}`, { response: openBarrier });
+        } catch (error) {
+          import_node_server_utils106.logger.error(
+            `Failed to open barrier at host ${host}. Critical system error:`,
+            error
+          );
+          openBarrier = { success: false, error: error?.message };
+        }
+      }
+      console.log("Open barrier response:", openBarrier);
       await session?.commitTransaction();
       return "Successfully updated visitor transaction.";
     } catch (error) {
@@ -49447,7 +49654,7 @@ function filterByStatus(attendance, shiftData, timezone, format2, status) {
     }
   });
 }
-function sleep(ms) {
+function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function fetchSites({ siteUrl, token }) {
@@ -49474,7 +49681,7 @@ async function fetchSites({ siteUrl, token }) {
       }
       if (attempt < maxRetries) {
         const delay = 1e3 * attempt;
-        await sleep(delay);
+        await sleep2(delay);
       }
     }
   } while (attempt < maxRetries);
@@ -55925,7 +56132,7 @@ function usePostPrelovedController() {
         import_joi134.default.string().valid(...Object.values(PostStatus))
       ).optional().allow(null),
       category: import_joi134.default.string().hex().length(24).optional().allow("", null),
-      subcategory: import_joi134.default.alternatives().try(import_joi134.default.array().items(import_joi134.default.string())).optional().allow(null, ""),
+      subcategory: import_joi134.default.array().items(import_joi134.default.string()).single().optional().allow(null),
       userId: import_joi134.default.string().optional().allow("", null)
     });
     const { error, value } = validation.validate(req.query, {
@@ -56130,6 +56337,17 @@ function usePostFavoriteRepo() {
       throw new import_node_server_utils237.NotFoundError("Favorite not found.");
     return result;
   }
+  async function getByPostId(postId) {
+    try {
+      postId = new import_mongodb135.ObjectId(postId);
+    } catch {
+      throw new import_node_server_utils237.BadRequestError("Invalid post ID format.");
+    }
+    const result = await collection.findOne({ postId });
+    if (!result)
+      throw new import_node_server_utils237.NotFoundError("Favorite not found.");
+    return result;
+  }
   async function updateById(_id, userId, session) {
     try {
       _id = new import_mongodb135.ObjectId(_id);
@@ -56155,6 +56373,7 @@ function usePostFavoriteRepo() {
   return {
     addFavorite,
     getById,
+    getByPostId,
     updateById
   };
 }
@@ -56202,7 +56421,7 @@ var import_node_server_utils239 = require("@7365admin1/node-server-utils");
 var import_joi136 = __toESM(require("joi"));
 function usePostFavoriteController() {
   const { addFavorite: _addFavorite, toggleFavorite: _toggleFavorite } = usePostFavoriteService();
-  const { getById: _getById } = usePostFavoriteRepo();
+  const { getById: _getById, getByPostId: _getByPostId } = usePostFavoriteRepo();
   async function addFavorite(req, res, next) {
     const { error, value } = schemaPostFavorite.validate(req.body, {
       abortEarly: false
@@ -56243,6 +56462,26 @@ function usePostFavoriteController() {
       return;
     }
   }
+  async function getByPostId(req, res, next) {
+    const schema2 = import_joi136.default.object({
+      postId: import_joi136.default.string().hex().length(24).required()
+    });
+    const { error, value } = schema2.validate({ postId: req.params.postId });
+    if (error) {
+      import_node_server_utils239.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils239.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getByPostId(value.postId);
+      res.status(200).json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils239.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   async function updateById(req, res, next) {
     const paramsSchema = import_joi136.default.object({
       _id: import_joi136.default.string().hex().length(24).required()
@@ -56272,6 +56511,7 @@ function usePostFavoriteController() {
   return {
     addFavorite,
     getById,
+    getByPostId,
     updateById
   };
 }
@@ -56568,7 +56808,50 @@ function useSubcategoryPrelovedRepo() {
       throw error;
     }
   }
-  return { getAll, getById, addSubcategory };
+  async function updateById(_id, value, session) {
+    let objectId2;
+    try {
+      objectId2 = new import_mongodb139.ObjectId(_id);
+    } catch {
+      throw new import_node_server_utils242.BadRequestError("Invalid subcategory ID format.");
+    }
+    if (value.category_id && typeof value.category_id === "string") {
+      try {
+        value.category_id = new import_mongodb139.ObjectId(value.category_id);
+      } catch {
+        throw new import_node_server_utils242.BadRequestError("Invalid category ID format.");
+      }
+    }
+    if (value.site && typeof value.site === "string") {
+      try {
+        value.site = new import_mongodb139.ObjectId(value.site);
+      } catch {
+        throw new import_node_server_utils242.BadRequestError("Invalid site ID format.");
+      }
+    }
+    value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const res = await collection.updateOne(
+      { _id: objectId2 },
+      { $set: value },
+      { session }
+    );
+    if (res.modifiedCount === 0)
+      throw new import_node_server_utils242.InternalServerError("Unable to update subcategory.");
+    return res;
+  }
+  async function deleteById(_id, session) {
+    let objectId2;
+    try {
+      objectId2 = new import_mongodb139.ObjectId(_id);
+    } catch {
+      throw new import_node_server_utils242.BadRequestError("Invalid subcategory ID format.");
+    }
+    const res = await collection.deleteOne({ _id: objectId2 }, { session });
+    if (res.deletedCount === 0)
+      throw new import_node_server_utils242.InternalServerError("Unable to delete subcategory.");
+    return res.deletedCount;
+  }
+  return { getAll, getById, addSubcategory, updateById, deleteById };
 }
 
 // src/controllers/subcategory-preloved.controller.ts
@@ -56578,7 +56861,9 @@ function useSubcategoryPrelovedController() {
   const {
     getAll: _getAll,
     getById: _getById,
-    addSubcategory: _addSubcategory
+    addSubcategory: _addSubcategory,
+    updateById: _updateById,
+    deleteById: _deleteById
   } = useSubcategoryPrelovedRepo();
   async function getAll(req, res, next) {
     const schema2 = import_joi140.default.object({
@@ -56641,7 +56926,50 @@ function useSubcategoryPrelovedController() {
       next(error2);
     }
   }
-  return { getAll, getById, addSubcategory };
+  async function updateById(req, res, next) {
+    const paramsSchema = import_joi140.default.object({
+      _id: import_joi140.default.string().hex().length(24).required()
+    });
+    const { error: paramsError, value: paramsValue } = paramsSchema.validate({
+      _id: req.params.id
+    });
+    if (paramsError) {
+      next(new import_node_server_utils243.BadRequestError(paramsError.message));
+      return;
+    }
+    const { error: bodyError, value: bodyValue } = schemaUpdateSubcategoryPreloved.validate(req.body, { abortEarly: false });
+    if (bodyError) {
+      const messages = bodyError.details.map((d) => d.message).join(", ");
+      import_node_server_utils243.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils243.BadRequestError(messages));
+      return;
+    }
+    try {
+      const data = await _updateById(paramsValue._id, bodyValue);
+      res.status(200).json(data);
+    } catch (error) {
+      import_node_server_utils243.logger.log({ level: "error", message: error.message });
+      next(error);
+    }
+  }
+  async function deleteById(req, res, next) {
+    const schema2 = import_joi140.default.object({
+      _id: import_joi140.default.string().hex().length(24).required()
+    });
+    const { error, value } = schema2.validate({ _id: req.params.id });
+    if (error) {
+      next(new import_node_server_utils243.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _deleteById(value._id);
+      res.status(200).json(data);
+    } catch (error2) {
+      import_node_server_utils243.logger.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
+  return { getAll, getById, addSubcategory, updateById, deleteById };
 }
 
 // src/models/online-forms-v2.model.ts
@@ -56735,6 +57063,7 @@ function MFormEntry(value) {
 
 // src/repositories/online-forms-v2.repository.ts
 var import_node_server_utils244 = require("@7365admin1/node-server-utils");
+var import_mongodb141 = require("mongodb");
 var online_forms_namespace_collection = "online-forms";
 function useFormEntryRepo() {
   const db = import_node_server_utils244.useAtlas.getDb();
@@ -56779,18 +57108,105 @@ function useFormEntryRepo() {
       throw error;
     }
   }
+  async function getAll({
+    search = "",
+    page = 1,
+    limit = 10,
+    sort = {},
+    status = "active",
+    org = "",
+    site = ""
+  }) {
+    page = page > 0 ? page - 1 : 0;
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    const cacheOptions = {
+      page,
+      limit,
+      status,
+      sort: JSON.stringify(sort),
+      ...site && { site },
+      ...search && { search }
+    };
+    const query = {
+      ...status ? { $and: [{ status }, { status: { $ne: "deleted" } }] } : { status: { $ne: "deleted" } },
+      ...site && { site: new import_mongodb141.ObjectId(site) },
+      ...search && { search: [{ name: { $regex: search, $options: "i" } }] }
+    };
+    const cacheKey = (0, import_node_server_utils244.makeCacheKey)(
+      online_forms_namespace_collection,
+      cacheOptions
+    );
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      import_node_server_utils244.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const items = await collection.aggregate([
+        { $match: query },
+        { $sort: sort },
+        { $skip: page * limit },
+        { $limit: limit }
+      ]).toArray();
+      const length = await collection.countDocuments(query);
+      const data = (0, import_node_server_utils244.paginate)(items, page, limit, length);
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        import_node_server_utils244.logger.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils244.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
+  async function getFormEntryById(_id) {
+    const cacheKey = (0, import_node_server_utils244.makeCacheKey)(online_forms_namespace_collection, { _id });
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      import_node_server_utils244.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      _id = new import_mongodb141.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils244.BadRequestError("Invalid online form ID format.");
+    }
+    const query = { _id, status: { $ne: "deleted" } };
+    try {
+      const [data] = await collection.aggregate([{ $match: query }]).toArray();
+      if (!data) {
+        throw new import_node_server_utils244.NotFoundError("Document not found.");
+      }
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        import_node_server_utils244.logger.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils244.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     add,
+    getAll,
+    getFormEntryById,
     createTextIndex
   };
 }
 
 // src/controllers/online-forms-v2.controller.ts
 var import_node_server_utils245 = require("@7365admin1/node-server-utils");
+var import_joi142 = __toESM(require("joi"));
 var import_exceljs3 = __toESM(require("exceljs"));
 var import_fs6 = __toESM(require("fs"));
 function useFormEntryController() {
-  const { add: _add } = useFormEntryRepo();
+  const {
+    add: _add,
+    getAll: _getAll,
+    getFormEntryById: _getFormEntryById
+  } = useFormEntryRepo();
   function toCamelCase(str) {
     return str.replace(/\s(.)/g, (_, char) => char.toUpperCase()).replace(/\s+/g, "").replace(/^(.)/, (_, char) => char.toLowerCase());
   }
@@ -56852,8 +57268,59 @@ function useFormEntryController() {
       next(error);
     }
   }
+  async function getAll(req, res, next) {
+    try {
+      const schema2 = import_joi142.default.object({
+        search: import_joi142.default.string().optional().allow("", null),
+        page: import_joi142.default.number().integer().min(1).allow("", null).default(1),
+        limit: import_joi142.default.number().integer().min(1).max(100).allow("", null).default(10),
+        status: import_joi142.default.string().optional().allow(null, ""),
+        org: import_joi142.default.string().hex().optional().allow("", null),
+        site: import_joi142.default.string().hex().optional().allow("", null)
+      });
+      const { error, value } = schema2.validate(req.query);
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils245.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils245.BadRequestError(messages));
+        return;
+      }
+      const { search, page, limit, status, org, site } = value;
+      const data = await _getAll({ search, page, limit, status, org, site });
+      res.json(data);
+      return;
+    } catch (error) {
+      import_node_server_utils245.logger.log({ level: "error", message: error.message });
+      next(error);
+      return;
+    }
+  }
+  async function getFormEntryById(req, res, next) {
+    try {
+      const schema2 = import_joi142.default.object({
+        _id: import_joi142.default.string().hex().length(24).required()
+      });
+      const { error, value } = schema2.validate({ _id: req.params.id });
+      if (error) {
+        const messages = error.details.map((d) => d.message).join(", ");
+        import_node_server_utils245.logger.log({ level: "error", message: messages });
+        next(new import_node_server_utils245.BadRequestError(messages));
+        return;
+      }
+      const { _id } = value;
+      const data = await _getFormEntryById(_id);
+      res.json(data);
+      return;
+    } catch (error) {
+      import_node_server_utils245.logger.log({ level: "error", message: error.message });
+      next(error);
+      return;
+    }
+  }
   return {
-    uploadFormEntrys
+    uploadFormEntrys,
+    getAll,
+    getFormEntryById
   };
 }
 
@@ -56897,7 +57364,7 @@ function useBuildingLevelService() {
 
 // src/controllers/building-level.controller.ts
 var import_node_server_utils247 = require("@7365admin1/node-server-utils");
-var import_joi142 = __toESM(require("joi"));
+var import_joi143 = __toESM(require("joi"));
 function useBuildingLevelController() {
   const { add: _add, updateLevelById: _updateLevelById } = useBuildingLevelService();
   const {
@@ -56924,12 +57391,12 @@ function useBuildingLevelController() {
   }
   async function getAll(req, res, next) {
     try {
-      const validation = import_joi142.default.object({
-        page: import_joi142.default.number().min(1).optional().default(1),
-        limit: import_joi142.default.number().min(1).optional().default(20),
-        search: import_joi142.default.string().optional().allow("", null),
-        site: import_joi142.default.string().hex().length(24).optional().allow("", null),
-        status: import_joi142.default.string().valid(...Object.values(BuildingLevelStatus)).default("active" /* ACTIVE */)
+      const validation = import_joi143.default.object({
+        page: import_joi143.default.number().min(1).optional().default(1),
+        limit: import_joi143.default.number().min(1).optional().default(20),
+        search: import_joi143.default.string().optional().allow("", null),
+        site: import_joi143.default.string().hex().length(24).optional().allow("", null),
+        status: import_joi143.default.string().valid(...Object.values(BuildingLevelStatus)).default("active" /* ACTIVE */)
       });
       const { error, value } = validation.validate(req.query, {
         abortEarly: false
@@ -56956,8 +57423,8 @@ function useBuildingLevelController() {
   }
   async function getById(req, res, next) {
     try {
-      const schema2 = import_joi142.default.object({
-        id: import_joi142.default.string().hex().length(24).required()
+      const schema2 = import_joi143.default.object({
+        id: import_joi143.default.string().hex().length(24).required()
       });
       const { error, value } = schema2.validate({ id: req.params.id });
       if (error) {
@@ -56995,8 +57462,8 @@ function useBuildingLevelController() {
   }
   async function deleteById(req, res, next) {
     try {
-      const schema2 = import_joi142.default.object({
-        id: import_joi142.default.string().hex().required()
+      const schema2 = import_joi143.default.object({
+        id: import_joi143.default.string().hex().required()
       });
       const { error, value } = schema2.validate({ id: req.params.id });
       if (error) {