@7365admin1/core 2.54.0 → 2.56.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 2.56.0
+
+### Minor Changes
+
+- 024c2b6: get latest hotfix changes
+
+## 2.55.0
+
+### Minor Changes
+
+- 259a720: get latest changes
+
 ## 2.54.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1856,7 +1856,7 @@ declare function useBuildingRepo(): {
     updateById: (_id: ObjectId | string, value: Pick<TBuilding, "name" | "block" | "levels" | "buildingFiles">, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     getBuildingLevel: (site: string | ObjectId, block: number) => Promise<mongodb.WithId<bson.Document> | TBuilding | null>;
-    getBuildingLevelWithUnits: (site: string | ObjectId, block: number) => Promise<mongodb.WithId<bson.Document> | TBuilding>;
+    getBuildingLevelWithUnits: (site: string | ObjectId, block: number | string | ObjectId) => Promise<bson.Document[]>;
 };
 
 declare function useBuildingService(): {
@@ -4650,6 +4650,15 @@ declare function UseAccessManagementRepo(): {
         pages: number;
         pageRange: string;
     }>;
+    assignMultipleCardsRepo: ({ assignees, unit, type, acm_url }: {
+        assignees: string[] | ObjectId[];
+        unit: string | ObjectId;
+        type: string;
+        acm_url: string;
+    }) => Promise<string>;
+    visitorCheckoutRepo: ({ userId }: {
+        userId: string;
+    }) => Promise<string>;
 };
 
 declare function useAccessManagementController(): {
@@ -4690,6 +4699,8 @@ declare function useAccessManagementController(): {
     }) => Promise<void>;
     getBlockLevelAndUnitList: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
     getTransactions: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
+    assignMultipleCards: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
+    visitorCheckout: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
 };
 
 declare const DEVICE_STATUS: {

package/dist/index.js

@@ -19643,47 +19643,77 @@ function useBuildingRepo() {
     }
     const query = {
       site,
-      block
+      _id: new import_mongodb49.ObjectId(block)
     };
     const cacheOptions = { ...query };
     const cacheKey = (0, import_node_server_utils82.makeCacheKey)(buildings_namespace_collection, cacheOptions);
     try {
-      const cached = await getCache(cacheKey);
-      if (cached) {
-        import_node_server_utils82.logger.log({
-          level: "info",
-          message: `Cache hit for getById building: ${cacheKey}`
-        });
-        return cached;
-      }
-      const result = await collection.findOne(query);
+      console.log(query);
+      const result = await collection.aggregate([
+        {
+          $match: {
+            ...query
+          }
+        },
+        {
+          $lookup: {
+            from: "building-levels",
+            let: { buildingId: "$_id" },
+            pipeline: [
+              {
+                $match: {
+                  $expr: { $eq: ["$block", "$$buildingId"] }
+                }
+              },
+              {
+                $lookup: {
+                  from: "building-units",
+                  let: { levelId: "$_id" },
+                  pipeline: [
+                    {
+                      $match: {
+                        $expr: {
+                          $and: [
+                            { $eq: ["$site", site] },
+                            { $eq: ["$block", "$$buildingId"] },
+                            { $eq: ["$level", "$$levelId"] },
+                            { $eq: ["$status", "active"] }
+                          ]
+                        }
+                      }
+                    }
+                  ],
+                  as: "buildingUnits"
+                }
+              },
+              // discard levels that have no active units
+              {
+                $match: {
+                  $expr: { $gt: [{ $size: "$buildingUnits" }, 0] }
+                }
+              }
+            ],
+            as: "buildingLevels"
+          }
+        },
+        {
+          $project: {
+            "_id": 1,
+            "site": 1,
+            "name": 1,
+            "block": 1,
+            "status": 1,
+            "buildingFloorPlan": 1,
+            "createdAt": 1,
+            "updatedAt": 1,
+            "deletedAt": 1,
+            "levels": "$buildingLevels"
+          }
+        }
+      ]).toArray();
       if (!result) {
         throw new import_node_server_utils82.BadRequestError("Building not found.");
       }
-      const validLevels = [];
-      for (const level of result.levels ?? []) {
-        const units = await _getBySiteBuildingLevel(
-          result.site,
-          result.block,
-          level
-        );
-        if (units) {
-          validLevels.push(level);
-        }
-      }
-      result.levels = validLevels;
-      console.log(result);
-      setCache(cacheKey, result, 300).then(() => {
-        import_node_server_utils82.logger.log({
-          level: "info",
-          message: `Cache set for building by id: ${cacheKey}`
-        });
-      }).catch((err) => {
-        import_node_server_utils82.logger.log({
-          level: "error",
-          message: `Failed to set cache for building by id: ${err.message}`
-        });
-      });
       return result;
     } catch (error) {
       if (error instanceof import_node_server_utils82.AppError) {
@@ -20143,14 +20173,13 @@ function useBuildingController() {
     let block = req.query.block;
     const validation = import_joi44.default.object({
       site: import_joi44.default.string().hex().required(),
-      block: import_joi44.default.number().required()
+      block: import_joi44.default.string().required()
     });
     const { error } = validation.validate({ site, block });
     if (error) {
       next(new import_node_server_utils84.BadRequestError(error.message));
       return;
     }
-    block = parseInt(block) ?? 0;
     try {
       const siteBlock = await _getBuildingLevelWithUnits(site, block);
       res.json(siteBlock);
@@ -24026,7 +24055,10 @@ function useVisitorTransactionService() {
             nric: value.nric,
             start,
             end,
-            recNo: value.recNo
+            recNo: value.recNo,
+            ...value.block && { block: value.block },
+            ...value.level && { level: value.level },
+            ...value.unit && { unit: value.unit }
           };
           await addVehicle(vehiclePayload);
         } else {
@@ -32873,21 +32905,23 @@ function useEventManagementController() {
     }
   }
   async function deleteEventManagementById(req, res, next) {
-    const validation = import_joi82.default.string().hex().required();
-    const _id = req.params.id;
-    const { error } = validation.validate(_id);
-    if (error) {
-      import_node_server_utils148.logger.log({ level: "error", message: error.message });
-      next(new import_node_server_utils148.BadRequestError(error.message));
-      return;
-    }
     try {
+      const schema2 = import_joi82.default.object({
+        _id: import_joi82.default.string().hex().length(24).required()
+      });
+      const { error, value } = schema2.validate({ _id: req.params.id });
+      if (error) {
+        import_node_server_utils148.logger.log({ level: "error", message: error.message });
+        next(new import_node_server_utils148.BadRequestError(error.message));
+        return;
+      }
+      const { _id } = value;
       await _deleteEventManagementById(_id);
       res.status(200).json({ message: "Successfully deleted event." });
       return;
-    } catch (error2) {
-      import_node_server_utils148.logger.log({ level: "error", message: error2.message });
-      next(error2);
+    } catch (error) {
+      import_node_server_utils148.logger.log({ level: "error", message: error.message });
+      next(error);
       return;
     }
   }
@@ -34865,7 +34899,7 @@ function UseAccessManagementRepo() {
                   localField: "_id",
                   foreignField: "level",
                   pipeline: [
-                    { $match: { status: { $ne: "deleted" } } },
+                    { $match: { status: { $ne: "deleted" }, site } },
                     { $project: { _id: 1, name: 1 } }
                   ],
                   as: "units"
@@ -36458,7 +36492,111 @@ function UseAccessManagementRepo() {
       const items = result[0].items;
       return (0, import_node_server_utils153.paginate)(items, page, limit, length);
     } catch (error) {
-      return Promise.reject("Server internal error.");
+      throw new Error(error.message);
+    }
+  }
+  async function assignMultipleCardsRepo({
+    assignees,
+    unit,
+    type,
+    acm_url
+  }) {
+    const session = import_node_server_utils153.useAtlas.getClient()?.startSession();
+    try {
+      session?.startTransaction();
+      if (assignees.length < 1) {
+        throw new Error("No user to Assign.");
+      }
+      assignees = assignees.map((data) => new import_mongodb90.ObjectId(data));
+      unit = new import_mongodb90.ObjectId(unit);
+      let availableCards = [];
+      let update = [];
+      let cards = [];
+      availableCards = await collection().aggregate([
+        {
+          $match: {
+            $expr: {
+              $and: [
+                { $eq: ["$assignedUnit", unit] },
+                { $eq: ["$userId", null] },
+                { $eq: ["$type", type] },
+                { $eq: ["$isActivated", true] }
+              ]
+            }
+          }
+        }
+      ]).toArray();
+      if (assignees.length > availableCards.length) {
+        throw new Error(`Not enough ${type} cards available.`);
+      }
+      cards = availableCards?.slice(0, assignees.length).map((card, index) => {
+        const userId = new import_mongodb90.ObjectId(assignees[index].toString());
+        card.staffNo = userId.toString().slice(-10);
+        return card;
+      });
+      update = availableCards.slice(0, assignees.length).map((card, index) => ({ _id: card._id, userId: new import_mongodb90.ObjectId(assignees[index]) }));
+      const commands = cards.map((item, index) => {
+        let ag = null;
+        if (item.accessGroup !== void 0) {
+          if (item.accessGroup?.length > 0) {
+            ag = item.accessGroup.map((g) => `<GROUP_NAME>${g}</GROUP_NAME>`).join("\n  ");
+          }
+        }
+        const command = {
+          commandId1: index * 2 + 1,
+          commandId2: index * 2 + 2,
+          staffName: `STAFF-${item._id.toString().slice(-10)}`,
+          staffNo1: `STAFF-${item._id.toString().slice(-10)}`,
+          staffNo2: `STAFF-${item._id.toString().slice(-10)}`,
+          dateOfJoin: formatEntryPassDate(item.startDate),
+          accessLevel: item.accessLevel ?? "0",
+          cardNo: item.cardNo,
+          pin: typeof item.pin === "string" && item.pin.trim() !== "" ? item.pin : "123456",
+          startDate: formatEntryPassDate(item.startDate),
+          endDate: formatEntryPassDate(item.endDate),
+          cardType: 0,
+          isActivated: item.isActivated ? 1 : 0,
+          isAntiPassBack: item.isAntiPassBack ? 1 : 0,
+          isLiftCard: item.isLiftCard ? 1 : 0,
+          isLiftActivate: item.isLiftCard ? 1 : 0,
+          liftAccessLevel: item.liftAccessLevel || 1,
+          liftAccessStartDate: formatEntryPassDate(item.liftAccessStartDate) || "19770510",
+          liftAccessEndDate: formatEntryPassDate(item.liftAccessEndDate) || "19770510",
+          accessGroup: ag
+        };
+        return readTemplate(`${item.accessLevel !== null ? "add-card" : "add-card-lift"}`, { ...command });
+      }).flat();
+      const response = await sendCommand(commands.join("").toString(), acm_url);
+      const result = await (0, import_xml2js2.parseStringPromise)(response, { explicitArray: false });
+      console.log("status code", result.RESULT.$.STCODE);
+      if (result && result.RESULT.$.STCODE !== "0") {
+        throw new Error("Command failed, server error.");
+      }
+      for (const { _id, userId } of update) {
+        await collection().updateOne({ _id }, { $set: { userId, staffNo: `STAFF-${userId.toString().slice(-10)}` } }, { session });
+      }
+      await session?.commitTransaction();
+      return "Cards assigned successfully.";
+    } catch (error) {
+      await session?.abortTransaction();
+      throw new Error(error.message);
+    } finally {
+      await session?.endSession();
+    }
+  }
+  async function visitorCheckoutRepo({ userId }) {
+    const session = import_node_server_utils153.useAtlas.getClient()?.startSession();
+    try {
+      session?.startTransaction();
+      const id = new import_mongodb90.ObjectId(userId);
+      await collection().updateMany({ userId: id }, { $set: { userId: null, status: "Available" } }, { session });
+      session?.commitTransaction();
+      return "Successful Checkout";
+    } catch (error) {
+      await session?.abortTransaction();
+      throw new Error(error.message);
+    } finally {
+      await session?.endSession();
     }
   }
   return {
@@ -36493,7 +36631,9 @@ function UseAccessManagementRepo() {
     checkoutVisitorRepo,
     getBlockLevelAndUnitListRepo,
     indexCombination,
-    getTransactionsRepo
+    getTransactionsRepo,
+    assignMultipleCardsRepo,
+    visitorCheckoutRepo
   };
 }
 
@@ -36534,7 +36674,9 @@ function useAccessManagementSvc() {
     signQrCodeRepo,
     checkoutVisitorRepo,
     getBlockLevelAndUnitListRepo,
-    getTransactionsRepo
+    getTransactionsRepo,
+    assignMultipleCardsRepo,
+    visitorCheckoutRepo
   } = UseAccessManagementRepo();
   const addPhysicalCardSvc = async (payload) => {
     try {
@@ -36830,6 +36972,22 @@ function useAccessManagementSvc() {
     try {
       const response = await getTransactionsRepo({ page, limit, site, cardNo, url });
       return response;
+    } catch (err) {
+      throw new Error(err.message);
+    }
+  };
+  const assignMultipleCardsSvc = async ({ assignees, unit, type, acm_url }) => {
+    try {
+      const response = await assignMultipleCardsRepo({ assignees, unit, type, acm_url });
+      return response;
+    } catch (err) {
+      throw new Error(err.message);
+    }
+  };
+  const visitorCheckoutSvc = async ({ userId }) => {
+    try {
+      const response = await visitorCheckoutRepo({ userId });
+      return response;
     } catch (err) {
       return Promise.reject("Server internal error.");
     }
@@ -36869,7 +37027,9 @@ function useAccessManagementSvc() {
     signQrCodeSvc,
     checkoutVisitorSvc,
     getBlockLevelAndUnitListSvc,
-    getTransactionsSvc
+    getTransactionsSvc,
+    assignMultipleCardsSvc,
+    visitorCheckoutSvc
   };
 }
 
@@ -36910,7 +37070,9 @@ function useAccessManagementController() {
     signQrCodeSvc,
     checkoutVisitorSvc,
     getBlockLevelAndUnitListSvc,
-    getTransactionsSvc
+    getTransactionsSvc,
+    assignMultipleCardsSvc,
+    visitorCheckoutSvc
   } = useAccessManagementSvc();
   const addPhysicalCard = async (req, res) => {
     try {
@@ -37694,6 +37856,39 @@ function useAccessManagementController() {
       });
       return res.json(result);
     } catch (error2) {
+      return res.status(400).json({
+        data: null,
+        message: error2.message
+      });
+    }
+  };
+  const assignMultipleCards = async (req, res) => {
+    try {
+      const { assignees, unit, type, acm_url } = req.body;
+      const schema2 = import_joi85.default.object({
+        assignees: import_joi85.default.array().items(import_joi85.default.string().hex()).required(),
+        type: import_joi85.default.string().required(),
+        unit: import_joi85.default.string().hex().required()
+      });
+      const { error } = schema2.validate({ assignees, type, unit });
+      if (error) {
+        throw new Error(`${error.message}`);
+      }
+      const result = await assignMultipleCardsSvc({ assignees, unit, type, acm_url });
+      return res.status(200).json({ message: "Success", data: result });
+    } catch (error) {
+      return res.status(400).json({
+        data: null,
+        message: error.message
+      });
+    }
+  };
+  const visitorCheckout = async (req, res) => {
+    try {
+      const userId = req.params.userId;
+      const result = await visitorCheckoutSvc({ userId });
+      return res.status(200).json({ message: "Success", data: result });
+    } catch (error) {
       return Promise.reject("Internal Server Error");
     }
   };
@@ -37730,7 +37925,9 @@ function useAccessManagementController() {
     checkoutVisitor,
     removeAccessCard,
     getBlockLevelAndUnitList,
-    getTransactions: getTransactions2
+    getTransactions: getTransactions2,
+    assignMultipleCards,
+    visitorCheckout
   };
 }