@7365admin1/core 3.26.0 → 3.28.0

package/dist/index.mjs

@@ -8676,6 +8676,31 @@ function useUserRepo() {
       throw new InternalServerError5("Failed to update user organization.");
     }
   }
+  async function updateUserUnitById(id, value, session) {
+    const _id = toObjectId(id);
+    const update = {};
+    if ("block" in value)
+      update.block = value.block ?? null;
+    if ("level" in value)
+      update.level = value.level ?? null;
+    if ("unitId" in value)
+      update.unitId = value.unitId ?? null;
+    if ("unitName" in value)
+      update.unitName = value.unitName ?? "";
+    if (Object.keys(update).length === 0) {
+      return "No user unit fields to update.";
+    }
+    try {
+      await collection.updateOne(
+        { _id },
+        { $set: { ...update, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      return "Successfully updated user unit information.";
+    } catch (error) {
+      throw new InternalServerError5("Failed to update user unit information.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -8694,7 +8719,8 @@ function useUserRepo() {
     getUserByEmailStatus,
     updateUserSIDById,
     resetPassword,
-    updateUserOrgById
+    updateUserOrgById,
+    updateUserUnitById
   };
 }
 
@@ -25161,6 +25187,10 @@ function usePersonRepo() {
   }
   async function getByNRIC(value) {
     try {
+      if (!value || value.trim() === "") {
+        logger52.warn("getByNRIC called with an empty or invalid NRIC value.");
+        return null;
+      }
       const cacheKey = makeCacheKey24(site_people_namespace_collection, {
         nric: value
       });
@@ -25209,8 +25239,11 @@ function usePersonRepo() {
     unit
   }, session) {
     try {
+      if (!unit || !ObjectId45.isValid(unit)) {
+        throw new BadRequestError72("Invalid unit ID.");
+      }
       const query = {
-        unit,
+        unit: new ObjectId45(unit),
         status,
         ...Array.isArray(type) && type.length > 0 && {
           type: { $in: type }
@@ -26189,18 +26222,7 @@ function useBuildingUnitRepo() {
     } catch (error) {
       throw new BadRequestError74("Invalid ID.");
     }
-    const cacheKey = makeCacheKey25(building_units_namespace_collection, {
-      _id: String(_id)
-    });
     try {
-      const cached = await getCache(cacheKey);
-      if (cached) {
-        logger54.log({
-          level: "info",
-          message: `Cache hit for getById building unit: ${cacheKey}`
-        });
-        return cached;
-      }
       const result = await collection.findOne({
         _id,
         deletedAt: { $in: ["", null] }
@@ -26208,17 +26230,6 @@ function useBuildingUnitRepo() {
       if (!result) {
         throw new BadRequestError74("Building unit not found.");
       }
-      setCache(cacheKey, result, 300).then(() => {
-        logger54.log({
-          level: "info",
-          message: `Cache set for building unit by id: ${cacheKey}`
-        });
-      }).catch((err) => {
-        logger54.log({
-          level: "error",
-          message: `Failed to set cache for building unit by id: ${err.message}`
-        });
-      });
       return result;
     } catch (error) {
       if (error instanceof AppError11) {
@@ -34749,7 +34760,7 @@ function useVisitorTransactionService() {
         const unit = await _getUnitById(value.unit);
         value.unitName = unit?.name;
       }
-      if (allowedPersonTypes.includes(value?.type)) {
+      if (allowedPersonTypes.includes(value?.type) && value?.nric) {
         const nric = value?.nric || "";
         const person = await getByNRIC(nric);
         const existingCompanyName = person?.companyName?.includes(
@@ -34981,6 +34992,103 @@ function useVisitorTransactionService() {
       let host;
       let username;
       let password;
+      if (value.checkIn) {
+        const parsed = new Date(value.checkIn);
+        value.checkIn = isNaN(parsed.getTime()) ? null : parsed;
+      }
+      if (value.isMembersAdded != true && Array.isArray(value.members) && value.members.length > 0) {
+        const chunkSize = 10;
+        const {
+          block,
+          level,
+          unit,
+          site,
+          org,
+          type,
+          company,
+          remarks,
+          contractorType,
+          unitName
+        } = value;
+        for (let i = 0; i < value.members.length; i += chunkSize) {
+          const chunk = value.members.slice(i, i + chunkSize);
+          await Promise.all(
+            chunk.map(async (member) => {
+              const clonedMember = structuredClone(member);
+              const { visitorPass, passKeys } = clonedMember;
+              const preparedVisitorPass = Array.isArray(visitorPass) ? visitorPass.map((item) => ({
+                ...item,
+                receivedDate: /* @__PURE__ */ new Date(),
+                status: "Not Returned" /* NOT_RETURNED */,
+                lastUpdate: null,
+                remarks: ""
+              })) : [];
+              const preparedPassKeys = Array.isArray(passKeys) ? passKeys.map((item) => ({
+                ...item,
+                receivedDate: /* @__PURE__ */ new Date(),
+                status: "Not Returned" /* NOT_RETURNED */,
+                lastUpdate: null,
+                remarks: ""
+              })) : [];
+              const visitorId = await _add(
+                {
+                  ...clonedMember,
+                  block,
+                  level,
+                  unit,
+                  unitName,
+                  site,
+                  org,
+                  type,
+                  company,
+                  remarks,
+                  contractorType,
+                  checkIn: value.checkIn,
+                  visitorPass: preparedVisitorPass,
+                  passKeys: preparedPassKeys,
+                  status: "registered" /* REGISTERED */
+                },
+                session
+              );
+              console.log("visitorId service", visitorId);
+              for (const item of preparedVisitorPass) {
+                await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Pass", session);
+                await KeyRepo.updateKeyById(
+                  item.keyId,
+                  {
+                    status: "In Use" /* IN_USE */,
+                    updatedBy: value.createdBy
+                  },
+                  value.site,
+                  session,
+                  void 0,
+                  visitorId,
+                  void 0,
+                  true
+                );
+              }
+              for (const item of preparedPassKeys) {
+                await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Key", session);
+                await KeyRepo.updateKeyById(
+                  item.keyId,
+                  {
+                    status: "In Use" /* IN_USE */,
+                    updatedBy: value.createdBy,
+                    visitorId
+                  },
+                  value.site,
+                  session,
+                  void 0,
+                  visitorId,
+                  void 0,
+                  true
+                );
+              }
+            })
+          );
+        }
+        value.isMembersAdded = true;
+      }
       if (value.site && value.plateNumber) {
         try {
           camera = await _getVisitorsInBySite(value.site);
@@ -35014,10 +35122,6 @@ function useVisitorTransactionService() {
         if (found === 1)
           throw new BadRequestError100("This plate number is blocklisted");
       }
-      if (value.checkIn) {
-        const parsed = new Date(value.checkIn);
-        value.checkIn = isNaN(parsed.getTime()) ? null : parsed;
-      }
       if (value.checkOut) {
         const parsed = new Date(value.checkOut);
         value.checkOut = isNaN(parsed.getTime()) ? null : parsed;
@@ -36078,7 +36182,8 @@ function usePersonService() {
     getUserByEmail,
     updateUserFieldById: _updateUserFieldById,
     getUserById,
-    updateUserOrgById: _updateUserOrgById
+    updateUserOrgById: _updateUserOrgById,
+    updateUserUnitById: _updateUserUnitById
   } = useUserRepo();
   const { add: addMember } = useMemberRepo();
   const { getById: _getUnitById, updateById: updateUnitById } = useBuildingUnitRepo();
@@ -36225,6 +36330,10 @@ function usePersonService() {
         value.unit = new ObjectId66(value.unit);
       }
       const isOrgChanged = value.org && person.org?.toString() !== value.org.toString();
+      const toKey = (v) => v === null || v === void 0 || v === "" ? "" : v.toString();
+      const isBlockChanged = "block" in value && toKey(value.block) !== toKey(person.block);
+      const isLevelChanged = "level" in value && toKey(value.level) !== toKey(person.level);
+      const isUnitChanged = "unit" in value && toKey(value.unit) !== toKey(person.unit);
       await _updateById(_id, value, session);
       if (isOrgChanged && person.user) {
         await _updateUserOrgById(
@@ -36233,6 +36342,26 @@ function usePersonService() {
           session
         );
       }
+      if ((isBlockChanged || isLevelChanged || isUnitChanged) && person.user) {
+        const userUnitPayload = {};
+        if (isBlockChanged) {
+          userUnitPayload.block = value.block ?? null;
+        }
+        if (isLevelChanged) {
+          userUnitPayload.level = value.level ?? null;
+        }
+        if (isUnitChanged) {
+          userUnitPayload.unitId = value.unit ?? null;
+          if ("unitName" in value) {
+            userUnitPayload.unitName = value.unitName ?? "";
+          }
+        }
+        await _updateUserUnitById(
+          person.user.toString(),
+          userUnitPayload,
+          session
+        );
+      }
       if (value.unit && (isNameUpdated || isOwnerChanged || value.isOwner)) {
         const unit = await _getUnitById(value.unit.toString());
         if (unit) {
@@ -36262,6 +36391,16 @@ function usePersonService() {
           }
         }
       }
+      if (isUnitChanged && person.isOwner && person.unit) {
+        const previousUnit = await _getUnitById(person.unit.toString());
+        if (previousUnit && previousUnit._id && previousUnit.owner?.toString() === person?._id?.toString()) {
+          await updateUnitById(
+            previousUnit._id.toString(),
+            { owner: "", ownerName: "" },
+            session
+          );
+        }
+      }
       await session.commitTransaction();
       return "Person updated successfully.";
     } catch (error) {
@@ -45303,7 +45442,6 @@ function useSiteUnitBillingService() {
   const { getAll, updateById: _updateById } = useSiteBillingItemRepo();
   const { getBuildingUnitsWithOwner: _getBuildingUnitsWithOwner } = useBuildingUnitRepo();
   async function processBilling() {
-    console.log("Starting billing process...");
     const billing_items = await getAll({
       search: "",
       page: 1,
@@ -45346,7 +45484,7 @@ function useSiteUnitBillingService() {
           const buildUnitBilling = (unit) => ({
             site: billing_item.site.toString(),
             org: billing_item.org.toString(),
-            billItem: billing_item._id,
+            billItem: billing_item._id?.toString(),
             billName: billing_item.name,
             unitId: unit._id.toString(),
             unit: unit.blockName + " / " + unit.levelName + " / " + unit.name,
@@ -45380,6 +45518,9 @@ function useSiteUnitBillingService() {
           level: "error",
           message: `Failed to proccess cron billing: ${error.message}`
         });
+        if (session.inTransaction()) {
+          await session.abortTransaction();
+        }
         continue;
       } finally {
         session.endSession();
@@ -45434,6 +45575,7 @@ function useSiteUnitBillingService() {
     const billingMonth = Number(billing_item.month);
     const billingDay = Number(billing_item.date);
     if (billing_item.frequency === "monthly" /* MONTHLY */) {
+      console.log("billing_item", billing_item.name);
       return todayDate === billingDay;
     }
     if (billing_item.frequency === "quarterly" /* QAURTERLY */) {
@@ -46569,7 +46711,7 @@ function UseAccessManagementRepo() {
             $lookup: {
               from: "building-levels",
               localField: "_id",
-              foreignField: "block",
+              foreignField: "blockId",
               pipeline: [
                 { $match: { status: { $ne: "deleted" } } },
                 {
@@ -46590,7 +46732,7 @@ function UseAccessManagementRepo() {
                 {
                   $project: {
                     _id: 1,
-                    level: 1,
+                    name: 1,
                     units: 1
                   }
                 }
@@ -46751,7 +46893,7 @@ function UseAccessManagementRepo() {
                   $project: {
                     _id: "$level.units._id",
                     name: "$level.units.name",
-                    level: { _id: "$level._id", level: "$level.level" },
+                    level: { _id: "$level._id", level: "$level.name" },
                     block: { _id: "$_id", name: "$name", block: "$block" },
                     site: "$site",
                     unit_owner: { $arrayElemAt: ["$unitOwner", 0] },
@@ -47875,7 +48017,8 @@ function UseAccessManagementRepo() {
             remarks: 1,
             requestDate: 1,
             createdAt: 1,
-            updatedAt: 1
+            updatedAt: 1,
+            userCred: 1
           }
         }
       );
@@ -48171,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 = [];
@@ -48218,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;
@@ -48360,7 +48506,7 @@ function UseAccessManagementRepo() {
           $lookup: {
             from: "building-levels",
             localField: "_id",
-            foreignField: "block",
+            foreignField: "blockId",
             as: "levels",
             pipeline: [
               {
@@ -50224,7 +50370,7 @@ function useAccessManagementController() {
         quantity = 1,
         type,
         nfcCards,
-        visitorId,
+        user,
         acm_url
       } = req.body;
       const schema2 = Joi87.object({
@@ -50239,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,
@@ -50247,7 +50393,7 @@ function useAccessManagementController() {
         quantity,
         type,
         nfcCards,
-        visitorId,
+        user,
         acm_url
       });
       if (error) {
@@ -50259,7 +50405,7 @@ function useAccessManagementController() {
         quantity,
         type,
         nfcCards,
-        visitorId,
+        user,
         acm_url
       });
       return res.status(200).json({ message: "Success", data: result });
@@ -50660,6 +50806,7 @@ import {
   InternalServerError as InternalServerError49,
   logger as logger126,
   makeCacheKey as makeCacheKey47,
+  NotFoundError as NotFoundError36,
   paginate as paginate41,
   useAtlas as useAtlas79,
   useCache as useCache49
@@ -50854,11 +51001,24 @@ function useNfcPatrolTagRepo() {
       });
     });
   }
+  async function getById(_id, session) {
+    try {
+      _id = typeof _id === "string" ? new ObjectId99(_id) : _id;
+    } catch {
+      throw new BadRequestError147("Invalid NFC Patrol Tag ID.");
+    }
+    const tag = await collection.findOne({ _id }, { session });
+    if (!tag) {
+      throw new NotFoundError36("NFC Patrol Tag not found.");
+    }
+    return tag;
+  }
   return {
     createIndexes,
     add,
     getAll,
-    updateNfcPatrolTagBySite
+    updateNfcPatrolTagBySite,
+    getById
   };
 }
 
@@ -50967,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 }),
@@ -51057,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
   };
 }
 
@@ -57597,7 +57781,7 @@ var schemaNfcPatrolLog = Joi110.object({
   checkPoints: Joi110.array().items(
     Joi110.object({
       nfcTag_id: Joi110.string().length(24).hex().required(),
-      nfcTag_name: Joi110.string().length(24).hex().required(),
+      nfcTag_name: Joi110.string().required(),
       travelTime: Joi110.number().integer().min(0).required(),
       startDateTime: Joi110.date().required().messages({
         "date.base": "startDateTime must be a valid date or ISO string"
@@ -57605,7 +57789,7 @@ var schemaNfcPatrolLog = Joi110.object({
       endDateTime: Joi110.date().required().messages({
         "date.base": "endDateTime must be a valid date or ISO string"
       }),
-      status: Joi110.string().valid("Completed", "Skipped").required(),
+      status: Joi110.string().valid("Pending", "Completed", "Skipped").required(),
       skippedRemarks: Joi110.string().required()
     })
   ).min(0).required(),
@@ -57790,19 +57974,62 @@ function useNfcPatrolLogRepo() {
       });
     });
   }
+  async function getById(id, session) {
+    try {
+      id = new ObjectId121(id);
+    } catch {
+      throw new BadRequestError179("Invalid Log ID.");
+    }
+    return collection.findOne(
+      { _id: id },
+      { session }
+    );
+  }
+  async function updateCheckpoint(id, checkpointIndex, payload, session) {
+    try {
+      id = new ObjectId121(id);
+    } catch {
+      throw new BadRequestError179("Invalid Log ID.");
+    }
+    const setData = {
+      [`checkPoints.${checkpointIndex}.status`]: payload.action === "complete" ? "Completed" : "Skipped",
+      [`checkPoints.${checkpointIndex}.endDateTime`]: /* @__PURE__ */ new Date()
+    };
+    if (payload.action === "skip") {
+      setData[`checkPoints.${checkpointIndex}.skippedRemarks`] = payload.skippedRemarks;
+    }
+    const res = await collection.updateOne(
+      { _id: id },
+      {
+        $set: setData
+      },
+      { session }
+    );
+    delCachedData();
+    return res;
+  }
   return {
     createIndexes,
     add,
-    getAllBySite
+    getAllBySite,
+    getById,
+    updateCheckpoint
   };
 }
 
 // src/services/nfc-patrol-log.service.ts
 import {
+  BadRequestError as BadRequestError180,
   useAtlas as useAtlas100
 } from "@7365admin1/node-server-utils";
 function useNfcPatrolLogService() {
-  const { add: _add } = useNfcPatrolLogRepo();
+  const {
+    add: _add,
+    getById,
+    updateCheckpoint
+  } = useNfcPatrolLogRepo();
+  const routeRepo = useNfcPatrolRouteRepo();
+  const tagRepo = useNfcPatrolTagRepo();
   async function add(value) {
     const session = useAtlas100.getClient()?.startSession();
     session?.startTransaction();
@@ -57817,8 +58044,54 @@ function useNfcPatrolLogService() {
       session?.endSession();
     }
   }
+  async function completeCheckpoint(logId, payload) {
+    const session = useAtlas100.getClient()?.startSession();
+    session?.startTransaction();
+    try {
+      const log = await getById(logId, session);
+      if (!log) {
+        throw new BadRequestError180("Patrol Log not found.");
+      }
+      const logCheckpoint = log.checkPoints[payload.checkpointIndex];
+      if (!logCheckpoint) {
+        throw new BadRequestError180("Checkpoint log not found.");
+      }
+      if (logCheckpoint.status === "Completed") {
+        throw new BadRequestError180("Checkpoint already completed.");
+      }
+      if (payload.action === "skip" && !payload.skippedRemarks?.trim()) {
+        throw new BadRequestError180("Skipped remarks are required.");
+      }
+      if (payload.action === "complete") {
+        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.tagID !== payload.uid) {
+          throw new BadRequestError180("Invalid NFC Tag.");
+        }
+      }
+      await updateCheckpoint(
+        logId,
+        payload.checkpointIndex,
+        payload,
+        session
+      );
+      await session?.commitTransaction();
+      return "Checkpoint updated.";
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      await session?.endSession();
+    }
+  }
   return {
-    add
+    add,
+    completeCheckpoint
   };
 }
 
@@ -57829,8 +58102,8 @@ import {
 } from "@7365admin1/node-server-utils";
 import Joi111 from "joi";
 function useNfcPatrolLogController() {
-  const { add: _add } = useNfcPatrolLogService();
-  const { getAllBySite: _getAllBySite } = useNfcPatrolLogRepo();
+  const { add: _add, completeCheckpoint: _completeCheckpoint } = useNfcPatrolLogService();
+  const { getAllBySite: _getAllBySite, getById: _getById } = useNfcPatrolLogRepo();
   async function add(req, res, next) {
     const payload = { ...req.body };
     try {
@@ -57892,9 +58165,36 @@ function useNfcPatrolLogController() {
       return;
     }
   }
+  async function completeCheckpoint(req, res, next) {
+    const { id } = req.params;
+    const payload = {
+      checkpointIndex: req.body.checkpointIndex,
+      uid: req.body.uid,
+      action: req.body.action,
+      skippedRemarks: req.body.skippedRemarks
+    };
+    try {
+      const data = await _completeCheckpoint(id, payload);
+      res.status(200).json(data);
+      return;
+    } catch (error) {
+      logger159.error(error.message);
+      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
+    getAllBySite,
+    completeCheckpoint,
+    getLog
   };
 }