@7365admin1/core 3.79.1-staging.351 → 3.79.1-staging.352

package/dist/index.d.ts

@@ -10951,11 +10951,17 @@ declare function UseAccessManagementRepo(): {
     }>;
     assignedAccessCardsByUnitRepo: (params: {
         site: string;
-        unitId: string;
+        unitId?: string;
         userType: string;
         type: string;
         search: string;
-    }) => Promise<bson.Document>;
+        page?: number;
+        limit?: number;
+    }) => Promise<{
+        items: any[];
+        pages: number;
+        pageRange: string;
+    }>;
     acknowlegdeCardRepo: (params: {
         userId: string[];
         cardId: string[];

package/dist/index.js

@@ -55827,26 +55827,50 @@ function UseAccessManagementRepo() {
   async function assignedAccessCardsByUnitRepo(params) {
     try {
       const site = new import_mongodb97.ObjectId(params.site);
-      const unitId = new import_mongodb97.ObjectId(params.unitId);
+      const unitId = params.unitId ? new import_mongodb97.ObjectId(params.unitId) : null;
       const userType = params.userType;
       const type = params.type;
-      const search = params.search;
+      const search = params.search ? params.search.trim() : "";
+      const page = params.page ? Number(params.page) - 1 : 0;
+      const limit = Number(params.limit) || 10;
       const typeFilter = type.toLowerCase() === "all" ? [] : [{ $eq: ["$type", type] }];
+      const matchesSearch = (field) => ({
+        $regexMatch: {
+          input: {
+            $cond: [{ $eq: [{ $type: field }, "string"] }, field, ""]
+          },
+          regex: search,
+          options: "i"
+        }
+      });
+      const unitNameMatch = matchesSearch("$$unitName");
       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" } }
+            unitNameMatch,
+            matchesSearch("$cardNo"),
+            matchesSearch("$accessLevel"),
+            matchesSearch("$doorName"),
+            matchesSearch("$liftName")
           ]
         }
       ] : [];
+      const unitFilters = [
+        ...unitId ? [] : [{ $gt: [{ $size: "$accessCards" }, 0] }],
+        ...search ? [
+          {
+            $or: [
+              matchesSearch("$name"),
+              { $gt: [{ $size: "$accessCards" }, 0] }
+            ]
+          }
+        ] : []
+      ];
       const result = await collectionName("building-units").aggregate(
         [
           {
             $match: {
-              _id: unitId,
+              ...unitId ? { _id: unitId } : {},
               site,
               status: { $ne: "deleted" }
             }
@@ -55884,7 +55908,7 @@ function UseAccessManagementRepo() {
           {
             $lookup: {
               from: "access-cards",
-              let: { unit: "$_id" },
+              let: { unit: "$_id", unitName: "$name" },
               pipeline: [
                 {
                   $match: {
@@ -55908,10 +55932,10 @@ function UseAccessManagementRepo() {
                         ...typeFilter,
                         // Cards actually held by a user only - a card sitting
                         // unassigned on the unit (`userId: null`) is left out.
-                        { $ne: ["$userId", null] }
+                        { $ne: ["$userId", null] },
+                        ...searchFilter
                       ]
-                    },
-                    ...searchFilter[0]
+                    }
                   }
                 },
                 { $sort: { _id: -1 } },
@@ -55941,20 +55965,48 @@ function UseAccessManagementRepo() {
               as: "accessCards"
             }
           },
+          // Listing mode hides units with nothing assigned, the same rule
+          // assignedAccessCardsRepo applies. A directly requested unitId is
+          // exempt, so the single-unit call still returns the unit with an
+          // empty `accessCards` list.
+          // The search keeps a unit whose own name matches even when none of
+          // its cards do.
+          ...unitFilters.length ? [{ $match: { $expr: { $and: unitFilters } } }] : [],
           {
-            $project: {
-              _id: 0,
-              unitId: "$_id",
-              block: { $ifNull: ["$buildingInfo.name", "$buildingName"] },
-              level: "$levelInfo.name",
-              unit: "$name",
-              accessCards: 1
+            $sort: {
+              "buildingInfo.name": 1,
+              "levelInfo.name": 1,
+              name: 1
+            }
+          },
+          {
+            $facet: {
+              totalCount: [{ $count: "count" }],
+              items: [
+                { $skip: page * limit },
+                { $limit: limit },
+                {
+                  $project: {
+                    _id: 0,
+                    unitId: "$_id",
+                    block: {
+                      $ifNull: ["$buildingInfo.name", "$buildingName"]
+                    },
+                    level: "$levelInfo.name",
+                    unit: "$name",
+                    accessCards: 1
+                  }
+                }
+              ]
             }
           }
         ],
         { allowDiskUse: true }
       ).toArray();
-      return result[0] ?? null;
+      const totalCount = result[0]?.totalCount?.[0]?.count ?? 0;
+      const items = result[0]?.items ?? [];
+      const paginatedResult = (0, import_node_server_utils145.paginate)(items, page, limit, totalCount);
+      return paginatedResult;
     } catch (error) {
       throw new Error(error.message);
     }
@@ -74394,21 +74446,27 @@ function useAccessManagementController() {
         unitId,
         userType,
         type,
-        search = ""
+        search = "",
+        page,
+        limit
       } = req.query;
       const schema2 = import_joi106.default.object({
         site: import_joi106.default.string().hex().required(),
-        unitId: import_joi106.default.string().hex().required(),
+        unitId: import_joi106.default.string().hex().optional().allow("", null),
         userType: import_joi106.default.string().required(),
         type: import_joi106.default.string().valid("all", ...Object.values(EAccessCardTypes)).required(),
-        search: import_joi106.default.string().optional().allow("", null)
+        search: import_joi106.default.string().optional().allow("", null),
+        page: import_joi106.default.number().optional().default(1),
+        limit: import_joi106.default.number().optional().default(10)
       });
       const { error } = schema2.validate({
         site,
         unitId,
         userType,
         type,
-        search
+        search,
+        page,
+        limit
       });
       if (error) {
         return res.status(400).json({ message: error.message });
@@ -74420,7 +74478,9 @@ function useAccessManagementController() {
         unitId,
         userType,
         type,
-        search
+        search,
+        page,
+        limit
       });
       return res.status(200).json({ message: "Success", data: result });
     } catch (error) {