@7365admin1/core 2.30.2 → 2.31.0

package/dist/index.mjs

@@ -13158,12 +13158,16 @@ var schemaUpdateVisTrans = Joi36.object({
   expiredAt: Joi36.date().iso().optional().allow(null, ""),
   visitorPass: Joi36.array().items(
     Joi36.object({
-      keyId: Joi36.string().hex().length(24).required()
+      keyId: Joi36.string().hex().length(24).required(),
+      status: Joi36.string().optional().allow(null, ""),
+      remarks: Joi36.string().optional().allow(null, "")
     })
   ).optional().allow(null),
   passKeys: Joi36.array().items(
     Joi36.object({
-      keyId: Joi36.string().hex().length(24).required()
+      keyId: Joi36.string().hex().length(24).required(),
+      status: Joi36.string().optional().allow(null, ""),
+      remarks: Joi36.string().optional().allow(null, "")
     })
   ).optional().allow(null),
   checkInRemarks: Joi36.string().optional().allow("", null),
@@ -21598,8 +21602,8 @@ var KeyRepo = class {
   static async updateKeyById(keyId, key, site, session, isChild) {
     try {
       keyId = new ObjectId57(keyId);
-      site = new ObjectId57(site);
-      key.updatedAt = /* @__PURE__ */ new Date();
+      if (site)
+        site = new ObjectId57(site);
       if (key.updatedBy)
         key.updatedBy = await convertObjectIdUtil(key.updatedBy);
       if (!key.status)
@@ -21609,7 +21613,8 @@ var KeyRepo = class {
     }
     try {
       key.updatedAt = /* @__PURE__ */ new Date();
-      let find = { _id: keyId, site };
+      const query = { _id: keyId, ...site && { site } };
+      let find = query;
       if (isChild)
         find = { parentId: keyId, site };
       const result = await this.collection().updateMany(
@@ -21761,7 +21766,7 @@ function useVisitorTransactionService() {
             if (member.visitorPass && Array.isArray(member.visitorPass) && member.visitorPass.length > 0) {
               for (const vp of member.visitorPass) {
                 try {
-                  const updatePayload = { status: "Not returned" /* NOT_RETURNED */ };
+                  const updatePayload = { status: "In Use" /* IN_USE */ };
                   const visitorPassId = typeof vp === "string" || vp instanceof ObjectId58 ? vp : vp.keyId;
                   await KeyRepo.updateKeyById(
                     visitorPassId,
@@ -21776,7 +21781,7 @@ function useVisitorTransactionService() {
             if (member.passKeys && Array.isArray(member.passKeys) && member.passKeys.length > 0) {
               for (const pk of member.passKeys) {
                 try {
-                  const updatePayload = { status: "Not returned" /* NOT_RETURNED */ };
+                  const updatePayload = { status: "In Use" /* IN_USE */ };
                   const passKeyId = typeof pk === "string" || pk instanceof ObjectId58 ? pk : pk.keyId;
                   await KeyRepo.updateKeyById(
                     passKeyId,
@@ -21892,7 +21897,7 @@ function useVisitorTransactionService() {
       if (value.visitorPass && Array.isArray(value.visitorPass) && value.visitorPass.length > 0) {
         for (const vp of value.visitorPass) {
           try {
-            const updatePayload = { status: "Not returned" /* NOT_RETURNED */ };
+            const updatePayload = { status: "In Use" /* IN_USE */ };
             const visitorPassId = typeof vp === "string" || vp instanceof ObjectId58 ? vp : vp.keyId;
             await KeyRepo.updateKeyById(
               visitorPassId,
@@ -21907,7 +21912,7 @@ function useVisitorTransactionService() {
       if (value.passKeys && Array.isArray(value.passKeys) && value.passKeys.length > 0) {
         for (const pk of value.passKeys) {
           try {
-            const updatePayload = { status: "Not returned" /* NOT_RETURNED */ };
+            const updatePayload = { status: "In Use" /* IN_USE */ };
             const passKeyId = typeof pk === "string" || pk instanceof ObjectId58 ? pk : pk.keyId;
             await KeyRepo.updateKeyById(
               passKeyId,
@@ -21933,6 +21938,52 @@ function useVisitorTransactionService() {
     const session = useAtlas48.getClient()?.startSession();
     session?.startTransaction();
     try {
+      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 ObjectId58 ? vp : vp.keyId;
+          await KeyRepo.updateKeyById(
+            visitorPassId,
+            updatePayload,
+            value.site
+          );
+          if (typeof vp !== "string" && !(vp instanceof ObjectId58)) {
+            keptVisitorPass.push({
+              keyId: new ObjectId58(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 ObjectId58 ? pk : pk.keyId;
+            await KeyRepo.updateKeyById(
+              passKeyId,
+              updatePayload,
+              value.site
+            );
+            if (typeof pk !== "string" && !(pk instanceof ObjectId58)) {
+              keptPassKeys.push({
+                keyId: new ObjectId58(passKeyId)
+              });
+            }
+          } catch (error) {
+            throw error;
+          }
+        }
+        value.passKeys = keptPassKeys;
+      }
       await _updateVisitorTansactionById(id, value, session);
       await session?.commitTransaction();
       return "Successfully updated visitor transaction.";
@@ -22925,7 +22976,8 @@ function usePersonController() {
     getPeopleByUnit: _getPeopleByUnit,
     getCompany: _getCompany,
     getPeopleByPlateNumber: _getPeopleByPlateNumber,
-    getPeopleByNRIC: _getPeopleByNRIC
+    getPeopleByNRIC: _getPeopleByNRIC,
+    getByUserId: _getByUserId
   } = usePersonRepo();
   const { add: _add, updateById: _updateById } = usePersonService();
   async function add(req, res, next) {
@@ -23224,6 +23276,25 @@ function usePersonController() {
       return;
     }
   }
+  async function getPersonByUserId(req, res, next) {
+    const validation = Joi58.string().required();
+    const userId = req.params.userId;
+    const { error } = validation.validate(userId);
+    if (error) {
+      logger82.log({ level: "error", message: error.message });
+      next(new BadRequestError101(error.message));
+      return;
+    }
+    try {
+      const data = await _getByUserId(userId);
+      res.json(data);
+      return;
+    } catch (error2) {
+      logger82.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
@@ -23234,7 +23305,8 @@ function usePersonController() {
     getPeopleByUnit,
     getCompany,
     getPeopleByPlateNumber,
-    getPeopleByNRIC
+    getPeopleByNRIC,
+    getPersonByUserId
   };
 }
 
@@ -30921,6 +30993,95 @@ function useSiteUnitBillingRepo() {
       throw error;
     }
   }
+  async function getResidentUserBilling({
+    search = "",
+    page = 1,
+    limit = 10,
+    sort = {},
+    status = "active",
+    site = "",
+    paymentStatus = "awaiting_payment",
+    month,
+    year,
+    unitId
+  }, session) {
+    page = page > 0 ? page - 1 : 0;
+    let dateExpr = {};
+    if (month && year) {
+      const monthNum = parseInt(month, 10);
+      const yearNum = parseInt(year, 10);
+      const startDate = new Date(yearNum, monthNum - 1, 1);
+      const endDate = new Date(yearNum, monthNum, 1);
+      dateExpr.createdAt = {
+        $gte: startDate,
+        $lt: endDate
+      };
+    }
+    const unitSearchRegex = search ? search.trim().replace(/\s+/g, "").replace(/\//g, "\\s*/\\s*") : null;
+    const query = {
+      paymentStatus,
+      status,
+      ...search && {
+        $or: [
+          { unitOwner: { $regex: search, $options: "i" } },
+          { billName: { $regex: search, $options: "i" } },
+          { unit: { $regex: unitSearchRegex, $options: "i" } },
+          {
+            $expr: {
+              $regexMatch: {
+                input: { $toString: "$amountPaid" },
+                regex: search,
+                options: "i"
+              }
+            }
+          }
+        ]
+      },
+      ...ObjectId86.isValid(site) && { site: new ObjectId86(site) },
+      ...dateExpr,
+      ...ObjectId86.isValid(unitId) && { unitId: new ObjectId86(unitId) }
+    };
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    try {
+      const basePipeline = [
+        { $match: query },
+        { $sort: sort },
+        { $skip: page * limit },
+        { $limit: limit },
+        {
+          $lookup: {
+            from: "site.billing.items",
+            localField: "billItem",
+            foreignField: "_id",
+            pipeline: [
+              {
+                $project: {
+                  _id: 1,
+                  totalAmount: 1
+                }
+              }
+            ],
+            as: "billDetails"
+          }
+        },
+        {
+          $unwind: {
+            path: "$billDetails",
+            preserveNullAndEmptyArrays: true
+          }
+        }
+      ];
+      const [items, countResult] = await Promise.all([
+        collection.aggregate(basePipeline, { session }).toArray(),
+        collection.aggregate([{ $match: query }, { $count: "total" }], { session }).toArray()
+      ]);
+      const totalCount = countResult[0]?.total || 0;
+      const data = paginate37(items, page, limit, totalCount);
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   function delCachedData() {
     delNamespace().then(() => {
       logger117.log({
@@ -30952,7 +31113,8 @@ function useSiteUnitBillingRepo() {
     getById,
     updateById,
     deleteById,
-    getUnitBillingBySite
+    getUnitBillingBySite,
+    getResidentUserBilling
   };
 }
 
@@ -31143,7 +31305,8 @@ function useSiteUnitBillingController() {
     getAll: _getAll,
     updateById: _updateById,
     deleteById: _deleteById,
-    getById: _getById
+    getById: _getById,
+    getResidentUserBilling: _getResidentUserBilling
   } = useSiteUnitBillingRepo();
   async function add(req, res, next) {
     const data = { ...req.body };
@@ -31284,12 +31447,64 @@ function useSiteUnitBillingController() {
       return;
     }
   }
+  async function getResidentUserBilling(req, res, next) {
+    const validation = Joi84.object({
+      page: Joi84.number().integer().min(1).allow("", null).default(1),
+      limit: Joi84.number().integer().min(1).max(100).allow("", null).default(10),
+      status: Joi84.string().optional().allow(null, ""),
+      search: Joi84.string().optional().allow(null, ""),
+      site: Joi84.string().required(),
+      paymentStatus: Joi84.string().optional().allow(null, ""),
+      month: Joi84.string().optional().allow(null, ""),
+      year: Joi84.string().optional().allow(null, ""),
+      unitId: Joi84.string().optional().allow(null, "")
+    });
+    const query = { ...req.query };
+    const { error } = validation.validate(query, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      logger119.log({ level: "error", message: messages });
+      next(new BadRequestError140(messages));
+      return;
+    }
+    const search = req.query.search ?? "";
+    const page = parseInt(req.query.page ?? "1");
+    const limit = parseInt(req.query.limit ?? "10");
+    const status = req.query.status ?? "active";
+    const site = req.query.site;
+    const paymentStatus = req.query.paymentStatus ?? "awaiting_payment";
+    const month = req.query.month ?? "";
+    const year = req.query.year ?? "";
+    const unitId = req.query.unitId ?? "";
+    try {
+      const data = await _getResidentUserBilling({
+        search,
+        page,
+        limit,
+        status,
+        site,
+        paymentStatus,
+        month,
+        year,
+        unitId
+      });
+      res.status(200).json(data);
+      return;
+    } catch (error2) {
+      logger119.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
     getById,
     updateById,
-    deleteById
+    deleteById,
+    getResidentUserBilling
   };
 }