@7365admin1/core 3.29.0 → 3.30.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.30.0
+
+### Minor Changes
+
+- fea767a: release changes in billing api, nfc api, etc.
+
 ## 3.29.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -4076,7 +4076,7 @@ declare function useBulletinBoardRepo(): {
 };
 
 declare function useBulletinBoardService(): {
-    add: (value: TBulletinBoard) => Promise<string>;
+    add: (value: TBulletinBoard) => Promise<"Successfully added bulletin board." | undefined>;
     updateBulletinBoardById: (id: string | ObjectId, value: Partial<TBulletinBoard>) => Promise<string>;
     processExpiredBulletinBoards: () => Promise<void>;
     processUpcomingBulletinBoards: () => Promise<void>;
@@ -4149,7 +4149,6 @@ declare function MBillingItem(value: TBillingItem): {
 };
 
 declare function useSiteBillingItemRepo(): {
-    createTextIndex: () => Promise<string>;
     add: (value: TBillingItem, session?: ClientSession) => Promise<ObjectId>;
     getAll: ({ search, page, limit, sort, status, site, }: {
         search?: string | undefined;
@@ -4852,9 +4851,7 @@ declare function UseAccessManagementRepo(): {
         siteId: string;
         cardId: string;
     }) => Promise<{
-        status: string;
-        site: mongodb.WithId<bson.Document> | null;
-        user: mongodb.WithId<bson.Document> | null;
+        history: mongodb.WithId<bson.Document>[];
         _id: ObjectId;
     } | null>;
     addQrTagRepo: (params: {
@@ -4906,8 +4903,13 @@ declare function UseAccessManagementRepo(): {
         purpose: string;
     }) => Promise<string>;
     checkoutVisitorRepo: (params: {
-        userId: string;
-    }) => Promise<mongodb.UpdateResult<bson.Document>>;
+        cards: {
+            userId: string;
+            cardId: string;
+            status: string;
+            remarks: string;
+        }[];
+    }) => Promise<mongodb.BulkWriteResult>;
     getBlockLevelAndUnitListRepo: (params: {
         site: string;
     }) => Promise<bson.Document[]>;
@@ -6060,7 +6062,7 @@ declare function useNfcPatrolLogRepo(): {
         items: any[];
         pages: number;
         pageRange: string;
-    } | TNfcPatrolLog>;
+    }>;
     getById: (id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document> | null>;
     updateCheckpoint: (id: string | ObjectId, checkpointIndex: number, payload: any, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
@@ -6070,6 +6072,7 @@ declare function useNfcPatrolLogService(): {
         site: string;
         routeId: string;
         date: string;
+        startTime: string;
         createdBy?: string;
     }) => Promise<string>;
     completeCheckpoint: (logId: string, payload: {

package/dist/index.js

@@ -34660,6 +34660,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 +34809,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
@@ -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({
@@ -57957,18 +58102,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,
@@ -58099,7 +58236,8 @@ function useNfcPatrolLogService() {
   const {
     add: _add,
     getById,
-    updateCheckpoint
+    updateCheckpoint,
+    getAllBySite: _getAllBySite
   } = useNfcPatrolLogRepo();
   const routeRepo = useNfcPatrolRouteRepo();
   const tagRepo = useNfcPatrolTagRepo();
@@ -58114,9 +58252,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 +58309,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 +58322,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 {
@@ -70471,6 +70629,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 +70679,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 +70917,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 +70952,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",