@7365admin1/core 3.27.0 → 3.28.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.28.0
+
+### Minor Changes
+
+- 14c9b14: urgent release for nfc patrol api
+
 ## 3.27.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -4887,8 +4887,8 @@ declare function UseAccessManagementRepo(): {
             _id: string;
             cardNo: string;
         }[];
-        visitorId: string;
         acm_url: string;
+        user: Record<string, unknown>;
     }) => Promise<{
         visitorId: ObjectId | undefined;
         registeredAt: Date;
@@ -5055,6 +5055,7 @@ declare function useNfcPatrolTagController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateNfcPatrolTagBySite: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 declare function useNfcPatrolTagRepo(): {
@@ -6062,6 +6063,7 @@ declare function useNfcPatrolLogController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAllBySite: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     completeCheckpoint: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getLog: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 declare function useAddressRepo(): {

package/dist/index.js

@@ -48014,7 +48014,8 @@ function UseAccessManagementRepo() {
             remarks: 1,
             requestDate: 1,
             createdAt: 1,
-            updatedAt: 1
+            updatedAt: 1,
+            userCred: 1
           }
         }
       );
@@ -48310,7 +48311,7 @@ function UseAccessManagementRepo() {
       const unitId = new import_mongodb97.ObjectId(params.unitId);
       const quantity = params.quantity;
       const type = params.type;
-      const visitorId = new import_mongodb97.ObjectId(params.visitorId);
+      const visitorId = new import_mongodb97.ObjectId(params.user?.visitorId);
       const nfcCards = params.nfcCards;
       const acm_url = params.acm_url;
       let cards = [];
@@ -48357,7 +48358,10 @@ function UseAccessManagementRepo() {
           const updateFields = {
             staffNo: `STAFF-${cardId.toString().slice(-10)}`,
             updatedAt: /* @__PURE__ */ new Date(),
-            userId: updatedVisitor
+            userId: updatedVisitor,
+            userCred: {
+              ...params.user
+            }
           };
           if (type === "QRCODE" /* QR */) {
             updateFields.one_time = true;
@@ -50363,7 +50367,7 @@ function useAccessManagementController() {
         quantity = 1,
         type,
         nfcCards,
-        visitorId,
+        user,
         acm_url
       } = req.body;
       const schema2 = import_joi87.default.object({
@@ -50378,7 +50382,7 @@ function useAccessManagementController() {
           })
         ).required(),
         acm_url: import_joi87.default.string().required(),
-        visitorId: import_joi87.default.string().hex().length(24).required()
+        user: import_joi87.default.object().optional().allow("", null)
       });
       const { error } = schema2.validate({
         site,
@@ -50386,7 +50390,7 @@ function useAccessManagementController() {
         quantity,
         type,
         nfcCards,
-        visitorId,
+        user,
         acm_url
       });
       if (error) {
@@ -50398,7 +50402,7 @@ function useAccessManagementController() {
         quantity,
         type,
         nfcCards,
-        visitorId,
+        user,
         acm_url
       });
       return res.status(200).json({ message: "Success", data: result });
@@ -51111,7 +51115,7 @@ var import_node_server_utils163 = require("@7365admin1/node-server-utils");
 var import_joi89 = __toESM(require("joi"));
 function useNfcPatrolTagController() {
   const { add: _add, updateNfcPatrolTagBySite: _updateNfcPatrolTagBySite } = useNfcPatrolTagService();
-  const { getAll: _getAll } = useNfcPatrolTagRepo();
+  const { getAll: _getAll, getById: _getById } = useNfcPatrolTagRepo();
   async function add(req, res, next) {
     const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
       (acc, [key, value2]) => ({ ...acc, [key]: value2 }),
@@ -51201,10 +51205,34 @@ function useNfcPatrolTagController() {
       return;
     }
   }
+  async function getById(req, res, next) {
+    const validation = import_joi89.default.object({
+      id: import_joi89.default.string().length(24).hex().required()
+    });
+    const { error } = validation.validate(req.params, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      import_node_server_utils163.logger.log({ level: "error", message: messages });
+      next(new import_node_server_utils163.BadRequestError(messages));
+      return;
+    }
+    try {
+      const tag = await _getById(req.params.id);
+      res.status(200).json(tag);
+      return;
+    } catch (error2) {
+      import_node_server_utils163.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
-    updateNfcPatrolTagBySite
+    updateNfcPatrolTagBySite,
+    getById
   };
 }
 
@@ -57894,14 +57922,6 @@ function useNfcPatrolLogService() {
       if (!log) {
         throw new import_node_server_utils199.BadRequestError("Patrol Log not found.");
       }
-      const route = await routeRepo.getById(log.route._id);
-      if (!route) {
-        throw new import_node_server_utils199.BadRequestError("Route not found.");
-      }
-      const checkpoint = route.checkPoints[payload.checkpointIndex];
-      if (!checkpoint) {
-        throw new import_node_server_utils199.BadRequestError("Checkpoint not found.");
-      }
       const logCheckpoint = log.checkPoints[payload.checkpointIndex];
       if (!logCheckpoint) {
         throw new import_node_server_utils199.BadRequestError("Checkpoint log not found.");
@@ -57913,11 +57933,14 @@ function useNfcPatrolLogService() {
         throw new import_node_server_utils199.BadRequestError("Skipped remarks are required.");
       }
       if (payload.action === "complete") {
-        const tag = await tagRepo.getById(checkpoint.nfcTag_id, session);
-        if (!tag.tagUID) {
+        const tag = await tagRepo.getById(logCheckpoint.nfcTag_id);
+        if (!tag) {
+          throw new import_node_server_utils199.BadRequestError("NFC Tag not found.");
+        }
+        if (!tag.tagID) {
           throw new import_node_server_utils199.BadRequestError("NFC Tag has not been configured.");
         }
-        if (tag.tagUID !== payload.uid) {
+        if (tag.tagID !== payload.uid) {
           throw new import_node_server_utils199.BadRequestError("Invalid NFC Tag.");
         }
       }
@@ -57933,7 +57956,7 @@ function useNfcPatrolLogService() {
       await session?.abortTransaction();
       throw error;
     } finally {
-      session?.endSession();
+      await session?.endSession();
     }
   }
   return {
@@ -57947,7 +57970,7 @@ var import_node_server_utils200 = require("@7365admin1/node-server-utils");
 var import_joi111 = __toESM(require("joi"));
 function useNfcPatrolLogController() {
   const { add: _add, completeCheckpoint: _completeCheckpoint } = useNfcPatrolLogService();
-  const { getAllBySite: _getAllBySite } = useNfcPatrolLogRepo();
+  const { getAllBySite: _getAllBySite, getById: _getById } = useNfcPatrolLogRepo();
   async function add(req, res, next) {
     const payload = { ...req.body };
     try {
@@ -58026,10 +58049,19 @@ function useNfcPatrolLogController() {
       next(error);
     }
   }
+  async function getLog(req, res, next) {
+    try {
+      const log = await _getById(req.params.id);
+      res.json(log);
+    } catch (error) {
+      next(error);
+    }
+  }
   return {
     add,
     getAllBySite,
-    completeCheckpoint
+    completeCheckpoint,
+    getLog
   };
 }