@7365admin1/core 3.29.0 → 3.31.0

package/dist/index.js

@@ -6128,6 +6128,7 @@ __export(src_exports, {
   schemaPostFavorite: () => schemaPostFavorite,
   schemaServiceProvider: () => schemaServiceProvider,
   schemaServiceProviderBilling: () => schemaServiceProviderBilling,
+  schemaSignNfcPatrolLog: () => schemaSignNfcPatrolLog,
   schemaSiteCamera: () => schemaSiteCamera,
   schemaSiteFacility: () => schemaSiteFacility,
   schemaSiteFacilityBooking: () => schemaSiteFacilityBooking,
@@ -34660,6 +34661,10 @@ var PushTokenRepo = class {
     const docs = await this.collection().find({ userId: { $in: userIds }, appSlug: { $eq: appSlug } }).toArray();
     return docs.map((d) => d.token);
   }
+  static async findUserIdsBySiteIdAndAppSlug(siteId, appSlug) {
+    const docs = await this.collection().find({ siteId, appSlug }).toArray();
+    return docs.map((d) => d.userId);
+  }
 };
 
 // src/services/notification.service.ts
@@ -34805,6 +34810,24 @@ var NotificationService = class {
       "iservice365-ma-mobile-app"
     );
   }
+  static async bulletinBoardCreatedForServiceApps(payload, appSlug) {
+    await send(
+      toStringArray(payload.to),
+      "Bulletin Board",
+      `There is new ${payload.status} bulletin board.`,
+      {
+        bulletinId: payload.bulletinId.toString(),
+        status: payload.status,
+        module: "bulletinBoard",
+        screen: "/(user)/bulletinInfo",
+        params: {
+          id: payload.bulletinId.toString()
+        }
+      },
+      false,
+      appSlug
+    );
+  }
 };
 
 // src/utils/valid-values.ts
@@ -36437,7 +36460,6 @@ function usePersonService() {
       }
       return "People added successfully.";
     } catch (error) {
-      console.log("error message service", error);
       import_node_server_utils112.logger.error("Error in people service add:", error);
       await session.abortTransaction();
       throw error;
@@ -36594,8 +36616,8 @@ function usePersonService() {
         phoneNumber: person.contact,
         org: person.org.toString(),
         site: person.site.toString(),
-        block: person.block ?? void 0,
-        level: person.level ?? void 0,
+        block: person.block?.toString() ?? void 0,
+        level: person.level?.toString() ?? void 0,
         unit: person.unit?.toString() ?? void 0,
         nric: person.nric,
         status: "active",
@@ -42709,6 +42731,101 @@ function useBulletinBoardService() {
           status: bulletinBoardStatus
         });
       }
+      if (recipients?.find((item) => item === "mechanical_electrical")) {
+        if (!siteId)
+          return;
+        const users2 = await PushTokenRepo.findUserIdsBySiteIdAndAppSlug(
+          siteId.toString(),
+          "iservice365-m-and-e-mobile-app"
+        );
+        if (users2.length <= 0)
+          return;
+        NotificationService.bulletinBoardCreatedForServiceApps(
+          {
+            to: users2,
+            bulletinId: bulletinBoardId,
+            subject: "Bulletin Board",
+            status: bulletinBoardStatus
+          },
+          "iservice365-m-and-e-mobile-app"
+        );
+      }
+      if (recipients?.find((item) => item === "pest_control_services")) {
+        if (!siteId)
+          return;
+        const users2 = await PushTokenRepo.findUserIdsBySiteIdAndAppSlug(
+          siteId.toString(),
+          "iservice365-pest-control-mobile-app"
+        );
+        if (users2.length <= 0)
+          return;
+        NotificationService.bulletinBoardCreatedForServiceApps(
+          {
+            to: users2,
+            bulletinId: bulletinBoardId,
+            subject: "Bulletin Board",
+            status: bulletinBoardStatus
+          },
+          "iservice365-pest-control-mobile-app"
+        );
+      }
+      if (recipients?.find((item) => item === "pool_maintenance_services")) {
+        if (!siteId)
+          return;
+        const users2 = await PushTokenRepo.findUserIdsBySiteIdAndAppSlug(
+          siteId.toString(),
+          "iservice365-pool-maintenance-mobile-app"
+        );
+        if (users2.length <= 0)
+          return;
+        NotificationService.bulletinBoardCreatedForServiceApps(
+          {
+            to: users2,
+            bulletinId: bulletinBoardId,
+            subject: "Bulletin Board",
+            status: bulletinBoardStatus
+          },
+          "iservice365-pool-maintenance-mobile-app"
+        );
+      }
+      if (recipients?.find((item) => item === "landscaping_services")) {
+        if (!siteId)
+          return;
+        const users2 = await PushTokenRepo.findUserIdsBySiteIdAndAppSlug(
+          siteId.toString(),
+          "iservice365-landscaping-mobile-app"
+        );
+        if (users2.length <= 0)
+          return;
+        NotificationService.bulletinBoardCreatedForServiceApps(
+          {
+            to: users2,
+            bulletinId: bulletinBoardId,
+            subject: "Bulletin Board",
+            status: bulletinBoardStatus
+          },
+          "iservice365-landscaping-mobile-app"
+        );
+      }
+      if (recipients?.find((item) => item === "cleaning_services")) {
+        if (!siteId)
+          return;
+        const users2 = await PushTokenRepo.findUserIdsBySiteIdAndAppSlug(
+          siteId.toString(),
+          "iservice365-hygiene-mobile-app"
+        );
+        if (users2.length <= 0)
+          return;
+        NotificationService.bulletinBoardCreatedForServiceApps(
+          {
+            to: users2,
+            bulletinId: bulletinBoardId,
+            subject: "Bulletin Board",
+            status: bulletinBoardStatus
+          },
+          "iservice365-hygiene-mobile-app"
+        );
+      }
       await session?.commitTransaction();
       return "Successfully added bulletin board.";
     } catch (error) {
@@ -43129,7 +43246,16 @@ function useSiteBillingItemRepo() {
   const { delNamespace, setCache, getCache } = (0, import_node_server_utils144.useCache)(namespace_collection);
   async function createIndexes() {
     try {
-      await collection.createIndexes([{ key: { site: 1, status: 1 } }]);
+      await collection.createIndexes([
+        // Serves the API list path: getAll filters by { site, status }.
+        { key: { site: 1, status: 1 } },
+        // Serves the cron path: processBilling() queries { status: "active" }
+        // with no site, so the site-leading index above cannot be used.
+        // A status-leading index avoids a full collection scan each run;
+        // billingType is included so the recurring/non-recurring split can
+        // be pushed down to the query later without another index.
+        { key: { status: 1, billingType: 1 } }
+      ]);
       return `Successfully created indexes for ${namespace_collection}.`;
     } catch (error) {
       import_node_server_utils144.logger.log({
@@ -43141,22 +43267,6 @@ function useSiteBillingItemRepo() {
       );
     }
   }
-  async function createTextIndex() {
-    try {
-      await collection.createIndex({
-        name: "text"
-      });
-      return "Successfully created text index on site billing item.";
-    } catch (error) {
-      import_node_server_utils144.logger.log({
-        level: "error",
-        message: error.message
-      });
-      throw new import_node_server_utils144.InternalServerError(
-        "Failed to create text index on site billing item."
-      );
-    }
-  }
   async function add(value, session) {
     try {
       value = MBillingItem(value);
@@ -43355,7 +43465,6 @@ function useSiteBillingItemRepo() {
     });
   }
   return {
-    createTextIndex,
     add,
     getAll,
     getById,
@@ -47019,7 +47128,8 @@ function UseAccessManagementRepo() {
                           type: 1,
                           cardNo: 1,
                           isActivated: 1,
-                          replacementStatus: 1
+                          replacementStatus: 1,
+                          damage: 1
                         }
                       }
                     ],
@@ -48209,26 +48319,20 @@ function UseAccessManagementRepo() {
             requestDate: 1,
             createdAt: 1,
             updatedAt: 1,
-            userCred: 1
+            userCred: 1,
+            damage: 1
           }
         }
       );
       if (!card)
         return null;
-      const site = await collectionName("sites").findOne(
-        { _id: card.site },
-        { projection: { name: 1, status: 1 } }
-      );
-      const user = card.userId ? await collectionName("users").findOne(
-        { _id: card.userId },
-        { projection: { name: 1, email: 1 } }
-      ) : null;
-      const status = card.userId === null && card.isActivated === true ? "available" : card.userId !== null && card.isActivated === true ? "assigned" : card.isActivated === false && card.replacementStatus !== null ? "replaced" : "deleted";
+      const history = await collectionName("access-cards-history").find({ cardId: convertedCardId }).toArray();
       return {
         ...card,
-        status,
-        site,
-        user
+        // status,
+        // site,
+        // user,
+        history
       };
     } catch (error) {
       throw new Error(error.message);
@@ -48548,6 +48652,16 @@ function UseAccessManagementRepo() {
       const updatedVisitor = result?._id;
       const assignCards = cards.map((card) => card._id);
       if (assignCards.length > 0) {
+        const historyRecords = assignCards.map((cardId) => ({
+          cardId: new import_mongodb97.ObjectId(cardId),
+          userId: updatedVisitor,
+          ...params.user,
+          createdAt: /* @__PURE__ */ new Date()
+        }));
+        await collectionName("access-cards-history").insertMany(
+          historyRecords,
+          { session }
+        );
         const bulkOps = assignCards.map((cardId) => {
           const updateFields = {
             staffNo: `STAFF-${cardId.toString().slice(-10)}`,
@@ -48662,11 +48776,35 @@ function UseAccessManagementRepo() {
     const session = import_node_server_utils158.useAtlas.getClient()?.startSession();
     try {
       await session?.startTransaction();
-      const userId = new import_mongodb97.ObjectId(params.userId);
-      const result = await collection().updateMany(
-        { userId },
-        { $set: { userId: null, status: "Available", updatedAt: /* @__PURE__ */ new Date() } }
-      );
+      const { cards } = params;
+      const isDamage = (status) => status.toLocaleLowerCase() === "lost" || status.toLocaleLowerCase() === "damage";
+      const bulkOps = cards.map((card) => ({
+        updateOne: {
+          filter: { _id: new import_mongodb97.ObjectId(card.cardId) },
+          update: {
+            $set: {
+              userId: null,
+              status: card.status,
+              remarks: card.remarks,
+              damage: isDamage(card.status),
+              updatedAt: /* @__PURE__ */ new Date(),
+              userCred: null
+            }
+          }
+        }
+      }));
+      const result = await collection().bulkWrite(bulkOps, { session });
+      const historyRecords = cards.map((card) => ({
+        cardId: new import_mongodb97.ObjectId(card.cardId),
+        userId: new import_mongodb97.ObjectId(card.userId),
+        status: card.status,
+        remarks: card.remarks,
+        damage: isDamage(card.status),
+        createdAt: /* @__PURE__ */ new Date()
+      }));
+      await collectionName("access-cards-history").insertMany(historyRecords, {
+        session
+      });
       await session?.commitTransaction();
       return result;
     } catch (error) {
@@ -50629,15 +50767,22 @@ function useAccessManagementController() {
   };
   const checkoutVisitor = async (req, res) => {
     try {
-      const { userId } = req.body;
+      const { cards } = req.body;
       const schema2 = import_joi87.default.object({
-        userId: import_joi87.default.string().hex().length(24).required()
+        cards: import_joi87.default.array().items(
+          import_joi87.default.object({
+            cardId: import_joi87.default.string().hex().length(24).required(),
+            userId: import_joi87.default.string().hex().length(24).required(),
+            status: import_joi87.default.string().required(),
+            remarks: import_joi87.default.string().allow("").required()
+          })
+        ).min(1).required()
       });
-      const { error } = schema2.validate({ userId });
+      const { error } = schema2.validate({ cards });
       if (error) {
         return res.status(400).json({ message: error.message });
       }
-      const result = await checkoutVisitorSvc({ userId });
+      const result = await checkoutVisitorSvc({ cards });
       return res.status(200).json({ message: "Success", data: result });
     } catch (error) {
       return res.status(500).json({
@@ -51319,6 +51464,11 @@ var schemaCreateNfcPatrolLog = import_joi89.default.object({
   startTime: import_joi89.default.string().required(),
   createdBy: import_joi89.default.string().length(24).hex().optional().allow("", null)
 });
+var schemaSignNfcPatrolLog = import_joi89.default.object({
+  guardName: import_joi89.default.string().required(),
+  guardSignatureFileId: import_joi89.default.string().length(24).hex().required(),
+  signedAt: import_joi89.default.date().optional()
+});
 var schemaNfcPatrolLog = import_joi89.default.object({
   _id: import_joi89.default.string().length(24).hex().optional().allow(null, ""),
   site: import_joi89.default.string().length(24).hex().required(),
@@ -51357,6 +51507,7 @@ var schemaNfcPatrolLog = import_joi89.default.object({
       skippedRemarks: import_joi89.default.string().required()
     })
   ).min(0).required(),
+  sign: schemaSignNfcPatrolLog.optional(),
   createdBy: import_joi89.default.string().length(24).hex().optional().allow(null, ""),
   createdAt: import_joi89.default.date().optional()
 });
@@ -51392,6 +51543,15 @@ function MNfcPatrolLog(valueArg) {
       throw new import_node_server_utils163.BadRequestError("Invalid route _id format");
     }
   }
+  if (value.sign?.guardSignatureFileId) {
+    try {
+      value.sign.guardSignatureFileId = new import_mongodb100.ObjectId(
+        value.sign.guardSignatureFileId
+      );
+    } catch {
+      throw new import_node_server_utils163.BadRequestError("Invalid guardSignatureFileId format");
+    }
+  }
   return {
     _id: value._id ?? new import_mongodb100.ObjectId(),
     site: value.site,
@@ -51400,6 +51560,7 @@ function MNfcPatrolLog(valueArg) {
     startDateTime: value.startDateTime,
     endDateTime: value.endDateTime,
     checkPoints: value.checkPoints,
+    sign: value.sign,
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     createdBy: value.createdBy ?? void 0
   };
@@ -52850,8 +53011,8 @@ function useStatementOfAccountRepo() {
   async function createIndexes() {
     try {
       await collection.createIndexes([
-        { key: { site: 1, status: 1 } },
-        { key: { site: 1, unitId: 1, status: 1 } },
+        { key: { site: 1, status: 1, createdAt: -1 } },
+        { key: { site: 1, unitId: 1, status: 1, createdAt: -1 } },
         { key: { createdAt: -1 } }
       ]);
       return `Successfully created indexes for ${namespace_collection}.`;
@@ -52917,12 +53078,7 @@ function useStatementOfAccountRepo() {
       let endDate = new Date(dateTo);
       endDate.setHours(23, 59, 59, 999);
       dateExpr = {
-        $expr: {
-          $and: [
-            { $gte: ["$createdAt", startDate] },
-            { $lte: ["$createdAt", endDate] }
-          ]
-        }
+        createdAt: { $gte: startDate, $lte: endDate }
       };
     }
     const unitSearchRegex = search ? search.trim().replace(/\s+/g, "").replace(/\//g, "\\s*/\\s*") : null;
@@ -53107,12 +53263,7 @@ function useStatementOfAccountRepo() {
       let endDate = new Date(dateTo);
       endDate.setHours(23, 59, 59, 999);
       dateExpr = {
-        $expr: {
-          $and: [
-            { $gte: ["$createdAt", startDate] },
-            { $lte: ["$createdAt", endDate] }
-          ]
-        }
+        createdAt: { $gte: startDate, $lte: endDate }
       };
     }
     const unitSearchRegex = search ? search.trim().replace(/\s+/g, "").replace(/\//g, "\\s*/\\s*") : null;
@@ -57957,18 +58108,10 @@ function useNfcPatrolLogRepo() {
     }
   }
   async function add(value, session) {
-    try {
-      value = MNfcPatrolLog(value);
-      const res = await collection.insertOne(value, { session });
-      delCachedData();
-      return res.insertedId;
-    } catch (error) {
-      const isDuplicated = error.message.includes("duplicate");
-      if (isDuplicated) {
-        throw new import_node_server_utils198.BadRequestError("NFC Patrol Log already exists.");
-      }
-      throw error;
-    }
+    value = MNfcPatrolLog(value);
+    const res = await collection.insertOne(value, { session });
+    delCachedData();
+    return res.insertedId;
   }
   async function getAllBySite({
     page = 1,
@@ -58084,12 +58227,28 @@ function useNfcPatrolLogRepo() {
     delCachedData();
     return res;
   }
+  async function sign(id, value, session) {
+    id = new import_mongodb121.ObjectId(id);
+    await collection.updateOne(
+      { _id: id },
+      {
+        $set: {
+          sign: {
+            ...value,
+            signedAt: /* @__PURE__ */ new Date()
+          }
+        }
+      },
+      { session }
+    );
+  }
   return {
     createIndexes,
     add,
     getAllBySite,
     getById,
-    updateCheckpoint
+    updateCheckpoint,
+    sign
   };
 }
 
@@ -58099,7 +58258,9 @@ function useNfcPatrolLogService() {
   const {
     add: _add,
     getById,
-    updateCheckpoint
+    updateCheckpoint,
+    getAllBySite: _getAllBySite,
+    sign: repoSign
   } = useNfcPatrolLogRepo();
   const routeRepo = useNfcPatrolRouteRepo();
   const tagRepo = useNfcPatrolTagRepo();
@@ -58114,9 +58275,30 @@ function useNfcPatrolLogService() {
       if (!route.startTimes?.length) {
         throw new import_node_server_utils199.BadRequestError("Route does not have any start time.");
       }
+      if (!route.startTimes.includes(value.startTime)) {
+        throw new import_node_server_utils199.BadRequestError("Invalid route start time.");
+      }
+      const existedLog = await _getAllBySite(
+        {
+          site: value.site,
+          page: 1,
+          limit: 1,
+          date: value.date,
+          route: {
+            _id: route._id.toString(),
+            startTime: value.startTime
+          }
+        },
+        session
+      );
+      if (existedLog.items.length > 0) {
+        throw new import_node_server_utils199.BadRequestError(
+          `Patrol log for ${value.startTime} already exists on ${value.date}.`
+        );
+      }
       const checkPoints = [];
       let currentTime = /* @__PURE__ */ new Date(
-        `${value.date}T${route.startTimes[0]}:00`
+        `${value.date}T${value.startTime}:00`
       );
       for (const checkPoint of route.checkPoints) {
         const tag = await tagRepo.getById(checkPoint.nfcTag_id, session);
@@ -58150,7 +58332,7 @@ function useNfcPatrolLogService() {
           _id: route._id.toString(),
           name: route.name,
           tolerance: Number(route.tolerance),
-          startTime: route.startTimes[0],
+          startTime: value.startTime,
           endTime: currentTime.toISOString().substring(11, 16)
         },
         date: value.date,
@@ -58163,7 +58345,6 @@ function useNfcPatrolLogService() {
       await session?.commitTransaction();
       return "Successfully added NFC Patrol Log.";
     } catch (error) {
-      console.error("Add NFC Patrol Log Error:", error);
       await session?.abortTransaction();
       throw error;
     } finally {
@@ -58215,9 +58396,26 @@ function useNfcPatrolLogService() {
       await session?.endSession();
     }
   }
+  async function sign(id, value) {
+    const log = await getById(id);
+    if (!log) {
+      throw new import_node_server_utils199.NotFoundError("Patrol log not found.");
+    }
+    const canSign = log.checkPoints.every(
+      (c) => c.status === "Completed" || c.status === "Skipped"
+    );
+    if (!canSign) {
+      throw new import_node_server_utils199.BadRequestError(
+        "All checkpoints must be completed or skipped before signing."
+      );
+    }
+    await repoSign(id, value);
+    return "Successfully signed patrol.";
+  }
   return {
     add,
-    completeCheckpoint
+    completeCheckpoint,
+    sign
   };
 }
 
@@ -58225,7 +58423,7 @@ function useNfcPatrolLogService() {
 var import_node_server_utils200 = require("@7365admin1/node-server-utils");
 var import_joi111 = __toESM(require("joi"));
 function useNfcPatrolLogController() {
-  const { add: _add, completeCheckpoint: _completeCheckpoint } = useNfcPatrolLogService();
+  const { add: _add, completeCheckpoint: _completeCheckpoint, sign: _sign } = useNfcPatrolLogService();
   const { getAllBySite: _getAllBySite, getById: _getById } = useNfcPatrolLogRepo();
   async function add(req, res, next) {
     try {
@@ -58317,11 +58515,26 @@ function useNfcPatrolLogController() {
       next(error);
     }
   }
+  async function sign(req, res, next) {
+    try {
+      const value = await schemaSignNfcPatrolLog.validateAsync(req.body);
+      const result = await _sign(
+        req.params.id,
+        value
+      );
+      res.json({
+        message: result
+      });
+    } catch (err) {
+      next(err);
+    }
+  }
   return {
     add,
     getAllBySite,
     completeCheckpoint,
-    getLog
+    getLog,
+    sign
   };
 }
 
@@ -70471,6 +70684,17 @@ function formatHidResponse(data) {
 function sanitizeHidPath(path5) {
   return path5.replace(/([?&]session=)[^&]+/i, "$1<redacted>");
 }
+function normalizeBaseUrl(value) {
+  return String(value || "").replace(/\/+$/, "");
+}
+function getRelayAuth() {
+  const username = process.env.HID_AMICO_RELAY_USERNAME;
+  const password = process.env.HID_AMICO_RELAY_PASSWORD;
+  if (!username || !password) {
+    return void 0;
+  }
+  return { username, password };
+}
 function toHidRequestError(error, path5) {
   if (import_axios4.default.isAxiosError(error)) {
     const status = error.response?.status;
@@ -70510,10 +70734,12 @@ var HidAmicoClient = class {
   constructor(reader) {
     this.reader = reader;
     this.session = "";
+    const relayAuth = getRelayAuth();
     this.http = import_axios4.default.create({
-      baseURL: reader.baseUrl.replace(/\/+$/, ""),
+      baseURL: normalizeBaseUrl(reader.baseUrl),
       timeout: 15e3,
-      headers: { "Content-Type": "application/json" }
+      headers: { "Content-Type": "application/json" },
+      ...relayAuth ? { auth: relayAuth } : {}
     });
   }
   async post(path5, body) {
@@ -70746,7 +70972,12 @@ function useHidAmicoService() {
     try {
       await client.login();
       const valid = await client.sessionIsValid();
-      await repo.updateById(id, { lastSeenAt: /* @__PURE__ */ new Date(), lastSyncMessage: "Connection test succeeded." });
+      await repo.updateById(id, {
+        status: "active",
+        lastSeenAt: /* @__PURE__ */ new Date(),
+        lastSyncStatus: "completed",
+        lastSyncMessage: "Connection test succeeded."
+      });
       await repo.addEvent({ reader: id, site: reader.site, type: "test", payload: { valid } });
       return { valid, message: "HID Amico connection test succeeded." };
     } catch (error) {
@@ -70776,6 +71007,7 @@ function useHidAmicoService() {
       }
       const message = batches.length ? `Synced ${batches.length} HID object batch(es).` : "HID reader session verified. No sync payload was supplied.";
       await repo.updateById(id, {
+        status: "active",
         lastSeenAt: /* @__PURE__ */ new Date(),
         lastSyncAt: /* @__PURE__ */ new Date(),
         lastSyncStatus: "completed",
@@ -71583,6 +71815,7 @@ function useHidAmicoController() {
   schemaPostFavorite,
   schemaServiceProvider,
   schemaServiceProviderBilling,
+  schemaSignNfcPatrolLog,
   schemaSiteCamera,
   schemaSiteFacility,
   schemaSiteFacilityBooking,