@7365admin1/core 3.30.0 → 3.31.0

package/dist/index.mjs

@@ -36319,7 +36319,6 @@ function usePersonService() {
       }
       return "People added successfully.";
     } catch (error) {
-      console.log("error message service", error);
       logger84.error("Error in people service add:", error);
       await session.abortTransaction();
       throw error;
@@ -36476,8 +36475,8 @@ function usePersonService() {
         phoneNumber: person.contact,
         org: person.org.toString(),
         site: person.site.toString(),
-        block: person.block ?? void 0,
-        level: person.level ?? void 0,
+        block: person.block?.toString() ?? void 0,
+        level: person.level?.toString() ?? void 0,
         unit: person.unit?.toString() ?? void 0,
         nric: person.nric,
         status: "active",
@@ -51474,6 +51473,11 @@ var schemaCreateNfcPatrolLog = Joi89.object({
   startTime: Joi89.string().required(),
   createdBy: Joi89.string().length(24).hex().optional().allow("", null)
 });
+var schemaSignNfcPatrolLog = Joi89.object({
+  guardName: Joi89.string().required(),
+  guardSignatureFileId: Joi89.string().length(24).hex().required(),
+  signedAt: Joi89.date().optional()
+});
 var schemaNfcPatrolLog = Joi89.object({
   _id: Joi89.string().length(24).hex().optional().allow(null, ""),
   site: Joi89.string().length(24).hex().required(),
@@ -51512,6 +51516,7 @@ var schemaNfcPatrolLog = Joi89.object({
       skippedRemarks: Joi89.string().required()
     })
   ).min(0).required(),
+  sign: schemaSignNfcPatrolLog.optional(),
   createdBy: Joi89.string().length(24).hex().optional().allow(null, ""),
   createdAt: Joi89.date().optional()
 });
@@ -51547,6 +51552,15 @@ function MNfcPatrolLog(valueArg) {
       throw new BadRequestError149("Invalid route _id format");
     }
   }
+  if (value.sign?.guardSignatureFileId) {
+    try {
+      value.sign.guardSignatureFileId = new ObjectId100(
+        value.sign.guardSignatureFileId
+      );
+    } catch {
+      throw new BadRequestError149("Invalid guardSignatureFileId format");
+    }
+  }
   return {
     _id: value._id ?? new ObjectId100(),
     site: value.site,
@@ -51555,6 +51569,7 @@ function MNfcPatrolLog(valueArg) {
     startDateTime: value.startDateTime,
     endDateTime: value.endDateTime,
     checkPoints: value.checkPoints,
+    sign: value.sign,
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     createdBy: value.createdBy ?? void 0
   };
@@ -53033,8 +53048,8 @@ function useStatementOfAccountRepo() {
   async function createIndexes() {
     try {
       await collection.createIndexes([
-        { key: { site: 1, status: 1 } },
-        { key: { site: 1, unitId: 1, status: 1 } },
+        { key: { site: 1, status: 1, createdAt: -1 } },
+        { key: { site: 1, unitId: 1, status: 1, createdAt: -1 } },
         { key: { createdAt: -1 } }
       ]);
       return `Successfully created indexes for ${namespace_collection}.`;
@@ -53100,12 +53115,7 @@ function useStatementOfAccountRepo() {
       let endDate = new Date(dateTo);
       endDate.setHours(23, 59, 59, 999);
       dateExpr = {
-        $expr: {
-          $and: [
-            { $gte: ["$createdAt", startDate] },
-            { $lte: ["$createdAt", endDate] }
-          ]
-        }
+        createdAt: { $gte: startDate, $lte: endDate }
       };
     }
     const unitSearchRegex = search ? search.trim().replace(/\s+/g, "").replace(/\//g, "\\s*/\\s*") : null;
@@ -53290,12 +53300,7 @@ function useStatementOfAccountRepo() {
       let endDate = new Date(dateTo);
       endDate.setHours(23, 59, 59, 999);
       dateExpr = {
-        $expr: {
-          $and: [
-            { $gte: ["$createdAt", startDate] },
-            { $lte: ["$createdAt", endDate] }
-          ]
-        }
+        createdAt: { $gte: startDate, $lte: endDate }
       };
     }
     const unitSearchRegex = search ? search.trim().replace(/\s+/g, "").replace(/\//g, "\\s*/\\s*") : null;
@@ -58346,18 +58351,35 @@ function useNfcPatrolLogRepo() {
     delCachedData();
     return res;
   }
+  async function sign(id, value, session) {
+    id = new ObjectId121(id);
+    await collection.updateOne(
+      { _id: id },
+      {
+        $set: {
+          sign: {
+            ...value,
+            signedAt: /* @__PURE__ */ new Date()
+          }
+        }
+      },
+      { session }
+    );
+  }
   return {
     createIndexes,
     add,
     getAllBySite,
     getById,
-    updateCheckpoint
+    updateCheckpoint,
+    sign
   };
 }
 
 // src/services/nfc-patrol-log.service.ts
 import {
   BadRequestError as BadRequestError180,
+  NotFoundError as NotFoundError50,
   useAtlas as useAtlas100
 } from "@7365admin1/node-server-utils";
 function useNfcPatrolLogService() {
@@ -58365,7 +58387,8 @@ function useNfcPatrolLogService() {
     add: _add,
     getById,
     updateCheckpoint,
-    getAllBySite: _getAllBySite
+    getAllBySite: _getAllBySite,
+    sign: repoSign
   } = useNfcPatrolLogRepo();
   const routeRepo = useNfcPatrolRouteRepo();
   const tagRepo = useNfcPatrolTagRepo();
@@ -58501,9 +58524,26 @@ function useNfcPatrolLogService() {
       await session?.endSession();
     }
   }
+  async function sign(id, value) {
+    const log = await getById(id);
+    if (!log) {
+      throw new NotFoundError50("Patrol log not found.");
+    }
+    const canSign = log.checkPoints.every(
+      (c) => c.status === "Completed" || c.status === "Skipped"
+    );
+    if (!canSign) {
+      throw new BadRequestError180(
+        "All checkpoints must be completed or skipped before signing."
+      );
+    }
+    await repoSign(id, value);
+    return "Successfully signed patrol.";
+  }
   return {
     add,
-    completeCheckpoint
+    completeCheckpoint,
+    sign
   };
 }
 
@@ -58514,7 +58554,7 @@ import {
 } from "@7365admin1/node-server-utils";
 import Joi111 from "joi";
 function useNfcPatrolLogController() {
-  const { add: _add, completeCheckpoint: _completeCheckpoint } = useNfcPatrolLogService();
+  const { add: _add, completeCheckpoint: _completeCheckpoint, sign: _sign } = useNfcPatrolLogService();
   const { getAllBySite: _getAllBySite, getById: _getById } = useNfcPatrolLogRepo();
   async function add(req, res, next) {
     try {
@@ -58606,11 +58646,26 @@ function useNfcPatrolLogController() {
       next(error);
     }
   }
+  async function sign(req, res, next) {
+    try {
+      const value = await schemaSignNfcPatrolLog.validateAsync(req.body);
+      const result = await _sign(
+        req.params.id,
+        value
+      );
+      res.json({
+        message: result
+      });
+    } catch (err) {
+      next(err);
+    }
+  }
   return {
     add,
     getAllBySite,
     completeCheckpoint,
-    getLog
+    getLog,
+    sign
   };
 }
 
@@ -64722,7 +64777,7 @@ import {
   logger as logger181,
   getDirectory as getDirectory5,
   BadRequestError as BadRequestError202,
-  NotFoundError as NotFoundError52,
+  NotFoundError as NotFoundError53,
   InternalServerError as InternalServerError70,
   useAtlas as useAtlas115,
   hashPassword as hashPassword4
@@ -64853,7 +64908,7 @@ function useVerificationServiceV2() {
       session?.startTransaction();
       const item = await _getByVerificationCode(verificationCode);
       if (!item) {
-        throw new NotFoundError52("Verification not found.");
+        throw new NotFoundError53("Verification not found.");
       }
       switch (item.status) {
         case "expired" /* EXPIRED */:
@@ -65091,7 +65146,7 @@ function useVerificationServiceV2() {
   async function resendSignUpVerification(email) {
     const item = await _getPendingVerificationByEmail(email);
     if (!item) {
-      throw new NotFoundError52(
+      throw new NotFoundError53(
         "Pending verification not found."
       );
     }
@@ -65411,7 +65466,7 @@ import {
   BadRequestError as BadRequestError205,
   comparePassword as comparePassword3,
   InternalServerError as InternalServerError72,
-  NotFoundError as NotFoundError54,
+  NotFoundError as NotFoundError55,
   useCache as useCache68
 } from "@7365admin1/node-server-utils";
 import { v4 as uuidv42 } from "uuid";
@@ -65424,7 +65479,7 @@ import {
   logger as logger183,
   BadRequestError as BadRequestError204,
   paginate as paginate60,
-  NotFoundError as NotFoundError53,
+  NotFoundError as NotFoundError54,
   AppError as AppError29,
   useCache as useCache67,
   makeCacheKey as makeCacheKey65,
@@ -65557,7 +65612,7 @@ function useUserRepoV2() {
       ]).toArray();
       const data = results.length > 0 ? results[0] : null;
       if (!data)
-        throw new NotFoundError53("User not found.");
+        throw new NotFoundError54("User not found.");
       setCache(cacheKey, data, 15 * 60).then(() => logger183.info(`Cache set for key: ${cacheKey}`)).catch(
         (err) => logger183.error(`Failed to set cache for key: ${cacheKey}`, err)
       );
@@ -65898,7 +65953,7 @@ function useAuthServiceV2() {
     try {
       const user = await getUserByEmail(email);
       if (!user) {
-        throw new NotFoundError54(
+        throw new NotFoundError55(
           "Invalid user email. Please check your email and try again."
         );
       }
@@ -65973,7 +66028,7 @@ import {
   comparePassword as comparePassword4,
   hashPassword as hashPassword5,
   InternalServerError as InternalServerError73,
-  NotFoundError as NotFoundError55,
+  NotFoundError as NotFoundError56,
   useAtlas as useAtlas117,
   useS3 as useS33
 } from "@7365admin1/node-server-utils";
@@ -66077,14 +66132,14 @@ function useUserServiceV2() {
     try {
       const otpDoc = await _getVerificationById(id);
       if (!otpDoc) {
-        throw new NotFoundError55("You are using an invalid reset link.");
+        throw new NotFoundError56("You are using an invalid reset link.");
       }
       if (otpDoc.status === "complete" /* COMPLETE */) {
         throw new BadRequestError206("This link has already been invalidated.");
       }
       const user = await _getUserByEmail(otpDoc.email);
       if (!user) {
-        throw new NotFoundError55("User not found.");
+        throw new NotFoundError56("User not found.");
       }
       if (!user._id) {
         throw new InternalServerError73("Invalid user ID.");
@@ -66911,7 +66966,7 @@ function MPost(value) {
 import {
   BadRequestError as BadRequestError212,
   InternalServerError as InternalServerError75,
-  NotFoundError as NotFoundError56,
+  NotFoundError as NotFoundError57,
   paginate as paginate61,
   useAtlas as useAtlas119
 } from "@7365admin1/node-server-utils";
@@ -67036,7 +67091,7 @@ function usePostPrelovedRepo() {
       ]).toArray();
       const data = result[0] ?? null;
       if (!data)
-        throw new NotFoundError56("Post not found.");
+        throw new NotFoundError57("Post not found.");
       return data;
     } catch (error) {
       throw error;
@@ -67300,7 +67355,7 @@ import { useAtlas as useAtlas121 } from "@7365admin1/node-server-utils";
 import {
   BadRequestError as BadRequestError213,
   InternalServerError as InternalServerError76,
-  NotFoundError as NotFoundError57,
+  NotFoundError as NotFoundError58,
   useAtlas as useAtlas120
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId140 } from "mongodb";
@@ -67386,7 +67441,7 @@ function usePostFavoriteRepo() {
     }
     const result = await collection.findOne({ _id });
     if (!result)
-      throw new NotFoundError57("Favorite not found.");
+      throw new NotFoundError58("Favorite not found.");
     return result;
   }
   async function getByPostId(postId) {
@@ -67397,7 +67452,7 @@ function usePostFavoriteRepo() {
     }
     const result = await collection.findOne({ postId });
     if (!result)
-      throw new NotFoundError57("Favorite not found.");
+      throw new NotFoundError58("Favorite not found.");
     return result;
   }
   async function updateById(_id, userId, session) {
@@ -67903,7 +67958,7 @@ function MCategoryPreloved(value) {
 import {
   BadRequestError as BadRequestError216,
   InternalServerError as InternalServerError77,
-  NotFoundError as NotFoundError58,
+  NotFoundError as NotFoundError59,
   useAtlas as useAtlas123
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId143 } from "mongodb";
@@ -67946,7 +68001,7 @@ function useCategoryPrelovedRepo() {
     try {
       const data = await collection.findOne({ _id: objectId2 });
       if (!data) {
-        throw new NotFoundError58("Category not found.");
+        throw new NotFoundError59("Category not found.");
       }
       return data;
     } catch (error) {
@@ -67975,7 +68030,7 @@ function useCategoryPrelovedRepo() {
     }
     const existing = await collection.findOne({ _id: objectId2 });
     if (!existing)
-      throw new NotFoundError58("Category not found.");
+      throw new NotFoundError59("Category not found.");
     const res = await collection.updateOne(
       { _id: objectId2 },
       { $set: { ...value, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } }
@@ -67993,7 +68048,7 @@ function useCategoryPrelovedRepo() {
     }
     const existing = await collection.findOne({ _id: objectId2 });
     if (!existing)
-      throw new NotFoundError58("Category not found.");
+      throw new NotFoundError59("Category not found.");
     const res = await collection.deleteOne({ _id: objectId2 });
     if (res.deletedCount === 0)
       throw new InternalServerError77("Unable to delete category.");
@@ -68160,7 +68215,7 @@ function MSubcategoryPreloved(value) {
 import {
   BadRequestError as BadRequestError218,
   InternalServerError as InternalServerError78,
-  NotFoundError as NotFoundError59,
+  NotFoundError as NotFoundError60,
   useAtlas as useAtlas124
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId145 } from "mongodb";
@@ -68211,7 +68266,7 @@ function useSubcategoryPrelovedRepo() {
     try {
       const data = await collection.findOne({ _id: objectId2 });
       if (!data) {
-        throw new NotFoundError59("Subcategory not found.");
+        throw new NotFoundError60("Subcategory not found.");
       }
       return data;
     } catch (error) {
@@ -68486,7 +68541,7 @@ function MChatPreloved(value) {
 import {
   BadRequestError as BadRequestError220,
   InternalServerError as InternalServerError79,
-  NotFoundError as NotFoundError60,
+  NotFoundError as NotFoundError61,
   useAtlas as useAtlas125
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId147 } from "mongodb";
@@ -68514,7 +68569,7 @@ function useChatPrelovedRepo() {
     }
     const existing = await collection.findOne({ _id: objectId2 });
     if (!existing)
-      throw new NotFoundError60("Chat not found.");
+      throw new NotFoundError61("Chat not found.");
     value.edited = true;
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     const res = await collection.updateOne({ _id: objectId2 }, { $set: value });
@@ -68531,7 +68586,7 @@ function useChatPrelovedRepo() {
     }
     const existing = await collection.findOne({ _id: objectId2 });
     if (!existing)
-      throw new NotFoundError60("Chat not found.");
+      throw new NotFoundError61("Chat not found.");
     const res = await collection.updateOne(
       { _id: objectId2 },
       { $set: { deletedAt: (/* @__PURE__ */ new Date()).toISOString(), updatedAt: (/* @__PURE__ */ new Date()).toISOString() } }
@@ -69212,7 +69267,7 @@ function MBidPreloved(value) {
 // src/repositories/bid-preloved.repo.ts
 import {
   InternalServerError as InternalServerError82,
-  NotFoundError as NotFoundError61,
+  NotFoundError as NotFoundError62,
   useAtlas as useAtlas128
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId151 } from "mongodb";
@@ -69234,7 +69289,7 @@ function useBidPrelovedRepo() {
     const objectId2 = typeof _id === "string" ? new ObjectId151(_id) : _id;
     const existing = await collection.findOne({ _id: objectId2 });
     if (!existing)
-      throw new NotFoundError61("Bid not found.");
+      throw new NotFoundError62("Bid not found.");
     const res = await collection.updateOne(
       { _id: objectId2 },
       { $set: { status, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } }
@@ -69248,7 +69303,7 @@ function useBidPrelovedRepo() {
       _id = new ObjectId151(_id);
     const result = await collection.findOne({ _id });
     if (!result)
-      throw new NotFoundError61("Bid not found.");
+      throw new NotFoundError62("Bid not found.");
     return result;
   }
   return { add, getById, updateStatus };
@@ -69529,7 +69584,7 @@ import {
   InternalServerError as InternalServerError84,
   logger as logger197,
   makeCacheKey as makeCacheKey66,
-  NotFoundError as NotFoundError62,
+  NotFoundError as NotFoundError63,
   paginate as paginate64,
   useAtlas as useAtlas130,
   useCache as useCache71
@@ -69634,7 +69689,7 @@ function useFormEntryRepo() {
     try {
       const [data] = await collection.aggregate([{ $match: query }]).toArray();
       if (!data) {
-        throw new NotFoundError62("Document not found.");
+        throw new NotFoundError63("Document not found.");
       }
       return data;
     } catch (error) {
@@ -69658,11 +69713,11 @@ function useFormEntryRepo() {
       }
       const onlineFormRequest = await collection.findOne({ _id });
       if (!onlineFormRequest) {
-        throw new NotFoundError62("Online form not found.");
+        throw new NotFoundError63("Online form not found.");
       }
       const user = await getUserById(onlineFormRequest.userId.toString());
       if (!user || !user._id) {
-        throw new NotFoundError62("User not found.");
+        throw new NotFoundError63("User not found.");
       }
       const userId = user._id.toString();
       await NotificationService.onlineFormRequestStatusUpdated({
@@ -72043,6 +72098,7 @@ export {
   schemaPostFavorite,
   schemaServiceProvider,
   schemaServiceProviderBilling,
+  schemaSignNfcPatrolLog,
   schemaSiteCamera,
   schemaSiteFacility,
   schemaSiteFacilityBooking,