@7365admin1/core 2.30.2 → 2.31.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 2.31.0
+
+### Minor Changes
+
+- 4acecf5: get all changes
+
 ## 2.30.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -2479,6 +2479,14 @@ declare function MPerson(value: TPerson): {
     deletedAt: string | Date | undefined;
 };
 
+declare enum KeyStatus {
+    AVAILABLE = "Available",
+    RETURNED = "Returned",
+    LOST = "Lost",
+    DAMAGED = "Damaged",
+    IN_USE = "In Use"
+}
+
 declare enum VisitorSort {
     CREATED_AT = "createdAt",
     NAME = "name",
@@ -2491,6 +2499,8 @@ declare enum VisitorStatus {
 }
 type TKeyRef = {
     keyId: string | ObjectId;
+    status?: KeyStatus;
+    remarks?: string;
 };
 type TVisitorTransaction = {
     _id?: ObjectId;
@@ -2768,6 +2778,7 @@ declare function usePersonController(): {
     getCompany: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getPeopleByPlateNumber: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getPeopleByNRIC: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getPersonByUserId: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TRobotMetadata = {
@@ -4016,6 +4027,22 @@ declare function useSiteUnitBillingRepo(): {
         dateTo?: string | undefined;
         unitId: string;
     }, session?: ClientSession) => Promise<bson.Document[]>;
+    getResidentUserBilling: ({ search, page, limit, sort, status, site, paymentStatus, month, year, unitId, }: {
+        search?: string | undefined;
+        page?: number | undefined;
+        limit?: number | undefined;
+        sort?: Record<string, any> | undefined;
+        status: string;
+        site?: string | undefined;
+        paymentStatus?: string | undefined;
+        month?: string | undefined;
+        year?: string | undefined;
+        unitId: string;
+    }, session?: ClientSession) => Promise<{
+        items: any[];
+        pages: number;
+        pageRange: string;
+    }>;
 };
 
 declare function useSiteUnitBillingService(): {
@@ -4029,6 +4056,7 @@ declare function useSiteUnitBillingController(): {
     getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getResidentUserBilling: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 interface AssignCardConfig {

package/dist/index.js

@@ -13360,12 +13360,16 @@ var schemaUpdateVisTrans = import_joi36.default.object({
   expiredAt: import_joi36.default.date().iso().optional().allow(null, ""),
   visitorPass: import_joi36.default.array().items(
     import_joi36.default.object({
-      keyId: import_joi36.default.string().hex().length(24).required()
+      keyId: import_joi36.default.string().hex().length(24).required(),
+      status: import_joi36.default.string().optional().allow(null, ""),
+      remarks: import_joi36.default.string().optional().allow(null, "")
     })
   ).optional().allow(null),
   passKeys: import_joi36.default.array().items(
     import_joi36.default.object({
-      keyId: import_joi36.default.string().hex().length(24).required()
+      keyId: import_joi36.default.string().hex().length(24).required(),
+      status: import_joi36.default.string().optional().allow(null, ""),
+      remarks: import_joi36.default.string().optional().allow(null, "")
     })
   ).optional().allow(null),
   checkInRemarks: import_joi36.default.string().optional().allow("", null),
@@ -21700,8 +21704,8 @@ var KeyRepo = class {
   static async updateKeyById(keyId, key, site, session, isChild) {
     try {
       keyId = new import_mongodb57.ObjectId(keyId);
-      site = new import_mongodb57.ObjectId(site);
-      key.updatedAt = /* @__PURE__ */ new Date();
+      if (site)
+        site = new import_mongodb57.ObjectId(site);
       if (key.updatedBy)
         key.updatedBy = await convertObjectIdUtil(key.updatedBy);
       if (!key.status)
@@ -21711,7 +21715,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(
@@ -21863,7 +21868,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 import_mongodb58.ObjectId ? vp : vp.keyId;
                   await KeyRepo.updateKeyById(
                     visitorPassId,
@@ -21878,7 +21883,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 import_mongodb58.ObjectId ? pk : pk.keyId;
                   await KeyRepo.updateKeyById(
                     passKeyId,
@@ -21994,7 +21999,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 import_mongodb58.ObjectId ? vp : vp.keyId;
             await KeyRepo.updateKeyById(
               visitorPassId,
@@ -22009,7 +22014,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 import_mongodb58.ObjectId ? pk : pk.keyId;
             await KeyRepo.updateKeyById(
               passKeyId,
@@ -22035,6 +22040,52 @@ function useVisitorTransactionService() {
     const session = import_node_server_utils101.useAtlas.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 import_mongodb58.ObjectId ? vp : vp.keyId;
+          await KeyRepo.updateKeyById(
+            visitorPassId,
+            updatePayload,
+            value.site
+          );
+          if (typeof vp !== "string" && !(vp instanceof import_mongodb58.ObjectId)) {
+            keptVisitorPass.push({
+              keyId: new import_mongodb58.ObjectId(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 import_mongodb58.ObjectId ? pk : pk.keyId;
+            await KeyRepo.updateKeyById(
+              passKeyId,
+              updatePayload,
+              value.site
+            );
+            if (typeof pk !== "string" && !(pk instanceof import_mongodb58.ObjectId)) {
+              keptPassKeys.push({
+                keyId: new import_mongodb58.ObjectId(passKeyId)
+              });
+            }
+          } catch (error) {
+            throw error;
+          }
+        }
+        value.passKeys = keptPassKeys;
+      }
       await _updateVisitorTansactionById(id, value, session);
       await session?.commitTransaction();
       return "Successfully updated visitor transaction.";
@@ -23013,7 +23064,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) {
@@ -23312,6 +23364,25 @@ function usePersonController() {
       return;
     }
   }
+  async function getPersonByUserId(req, res, next) {
+    const validation = import_joi58.default.string().required();
+    const userId = req.params.userId;
+    const { error } = validation.validate(userId);
+    if (error) {
+      import_node_server_utils107.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils107.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getByUserId(userId);
+      res.json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils107.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
@@ -23322,7 +23393,8 @@ function usePersonController() {
     getPeopleByUnit,
     getCompany,
     getPeopleByPlateNumber,
-    getPeopleByNRIC
+    getPeopleByNRIC,
+    getPersonByUserId
   };
 }
 
@@ -30875,6 +30947,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"
+              }
+            }
+          }
+        ]
+      },
+      ...import_mongodb86.ObjectId.isValid(site) && { site: new import_mongodb86.ObjectId(site) },
+      ...dateExpr,
+      ...import_mongodb86.ObjectId.isValid(unitId) && { unitId: new import_mongodb86.ObjectId(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 = (0, import_node_server_utils149.paginate)(items, page, limit, totalCount);
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   function delCachedData() {
     delNamespace().then(() => {
       import_node_server_utils149.logger.log({
@@ -30906,7 +31067,8 @@ function useSiteUnitBillingRepo() {
     getById,
     updateById,
     deleteById,
-    getUnitBillingBySite
+    getUnitBillingBySite,
+    getResidentUserBilling
   };
 }
 
@@ -31093,7 +31255,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 };
@@ -31234,12 +31397,64 @@ function useSiteUnitBillingController() {
       return;
     }
   }
+  async function getResidentUserBilling(req, res, next) {
+    const validation = import_joi84.default.object({
+      page: import_joi84.default.number().integer().min(1).allow("", null).default(1),
+      limit: import_joi84.default.number().integer().min(1).max(100).allow("", null).default(10),
+      status: import_joi84.default.string().optional().allow(null, ""),
+      search: import_joi84.default.string().optional().allow(null, ""),
+      site: import_joi84.default.string().required(),
+      paymentStatus: import_joi84.default.string().optional().allow(null, ""),
+      month: import_joi84.default.string().optional().allow(null, ""),
+      year: import_joi84.default.string().optional().allow(null, ""),
+      unitId: import_joi84.default.string().optional().allow(null, "")
+    });
+    const query = { ...req.query };
+    const { error } = validation.validate(query, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils151.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils151.BadRequestError(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) {
+      import_node_server_utils151.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
     getById,
     updateById,
-    deleteById
+    deleteById,
+    getResidentUserBilling
   };
 }