@7365admin1/core 3.26.0 → 3.27.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.27.0
+
+### Minor Changes
+
+- ad3a683: release changes today
+
 ## 3.26.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -174,6 +174,12 @@ declare function useUserRepo(): {
         sid: string;
     }, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     updateUserOrgById: (id: string | ObjectId, org: string | ObjectId, session?: ClientSession) => Promise<string>;
+    updateUserUnitById: (id: string | ObjectId, value: {
+        block?: ObjectId | null;
+        level?: ObjectId | null;
+        unitId?: ObjectId | null;
+        unitName?: string;
+    }, session?: ClientSession) => Promise<"No user unit fields to update." | "Successfully updated user unit information.">;
 };
 
 declare function useUserController(): {
@@ -2874,6 +2880,7 @@ type TVisitorTransaction = {
     inviterId?: string | ObjectId;
     createdBy?: string | ObjectId;
     updatedBy?: string | ObjectId;
+    isMembersAdded?: boolean;
 };
 declare const schemaVisitorTransaction: Joi.ObjectSchema<any>;
 declare const schemaUpdateVisTrans: Joi.ObjectSchema<any>;
@@ -5087,6 +5094,7 @@ declare function useNfcPatrolTagRepo(): {
         },
         ClientSession?
     ]) => Promise<mongodb.UpdateResult<bson.Document>>;
+    getById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document>>;
 };
 
 declare enum DOBStatus {
@@ -6036,15 +6044,24 @@ declare function useNfcPatrolLogRepo(): {
         pages: number;
         pageRange: string;
     } | TNfcPatrolLog>;
+    getById: (id: string | ObjectId, session?: ClientSession) => Promise<mongodb.WithId<bson.Document> | null>;
+    updateCheckpoint: (id: string | ObjectId, checkpointIndex: number, payload: any, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
 
 declare function useNfcPatrolLogService(): {
     add: (value: TNfcPatrolLog) => Promise<string>;
+    completeCheckpoint: (logId: string, payload: {
+        checkpointIndex: number;
+        uid: string;
+        action: "complete" | "skip";
+        skippedRemarks?: string;
+    }) => Promise<string>;
 };
 
 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>;
 };
 
 declare function useAddressRepo(): {

package/dist/index.js

@@ -9141,6 +9141,31 @@ function useUserRepo() {
       throw new import_node_server_utils10.InternalServerError("Failed to update user organization.");
     }
   }
+  async function updateUserUnitById(id, value, session) {
+    const _id = (0, import_node_server_utils10.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 import_node_server_utils10.InternalServerError("Failed to update user unit information.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -9159,7 +9184,8 @@ function useUserRepo() {
     getUserByEmailStatus,
     updateUserSIDById,
     resetPassword,
-    updateUserOrgById
+    updateUserOrgById,
+    updateUserUnitById
   };
 }
 
@@ -25401,6 +25427,10 @@ function usePersonRepo() {
   }
   async function getByNRIC(value) {
     try {
+      if (!value || value.trim() === "") {
+        import_node_server_utils74.logger.warn("getByNRIC called with an empty or invalid NRIC value.");
+        return null;
+      }
       const cacheKey = (0, import_node_server_utils74.makeCacheKey)(site_people_namespace_collection, {
         nric: value
       });
@@ -25449,8 +25479,11 @@ function usePersonRepo() {
     unit
   }, session) {
     try {
+      if (!unit || !import_mongodb45.ObjectId.isValid(unit)) {
+        throw new import_node_server_utils74.BadRequestError("Invalid unit ID.");
+      }
       const query = {
-        unit,
+        unit: new import_mongodb45.ObjectId(unit),
         status,
         ...Array.isArray(type) && type.length > 0 && {
           type: { $in: type }
@@ -26419,18 +26452,7 @@ function useBuildingUnitRepo() {
     } catch (error) {
       throw new import_node_server_utils76.BadRequestError("Invalid ID.");
     }
-    const cacheKey = (0, import_node_server_utils76.makeCacheKey)(building_units_namespace_collection, {
-      _id: String(_id)
-    });
     try {
-      const cached = await getCache(cacheKey);
-      if (cached) {
-        import_node_server_utils76.logger.log({
-          level: "info",
-          message: `Cache hit for getById building unit: ${cacheKey}`
-        });
-        return cached;
-      }
       const result = await collection.findOne({
         _id,
         deletedAt: { $in: ["", null] }
@@ -26438,17 +26460,6 @@ function useBuildingUnitRepo() {
       if (!result) {
         throw new import_node_server_utils76.BadRequestError("Building unit not found.");
       }
-      setCache(cacheKey, result, 300).then(() => {
-        import_node_server_utils76.logger.log({
-          level: "info",
-          message: `Cache set for building unit by id: ${cacheKey}`
-        });
-      }).catch((err) => {
-        import_node_server_utils76.logger.log({
-          level: "error",
-          message: `Failed to set cache for building unit by id: ${err.message}`
-        });
-      });
       return result;
     } catch (error) {
       if (error instanceof import_node_server_utils76.AppError) {
@@ -34904,7 +34915,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(
@@ -35136,6 +35147,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);
@@ -35169,10 +35277,6 @@ function useVisitorTransactionService() {
         if (found === 1)
           throw new import_node_server_utils107.BadRequestError("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;
@@ -36216,7 +36320,8 @@ function usePersonService() {
     getUserByEmail,
     updateUserFieldById: _updateUserFieldById,
     getUserById,
-    updateUserOrgById: _updateUserOrgById
+    updateUserOrgById: _updateUserOrgById,
+    updateUserUnitById: _updateUserUnitById
   } = useUserRepo();
   const { add: addMember } = useMemberRepo();
   const { getById: _getUnitById, updateById: updateUnitById } = useBuildingUnitRepo();
@@ -36363,6 +36468,10 @@ function usePersonService() {
         value.unit = new import_mongodb66.ObjectId(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(
@@ -36371,6 +36480,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) {
@@ -36400,6 +36529,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) {
@@ -45304,7 +45443,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,
@@ -45347,7 +45485,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,
@@ -45381,6 +45519,9 @@ function useSiteUnitBillingService() {
           level: "error",
           message: `Failed to proccess cron billing: ${error.message}`
         });
+        if (session.inTransaction()) {
+          await session.abortTransaction();
+        }
         continue;
       } finally {
         session.endSession();
@@ -45435,6 +45576,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 */) {
@@ -46566,7 +46708,7 @@ function UseAccessManagementRepo() {
             $lookup: {
               from: "building-levels",
               localField: "_id",
-              foreignField: "block",
+              foreignField: "blockId",
               pipeline: [
                 { $match: { status: { $ne: "deleted" } } },
                 {
@@ -46587,7 +46729,7 @@ function UseAccessManagementRepo() {
                 {
                   $project: {
                     _id: 1,
-                    level: 1,
+                    name: 1,
                     units: 1
                   }
                 }
@@ -46748,7 +46890,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] },
@@ -48357,7 +48499,7 @@ function UseAccessManagementRepo() {
           $lookup: {
             from: "building-levels",
             localField: "_id",
-            foreignField: "block",
+            foreignField: "blockId",
             as: "levels",
             pipeline: [
               {
@@ -50843,11 +50985,24 @@ function useNfcPatrolTagRepo() {
       });
     });
   }
+  async function getById(_id, session) {
+    try {
+      _id = typeof _id === "string" ? new import_mongodb99.ObjectId(_id) : _id;
+    } catch {
+      throw new import_node_server_utils161.BadRequestError("Invalid NFC Patrol Tag ID.");
+    }
+    const tag = await collection.findOne({ _id }, { session });
+    if (!tag) {
+      throw new import_node_server_utils161.NotFoundError("NFC Patrol Tag not found.");
+    }
+    return tag;
+  }
   return {
     createIndexes,
     add,
     getAll,
-    updateNfcPatrolTagBySite
+    updateNfcPatrolTagBySite,
+    getById
   };
 }
 
@@ -57479,7 +57634,7 @@ var schemaNfcPatrolLog = import_joi110.default.object({
   checkPoints: import_joi110.default.array().items(
     import_joi110.default.object({
       nfcTag_id: import_joi110.default.string().length(24).hex().required(),
-      nfcTag_name: import_joi110.default.string().length(24).hex().required(),
+      nfcTag_name: import_joi110.default.string().required(),
       travelTime: import_joi110.default.number().integer().min(0).required(),
       startDateTime: import_joi110.default.date().required().messages({
         "date.base": "startDateTime must be a valid date or ISO string"
@@ -57487,7 +57642,7 @@ var schemaNfcPatrolLog = import_joi110.default.object({
       endDateTime: import_joi110.default.date().required().messages({
         "date.base": "endDateTime must be a valid date or ISO string"
       }),
-      status: import_joi110.default.string().valid("Completed", "Skipped").required(),
+      status: import_joi110.default.string().valid("Pending", "Completed", "Skipped").required(),
       skippedRemarks: import_joi110.default.string().required()
     })
   ).min(0).required(),
@@ -57664,17 +57819,59 @@ function useNfcPatrolLogRepo() {
       });
     });
   }
+  async function getById(id, session) {
+    try {
+      id = new import_mongodb121.ObjectId(id);
+    } catch {
+      throw new import_node_server_utils198.BadRequestError("Invalid Log ID.");
+    }
+    return collection.findOne(
+      { _id: id },
+      { session }
+    );
+  }
+  async function updateCheckpoint(id, checkpointIndex, payload, session) {
+    try {
+      id = new import_mongodb121.ObjectId(id);
+    } catch {
+      throw new import_node_server_utils198.BadRequestError("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
 var import_node_server_utils199 = require("@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 = import_node_server_utils199.useAtlas.getClient()?.startSession();
     session?.startTransaction();
@@ -57689,8 +57886,59 @@ function useNfcPatrolLogService() {
       session?.endSession();
     }
   }
+  async function completeCheckpoint(logId, payload) {
+    const session = import_node_server_utils199.useAtlas.getClient()?.startSession();
+    session?.startTransaction();
+    try {
+      const log = await getById(logId, session);
+      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.");
+      }
+      if (logCheckpoint.status === "Completed") {
+        throw new import_node_server_utils199.BadRequestError("Checkpoint already completed.");
+      }
+      if (payload.action === "skip" && !payload.skippedRemarks?.trim()) {
+        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) {
+          throw new import_node_server_utils199.BadRequestError("NFC Tag has not been configured.");
+        }
+        if (tag.tagUID !== payload.uid) {
+          throw new import_node_server_utils199.BadRequestError("Invalid NFC Tag.");
+        }
+      }
+      await updateCheckpoint(
+        logId,
+        payload.checkpointIndex,
+        payload,
+        session
+      );
+      await session?.commitTransaction();
+      return "Checkpoint updated.";
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
   return {
-    add
+    add,
+    completeCheckpoint
   };
 }
 
@@ -57698,7 +57946,7 @@ function useNfcPatrolLogService() {
 var import_node_server_utils200 = require("@7365admin1/node-server-utils");
 var import_joi111 = __toESM(require("joi"));
 function useNfcPatrolLogController() {
-  const { add: _add } = useNfcPatrolLogService();
+  const { add: _add, completeCheckpoint: _completeCheckpoint } = useNfcPatrolLogService();
   const { getAllBySite: _getAllBySite } = useNfcPatrolLogRepo();
   async function add(req, res, next) {
     const payload = { ...req.body };
@@ -57761,9 +58009,27 @@ 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) {
+      import_node_server_utils200.logger.error(error.message);
+      next(error);
+    }
+  }
   return {
     add,
-    getAllBySite
+    getAllBySite,
+    completeCheckpoint
   };
 }