@7365admin1/core 3.31.0 → 3.32.0

package/dist/index.js

@@ -42372,7 +42372,11 @@ function useBulletinBoardRepo() {
   );
   async function createIndexes() {
     try {
-      await collection.createIndexes([{ key: { site: 1, status: 1 } }]);
+      await collection.createIndexes([
+        { key: { site: 1, status: 1, _id: -1 } },
+        { key: { status: 1, startDate: 1 } },
+        { key: { status: 1, endDate: 1 } }
+      ]);
     } catch (error) {
       throw new import_node_server_utils140.InternalServerError("Failed to create index on site.");
     }
@@ -47383,6 +47387,7 @@ function UseAccessManagementRepo() {
       const userType = params.userType;
       const type = params.type;
       const search = params.search;
+      const typeFilter = type.toLowerCase() === "all" ? [] : [{ $eq: ["$type", type] }];
       const query = {
         site: { $in: [site] }
       };
@@ -47409,7 +47414,7 @@ function UseAccessManagementRepo() {
             $lookup: {
               from: "building-levels",
               localField: "_id",
-              foreignField: "block",
+              foreignField: "blockId",
               pipeline: [
                 { $match: { status: { $ne: "deleted" } } },
                 {
@@ -47423,14 +47428,29 @@ function UseAccessManagementRepo() {
                       {
                         $lookup: {
                           from: "access-cards",
-                          localField: "_id",
-                          foreignField: "assignedUnit",
+                          let: { unit: "$_id" },
                           pipeline: [
                             {
                               $match: {
-                                isActivated: true,
-                                userType,
-                                type
+                                $expr: {
+                                  $and: [
+                                    {
+                                      $in: [
+                                        "$$unit",
+                                        {
+                                          $cond: [
+                                            { $isArray: "$assignedUnit" },
+                                            "$assignedUnit",
+                                            ["$assignedUnit"]
+                                          ]
+                                        }
+                                      ]
+                                    },
+                                    { $eq: ["$isActivated", true] },
+                                    { $eq: ["$userType", userType] },
+                                    ...typeFilter
+                                  ]
+                                }
                               }
                             },
                             {
@@ -47485,7 +47505,7 @@ function UseAccessManagementRepo() {
                 {
                   $project: {
                     _id: 1,
-                    level: 1,
+                    level: "$name",
                     units: 1
                   }
                 }
@@ -47534,10 +47554,11 @@ function UseAccessManagementRepo() {
           },
           {
             $project: {
-              name: 1,
-              "level.level": 1,
-              "level.units.name": 1,
-              "level.units.fAccessCards": 1
+              _id: 0,
+              unitId: "$level.units._id",
+              block: "$name",
+              level: "$level.level",
+              unit: "$level.units.name"
             }
           }
         ],
@@ -47548,6 +47569,138 @@ function UseAccessManagementRepo() {
       throw new Error(error.message);
     }
   }
+  async function assignedAccessCardsByUnitRepo(params) {
+    try {
+      const site = new import_mongodb97.ObjectId(params.site);
+      const unitId = new import_mongodb97.ObjectId(params.unitId);
+      const userType = params.userType;
+      const type = params.type;
+      const search = params.search;
+      const typeFilter = type.toLowerCase() === "all" ? [] : [{ $eq: ["$type", type] }];
+      const searchFilter = search ? [
+        {
+          $or: [
+            { cardNo: { $regex: search.trim(), $options: "i" } },
+            { accessLevel: { $regex: search.trim(), $options: "i" } },
+            { doorName: { $regex: search.trim(), $options: "i" } },
+            { liftName: { $regex: search.trim(), $options: "i" } }
+          ]
+        }
+      ] : [];
+      const result = await collectionName("building-units").aggregate(
+        [
+          {
+            $match: {
+              _id: unitId,
+              site,
+              status: { $ne: "deleted" }
+            }
+          },
+          {
+            $lookup: {
+              from: "building-levels",
+              localField: "level",
+              foreignField: "_id",
+              pipeline: [{ $project: { _id: 1, name: 1 } }],
+              as: "levelInfo"
+            }
+          },
+          {
+            $unwind: {
+              path: "$levelInfo",
+              preserveNullAndEmptyArrays: true
+            }
+          },
+          {
+            $lookup: {
+              from: "buildings",
+              localField: "building",
+              foreignField: "_id",
+              pipeline: [{ $project: { _id: 1, name: 1 } }],
+              as: "buildingInfo"
+            }
+          },
+          {
+            $unwind: {
+              path: "$buildingInfo",
+              preserveNullAndEmptyArrays: true
+            }
+          },
+          {
+            $lookup: {
+              from: "access-cards",
+              let: { unit: "$_id" },
+              pipeline: [
+                {
+                  $match: {
+                    $expr: {
+                      $and: [
+                        {
+                          $in: [
+                            "$$unit",
+                            {
+                              $cond: [
+                                { $isArray: "$assignedUnit" },
+                                "$assignedUnit",
+                                ["$assignedUnit"]
+                              ]
+                            }
+                          ]
+                        },
+                        { $eq: ["$site", site] },
+                        { $eq: ["$isActivated", true] },
+                        { $eq: ["$userType", userType] },
+                        ...typeFilter
+                      ]
+                    },
+                    ...searchFilter[0]
+                  }
+                },
+                { $sort: { _id: -1 } },
+                {
+                  $project: {
+                    _id: 1,
+                    type: 1,
+                    cardNo: 1,
+                    accessLevel: 1,
+                    accessGroup: 1,
+                    accessType: 1,
+                    qrData: 1,
+                    startDate: 1,
+                    endDate: 1,
+                    isActivated: 1,
+                    isAntiPassBack: 1,
+                    isLiftCard: 1,
+                    liftAccessLevel: 1,
+                    doorName: 1,
+                    liftName: 1,
+                    replacementStatus: 1,
+                    qrTag: 1,
+                    qrTagCardNo: 1
+                  }
+                }
+              ],
+              as: "accessCards"
+            }
+          },
+          {
+            $project: {
+              _id: 0,
+              unitId: "$_id",
+              block: { $ifNull: ["$buildingInfo.name", "$buildingName"] },
+              level: "$levelInfo.name",
+              unit: "$name",
+              accessCards: 1
+            }
+          }
+        ],
+        { allowDiskUse: true }
+      ).toArray();
+      return result[0] ?? null;
+    } catch (error) {
+      throw new Error(error.message);
+    }
+  }
   async function acknowlegdeCardRepo(params) {
     const session = import_node_server_utils158.useAtlas.getClient()?.startSession();
     try {
@@ -49011,7 +49164,8 @@ function UseAccessManagementRepo() {
     assignees,
     unit,
     type,
-    acm_url
+    acm_url,
+    id
   }) {
     const session = import_node_server_utils158.useAtlas.getClient()?.startSession();
     try {
@@ -49026,31 +49180,35 @@ function UseAccessManagementRepo() {
       let availableCards = [];
       let update = [];
       let cards = [];
-      availableCards = await collection().aggregate([
-        {
-          $match: {
-            $expr: {
-              $and: [
-                {
-                  $in: [
-                    unit,
-                    {
-                      $cond: [
-                        { $isArray: "$assignedUnit" },
-                        "$assignedUnit",
-                        ["$assignedUnit"]
-                      ]
-                    }
-                  ]
-                },
-                { $eq: ["$userId", null] },
-                { $eq: ["$type", type] },
-                { $eq: ["$isActivated", true] }
-              ]
+      if (id) {
+        availableCards = await collection().find({ _id: new import_mongodb97.ObjectId(id) }).toArray();
+      } else {
+        availableCards = await collection().aggregate([
+          {
+            $match: {
+              $expr: {
+                $and: [
+                  {
+                    $in: [
+                      unit,
+                      {
+                        $cond: [
+                          { $isArray: "$assignedUnit" },
+                          "$assignedUnit",
+                          ["$assignedUnit"]
+                        ]
+                      }
+                    ]
+                  },
+                  { $eq: ["$userId", null] },
+                  { $eq: ["$type", type] },
+                  { $eq: ["$isActivated", true] }
+                ]
+              }
             }
           }
-        }
-      ]).toArray();
+        ]).toArray();
+      }
       if (assignees.length > availableCards.length) {
         throw new Error(`Not enough ${type} cards available.`);
       }
@@ -49106,13 +49264,34 @@ function UseAccessManagementRepo() {
         throw new Error("Command failed, server error.");
       }
       for (const { _id, userId } of update) {
+        const user = userId ? await collectionName("users").findOne(
+          { _id: userId },
+          { projection: { name: 1, email: 1 } }
+        ) : null;
         await collection().updateOne(
           { _id },
           {
-            $set: { userId, staffNo: `STAFF-${userId.toString().slice(-10)}` }
+            $set: {
+              userId,
+              staffNo: `STAFF-${userId.toString().slice(-10)}`,
+              userCred: user ? { ...user } : null
+            }
           },
           { session }
         );
+        if (user) {
+          const { _id: userRefId, ...userInfo } = user;
+          await collectionName("access-cards-history").insertOne(
+            {
+              ...userInfo,
+              cardId: _id,
+              userId,
+              createdAt: /* @__PURE__ */ new Date(),
+              type: "assigned"
+            },
+            { session }
+          );
+        }
       }
       await session?.commitTransaction();
       return "Cards assigned successfully.";
@@ -49277,6 +49456,7 @@ function UseAccessManagementRepo() {
     availableAccessCardsRepo,
     userTypeAccessCardsRepo,
     assignedAccessCardsRepo,
+    assignedAccessCardsByUnitRepo,
     acknowlegdeCardRepo,
     accessandLiftCardsRepo,
     replaceCardRepo,
@@ -49328,6 +49508,7 @@ function useAccessManagementSvc() {
     availableAccessCardsRepo,
     userTypeAccessCardsRepo,
     assignedAccessCardsRepo,
+    assignedAccessCardsByUnitRepo,
     acknowlegdeCardRepo,
     accessandLiftCardsRepo,
     replaceCardRepo,
@@ -49502,6 +49683,14 @@ function useAccessManagementSvc() {
       throw new Error(err.message);
     }
   };
+  const assignedAccessCardsByUnitSvc = async (params) => {
+    try {
+      const response = await assignedAccessCardsByUnitRepo({ ...params });
+      return response;
+    } catch (err) {
+      throw new Error(err.message);
+    }
+  };
   const acknowlegdeCardSvc = async (params) => {
     try {
       const response = await acknowlegdeCardRepo({ ...params });
@@ -49717,14 +49906,16 @@ function useAccessManagementSvc() {
     assignees,
     unit,
     type,
-    acm_url
+    acm_url,
+    id
   }) => {
     try {
       const response = await assignMultipleCardsRepo({
         assignees,
         unit,
         type,
-        acm_url
+        acm_url,
+        id
       });
       return response;
     } catch (err) {
@@ -49818,6 +50009,7 @@ function useAccessManagementSvc() {
     availableAccessCardsSvc,
     userTypeAccessCardsSvc,
     assignedAccessCardsSvc,
+    assignedAccessCardsByUnitSvc,
     acknowlegdeCardSvc,
     accessandLiftCardsSvc,
     replaceCardSvc,
@@ -49867,6 +50059,7 @@ function useAccessManagementController() {
     availableAccessCardsSvc,
     userTypeAccessCardsSvc,
     assignedAccessCardsSvc,
+    assignedAccessCardsByUnitSvc,
     acknowlegdeCardSvc,
     accessandLiftCardsSvc,
     replaceCardSvc,
@@ -50205,6 +50398,47 @@ function useAccessManagementController() {
       });
     }
   };
+  const assignedAccessCardsByUnit = async (req, res) => {
+    try {
+      const {
+        site,
+        unitId,
+        userType,
+        type,
+        search = ""
+      } = req.query;
+      const schema2 = import_joi87.default.object({
+        site: import_joi87.default.string().hex().required(),
+        unitId: import_joi87.default.string().hex().required(),
+        userType: import_joi87.default.string().required(),
+        type: import_joi87.default.string().valid("all", ...Object.values(EAccessCardTypes)).required(),
+        search: import_joi87.default.string().optional().allow("", null)
+      });
+      const { error } = schema2.validate({
+        site,
+        unitId,
+        userType,
+        type,
+        search
+      });
+      if (error) {
+        return res.status(400).json({ message: error.message });
+      }
+      const result = await assignedAccessCardsByUnitSvc({
+        site,
+        unitId,
+        userType,
+        type,
+        search
+      });
+      return res.status(200).json({ message: "Success", data: result });
+    } catch (error) {
+      return res.status(500).json({
+        data: null,
+        message: error.message
+      });
+    }
+  };
   const acknowlegdeCard = async (req, res) => {
     try {
       const { userId, site, cardId } = req.body;
@@ -50849,7 +51083,7 @@ function useAccessManagementController() {
   };
   const assignMultipleCards = async (req, res) => {
     try {
-      const { assignees, unit, type, acm_url } = req.body;
+      const { assignees, unit, type, acm_url, id } = req.body;
       const schema2 = import_joi87.default.object({
         assignees: import_joi87.default.array().items(import_joi87.default.string().hex()).required(),
         type: import_joi87.default.string().required(),
@@ -50863,7 +51097,8 @@ function useAccessManagementController() {
         assignees,
         unit,
         type,
-        acm_url
+        acm_url,
+        id
       });
       return res.status(200).json({ message: "Success", data: result });
     } catch (error) {
@@ -51044,6 +51279,7 @@ function useAccessManagementController() {
     availableAccessCards,
     userTypeAccessCards,
     assignedAccessCards,
+    assignedAccessCardsByUnit,
     acknowlegdeCard,
     accessandLiftCards,
     replaceCard,
@@ -52405,25 +52641,13 @@ function useBulletinVideoRepo() {
   }
   async function createIndexes() {
     try {
-      await collection.createIndexes([{ key: { site: 1 } }]);
+      await collection.createIndexes([{ key: { site: 1, createdAt: -1 } }]);
     } catch (error) {
       throw new import_node_server_utils168.InternalServerError(
         "Failed to create index on bulletin videos."
       );
     }
   }
-  async function createTextIndex() {
-    try {
-      await collection.createIndex({
-        title: "text",
-        description: "text"
-      });
-    } catch (error) {
-      throw new import_node_server_utils168.InternalServerError(
-        "Failed to create text index on bulletin videos."
-      );
-    }
-  }
   const namespace_collection = "bulletin-videos";
   const collection = db.collection(namespace_collection);
   const { delNamespace, getCache, setCache } = (0, import_node_server_utils168.useCache)(namespace_collection);
@@ -52469,26 +52693,16 @@ function useBulletinVideoRepo() {
       startingDate.setUTCHours(0, 0, 0, 0);
       const endingDate = new Date(endDate);
       endingDate.setUTCHours(23, 59, 59, 999);
-      const parsedCreatedAt = {
-        $dateFromString: {
-          dateString: "$createdAt",
-          onError: /* @__PURE__ */ new Date(0),
-          onNull: /* @__PURE__ */ new Date(0)
-        }
-      };
       dateExpr = {
-        $expr: {
-          $and: [
-            { $gte: [parsedCreatedAt, startingDate] },
-            { $lte: [parsedCreatedAt, endingDate] }
-          ]
+        createdAt: {
+          $gte: startingDate.toISOString(),
+          $lte: endingDate.toISOString()
         }
       };
     }
     const query = {
       site,
       status: { $ne: "deleted" },
-      ...search && { $text: { $search: search } },
       ...dateExpr
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
@@ -52642,8 +52856,7 @@ function useBulletinVideoRepo() {
     getBulletinVideoById,
     updateBulletinVideoById,
     deleteBulletinVideoById,
-    createIndexes,
-    createTextIndex
+    createIndexes
   };
 }
 
@@ -58118,6 +58331,7 @@ function useNfcPatrolLogRepo() {
     limit = 10,
     site,
     date,
+    type,
     route
   }, session) {
     const pageIndex = page > 0 ? page - 1 : 0;
@@ -58131,7 +58345,18 @@ function useNfcPatrolLogRepo() {
       site: siteId
     };
     if (date) {
-      query.date = date;
+      if (type === "month") {
+        const [year, month] = date.split("-").map(Number);
+        const endDay = new Date(year, month, 0).getDate();
+        query.date = {
+          $gte: `${year}-${String(month).padStart(2, "0")}-01`,
+          $lte: `${year}-${String(month).padStart(2, "0")}-${String(
+            endDay
+          ).padStart(2, "0")}`
+        };
+      } else {
+        query.date = date;
+      }
     }
     if (route?._id) {
       query["route._id"] = typeof route._id === "string" ? new import_mongodb121.ObjectId(route._id) : route._id;
@@ -58144,13 +58369,17 @@ function useNfcPatrolLogRepo() {
       page: pageIndex,
       limit
     };
-    if (date)
+    if (date) {
       cacheOptions.date = date;
+    }
+    if (type) {
+      cacheOptions.type = type;
+    }
     if (route?._id) {
-      cacheOptions.routeId = route?._id;
+      cacheOptions.routeId = typeof route._id === "string" ? route._id : route._id.toString();
     }
     if (route?.startTime) {
-      cacheOptions.routeStartTime = route?.startTime;
+      cacheOptions.routeStartTime = route.startTime;
     }
     const cacheKey = (0, import_node_server_utils198.makeCacheKey)(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
@@ -58158,27 +58387,25 @@ function useNfcPatrolLogRepo() {
       import_node_server_utils198.logger.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
-    try {
-      const items = await collection.aggregate(
-        [
-          { $match: query },
-          { $sort: { date: -1 } },
-          { $skip: pageIndex * limit },
-          { $limit: limit }
-        ],
-        { session }
-      ).toArray();
-      const length = await collection.countDocuments(query, { session });
-      const data = (0, import_node_server_utils198.paginate)(items, pageIndex, limit, length);
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils198.logger.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        import_node_server_utils198.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
-      return data;
-    } catch (error) {
-      throw error;
-    }
+    const items = await collection.aggregate(
+      [
+        { $match: query },
+        { $sort: { date: -1 } },
+        { $skip: pageIndex * limit },
+        { $limit: limit }
+      ],
+      { session }
+    ).toArray();
+    const length = await collection.countDocuments(query, {
+      session
+    });
+    const data = (0, import_node_server_utils198.paginate)(items, pageIndex, limit, length);
+    setCache(cacheKey, data, 15 * 60).then(() => {
+      import_node_server_utils198.logger.info(`Cache set for key: ${cacheKey}`);
+    }).catch((err) => {
+      import_node_server_utils198.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+    });
+    return data;
   }
   function delCachedData() {
     delNamespace().then(() => {
@@ -58443,17 +58670,16 @@ function useNfcPatrolLogController() {
   }
   async function getAllBySite(req, res, next) {
     const validation = import_joi111.default.object({
-      page: import_joi111.default.number().integer().min(1).allow("", null).default(1),
-      limit: import_joi111.default.number().integer().min(1).max(100).allow("", null).default(10),
+      page: import_joi111.default.number().integer().min(1).default(1),
+      limit: import_joi111.default.number().integer().min(1).max(100).default(10),
       site: import_joi111.default.string().length(24).hex().required(),
-      date: import_joi111.default.string().regex(/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/).required().messages({
-        "string.pattern.base": "Date must be in YYYY-MM-DD format (e.g., 2025-12-30)"
-      }).required(),
+      date: import_joi111.default.string().pattern(/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/).required().messages({
+        "string.pattern.base": "Date must be in YYYY-MM-DD format (e.g. 2026-07-17)"
+      }),
+      type: import_joi111.default.string().valid("month").optional(),
       route: import_joi111.default.object({
         _id: import_joi111.default.string().length(24).hex().required(),
-        startTime: import_joi111.default.string().regex(/^([01]\d|2[0-3]):([0-5]\d)$/).messages({
-          "string.pattern.base": "Each startTime must be in HH:mm 24-hour format"
-        }).required()
+        startTime: import_joi111.default.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).required()
       }).required()
     });
     const query = {