@7365admin1/core 2.72.0 → 2.74.0

package/dist/index.mjs

@@ -3649,6 +3649,51 @@ function useMemberRepo() {
       throw error;
     }
   }
+  async function getByUserIdTypeOrg(user, type, org) {
+    try {
+      user = new ObjectId11(user);
+    } catch {
+      throw new BadRequestError11("Invalid user ID format.");
+    }
+    try {
+      org = new ObjectId11(org);
+    } catch {
+      throw new BadRequestError11("Invalid organization ID format.");
+    }
+    const cacheKey = makeCacheKey6(namespace_collection, {
+      user: user.toString(),
+      type,
+      org: org.toString()
+    });
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger8.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const data = await collection.findOne({
+        user,
+        type,
+        org
+      });
+      if (!data) {
+        throw new NotFoundError5("Member not found.");
+      }
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        logger8.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger8.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      if (error instanceof AppError2) {
+        throw error;
+      }
+      throw new InternalServerError6(
+        "Internal server error, failed to retrieve member."
+      );
+    }
+  }
   return {
     createIndex,
     createUniqueIndex,
@@ -3669,7 +3714,8 @@ function useMemberRepo() {
     countUserMembershipById,
     updateRoleById,
     getByRoles,
-    updateSiteById
+    updateSiteById,
+    getByUserIdTypeOrg
   };
 }
 
@@ -4147,6 +4193,8 @@ var orgSchema = Joi8.object({
   busInst: Joi8.string().optional().allow("", null),
   status: Joi8.string().optional().allow("", null),
   defaultSite: Joi8.string().hex().optional().allow("", null),
+  terms: Joi8.string().optional().allow("", null),
+  policies: Joi8.string().optional().allow("", null),
   createdAt: Joi8.string().optional().allow("", null),
   updatedAt: Joi8.string().optional().allow("", null),
   deletedAt: Joi8.string().optional().allow("", null)
@@ -4174,6 +4222,8 @@ function MOrg(value) {
     busInst: value.busInst,
     status: value.status || "active",
     defaultSite: value.defaultSite,
+    terms: value.terms ?? "",
+    policies: value.policies ?? "",
     createdAt: value.createdAt || /* @__PURE__ */ new Date(),
     updatedAt: "",
     deletedAt: ""
@@ -4189,6 +4239,7 @@ function useOrgRepo() {
   }
   const namespace_collection = "organizations";
   const collection = db.collection(namespace_collection);
+  const rolesCollection = db.collection("roles");
   const { delNamespace, getCache, setCache } = useCache9(namespace_collection);
   async function createIndex() {
     try {
@@ -4668,6 +4719,26 @@ function useOrgRepo() {
       throw error;
     }
   }
+  async function getAdminOrgForResident() {
+    const role = await rolesCollection.findOne({ type: "admin" });
+    if (!role)
+      throw new NotFoundError7("Admin role not found.");
+    let orgId;
+    try {
+      orgId = new ObjectId15(role.org);
+    } catch {
+      throw new InternalServerError9(
+        "Invalid organization reference in admin role."
+      );
+    }
+    const org = await collection.findOne(
+      { _id: orgId },
+      { projection: { terms: 1, policies: 1, _id: 0 } }
+    );
+    if (!org)
+      throw new NotFoundError7("Organization not found.");
+    return org;
+  }
   return {
     createIndex,
     createTextIndex,
@@ -4682,7 +4753,8 @@ function useOrgRepo() {
     updateStatusById,
     deleteById,
     getOrgsByEmail,
-    getOrganizationsWithSubscription
+    getOrganizationsWithSubscription,
+    getAdminOrgForResident
   };
 }
 
@@ -5301,7 +5373,7 @@ function useSiteRepo() {
     try {
       const items = await collection.aggregate([
         ...basePipeline,
-        { $project: { _id: 1, name: 1, orgId: 1 } },
+        { $project: { _id: 1, name: 1, orgId: 1, category: 1 } },
         { $skip: page * limit },
         { $limit: limit }
       ]).toArray();
@@ -7933,6 +8005,7 @@ function useMemberController() {
     getAll: _getAll,
     getOrgsByMembership: _getOrgsByMembership,
     getByUserIdType: _getByUserIdType,
+    getByUserIdTypeOrg: _getByUserIdTypeOrg,
     updateMemberStatus: _updateMemberStatus,
     updateStatusByUserId: _updateStatusByUserId,
     updateSiteById: _updateSiteById
@@ -8203,17 +8276,57 @@ function useMemberController() {
       next(error2);
     }
   }
+  async function getByUserIdTypeOrg(req, res, next) {
+    const validation = Joi15.object({
+      id: Joi15.string().hex().required(),
+      type: Joi15.string().required(),
+      org: Joi15.string().hex().required()
+    });
+    const params = {
+      ...req.params,
+      ...req.query
+    };
+    const { error } = validation.validate(params);
+    if (error) {
+      logger21.log({
+        level: "error",
+        message: error.message
+      });
+      next(new BadRequestError30(error.message));
+      return;
+    }
+    const user = req.params.id;
+    const type = req.params.type;
+    const org = req.query.org;
+    try {
+      const data = await _getByUserIdTypeOrg(
+        user,
+        type,
+        org
+      );
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger21.log({
+        level: "error",
+        message: error2.message
+      });
+      next(error2);
+      return;
+    }
+  }
   return {
     createMember,
     getByUserId,
     getByUserIdType,
     getAll,
+    getAllByUser,
     getOrgsByMembership,
     updateMemberStatus,
     updateRoleById,
     createMemberDirect,
     updateSiteById,
-    getAllByUser
+    getByUserIdTypeOrg
   };
 }
 
@@ -8783,7 +8896,8 @@ function useOrgController() {
     getAll: _getAll,
     add: _add,
     update: _update,
-    getOrgsByEmail: _getOrgsByEmail
+    getOrgsByEmail: _getOrgsByEmail,
+    getAdminOrgForResident: _getAdminOrgForResident
   } = useOrgRepo();
   async function add(req, res, next) {
     const validation = Joi18.object({
@@ -8791,7 +8905,9 @@ function useOrgController() {
       type: Joi18.string().required(),
       nature: Joi18.string().valid(...allowedNatures).required(),
       email: Joi18.string().email().optional().allow("", null),
-      contact: Joi18.string().optional().allow("", null)
+      contact: Joi18.string().optional().allow("", null),
+      terms: Joi18.string().optional().allow("", null),
+      policies: Joi18.string().optional().allow("", null)
     });
     const { error } = validation.validate(req.body);
     if (error) {
@@ -8997,7 +9113,9 @@ function useOrgController() {
       type: Joi18.string().optional(),
       nature: Joi18.string().valid(...allowedNatures).optional(),
       email: Joi18.string().email().allow("", null).optional(),
-      contact: Joi18.string().allow("", null).optional()
+      contact: Joi18.string().allow("", null).optional(),
+      terms: Joi18.string().optional().allow("", null),
+      policies: Joi18.string().optional().allow("", null)
     });
     const { error } = validation.validate(req.body);
     if (error) {
@@ -9016,6 +9134,15 @@ function useOrgController() {
       next(err);
     }
   }
+  async function getAdminOrgForResident(_req, res, next) {
+    try {
+      const data = await _getAdminOrgForResident();
+      res.status(200).json(data);
+    } catch (error) {
+      logger25.log({ level: "error", message: error.message });
+      next(error);
+    }
+  }
   return {
     add,
     addOnboardingOrg,
@@ -9025,7 +9152,8 @@ function useOrgController() {
     getById,
     getByEmail,
     update,
-    getOrgsByEmail
+    getOrgsByEmail,
+    getAdminOrgForResident
   };
 }
 
@@ -14279,7 +14407,8 @@ function MSiteCamera(value) {
     name: value.name ?? "",
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: value.updatedAt ?? "",
-    deletedAt: value.deletedAt ?? ""
+    deletedAt: value.deletedAt ?? "",
+    ANPRSwitches: value.ANPRSwitches ?? void 0
   };
 }
 
@@ -14375,7 +14504,8 @@ var schemaPerson = Joi36.object({
   plateNumber: Joi36.string().optional().allow(null, ""),
   platform: Joi36.string().valid("web", "mobile").optional().allow(null, ""),
   approvedBy: schemaApprover.optional().allow(null, ""),
-  countryCode: Joi36.string().optional().allow(null, "")
+  countryCode: Joi36.string().optional().allow(null, ""),
+  callingCode: Joi36.string().optional().allow(null, "")
 });
 var schemaUpdatePerson = Joi36.object({
   _id: Joi36.string().hex().required(),
@@ -14399,7 +14529,8 @@ var schemaUpdatePerson = Joi36.object({
   plateNumber: Joi36.string().optional().allow(null, ""),
   platform: Joi36.string().valid("web", "mobile").optional().allow(null, ""),
   approvedBy: schemaApprover.optional().allow(null, ""),
-  countryCode: Joi36.string().optional().allow(null, "")
+  countryCode: Joi36.string().optional().allow(null, ""),
+  callingCode: Joi36.string().optional().allow(null, "")
 });
 function MPerson(value) {
   const { error } = schemaPerson.validate(value);
@@ -14473,6 +14604,7 @@ function MPerson(value) {
     platForm: value.platform ?? "",
     approvedBy: value.approvedBy ?? { id: "", name: "" },
     countryCode: value.countryCode ?? "",
+    callingCode: value.callingCode ?? "",
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: value.updatedAt,
     deletedAt: value.deletedAt
@@ -15276,6 +15408,7 @@ var VehicleSort = /* @__PURE__ */ ((VehicleSort2) => {
 var OrgNature = /* @__PURE__ */ ((OrgNature2) => {
   OrgNature2["PROPERTY_MANAGEMENT_AGENCY"] = "property_management_agency";
   OrgNature2["SECURITY_AGENCY"] = "security_agency";
+  OrgNature2["REAL_ESTATE_DEVELOPER"] = "real_estate_developer";
   return OrgNature2;
 })(OrgNature || {});
 var ANPRMode = /* @__PURE__ */ ((ANPRMode2) => {
@@ -16404,39 +16537,70 @@ function useDahuaService() {
         loggerDahua.error("checkOutBySiteAndPlate catch error: ", error);
       }
     }
-    async function addTransaction(plateNumber2, site, cameraType, onDetected2) {
+    async function addTransaction(plateNumber2, site, cameraType, ANPRSwitches, onDetected2) {
       if (!plateNumber2 || !site)
-        return;
-      const resident = await getVehicleBySiteAndPlateNumber(plateNumber2, camera?.site, "resident", "active");
+        return null;
       let insert = null;
-      if (resident?._id && (cameraType == "entry" || cameraType == "residents")) {
+      if (cameraType == "entry") {
         await checkOutBySiteAndPlate(camera.site, plateNumber2);
-        insert = await add({
-          site,
-          plateNumber: plateNumber2,
-          name: resident?.name,
-          nric: resident?.nric,
-          contact: resident?.phoneNumber,
-          block: Number(resident?.block),
-          level: resident?.level,
-          unit: resident?.unit?.toString(),
-          unitName: resident?.unitName,
-          type: resident?.category,
-          status: "registered" /* REGISTERED */
-          // expiredAt: resident?.end,
-        }, void 0, true);
-        loggerDahua.info(`${camera?.siteName}-${camera?.direction}] Resident with plate ${plateNumber2} and transaction ID ${insert?._id}`);
-      } else if (!resident?._id && (cameraType == "entry" || cameraType == "visitors")) {
-        if (!plateNumber2 || !site)
-          return;
+        const resident = await getVehicleBySiteAndPlateNumber(plateNumber2, camera?.site, "resident", "active");
+        if (resident?._id) {
+          insert = await add({
+            site,
+            plateNumber: plateNumber2,
+            name: resident?.name,
+            nric: resident?.nric,
+            contact: resident?.phoneNumber,
+            block: Number(resident?.block),
+            level: resident?.level,
+            unit: resident?.unit?.toString(),
+            unitName: resident?.unitName,
+            type: resident?.category,
+            status: "registered" /* REGISTERED */
+            // expiredAt: resident?.end,
+          }, void 0, true);
+          loggerDahua.info(`${camera?.siteName}-${camera?.direction}] Resident with plate ${plateNumber2} and transaction ID ${insert?._id}`);
+        } else if (ANPRSwitches?.enableUnregistered) {
+          insert = await add({
+            site,
+            plateNumber: plateNumber2,
+            status: "unregistered" /* UNREGISTERED */
+            // expiredAt: resident?.end,
+          }, void 0, true);
+          loggerDahua.info(`${camera?.siteName}-${camera?.direction}] Unregistered vehicle with plate ${plateNumber2} and transaction ID ${insert?._id}`);
+        }
+      } else if (cameraType == "residents") {
         await checkOutBySiteAndPlate(camera.site, plateNumber2);
-        insert = await add({
-          site,
-          plateNumber: plateNumber2,
-          status: "unregistered" /* UNREGISTERED */
-          // expiredAt: resident?.end,
-        }, void 0, true);
-        loggerDahua.info(`${camera?.siteName}-${camera?.direction}] Unregistered vehicle with plate ${plateNumber2} and transaction ID ${insert?._id}`);
+        const resident = await getVehicleBySiteAndPlateNumber(plateNumber2, camera?.site, "resident", "active");
+        if (resident?._id) {
+          insert = await add({
+            site,
+            plateNumber: plateNumber2,
+            name: resident?.name,
+            nric: resident?.nric,
+            contact: resident?.phoneNumber,
+            block: Number(resident?.block),
+            level: resident?.level,
+            unit: resident?.unit?.toString(),
+            unitName: resident?.unitName,
+            type: resident?.category,
+            status: "registered" /* REGISTERED */
+            // expiredAt: resident?.end,
+          }, void 0, true);
+          loggerDahua.info(`${camera?.siteName}-${camera?.direction}] Resident with plate ${plateNumber2} and transaction ID ${insert?._id}`);
+        }
+      } else if (cameraType == "visitors" && ANPRSwitches?.enableUnregistered) {
+        await checkOutBySiteAndPlate(camera.site, plateNumber2);
+        const resident = await getVehicleBySiteAndPlateNumber(plateNumber2, camera?.site, "resident", "active");
+        if (!resident?._id) {
+          insert = await add({
+            site,
+            plateNumber: plateNumber2,
+            status: "unregistered" /* UNREGISTERED */
+            // expiredAt: resident?.end,
+          }, void 0, true);
+          loggerDahua.info(`${camera?.siteName}-${camera?.direction}] Unregistered vehicle with plate ${plateNumber2} and transaction ID ${insert?._id}`);
+        }
       }
       if (insert?._id && insert?.site && onDetected2) {
         onDetected2({ _id: insert?._id, site: insert?.site?.toString(), plateNumber: insert?.plateNumber, cameraDirection: camera?.direction, direction });
@@ -16449,10 +16613,12 @@ function useDahuaService() {
       );
       if ((camera?.direction == "entry" || camera?.direction == "visitors" || camera?.direction == "residents") && plateNumber) {
         try {
-          const result = await addTransaction(plateNumber, camera?.site, camera?.direction, onDetected2);
-          const transactionId = result?._id;
-          currentTransactionId = transactionId?.toString();
-          currentSnapshotField = "snapshotEntryImage";
+          const result = await addTransaction(plateNumber, camera?.site, camera?.direction, camera?.ANPRSwitches, onDetected2);
+          if (camera?.ANPRSwitches?.vehicleSnapshot && result?._id) {
+            const transactionId = result?._id;
+            currentTransactionId = transactionId?.toString();
+            currentSnapshotField = "snapshotEntryImage";
+          }
         } catch (error) {
           console.log("failed to create visitor transaction", error);
           loggerDahua.error(
@@ -16462,23 +16628,25 @@ function useDahuaService() {
         }
       } else if (camera?.direction == "exit" && plateNumber) {
         const existingOpenTransaction = await checkOutBySiteAndPlate(camera?.site, plateNumber, onDetected2);
-        if (existingOpenTransaction?._id) {
+        if (existingOpenTransaction?._id && camera?.ANPRSwitches?.vehicleSnapshot) {
           currentTransactionId = existingOpenTransaction._id.toString();
           currentSnapshotField = "snapshotExitImage";
         }
       } else if (camera?.direction == "both" && plateNumber) {
         if (direction.toLowerCase() === "leave") {
           const existingOpenTransaction = await checkOutBySiteAndPlate(camera?.site, plateNumber, onDetected2);
-          if (existingOpenTransaction?._id) {
+          if (existingOpenTransaction?._id && camera?.ANPRSwitches?.vehicleSnapshot) {
             currentTransactionId = existingOpenTransaction._id.toString();
             currentSnapshotField = "snapshotExitImage";
           }
         } else if (direction.toLowerCase() === "approach") {
           try {
-            const result = await addTransaction(plateNumber, camera?.site, "entry", onDetected2);
-            const transactionId = result?._id;
-            currentTransactionId = transactionId?.toString();
-            currentSnapshotField = "snapshotEntryImage";
+            const result = await addTransaction(plateNumber, camera?.site, "entry", camera?.ANPRSwitches, onDetected2);
+            if (camera?.ANPRSwitches?.vehicleSnapshot && result?._id) {
+              const transactionId = result?._id;
+              currentTransactionId = transactionId?.toString();
+              currentSnapshotField = "snapshotEntryImage";
+            }
           } catch (error) {
             console.log("failed to create visitor transaction", error);
             loggerDahua.error(
@@ -16517,7 +16685,7 @@ function useDahuaService() {
           if (plateNumber && UTCData) {
             await processVehicleTransaction(onDetected2);
           }
-        } else if (part.includes("Content-Type: image/jpeg")) {
+        } else if (part.includes("Content-Type: image/jpeg") && camera?.ANPRSwitches?.vehicleSnapshot) {
           const [headers, ...imageParts] = part.split("\r\n\r\n");
           const imageChunk = Buffer.from(imageParts.join("\r\n\r\n"), "binary");
           const lengthMatch = headers.match(/Content-Length:\s*(\d+)/i);
@@ -17332,6 +17500,30 @@ function useSiteCameraRepo() {
           $project: {
             siteDetails: 0
           }
+        },
+        {
+          $lookup: {
+            from: "anpr-settings",
+            localField: "site",
+            foreignField: "site",
+            as: "anprSettingsDetails"
+          }
+        },
+        {
+          $unwind: {
+            path: "$anprSettingsDetails",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $addFields: {
+            ANPRSwitches: "$anprSettingsDetails.ANPRSwitches"
+          }
+        },
+        {
+          $project: {
+            anprSettingsDetails: 0
+          }
         }
       ]).toArray();
       const length = await collection.countDocuments(query);
@@ -17367,9 +17559,29 @@ function useSiteCameraRepo() {
           $addFields: {
             siteName: "$siteDetails.name"
           }
+        },
+        {
+          $lookup: {
+            from: "anpr-settings",
+            localField: "site",
+            foreignField: "site",
+            as: "anprSettingsDetails"
+          }
+        },
+        {
+          $unwind: {
+            path: "$anprSettingsDetails",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $addFields: {
+            ANPRSwitches: "$anprSettingsDetails.ANPRSwitches"
+          }
         }
       ];
       pipeline.push({ $project: { siteDetails: 0 } });
+      pipeline.push({ $project: { anprSettingsDetails: 0 } });
       if (Object.keys(project).length > 0) {
         pipeline.push({ $project: project });
       }
@@ -17380,6 +17592,62 @@ function useSiteCameraRepo() {
       throw error;
     }
   }
+  async function findMany(query, project = {}) {
+    try {
+      const pipeline = [
+        { $match: query },
+        { $limit: 1 },
+        {
+          $lookup: {
+            from: "sites",
+            localField: "site",
+            foreignField: "_id",
+            as: "siteDetails"
+          }
+        },
+        {
+          $unwind: {
+            path: "$siteDetails",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $addFields: {
+            siteName: "$siteDetails.name"
+          }
+        },
+        {
+          $lookup: {
+            from: "anpr-settings",
+            localField: "site",
+            foreignField: "site",
+            as: "anprSettingsDetails"
+          }
+        },
+        {
+          $unwind: {
+            path: "$anprSettingsDetails",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $addFields: {
+            ANPRSwitches: "$anprSettingsDetails.ANPRSwitches"
+          }
+        }
+      ];
+      pipeline.push({ $project: { siteDetails: 0 } });
+      pipeline.push({ $project: { anprSettingsDetails: 0 } });
+      if (Object.keys(project).length > 0) {
+        pipeline.push({ $project: project });
+      }
+      const result = await collection.aggregate(pipeline).toArray();
+      return result.length > 0 ? result : [];
+    } catch (error) {
+      console.error("Error in findOne aggregation:", error);
+      throw error;
+    }
+  }
   return {
     createIndexes,
     add,
@@ -39380,6 +39648,32 @@ function UseAccessManagementRepo() {
       throw new Error(error.message);
     }
   }
+  async function qrCodeListRepo({ type, search, site, page, limit, isLift, userId }) {
+    try {
+      page = page ? page - 1 : 0;
+      let defaultQuery = {};
+      let searchQuery = {};
+      site = new ObjectId92(site);
+      userId = new ObjectId92(userId);
+      if (search) {
+        searchQuery = {
+          $or: [{ fullName: { $regex: search, $options: "i" } }, { cardNo: { $regex: search, $options: "i" } }]
+        };
+      }
+      defaultQuery = { site, isLiftCard: isLift, userId, userType: { $in: ["Visitor/Resident", "Resident/Tenant"] } };
+      const result = collection().aggregate([
+        {
+          $match: { ...defaultQuery, ...searchQuery }
+        },
+        { $sort: { _id: -1 } },
+        { $skip: page * limit },
+        { $limit: limit }
+      ]).toArray();
+      return result;
+    } catch (error) {
+      throw new Error(error.message);
+    }
+  }
   return {
     createIndexes,
     createIndexForEntrypass,
@@ -39418,7 +39712,8 @@ function UseAccessManagementRepo() {
     uploadTemplateRepo,
     getResidentsRepo,
     userAccessCardsRepo,
-    removeTemplateRepo
+    removeTemplateRepo,
+    qrCodeListRepo
   };
 }
 
@@ -39465,7 +39760,8 @@ function useAccessManagementSvc() {
     uploadTemplateRepo,
     getResidentsRepo,
     userAccessCardsRepo,
-    removeTemplateRepo
+    removeTemplateRepo,
+    qrCodeListRepo
   } = UseAccessManagementRepo();
   const addPhysicalCardSvc = async (payload) => {
     try {
@@ -39851,6 +40147,14 @@ function useAccessManagementSvc() {
       throw new Error(err.message);
     }
   };
+  const qrCodeListSvc = async ({ type, search, site, page, limit, isLift, userId }) => {
+    try {
+      const response = await qrCodeListRepo({ type, search, site, page, limit, isLift, userId });
+      return response;
+    } catch (err) {
+      throw new Error(err.message);
+    }
+  };
   return {
     addPhysicalCardSvc,
     addNonPhysicalCardSvc,
@@ -39892,7 +40196,8 @@ function useAccessManagementSvc() {
     uploadTemplateSvc,
     getResidentsSvc,
     userAccessCardsSvc,
-    removeTemplateSvc
+    removeTemplateSvc,
+    qrCodeListSvc
   };
 }
 
@@ -39939,7 +40244,8 @@ function useAccessManagementController() {
     uploadTemplateSvc,
     getResidentsSvc,
     userAccessCardsSvc,
-    removeTemplateSvc
+    removeTemplateSvc,
+    qrCodeListSvc
   } = useAccessManagementSvc();
   const addPhysicalCard = async (req, res) => {
     try {
@@ -41008,6 +41314,47 @@ function useAccessManagementController() {
       });
     }
   };
+  const qrCodeList = async (req, res) => {
+    try {
+      const {
+        type,
+        site,
+        page,
+        limit = 10,
+        search = "",
+        isLift,
+        userId
+      } = req.query;
+      const schema2 = Joi87.object({
+        type: Joi87.string().required(),
+        site: Joi87.string().hex().required(),
+        page: Joi87.number().optional().default(1),
+        limit: Joi87.number().optional().default(10),
+        search: Joi87.string().optional().allow("", null),
+        isLift: Joi87.boolean().optional().default(false),
+        userId: Joi87.string().required()
+      });
+      const { error } = schema2.validate({ type, site, page, limit, search, isLift, userId });
+      if (error) {
+        return res.status(400).json({ message: error.message });
+      }
+      const result = await qrCodeListSvc({
+        type,
+        site,
+        page: Number(page),
+        limit: Number(limit),
+        search,
+        isLift: Boolean(isLift),
+        userId
+      });
+      return res.status(200).json({ data: result });
+    } catch (error) {
+      return res.status(400).json({
+        data: null,
+        message: error.message
+      });
+    }
+  };
   return {
     addPhysicalCard,
     addNonPhysicalCard,
@@ -41047,7 +41394,8 @@ function useAccessManagementController() {
     uploadTemplate,
     getResidents,
     userAccessCards,
-    removeTemplate
+    removeTemplate,
+    qrCodeList
   };
 }
 
@@ -55538,7 +55886,8 @@ function usePostPrelovedRepo() {
     site,
     status,
     category,
-    subcategory
+    subcategory,
+    userId
   }, session) {
     page = page > 0 ? page - 1 : 0;
     if (site) {
@@ -55581,7 +55930,34 @@ function usePostPrelovedRepo() {
       ...categoryId && { category: categoryId },
       ...subcategoryIds && { subcategory: { $in: subcategoryIds } }
     };
+    let userObjectId = null;
+    if (userId) {
+      try {
+        userObjectId = new ObjectId132(userId);
+      } catch {
+        throw new BadRequestError212("Invalid user ID format.");
+      }
+    }
     const sortObj = buildSortObj(filter);
+    const FAVORITE_COUNT_LOOKUP = {
+      $lookup: {
+        from: "post-favorites",
+        localField: "_id",
+        foreignField: "postId",
+        pipeline: [{ $project: { userIds: 1 } }],
+        as: "favoriteData"
+      }
+    };
+    const favoriteUserIds = {
+      $ifNull: [{ $arrayElemAt: ["$favoriteData.userIds", 0] }, []]
+    };
+    const FAVORITE_COUNT_ADD_FIELD = {
+      $addFields: {
+        favoriteCount: { $size: favoriteUserIds },
+        isFavorited: userObjectId ? { $in: [userObjectId, favoriteUserIds] } : false
+      }
+    };
+    const FAVORITE_COUNT_UNSET = { $unset: "favoriteData" };
     try {
       const items = await collection.aggregate(
         [
@@ -55589,6 +55965,9 @@ function usePostPrelovedRepo() {
           USER_LOOKUP,
           USER_UNWIND,
           CATEGORY_LOOKUP,
+          FAVORITE_COUNT_LOOKUP,
+          FAVORITE_COUNT_ADD_FIELD,
+          FAVORITE_COUNT_UNSET,
           { $sort: sortObj },
           { $skip: page * limit },
           { $limit: limit }
@@ -55741,7 +56120,8 @@ function usePostPrelovedController() {
         Joi134.string().valid(...Object.values(PostStatus))
       ).optional().allow(null),
       category: Joi134.string().hex().length(24).optional().allow("", null),
-      subcategory: Joi134.alternatives().try(Joi134.array().items(Joi134.string())).optional().allow(null, "")
+      subcategory: Joi134.alternatives().try(Joi134.array().items(Joi134.string())).optional().allow(null, ""),
+      userId: Joi134.string().optional().allow("", null)
     });
     const { error, value } = validation.validate(req.query, {
       abortEarly: false
@@ -55752,7 +56132,17 @@ function usePostPrelovedController() {
       next(new BadRequestError213(messages));
       return;
     }
-    const { page, limit, search, filter, site, status, category, subcategory } = value;
+    const {
+      page,
+      limit,
+      search,
+      filter,
+      site,
+      status,
+      category,
+      subcategory,
+      userId
+    } = value;
     try {
       const data = await _getAll({
         page,
@@ -55762,7 +56152,8 @@ function usePostPrelovedController() {
         site,
         status: status ? Array.isArray(status) ? status : [status] : void 0,
         category: category ?? void 0,
-        subcategory: subcategory ? Array.isArray(subcategory) ? subcategory : [subcategory] : void 0
+        subcategory: subcategory ? Array.isArray(subcategory) ? subcategory : [subcategory] : void 0,
+        userId
       });
       res.status(200).json(data);
       return;
@@ -56120,7 +56511,7 @@ function MCategoryPreloved(value) {
     name: value.name ?? "",
     createdBy: value.createdBy ?? "",
     site: value.site ?? null,
-    createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+    createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt ?? null
   };
 }
@@ -56180,14 +56571,26 @@ function useCategoryPrelovedRepo() {
       throw error;
     }
   }
-  return { getAll, getById };
+  async function addCategory(item, session) {
+    const doc = MCategoryPreloved(item);
+    try {
+      const res = await collection.insertOne(doc, { session });
+      return res.insertedId;
+    } catch (error) {
+      const isDuplicated = error.message?.includes("duplicate");
+      if (isDuplicated)
+        throw new BadRequestError216("Category already exists.");
+      throw error;
+    }
+  }
+  return { getAll, getById, addCategory };
 }
 
 // src/controllers/category-preloved.controller.ts
 import { BadRequestError as BadRequestError217, logger as logger190 } from "@7365admin1/node-server-utils";
 import Joi138 from "joi";
 function useCategoryPrelovedController() {
-  const { getAll: _getAll, getById: _getById } = useCategoryPrelovedRepo();
+  const { getAll: _getAll, getById: _getById, addCategory: _addCategory } = useCategoryPrelovedRepo();
   async function getAll(req, res, next) {
     const schema2 = Joi138.object({
       search: Joi138.string().optional().allow("", null),
@@ -56230,7 +56633,25 @@ function useCategoryPrelovedController() {
       return;
     }
   }
-  return { getAll, getById };
+  async function addCategory(req, res, next) {
+    const { error, value } = schemaCategoryPreloved.validate(req.body, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      logger190.log({ level: "error", message: messages });
+      next(new BadRequestError217(messages));
+      return;
+    }
+    try {
+      const data = await _addCategory(value);
+      res.status(201).json(data);
+    } catch (error2) {
+      logger190.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
+  return { getAll, getById, addCategory };
 }
 
 // src/models/subcategory-preloved.model.ts
@@ -56411,6 +56832,11 @@ var FormEntryStatus = /* @__PURE__ */ ((FormEntryStatus2) => {
 var schemaFormEntry = Joi141.object({
   _id: Joi141.string().hex().optional().allow("", null),
   formType: Joi141.string().required(),
+  block: Joi141.string().optional().allow(null, ""),
+  level: Joi141.string().optional().allow(null, ""),
+  unit: Joi141.string().optional().allow(null, ""),
+  name: Joi141.string().optional().allow(null, ""),
+  phoneNumber: Joi141.string().optional().allow(null, ""),
   fields: Joi141.object().pattern(
     Joi141.string(),
     Joi141.alternatives().try(
@@ -56572,15 +56998,22 @@ function useFormEntryController() {
       }
       const headerRow = worksheet.getRow(1);
       const headers = headerRow.values.slice(1).map((h) => String(h ?? "").trim());
+      const knownKeys = ["block", "level", "unit", "name", "phoneNumber"];
+      const topLevel = {};
       const fields = {};
       headers.forEach((header) => {
-        fields[header] = null;
+        const normalized = toCamelCase(header);
+        if (knownKeys.includes(normalized)) {
+          topLevel[normalized] = null;
+        } else {
+          fields[normalized] = null;
+        }
       });
       const formType = req.file.originalname.replace(/\.[^/.]+$/, "");
-      const normalizedFields = normalizeKeys(fields);
       const payload = {
         formType,
-        fields: normalizedFields,
+        ...topLevel,
+        fields,
         status: "active" /* ACTIVE */
       };
       const { error, value } = schemaFormEntry.validate(payload, {