@7365admin1/core 3.64.3-staging.283 → 3.64.3-staging.284

package/dist/index.d.ts

@@ -7577,6 +7577,7 @@ declare function UseAccessManagementRepo(): {
         userType: string;
         type: string;
         search: string;
+        userId?: string | null;
     }) => Promise<bson.Document>;
     acknowlegdeCardRepo: (params: {
         userId: string[];

package/dist/index.js

@@ -36675,9 +36675,10 @@ function useBuildingUnitRepo() {
       building_units_namespace_collection,
       cacheOptions
     );
-    const buildingCollection = await db2?.collection("buildings").findOne({ _id: (0, import_node_server_utils102.toObjectId)(block) });
+    const blockObjectId = (0, import_node_server_utils102.toObjectId)(block);
+    const buildingCollection = await db2?.collection("buildings").findOne({ _id: blockObjectId });
     const blockNumber = buildingCollection?.block;
-    query2.block = blockNumber !== void 0 ? blockNumber : block;
+    query2.block = blockNumber !== void 0 ? { $in: [blockNumber, blockObjectId] } : blockObjectId;
     try {
       const data = await collection.aggregate([{ $match: query2 }, { $project: { name: 1 } }]).toArray();
       setCache(cacheKey, data, 15 * 60).then(() => {
@@ -55965,6 +55966,7 @@ function UseAccessManagementRepo() {
       const type = params.type;
       const search = params.search;
       const typeFilter = type.toLowerCase() === "all" ? [] : [{ $eq: ["$type", type] }];
+      const userIdFilter = params.userId ? [{ $eq: ["$userId", new import_mongodb90.ObjectId(params.userId)] }] : [];
       const searchFilter = search ? [
         {
           $or: [
@@ -56038,7 +56040,8 @@ function UseAccessManagementRepo() {
                         { $eq: ["$site", site] },
                         { $eq: ["$isActivated", true] },
                         { $eq: ["$userType", userType] },
-                        ...typeFilter
+                        ...typeFilter,
+                        ...userIdFilter
                       ]
                     },
                     ...searchFilter[0]
@@ -71097,21 +71100,24 @@ function useAccessManagementController() {
         unitId,
         userType,
         type,
-        search = ""
+        search = "",
+        userId = ""
       } = req.query;
       const schema2 = import_joi101.default.object({
         site: import_joi101.default.string().hex().required(),
         unitId: import_joi101.default.string().hex().required(),
         userType: import_joi101.default.string().required(),
         type: import_joi101.default.string().valid("all", ...Object.values(EAccessCardTypes)).required(),
-        search: import_joi101.default.string().optional().allow("", null)
+        search: import_joi101.default.string().optional().allow("", null),
+        userId: import_joi101.default.string().hex().optional().allow("", null)
       });
       const { error } = schema2.validate({
         site,
         unitId,
         userType,
         type,
-        search
+        search,
+        userId
       });
       if (error) {
         return res.status(400).json({ message: error.message });
@@ -71123,7 +71129,8 @@ function useAccessManagementController() {
         unitId,
         userType,
         type,
-        search
+        search,
+        userId
       });
       return res.status(200).json({ message: "Success", data: result });
     } catch (error) {