@7365admin1/core 2.11.0 → 2.12.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 2.12.0
+
+### Minor Changes
+
+- aeab1d6: get latest changes
+
 ## 2.11.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -192,7 +192,7 @@ declare function useRoleRepo(): {
     }) => Promise<{}>;
     updateRole: (_id: string | ObjectId, value: TMiniRole, session?: ClientSession) => Promise<ObjectId>;
     updatePermissionsById: (_id: string | ObjectId, permissions: TRole["permissions"], session?: ClientSession) => Promise<string>;
-    deleteRole: (_id: string | ObjectId, session?: ClientSession) => Promise<string>;
+    deleteRole: (_id: string | ObjectId, session?: ClientSession) => Promise<void>;
     getOwnerRolesByTypeOrg: (type: string, org: string | ObjectId) => Promise<TRole[]>;
 };
 
@@ -2603,6 +2603,7 @@ declare function usePatrolRouteRepo(): {
         start: string;
         day: number;
     }, session?: ClientSession) => Promise<{}>;
+    getById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document> | TPatrolRoute | null>;
 };
 
 declare function usePatrolRouteController(): {
@@ -2611,6 +2612,7 @@ declare function usePatrolRouteController(): {
     updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getScheduledRoute: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type logCamera = {
@@ -2674,6 +2676,7 @@ declare function usePatrolLogRepo(): {
     }, session?: ClientSession) => Promise<{}>;
     updateById: (_id: string | ObjectId, value: Partial<TPatrolLog>, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<string>;
+    getById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document> | TPatrolLog | null>;
 };
 
 declare function usePatrolLogController(): {
@@ -2681,6 +2684,7 @@ declare function usePatrolLogController(): {
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TimeSlot = {
@@ -3843,6 +3847,11 @@ declare function UseAccessManagementRepo(): {
         type: string;
         search: string;
     }) => Promise<bson.Document[]>;
+    acknowlegdeCardRepo: (params: {
+        userId: string[];
+        cardId: string[];
+        site: string;
+    }) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
 
 declare function useAccessManagementController(): {
@@ -3856,6 +3865,7 @@ declare function useAccessManagementController(): {
     availableAccessCards: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
     userTypeAccessCards: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
     assignedAccessCards: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
+    acknowlegdeCard: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
 };
 
 declare const DEVICE_STATUS: {

package/dist/index.js

@@ -5598,6 +5598,7 @@ function useRoleRepo() {
     }
   }
   const { delNamespace, setCache, getCache, delCache } = (0, import_node_server_utils23.useCache)(namespace_collection);
+  const { delNamespace: _delDashboardNameSpace } = (0, import_node_server_utils23.useCache)("dashboard");
   async function addRole(value, session) {
     value = new MRole(value);
     try {
@@ -5860,15 +5861,21 @@ function useRoleRepo() {
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new import_node_server_utils23.InternalServerError("Unable to update feedback status.");
+        throw new import_node_server_utils23.InternalServerError("Unable to update role status.");
       }
-      const cacheKey = (0, import_node_server_utils23.makeCacheKey)(namespace_collection, { _id });
-      delCache(cacheKey).then(() => {
-        import_node_server_utils23.logger.info(`Cache deleted for key: ${cacheKey}`);
+      delNamespace().then(() => {
+        import_node_server_utils23.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        import_node_server_utils23.logger.error(`Failed to delete cache for key: ${cacheKey}`, err);
+        import_node_server_utils23.logger.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      _delDashboardNameSpace().then(() => {
+        import_node_server_utils23.logger.info(`Cache cleared for namespace: dashboard`);
+      }).catch((err) => {
+        import_node_server_utils23.logger.error(`Failed to clear cache for namespace: dashboard`, err);
       });
-      return "Successfully deleted role.";
     } catch (error) {
       throw new import_node_server_utils23.InternalServerError("Failed to delete role.");
     }
@@ -6957,7 +6964,7 @@ function useRoleController() {
   }
   async function deleteRole(req, res, next) {
     const validation = import_joi15.default.string().hex().required();
-    const _id = req.params.id;
+    const _id = req.query.id;
     const { error } = validation.validate(_id);
     if (error) {
       import_node_server_utils29.logger.log({ level: "error", message: error.message });
@@ -7608,7 +7615,7 @@ function useFileController() {
   }
   async function deleteFile(req, res, next) {
     const validation = import_joi18.default.string().hex().required();
-    const _id = req.params.id;
+    const _id = req.query.id;
     const { error } = validation.validate(_id);
     if (error) {
       import_node_server_utils34.logger.log({ level: "error", message: error.message });
@@ -11022,7 +11029,6 @@ function useFeedbackController() {
   async function deleteFeedback(req, res, next) {
     const validation = import_joi28.default.string().hex().required();
     const _id = req.query.id;
-    console.log(_id);
     const { error } = validation.validate(_id);
     if (error) {
       import_node_server_utils55.logger.log({ level: "error", message: error.message });
@@ -20802,13 +20808,38 @@ function usePatrolRouteRepo() {
       throw error;
     }
   }
+  async function getById(_id, session) {
+    try {
+      _id = new import_mongodb60.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils113.BadRequestError("Invalid patrol log ID format.");
+    }
+    const cacheKey = (0, import_node_server_utils113.makeCacheKey)(namespace_collection, { _id });
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      import_node_server_utils113.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const data = await collection.findOne({ _id }, { session });
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        import_node_server_utils113.logger.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils113.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createTextIndex,
     add,
     getAll,
     updateById,
     deleteById,
-    getScheduledRoute
+    getScheduledRoute,
+    getById
   };
 }
 
@@ -20821,7 +20852,8 @@ function usePatrolRouteController() {
     getAll: _getAll,
     updateById: _updateById,
     deleteById: _deleteById,
-    getScheduledRoute: _getScheduledRoute
+    getScheduledRoute: _getScheduledRoute,
+    getById: _getById
   } = usePatrolRouteRepo();
   async function add(req, res, next) {
     const data = { ...req.body };
@@ -20989,12 +21021,34 @@ function usePatrolRouteController() {
       return;
     }
   }
+  async function getById(req, res, next) {
+    const id = req.params.id;
+    const validation = import_joi64.default.object({
+      id: import_joi64.default.string().hex().required()
+    });
+    const { error } = validation.validate({ id });
+    if (error) {
+      next(new import_node_server_utils114.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const routes = await _getById(id);
+      res.json({
+        message: "Successfully retrieved patrol routes.",
+        data: routes
+      });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
     add,
     getAll,
     updateById,
     deleteById,
-    getScheduledRoute
+    getScheduledRoute,
+    getById
   };
 }
 
@@ -21244,6 +21298,30 @@ function usePatrolLogRepo() {
       throw error;
     }
   }
+  async function getById(_id, session) {
+    try {
+      _id = new import_mongodb62.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils116.BadRequestError("Invalid patrol log ID format.");
+    }
+    const cacheKey = (0, import_node_server_utils116.makeCacheKey)(namespace_collection, { _id });
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      import_node_server_utils116.logger.info(`Cache hit for key: ${cacheKey}`);
+      return cachedData;
+    }
+    try {
+      const data = await collection.findOne({ _id }, { session });
+      setCache(cacheKey, data, 15 * 60).then(() => {
+        import_node_server_utils116.logger.info(`Cache set for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils116.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
+      });
+      return data;
+    } catch (error) {
+      throw error;
+    }
+  }
   function delCachedData() {
     delNamespace().then(() => {
       import_node_server_utils116.logger.log({
@@ -21263,7 +21341,8 @@ function usePatrolLogRepo() {
     add,
     getAll,
     updateById,
-    deleteById
+    deleteById,
+    getById
   };
 }
 
@@ -21335,7 +21414,8 @@ function usePatrolLogController() {
   const {
     getAll: _getAll,
     updateById: _updateById,
-    deleteById: _deleteById
+    deleteById: _deleteById,
+    getById: _getById
   } = usePatrolLogRepo();
   const { add: _add } = usePatrolLogService();
   async function add(req, res, next) {
@@ -21447,7 +21527,28 @@ function usePatrolLogController() {
       return;
     }
   }
-  return { add, getAll, updateById, deleteById };
+  async function getById(req, res, next) {
+    const id = req.params.id;
+    const validation = import_joi66.default.object({
+      id: import_joi66.default.string().hex().required()
+    });
+    const { error } = validation.validate({ id });
+    if (error) {
+      next(new import_node_server_utils118.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const logs = await _getById(id);
+      res.json({
+        message: "Successfully retrieved patrol log.",
+        data: logs
+      });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  return { add, getAll, updateById, deleteById, getById };
 }
 
 // src/models/site-facility.model.ts
@@ -23940,7 +24041,7 @@ function useDocumentManagementController() {
   }
   async function deleteDocumentById(req, res, next) {
     const validation = import_joi74.default.string().hex().required();
-    const _id = req.params.id;
+    const _id = req.query.id;
     const { error } = validation.validate(_id);
     if (error) {
       import_node_server_utils130.logger.log({ level: "error", message: error.message });
@@ -27999,6 +28100,41 @@ function UseAccessManagementRepo() {
       throw new Error(error.message);
     }
   }
+  async function acknowlegdeCardRepo(params) {
+    const session = import_node_server_utils149.useAtlas.getClient()?.startSession();
+    try {
+      session?.startTransaction();
+      const { userId, cardId, site } = params;
+      const allUserId = await Promise.all(userId.map(async (id) => new import_mongodb83.ObjectId(id)));
+      const allCardId = await Promise.all(cardId.map(async (id) => new import_mongodb83.ObjectId(id)));
+      const siteId = new import_mongodb83.ObjectId(site);
+      const result = await collection().updateMany(
+        {
+          $or: [
+            {
+              _id: { $in: allCardId },
+              site: siteId
+            },
+            {
+              userId: { $in: allUserId },
+              site: siteId,
+              isActivated: false,
+              replacementStatus: "Issuance"
+            }
+          ]
+        },
+        { $set: { replacementStatus: "Complete" } },
+        { session }
+      );
+      await session?.commitTransaction();
+      return result;
+    } catch (error) {
+      await session?.abortTransaction();
+      throw new Error(error.message);
+    } finally {
+      await session?.endSession();
+    }
+  }
   return {
     createIndexes,
     createIndexForEntrypass,
@@ -28008,7 +28144,8 @@ function UseAccessManagementRepo() {
     allAccessCardsCountsRepo,
     availableAccessCardsRepo,
     userTypeAccessCardsRepo,
-    assignedAccessCardsRepo
+    assignedAccessCardsRepo,
+    acknowlegdeCardRepo
   };
 }
 
@@ -28123,7 +28260,8 @@ function useAccessManagementSvc() {
     allAccessCardsCountsRepo,
     availableAccessCardsRepo,
     userTypeAccessCardsRepo,
-    assignedAccessCardsRepo
+    assignedAccessCardsRepo,
+    acknowlegdeCardRepo
   } = UseAccessManagementRepo();
   const addPhysicalCardSvc = async (payload) => {
     try {
@@ -28199,10 +28337,22 @@ function useAccessManagementSvc() {
   };
   const accessGroupsSvc = async (params) => {
     try {
+      const key = `${namespace}:${params.user}:access-groups`;
+      const listKey = `${namespace}:${params.user}:list`;
+      const { redis } = (0, import_node_server_utils150.useCache)(key);
+      const cachedData = await getCache({ key, redis });
+      if (cachedData) {
+        console.log("\u26A1 Cache hit:", key);
+        redis.expire(key, 60).catch(console.error);
+        redis.lrem(listKey, 0, key).then(() => redis.lpush(listKey, key)).then(() => redis.ltrim(listKey, 0, 9)).catch(console.error);
+        return cachedData;
+      }
       const command = readTemplate("access-group");
       const response = await sendCommand(command, params.acm_url);
       const res = await (0, import_xml2js.parseStringPromise)(response, { explicitArray: false });
       const format = await formatAccessGroup(res);
+      await setCache({ key, data: format, ttlSeconds: 60, redis });
+      redis.lrem(listKey, 0, key).then(() => redis.lpush(listKey, key)).then(() => redis.ltrim(listKey, 0, 9)).catch(console.error);
       return format;
     } catch (err) {
       throw new Error(err.message);
@@ -28248,6 +28398,14 @@ function useAccessManagementSvc() {
       throw new Error(err.message);
     }
   };
+  const acknowlegdeCardSvc = async (params) => {
+    try {
+      const response = await acknowlegdeCardRepo({ ...params });
+      return response;
+    } catch (err) {
+      throw new Error(err.message);
+    }
+  };
   return {
     addPhysicalCardSvc,
     addNonPhysicalCardSvc,
@@ -28258,7 +28416,8 @@ function useAccessManagementSvc() {
     allAccessCardsCountsSvc,
     availableAccessCardsSvc,
     userTypeAccessCardsSvc,
-    assignedAccessCardsSvc
+    assignedAccessCardsSvc,
+    acknowlegdeCardSvc
   };
 }
 
@@ -28274,7 +28433,8 @@ function useAccessManagementController() {
     allAccessCardsCountsSvc,
     availableAccessCardsSvc,
     userTypeAccessCardsSvc,
-    assignedAccessCardsSvc
+    assignedAccessCardsSvc,
+    acknowlegdeCardSvc
   } = useAccessManagementSvc();
   const addPhysicalCard = async (req, res) => {
     try {
@@ -28437,10 +28597,11 @@ function useAccessManagementController() {
   const accessGroups = async (req, res) => {
     try {
       const { acm_url } = req.query;
+      const user = req.cookies?.sid;
       if (!acm_url || typeof acm_url !== "string") {
         throw new Error("Access Control URL is required");
       }
-      const result = await accessGroupsSvc({ acm_url });
+      const result = await accessGroupsSvc({ acm_url, user });
       return res.status(200).json({ message: "Success", data: result });
     } catch (error) {
       return res.status(400).json({
@@ -28555,6 +28716,27 @@ function useAccessManagementController() {
       });
     }
   };
+  const acknowlegdeCard = async (req, res) => {
+    try {
+      const { userId, site, cardId } = req.body;
+      const schema2 = import_joi85.default.object({
+        userId: import_joi85.default.array().items(import_joi85.default.string().hex()).required(),
+        cardId: import_joi85.default.array().items(import_joi85.default.string().hex()).required(),
+        site: import_joi85.default.string().hex().required()
+      });
+      const { error } = schema2.validate({ userId, cardId, site });
+      if (error) {
+        return res.status(400).json({ message: error.message });
+      }
+      const result = await acknowlegdeCardSvc({ userId, cardId, site });
+      return res.status(200).json({ message: "Success", data: result });
+    } catch (error) {
+      return res.status(500).json({
+        data: null,
+        message: error.message
+      });
+    }
+  };
   return {
     addPhysicalCard,
     addNonPhysicalCard,
@@ -28565,7 +28747,8 @@ function useAccessManagementController() {
     allAccessCardsCounts,
     availableAccessCards,
     userTypeAccessCards,
-    assignedAccessCards
+    assignedAccessCards,
+    acknowlegdeCard
   };
 }