@7365admin1/core 3.27.0 → 3.28.0

package/dist/index.mjs

@@ -48017,7 +48017,8 @@ function UseAccessManagementRepo() {
             remarks: 1,
             requestDate: 1,
             createdAt: 1,
-            updatedAt: 1
+            updatedAt: 1,
+            userCred: 1
           }
         }
       );
@@ -48313,7 +48314,7 @@ function UseAccessManagementRepo() {
       const unitId = new ObjectId97(params.unitId);
       const quantity = params.quantity;
       const type = params.type;
-      const visitorId = new ObjectId97(params.visitorId);
+      const visitorId = new ObjectId97(params.user?.visitorId);
       const nfcCards = params.nfcCards;
       const acm_url = params.acm_url;
       let cards = [];
@@ -48360,7 +48361,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;
@@ -50366,7 +50370,7 @@ function useAccessManagementController() {
         quantity = 1,
         type,
         nfcCards,
-        visitorId,
+        user,
         acm_url
       } = req.body;
       const schema2 = Joi87.object({
@@ -50381,7 +50385,7 @@ function useAccessManagementController() {
           })
         ).required(),
         acm_url: Joi87.string().required(),
-        visitorId: Joi87.string().hex().length(24).required()
+        user: Joi87.object().optional().allow("", null)
       });
       const { error } = schema2.validate({
         site,
@@ -50389,7 +50393,7 @@ function useAccessManagementController() {
         quantity,
         type,
         nfcCards,
-        visitorId,
+        user,
         acm_url
       });
       if (error) {
@@ -50401,7 +50405,7 @@ function useAccessManagementController() {
         quantity,
         type,
         nfcCards,
-        visitorId,
+        user,
         acm_url
       });
       return res.status(200).json({ message: "Success", data: result });
@@ -51123,7 +51127,7 @@ import { BadRequestError as BadRequestError149, logger as logger127 } from "@736
 import Joi89 from "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 }),
@@ -51213,10 +51217,34 @@ function useNfcPatrolTagController() {
       return;
     }
   }
+  async function getById(req, res, next) {
+    const validation = Joi89.object({
+      id: Joi89.string().length(24).hex().required()
+    });
+    const { error } = validation.validate(req.params, {
+      abortEarly: false
+    });
+    if (error) {
+      const messages = error.details.map((d) => d.message).join(", ");
+      logger127.log({ level: "error", message: messages });
+      next(new BadRequestError149(messages));
+      return;
+    }
+    try {
+      const tag = await _getById(req.params.id);
+      res.status(200).json(tag);
+      return;
+    } catch (error2) {
+      logger127.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
-    updateNfcPatrolTagBySite
+    updateNfcPatrolTagBySite,
+    getById
   };
 }
 
@@ -58024,14 +58052,6 @@ function useNfcPatrolLogService() {
       if (!log) {
         throw new BadRequestError180("Patrol Log not found.");
       }
-      const route = await routeRepo.getById(log.route._id);
-      if (!route) {
-        throw new BadRequestError180("Route not found.");
-      }
-      const checkpoint = route.checkPoints[payload.checkpointIndex];
-      if (!checkpoint) {
-        throw new BadRequestError180("Checkpoint not found.");
-      }
       const logCheckpoint = log.checkPoints[payload.checkpointIndex];
       if (!logCheckpoint) {
         throw new BadRequestError180("Checkpoint log not found.");
@@ -58043,11 +58063,14 @@ function useNfcPatrolLogService() {
         throw new BadRequestError180("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 BadRequestError180("NFC Tag not found.");
+        }
+        if (!tag.tagID) {
           throw new BadRequestError180("NFC Tag has not been configured.");
         }
-        if (tag.tagUID !== payload.uid) {
+        if (tag.tagID !== payload.uid) {
           throw new BadRequestError180("Invalid NFC Tag.");
         }
       }
@@ -58063,7 +58086,7 @@ function useNfcPatrolLogService() {
       await session?.abortTransaction();
       throw error;
     } finally {
-      session?.endSession();
+      await session?.endSession();
     }
   }
   return {
@@ -58080,7 +58103,7 @@ import {
 import Joi111 from "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 {
@@ -58159,10 +58182,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
   };
 }