@7365admin1/core 3.7.0 → 3.8.0

package/dist/index.mjs

@@ -11889,9 +11889,7 @@ function useVerificationService() {
           ...metadata,
           app
         },
-        expireAt: new Date(
-          Date.now() + 72 * 60 * 60 * 1e3
-        ).toISOString(),
+        expireAt: new Date(Date.now() + 72 * 60 * 60 * 1e3).toISOString(),
         createdAt: (/* @__PURE__ */ new Date()).toISOString()
       };
       const createdId = await add(value);
@@ -11910,10 +11908,7 @@ function useVerificationService() {
           hasPestControl: app === "pest_control_services",
           hasPoolMaintenance: app === "pool_maintenance_services"
         },
-        filePath: getDirectory(
-          __dirname,
-          "./public/handlebars/user-invite"
-        )
+        filePath: getDirectory(__dirname, "./public/handlebars/user-invite")
       });
       await mailer.sendMail({
         to: email,
@@ -12056,7 +12051,15 @@ function useVerificationService() {
       throw error2;
     }
   }
-  async function createSimpleServiceProviderInvite({ email, app, name, role, orgId, siteId, siteName }) {
+  async function createSimpleServiceProviderInvite({
+    email,
+    app,
+    name,
+    role,
+    orgId,
+    siteId,
+    siteName
+  }) {
     const schema2 = Joi11.object({
       email: Joi11.string().email().lowercase().required(),
       app: Joi11.string().allow("", null),
@@ -12098,7 +12101,10 @@ function useVerificationService() {
     };
     try {
       const id = await _add(value);
-      const filePath = getDirectory(__dirname, `./public/handlebars/${value.type}`);
+      const filePath = getDirectory(
+        __dirname,
+        `./public/handlebars/${value.type}`
+      );
       const link = `${APP_MAIN}/verify/${value.type}/${id}`;
       const emailContent = compileHandlebar({
         context: {
@@ -21025,6 +21031,15 @@ async function convertObjectIdUtil(id) {
     return Promise.reject("Invalid ID conversion to ObjectId");
   }
 }
+async function convertObjectIdUtil2(id, fieldName) {
+  try {
+    if (!id)
+      throw new Error(`Invalid ID conversion to ObjectId of ${fieldName}.`);
+    return new ObjectId40(id);
+  } catch (_) {
+    throw new Error(`Invalid ID conversion to ObjectId of ${fieldName}.`);
+  }
+}
 
 // src/repositories/visitor-transaction.repo.ts
 import moment from "moment-timezone";
@@ -22827,6 +22842,38 @@ function useVehicleRepo() {
       throw error;
     }
   }
+  async function getBlocklistedVehicleByPlateNumber(plateNumber, site) {
+    if (!plateNumber) {
+      throw new BadRequestError69("Plate number is required");
+    }
+    const baseQuery = {
+      type: "blocklist" /* BLOCKLIST */,
+      plateNumber,
+      ...site && {
+        site: typeof site === "string" ? new ObjectId43(site) : site
+      }
+    };
+    try {
+      const pipeline = [
+        { $match: baseQuery },
+        {
+          $addFields: {
+            latestDate: { $max: ["$createdAt", "$updatedAt"] }
+          }
+        },
+        { $sort: { latestDate: -1 } },
+        {
+          $project: {
+            latestDate: 0
+          }
+        }
+      ];
+      const [result] = await collection.aggregate(pipeline).toArray();
+      return result;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -22845,7 +22892,8 @@ function useVehicleRepo() {
     bulkUpsertVehicles,
     getSpecificVehicleById,
     getBlocklistedVehicles,
-    getVehicleBySiteAndPlateNumber
+    getVehicleBySiteAndPlateNumber,
+    getBlocklistedVehicleByPlateNumber
   };
 }
 
@@ -33279,6 +33327,241 @@ var KeyRepo = class {
       return Promise.reject("Failed to delete key");
     }
   }
+  static async getById2(id) {
+    return this.collection().aggregate([
+      { $match: { _id: new ObjectId61(id) } },
+      {
+        $lookup: {
+          from: "qr-code-templates",
+          localField: "template",
+          foreignField: "_id",
+          as: "QRTemplateInfo"
+        }
+      },
+      {
+        $unwind: {
+          path: "$QRTemplateInfo",
+          preserveNullAndEmptyArrays: true
+        }
+      },
+      {
+        $addFields: {
+          prefixPass: { $toUpper: "$QRTemplateInfo.prefixPass" },
+          prefixKey: { $toUpper: "$QRTemplateInfo.prefixKey" },
+          templateName: "$QRTemplateInfo.name"
+        }
+      },
+      {
+        $addFields: {
+          prefixAndName: {
+            $cond: {
+              if: { $or: [{ $not: "$prefixPass" }, { $not: "$prefixKey" }] },
+              then: "$name",
+              else: {
+                $cond: {
+                  if: { $eq: ["$passType", "pass-key"] },
+                  then: { $concat: ["$prefixKey", "$name"] },
+                  else: { $concat: ["$prefixPass", "$name"] }
+                }
+              }
+            }
+          }
+        }
+      }
+    ]).toArray().then((results) => results.length ? results[0] : null);
+  }
+  static async checkPassKeyAvailability(visitorPass, passKeys) {
+    if (Array.isArray(visitorPass) && visitorPass.length > 0) {
+      for (let i = 0; i < visitorPass.length; i++) {
+        let pass = await convertObjectIdUtil2(visitorPass[i].keyId, "Pass ID");
+        const getPass = await this.getById2(pass);
+        if (!getPass)
+          throw new Error("Pass not found");
+        if (getPass?.status && getPass?.status.toLowerCase() != "Available".toLowerCase())
+          throw new Error(`Pass ${getPass?.prefixAndName} is ${getPass?.status}`);
+      }
+    }
+    if (Array.isArray(passKeys) && passKeys.length > 0) {
+      for (let i = 0; i < passKeys.length; i++) {
+        let key = await convertObjectIdUtil2(passKeys[i].keyId, "Key ID");
+        const getPass = await this.getById2(key);
+        if (!getPass)
+          throw new Error(`Key not found`);
+        if (getPass?.status && getPass?.status.toLowerCase() != "Available".toLowerCase())
+          throw new Error(`Pass ${getPass?.prefixAndName} is ${getPass?.status}`);
+      }
+    }
+  }
+};
+
+// src/services/notification.service.ts
+import { sendExpoPushNotifications } from "iservice365-expo-notifications";
+
+// src/repositories/push-token.repository.ts
+var PushTokenRepo = class {
+  static collection() {
+    return getDB().collection("push_tokens");
+  }
+  static async createIndexes() {
+    await Promise.all([
+      this.collection().createIndex({ token: 1 }, { unique: true }),
+      this.collection().createIndex({ userId: 1, platform: 1 }),
+      this.collection().createIndex({ siteId: 1 })
+    ]);
+  }
+  static async upsert(userId, token, platform, siteId, projectId, appSlug) {
+    const now = /* @__PURE__ */ new Date();
+    const p = platform;
+    const existing = await this.collection().findOne({ token });
+    if (existing) {
+      await this.collection().updateOne(
+        { token },
+        {
+          $set: {
+            userId,
+            platform: p,
+            siteId,
+            projectId,
+            appSlug,
+            updatedAt: now
+          }
+        }
+      );
+      return;
+    }
+    await this.collection().deleteMany({ userId, platform: p });
+    await this.collection().insertOne({
+      userId,
+      siteId,
+      token,
+      platform: p,
+      projectId,
+      appSlug,
+      createdAt: now,
+      updatedAt: now
+    });
+  }
+  static async remove(token) {
+    await this.collection().deleteMany({ token });
+  }
+  static async findTokensByUserIds(userIds, appSlug) {
+    const docs = await this.collection().find({ userId: { $in: userIds }, appSlug: { $eq: appSlug } }).toArray();
+    return docs.map((d) => d.token);
+  }
+};
+
+// src/services/notification.service.ts
+function toStringArray(recipient) {
+  const arr = Array.isArray(recipient) ? recipient : [recipient];
+  return arr.map((r) => r.toString());
+}
+async function send(userIds, title, body, data, isForMAMobileApp = false, appSlug) {
+  try {
+    let tokens = [];
+    if (isForMAMobileApp) {
+      tokens = await PushTokenRepo.findTokensByUserIds(userIds, appSlug);
+    } else {
+      tokens = await PushTokenRepo.findTokensByUserIds(userIds);
+    }
+    if (!tokens.length)
+      return;
+    for (const token of tokens) {
+      await sendExpoPushNotifications([token], { title, body, data });
+    }
+  } catch (error) {
+    console.warn("[NotificationService]", error);
+  }
+}
+var NotificationService = class {
+  static async bulletinBoardCreated(payload) {
+    await send(
+      toStringArray(payload.to),
+      "Bulletin Board",
+      `There is new ${payload.status} bulletin board.`,
+      {
+        bulletinId: payload.bulletinId.toString(),
+        status: payload.status,
+        module: "feedback",
+        screen: "/(user)/bulletinInfo",
+        params: {
+          id: payload.bulletinId.toString()
+        }
+      },
+      false,
+      "iservice365-resident-mobile-app"
+    );
+  }
+  static async prelovedMarketplacePostCreation(payload) {
+    await send(
+      toStringArray(payload.to),
+      "Preloved Marketplace",
+      `New preloved marketplace post added.`,
+      {
+        prelovedId: payload.prelovedId.toString(),
+        status: payload.status,
+        module: "prelovedMarketplace",
+        screen: "/(user)/(marketplace)/prelovedPostInfo",
+        params: {
+          id: payload.prelovedId.toString()
+        }
+      },
+      false,
+      "iservice365-resident-mobile-app"
+    );
+  }
+  static async bulletinBoardCreatedForMA(payload) {
+    await send(
+      toStringArray(payload.to),
+      "Bulletin Board",
+      `There is new ${payload.status} bulletin board.`,
+      {
+        bulletinId: payload.bulletinId.toString(),
+        status: payload.status,
+        module: "feedback",
+        screen: "/(user)/(bulletin-board)",
+        params: {
+          id: payload.bulletinId.toString()
+        }
+      },
+      true,
+      "iservice365-ma-mobile-app"
+    );
+  }
+  static async eventCreatedForMA(payload) {
+    await send(
+      toStringArray(payload.to),
+      "Event",
+      `There is new ${payload.status} event.`,
+      {
+        eventId: payload.eventId.toString(),
+        status: payload.status,
+        module: "event",
+        screen: "/(user)/(events)",
+        params: {
+          id: payload.eventId.toString()
+        }
+      },
+      true,
+      "iservice365-ma-mobile-app"
+    );
+  }
+  static async invitedVisitorCheckOutForMa(payload) {
+    await send(
+      toStringArray(payload.to),
+      "Invited Visitor Check Out",
+      `The invited visitor ${payload.name}, has been checked out.`,
+      {
+        visitorTransactionId: payload._id.toString(),
+        module: "visitors",
+        screen: "/(user)/visitor-management",
+        params: {
+          id: payload._id.toString()
+        }
+      },
+      true,
+      "iservice365-ma-mobile-app"
+    );
+  }
 };
 
 // src/services/visitor-transaction.service.ts
@@ -33315,8 +33598,11 @@ function useVisitorTransactionService() {
   } = useDahuaService();
   const { getAllSites: _getAllSites } = useSiteRepo();
   const { getByUserId: _getByUserId } = usePersonRepo();
-  const { add: addVehicle } = useVehicleRepo();
+  const {
+    getBlocklistedVehicleByPlateNumber: _getBlocklistedVehicleByPlateNumber
+  } = useVehicleRepo();
   const { getById: _getUnitById } = useBuildingUnitRepo();
+  const { getUsersBySiteId } = useMemberRepo();
   function extractKeyId(item) {
     if (!item)
       return null;
@@ -33393,6 +33679,13 @@ function useVisitorTransactionService() {
     const start = value.checkIn ? new Date(value.checkIn) : /* @__PURE__ */ new Date();
     try {
       session?.startTransaction();
+      if (value.plateNumber) {
+        const result2 = await _getBlocklistedVehicleByPlateNumber(
+          value.plateNumber
+        );
+        if (result2)
+          throw new BadRequestError100("Plate number is blocklisted");
+      }
       let camera;
       if (value.site && value.plateNumber) {
         try {
@@ -33458,6 +33751,10 @@ function useVisitorTransactionService() {
         for (let i = 0; i < value.members.length; i += chunkSize) {
           const chunk = value.members.slice(i, i + chunkSize);
           for (const member of chunk) {
+            await KeyRepo.checkPassKeyAvailability(
+              member.visitorPass,
+              member.passKeys
+            );
             if (member.visitorPass && Array.isArray(member.visitorPass) && member.visitorPass.length > 0) {
               for (const vp of member.visitorPass) {
                 try {
@@ -33544,6 +33841,7 @@ function useVisitorTransactionService() {
         if (found === 1)
           throw new BadRequestError100("This plate number is blocklisted");
       }
+      await KeyRepo.checkPassKeyAvailability(value.visitorPass, value.passKeys);
       if (value.visitorPass && Array.isArray(value.visitorPass) && value.visitorPass.length > 0 && value.visitorPass) {
         for (const vp of value.visitorPass) {
           try {
@@ -33591,7 +33889,9 @@ function useVisitorTransactionService() {
             password,
             plateNumber: value?.plateNumber
           });
-          logger80.info(`Barrier command sent successfully to ${host}`, { response: openBarrier });
+          logger80.info(`Barrier command sent successfully to ${host}`, {
+            response: openBarrier
+          });
         } catch (error) {
           logger80.error(
             `Failed to open barrier at host ${host}. Critical system error:`,
@@ -33731,7 +34031,9 @@ function useVisitorTransactionService() {
             password,
             plateNumber: value?.plateNumber
           });
-          logger80.info(`Barrier command sent successfully to ${host}`, { response: openBarrier });
+          logger80.info(`Barrier command sent successfully to ${host}`, {
+            response: openBarrier
+          });
         } catch (error) {
           logger80.error(
             `Failed to open barrier at host ${host}. Critical system error:`,
@@ -33741,6 +34043,28 @@ function useVisitorTransactionService() {
         }
       }
       console.log("Open barrier response:", openBarrier);
+      const visitorTransaction = await _getVisitorTransactionById(
+        id.toString()
+      );
+      if (!visitorTransaction) {
+        throw new Error("Visitor transaction not found.");
+      }
+      if (value.checkOut && visitorTransaction.type === "guest" /* GUEST */) {
+        const users = await getUsersBySiteId({
+          status: "active",
+          siteId: visitorTransaction.site.toString()
+        });
+        if (users?.length > 0) {
+          const userIds = Array.from(
+            new Set(users.map((item) => item.user.toString()))
+          );
+          NotificationService.invitedVisitorCheckOutForMa({
+            to: userIds,
+            name: visitorTransaction.name,
+            _id: id.toString()
+          });
+        }
+      }
       await session?.commitTransaction();
       return "Successfully updated visitor transaction.";
     } catch (error) {
@@ -33944,7 +34268,12 @@ function useVisitorTransactionController() {
       return;
     } catch (error) {
       logger81.log({ level: "error", message: error.message });
-      next(error);
+      console.log("error", error);
+      if (error?.message) {
+        next(new BadRequestError101(error?.message));
+      } else {
+        next(error);
+      }
       return;
     }
   }
@@ -40899,120 +41228,6 @@ function useBulletinBoardRepo() {
 // src/services/bulletin-board.service.ts
 import { useAtlas as useAtlas68, NotFoundError as NotFoundError30 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId85 } from "mongodb";
-
-// src/services/notification.service.ts
-import { sendExpoPushNotifications } from "iservice365-expo-notifications";
-
-// src/repositories/push-token.repository.ts
-var PushTokenRepo = class {
-  static collection() {
-    return getDB().collection("push_tokens");
-  }
-  static async createIndexes() {
-    await Promise.all([
-      this.collection().createIndex({ token: 1 }, { unique: true }),
-      this.collection().createIndex({ userId: 1, platform: 1 }),
-      this.collection().createIndex({ siteId: 1 })
-    ]);
-  }
-  static async upsert(userId, token, platform, siteId, projectId, appSlug) {
-    const now = /* @__PURE__ */ new Date();
-    const p = platform;
-    const existing = await this.collection().findOne({ token });
-    if (existing) {
-      await this.collection().updateOne(
-        { token },
-        {
-          $set: {
-            userId,
-            platform: p,
-            siteId,
-            projectId,
-            appSlug,
-            updatedAt: now
-          }
-        }
-      );
-      return;
-    }
-    await this.collection().deleteMany({ userId, platform: p });
-    await this.collection().insertOne({
-      userId,
-      siteId,
-      token,
-      platform: p,
-      projectId,
-      appSlug,
-      createdAt: now,
-      updatedAt: now
-    });
-  }
-  static async remove(token) {
-    await this.collection().deleteMany({ token });
-  }
-  static async findTokensByUserIds(userIds, appSlug) {
-    const docs = await this.collection().find({ userId: { $in: userIds }, appSlug: { $eq: appSlug } }).toArray();
-    return docs.map((d) => d.token);
-  }
-};
-
-// src/services/notification.service.ts
-function toStringArray(recipient) {
-  const arr = Array.isArray(recipient) ? recipient : [recipient];
-  return arr.map((r) => r.toString());
-}
-async function send(userIds, title, body, data, appSlug) {
-  try {
-    const tokens = Array.from(
-      new Set(await PushTokenRepo.findTokensByUserIds(userIds, appSlug))
-    );
-    if (!tokens.length)
-      return;
-    for (const token of tokens) {
-      await sendExpoPushNotifications([token], { title, body, data });
-    }
-  } catch (error) {
-    console.warn("[NotificationService]", error);
-  }
-}
-var NotificationService = class {
-  static async bulletinBoardCreated(payload) {
-    await send(
-      toStringArray(payload.to),
-      "Bulletin Board",
-      `There is new ${payload.status} bulletin board.`,
-      {
-        bulletinId: payload.bulletinId.toString(),
-        status: payload.status,
-        module: "feedback",
-        screen: "/(user)/bulletinInfo",
-        params: {
-          id: payload.bulletinId.toString()
-        }
-      },
-      "iservice365-resident-mobile-app"
-    );
-  }
-  static async prelovedMarketplacePostCreation(payload) {
-    await send(
-      toStringArray(payload.to),
-      "Preloved Marketplace",
-      `New preloved marketplace post added.`,
-      {
-        prelovedId: payload.prelovedId.toString(),
-        status: payload.status,
-        module: "prelovedMarketplace",
-        screen: "/(user)/(marketplace)/prelovedPostInfo",
-        params: {
-          id: payload.prelovedId.toString()
-        }
-      },
-      "iservice365-resident-mobile-app"
-    );
-  }
-};
-
-// src/services/bulletin-board.service.ts
 function useBulletinBoardService() {
   const {
     add: _add,
@@ -41079,6 +41294,12 @@ function useBulletinBoardService() {
             status: bulletinBoardStatus
           });
         }
+        NotificationService.bulletinBoardCreatedForMA({
+          to: userIds,
+          bulletinId: bulletinBoardId,
+          subject: "Bulletin Board",
+          status: bulletinBoardStatus
+        });
       }
       await session?.commitTransaction();
       return "Successfully added bulletin board.";
@@ -43041,11 +43262,27 @@ function useEventManagementService() {
     updateEventManagementById: _updateEventManagementById,
     processCompletedEvents: _processCompletedEvents
   } = useEventManagementRepo();
+  const { getUsersBySiteId } = useMemberRepo();
   async function add(value) {
     const session = useAtlas74.getClient()?.startSession();
     try {
       session?.startTransaction();
-      await _add(value, session);
+      const response = await _add(value, session);
+      console.log("response", response);
+      const users = await getUsersBySiteId({
+        status: "active",
+        siteId: value.site
+      });
+      if (users?.length > 0) {
+        const userIds = Array.from(
+          new Set(users.map((item) => item.user.toString()))
+        );
+        NotificationService.eventCreatedForMA({
+          to: userIds,
+          eventId: response,
+          status: value.status
+        });
+      }
       await session?.commitTransaction();
       return "Successfully added event.";
     } catch (error) {
@@ -56552,73 +56789,6 @@ var Period = /* @__PURE__ */ ((Period2) => {
   Period2["THIS_MONTH"] = "thisMonth";
   return Period2;
 })(Period || {});
-function getPeriodRangeWithPrevious(period) {
-  const now = /* @__PURE__ */ new Date();
-  let currentStart = /* @__PURE__ */ new Date();
-  let currentEnd = /* @__PURE__ */ new Date();
-  let previousStart = /* @__PURE__ */ new Date();
-  let previousEnd = /* @__PURE__ */ new Date();
-  if (period === "today" /* TODAY */) {
-    currentStart.setHours(0, 0, 0, 0);
-    currentEnd.setHours(23, 59, 59, 999);
-    previousStart = new Date(currentStart);
-    previousStart.setDate(previousStart.getDate() - 1);
-    previousEnd = new Date(currentEnd);
-    previousEnd.setDate(previousEnd.getDate() - 1);
-  } else if (period === "thisWeek" /* THIS_WEEK */) {
-    const day = now.getDay();
-    const diffToMonday = day === 0 ? -6 : 1 - day;
-    currentStart = new Date(now);
-    currentStart.setDate(now.getDate() + diffToMonday);
-    currentStart.setHours(0, 0, 0, 0);
-    currentEnd = new Date(currentStart);
-    currentEnd.setDate(currentStart.getDate() + 6);
-    currentEnd.setHours(23, 59, 59, 999);
-    previousStart = new Date(currentStart);
-    previousStart.setDate(previousStart.getDate() - 7);
-    previousEnd = new Date(currentEnd);
-    previousEnd.setDate(previousEnd.getDate() - 7);
-  } else if (period === "thisMonth" /* THIS_MONTH */) {
-    currentStart = new Date(now.getFullYear(), now.getMonth(), 1);
-    currentEnd = new Date(
-      now.getFullYear(),
-      now.getMonth() + 1,
-      0,
-      23,
-      59,
-      59,
-      999
-    );
-    previousStart = new Date(now.getFullYear(), now.getMonth() - 1, 1);
-    previousEnd = new Date(
-      now.getFullYear(),
-      now.getMonth(),
-      0,
-      23,
-      59,
-      59,
-      999
-    );
-  } else {
-    throw new BadRequestError182("Invalid period.");
-  }
-  return {
-    current: {
-      start: currentStart.toISOString(),
-      end: currentEnd.toISOString()
-    },
-    previous: {
-      start: previousStart.toISOString(),
-      end: previousEnd.toISOString()
-    }
-  };
-}
-function calculatePercentage(current, previous) {
-  if (previous === 0) {
-    return current === 0 ? 0 : 100;
-  }
-  return Number(((current - previous) / previous * 100).toFixed(2));
-}
 function useNewDashboardRepo() {
   const db = useAtlas100.getDb();
   if (!db) {
@@ -57127,7 +57297,8 @@ function useNewDashboardRepo() {
       currentlyOnSiteCount,
       facilityReport,
       yesterdayFacilityReport,
-      todayFacilityReport
+      todayFacilityReport,
+      workOrderStatusReport
     ] = await Promise.all([
       workOrderCollection.aggregate([
         {
@@ -57317,6 +57488,20 @@ function useNewDashboardRepo() {
           }
         },
         { $count: "count" }
+      ]).toArray(),
+      workOrderCollection.aggregate([
+        {
+          $match: {
+            site: { $in: [siteIdObj, siteId] },
+            createdAt: periodRange
+          }
+        },
+        {
+          $group: {
+            _id: "$status",
+            count: { $sum: 1 }
+          }
+        }
       ]).toArray()
     ]);
     const wFacet = workOrderReport[0] ?? { total: [], inProgress: [] };
@@ -57325,6 +57510,23 @@ function useNewDashboardRepo() {
       ongoing: [],
       waitingApproval: []
     };
+    const workOrderStatus = {
+      pending: 0,
+      inProgress: 0,
+      completed: 0
+    };
+    for (const item of workOrderStatusReport || []) {
+      const rawStatus = String(item._id || "").toLowerCase().trim();
+      if (rawStatus === "to-do" || rawStatus === "for-review") {
+        workOrderStatus.pending += item.count || 0;
+      } else if (rawStatus === "in-progress") {
+        workOrderStatus.inProgress += item.count || 0;
+      } else if (rawStatus === "completed") {
+        workOrderStatus.completed += item.count || 0;
+      } else {
+        workOrderStatus.pending += item.count || 0;
+      }
+    }
     const data = {
       openWorkOrder: {
         count: wFacet.total[0]?.count ?? 0,
@@ -57359,6 +57561,7 @@ function useNewDashboardRepo() {
           yesterdayFacilityReport[0]?.count ?? 0
         )
       },
+      workOrderStatus,
       upcomingEvents,
       todayReminders,
       todayAttentions
@@ -66058,7 +66261,8 @@ var schemaUpdateChatPreloved = Joi141.object({
   reactions: Joi141.string().optional().allow("", null)
 });
 var schemaChatPreloved = Joi141.object({
-  channelId: Joi141.string().hex().length(24).required(),
+  channelId: Joi141.string().hex().length(24).optional().allow("", null),
+  receiverId: Joi141.string().hex().length(24).optional().allow("", null),
   senderId: Joi141.string().hex().length(24).required(),
   postId: Joi141.string().hex().length(24).optional().allow("", null),
   message: schemaMessage.required(),
@@ -66105,7 +66309,7 @@ function MChatPreloved(value) {
   }
   return {
     _id: new ObjectId145(),
-    channelId: value.channelId ?? "",
+    channelId: value.channelId ?? null,
     senderId: value.senderId ?? "",
     postId: value.postId ?? null,
     message: {
@@ -66344,7 +66548,130 @@ function useChannelPrelovedRepo() {
       throw error;
     }
   }
-  return { add, getByParticipants, getChannelMessages };
+  async function getChatLists(currentUserId, page = 1, limit = 10, search) {
+    const normalizedPage = page > 0 ? page - 1 : 0;
+    const normalizedLimit = limit || 10;
+    const _currentUserId = new ObjectId148(currentUserId);
+    const escapedSearch = search ? search.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") : null;
+    const pipeline = [
+      {
+        $match: {
+          $or: [{ receiverId: _currentUserId }, { senderId: _currentUserId }]
+        }
+      },
+      {
+        $lookup: {
+          from: "users",
+          localField: "senderId",
+          foreignField: "_id",
+          pipeline: [
+            {
+              $project: {
+                name: 1,
+                profile: 1,
+                type: 1
+              }
+            }
+          ],
+          as: "senderId"
+        }
+      },
+      { $unwind: { path: "$senderId", preserveNullAndEmptyArrays: true } },
+      {
+        $lookup: {
+          from: "post-preloved",
+          localField: "postId",
+          foreignField: "_id",
+          pipeline: [
+            {
+              $project: {
+                title: 1,
+                description: 1,
+                attachments: 1,
+                price: 1,
+                status: 1,
+                createdBy: 1,
+                reserverId: 1
+              }
+            }
+          ],
+          as: "postDetails"
+        }
+      },
+      { $unwind: { path: "$postDetails", preserveNullAndEmptyArrays: true } },
+      ...escapedSearch ? [
+        {
+          $match: {
+            $or: [
+              {
+                "senderId.name": {
+                  $regex: new RegExp(escapedSearch, "i")
+                }
+              },
+              {
+                "postDetails.title": {
+                  $regex: new RegExp(escapedSearch, "i")
+                }
+              }
+            ]
+          }
+        }
+      ] : [],
+      {
+        $lookup: {
+          from: "chat-preloved",
+          localField: "_id",
+          foreignField: "channelId",
+          pipeline: [
+            { $match: { deletedAt: null } },
+            { $sort: { createdAt: -1 } },
+            { $limit: 1 }
+          ],
+          as: "latestChat"
+        }
+      },
+      { $unwind: { path: "$latestChat", preserveNullAndEmptyArrays: true } },
+      { $addFields: { lastMessageDate: "$latestChat.createdAt" } },
+      {
+        $lookup: {
+          from: "bid-preloved",
+          localField: "postId",
+          foreignField: "postId",
+          pipeline: [
+            { $sort: { createdAt: -1 } },
+            { $limit: 1 },
+            { $project: { price: 1, message: 1, status: 1, type: 1 } }
+          ],
+          as: "latestBidDetails"
+        }
+      },
+      {
+        $unwind: {
+          path: "$latestBidDetails",
+          preserveNullAndEmptyArrays: true
+        }
+      },
+      { $sort: { lastMessageDate: -1 } },
+      {
+        $facet: {
+          totalCount: [{ $count: "count" }],
+          items: [
+            { $skip: normalizedPage * normalizedLimit },
+            { $limit: normalizedLimit }
+          ]
+        }
+      }
+    ];
+    try {
+      const result = await collection.aggregate(pipeline).toArray();
+      const totalCount = result[0].totalCount[0]?.count ?? 0;
+      const items = result[0].items;
+      return paginate63(items, normalizedPage, normalizedLimit, totalCount);
+    } catch (error) {
+      throw error;
+    }
+  }
+  return { add, getByParticipants, getChatLists, getChannelMessages };
 }
 
 // src/services/chat-preloved.service.ts
@@ -66462,7 +66789,12 @@ function useChatPrelovedController() {
 import { BadRequestError as BadRequestError223, logger as logger193 } from "@7365admin1/node-server-utils";
 import Joi144 from "joi";
 function useChannelPrelovedController() {
-  const { add: _add, getChannelMessages: _getChannelMessages } = useChannelPrelovedRepo();
+  const {
+    add: _add,
+    getByParticipants: _getByParticipants,
+    getChatLists: _getChatLists,
+    getChannelMessages: _getChannelMessages
+  } = useChannelPrelovedRepo();
   async function add(req, res, next) {
     const { error, value } = schemaChannelPreloved.validate(req.body, {
       abortEarly: false
@@ -66499,9 +66831,7 @@ function useChannelPrelovedController() {
       next(new BadRequestError223(paramError.message));
       return;
     }
-    const { error: queryError, value: query } = querySchema.validate(
-      req.query
-    );
+    const { error: queryError, value: query } = querySchema.validate(req.query);
     if (queryError) {
       logger193.log({ level: "error", message: queryError.message });
       next(new BadRequestError223(queryError.message));
@@ -66521,7 +66851,57 @@ function useChannelPrelovedController() {
       next(error);
     }
   }
-  return { add, getChannelMessages };
+  async function getChannel(req, res, next) {
+    const querySchema = Joi144.object({
+      postId: Joi144.string().hex().length(24).required(),
+      receiverId: Joi144.string().hex().length(24).required(),
+      senderId: Joi144.string().hex().length(24).required()
+    });
+    const { error, value } = querySchema.validate(req.query);
+    if (error) {
+      logger193.log({ level: "error", message: error.message });
+      next(new BadRequestError223(error.message));
+      return;
+    }
+    try {
+      const data = await _getByParticipants(
+        value.senderId,
+        value.receiverId,
+        value.postId
+      );
+      res.status(200).json(data);
+    } catch (error2) {
+      logger193.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
+  async function getChatLists(req, res, next) {
+    const querySchema = Joi144.object({
+      currentUserId: Joi144.string().hex().length(24).required(),
+      page: Joi144.number().integer().min(1).default(1),
+      limit: Joi144.number().integer().min(1).max(100).default(10),
+      search: Joi144.string().optional().allow("", null)
+    });
+    const { error, value } = querySchema.validate(req.query);
+    if (error) {
+      logger193.log({ level: "error", message: error.message });
+      next(new BadRequestError223(error.message));
+      return;
+    }
+    try {
+      const data = await _getChatLists(
+        value.currentUserId,
+        value.page,
+        value.limit,
+        value.search || void 0
+      );
+      res.status(200).json(data);
+    } catch (error2) {
+      logger193.log({ level: "error", message: error2.message });
+      next(error2);
+    }
+  }
+  return { add, getChannel, getChatLists, getChannelMessages };
 }
 
 // src/models/online-forms-v2.model.ts
@@ -66754,7 +67134,23 @@ function useFormEntryRepo() {
         { $match: query },
         { $sort: sort },
         { $skip: page * limit },
-        { $limit: limit }
+        { $limit: limit },
+        {
+          $lookup: {
+            from: "users",
+            localField: "userId",
+            foreignField: "_id",
+            as: "user",
+            pipeline: [{ $project: { name: 1 } }]
+          }
+        },
+        { $unwind: { path: "$user", preserveNullAndEmptyArrays: true } },
+        {
+          $addFields: {
+            name: { $ifNull: ["$user.name", "$name"] }
+          }
+        },
+        { $project: { user: 0 } }
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate64(items, page, limit, length);
@@ -67524,7 +67920,6 @@ export {
   building_units_namespace_collection,
   buildings_namespace_collection,
   bulletin_boards_namespace_collection,
-  calculatePercentage,
   chatSchema,
   createManpowerRemarksDaily,
   customerSchema,
@@ -67535,7 +67930,6 @@ export {
   feedbacks2_namespace_collection,
   feedbacks_namespace_collection,
   formatDahuaDate,
-  getPeriodRangeWithPrevious,
   guests_namespace_collection,
   incidentReportLog,
   incidents_namespace_collection,