@7365admin1/core 2.34.0 → 2.35.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 2.35.1
+
+### Patch Changes
+
+- 9157cc3: Improve dob search entry / fix visitor transaction pick up
+
+## 2.35.0
+
+### Minor Changes
+
+- 2d50f94: get latest changes
+
 ## 2.34.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -62,6 +62,7 @@ type TUser = {
     name: string;
     defaultOrg?: string | ObjectId;
     status?: string;
+    sid?: string;
     createdAt?: string;
     updatedAt?: string;
     deletedAt?: string;
@@ -122,6 +123,12 @@ declare function useUserRepo(): {
     }, session?: ClientSession) => Promise<string>;
     updateDefaultOrgByEmail: (email: string, value: string, session?: ClientSession) => Promise<string>;
     getUserByEmailStatus: (email: string) => Promise<TUser | null>;
+    updateUserSIDById: (id: string | ObjectId, sid: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
+    resetPassword: ({ _id, password, sid, }: {
+        _id: string | ObjectId;
+        password: string;
+        sid: string;
+    }, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
 
 declare function useUserController(): {
@@ -2595,11 +2602,11 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
     numberOfPassengers: number | null;
     email: string | undefined;
     isOvernightParking: boolean;
-    invitedId: ObjectId;
+    invitedId: string | ObjectId;
     overnightParking: {
         status: string;
         remarks: string;
-        updatedBy: ObjectId;
+        updatedBy: string | ObjectId;
     } | null;
 };
 
@@ -6362,6 +6369,7 @@ declare function useAuthControllerV2(): {
     login: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     logout: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     resetPassword: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    verifyPassword: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 declare function useAuthServiceV2(): {
@@ -6375,6 +6383,7 @@ declare function useAuthServiceV2(): {
         user: string;
     }>;
     logout: (sid: string) => Promise<string>;
+    verifyPassword: (_id: string | ObjectId, password: string) => Promise<string>;
 };
 
 declare function useUserRepoV2(): {

package/dist/index.js

@@ -1977,10 +1977,21 @@ function useOccurrenceEntryRepo() {
     } catch (error) {
       throw new import_node_server_utils8.BadRequestError("Invalid site ID format.");
     }
-    const baseQuery = {
-      site
+    const escapedSearch = search ? search.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") : "";
+    const query = {
+      site,
+      ...search && {
+        $or: [
+          { occurrence: { $regex: escapedSearch, $options: "i" } },
+          { bookEntryCount: { $regex: escapedSearch, $options: "i" } },
+          { subjectName: { $regex: escapedSearch, $options: "i" } },
+          { userName: { $regex: escapedSearch, $options: "i" } }
+        ]
+      },
+      ...dailyOccurrenceBookId && {
+        dailyOccurrenceBookId: typeof dailyOccurrenceBookId === "string" ? new import_mongodb7.ObjectId(dailyOccurrenceBookId) : dailyOccurrenceBookId
+      }
     };
-    let query = { ...baseQuery };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheOptions = {
       site: site.toString(),
@@ -1989,20 +2000,9 @@ function useOccurrenceEntryRepo() {
       limit,
       ...dailyOccurrenceBookId && {
         dailyOccurrenceBookId
-      }
+      },
+      ...search && { search }
     };
-    if (search) {
-      query.$text = { $search: search };
-      cacheOptions.search = search;
-    }
-    if (dailyOccurrenceBookId) {
-      try {
-        dailyOccurrenceBookId = new import_mongodb7.ObjectId(dailyOccurrenceBookId);
-        query.dailyOccurrenceBookId = dailyOccurrenceBookId;
-      } catch (error) {
-        throw new import_node_server_utils8.BadRequestError("Invalid daily occurrence book ID format.");
-      }
-    }
     const cacheKey = (0, import_node_server_utils8.makeCacheKey)(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -2104,19 +2104,6 @@ function useOccurrenceEntryRepo() {
         { session }
       ).toArray();
       length = await collection.countDocuments(query, { session });
-      if ((!items || items.length === 0) && search) {
-        const regexQuery = {
-          ...baseQuery,
-          $or: [{ occurrence: { $regex: search, $options: "i" } }]
-        };
-        items = await collection.aggregate([
-          { $match: regexQuery },
-          { $sort: sort },
-          { $skip: page * limit },
-          { $limit: limit }
-        ]).toArray();
-        length = await collection.countDocuments(regexQuery, { session });
-      }
       const data = (0, import_node_server_utils8.paginate)(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
         import_node_server_utils8.logger.info(`Cache set for key: ${cacheKey}`);
@@ -2605,20 +2592,9 @@ function useUserRepo() {
   }
   async function getUserByEmail(email) {
     try {
-      const cacheKey = (0, import_node_server_utils10.makeCacheKey)(namespace_collection, { email });
-      const cachedData = await getCache(cacheKey);
-      if (cachedData) {
-        import_node_server_utils10.logger.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
-      }
       const data = await collection.findOne({
         email: { $regex: `^${email}$`, $options: "i" }
       });
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        import_node_server_utils10.logger.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        import_node_server_utils10.logger.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error) {
       throw new import_node_server_utils10.InternalServerError("Failed to get user by email.");
@@ -2925,6 +2901,39 @@ function useUserRepo() {
       throw new import_node_server_utils10.InternalServerError("Failed to update user password.");
     }
   }
+  async function resetPassword({
+    _id,
+    password,
+    sid
+  }, session) {
+    try {
+      _id = new import_mongodb9.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils10.BadRequestError("Invalid user ID format.");
+    }
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        { $set: { password, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      const cacheKey = (0, import_node_server_utils10.makeCacheKey)(namespace_collection, { _id });
+      delCache(cacheKey).then(() => {
+        import_node_server_utils10.logger.info(`Cache deleted for key: ${cacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils10.logger.error(`Failed to delete cache for key: ${cacheKey}`, err);
+      });
+      const authCacheKey = `sid:${sid}`;
+      delCache(authCacheKey).then(() => {
+        import_node_server_utils10.logger.info(`Cache deleted for key: ${authCacheKey}`);
+      }).catch((err) => {
+        import_node_server_utils10.logger.error(`Failed to delete cache for key: ${authCacheKey}`, err);
+      });
+      return result;
+    } catch (error) {
+      throw new import_node_server_utils10.InternalServerError("Failed to update user password.");
+    }
+  }
   async function updateBirthday({
     _id,
     month,
@@ -3017,6 +3026,19 @@ function useUserRepo() {
       throw new import_node_server_utils10.InternalServerError(`Failed to update user ${field}.`);
     }
   }
+  async function updateUserSIDById(id, sid, session) {
+    const _id = (0, import_node_server_utils10.toObjectId)(id);
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        { $set: { sid, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      return result;
+    } catch (error) {
+      throw new import_node_server_utils10.InternalServerError("Failed to update user.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -3032,7 +3054,9 @@ function useUserRepo() {
     updateBirthday,
     updateUserFieldById,
     updateDefaultOrgByEmail,
-    getUserByEmailStatus
+    getUserByEmailStatus,
+    updateUserSIDById,
+    resetPassword
   };
 }
 
@@ -3860,7 +3884,11 @@ function useMemberRepo() {
 
 // src/services/auth.service.ts
 function useAuthService() {
-  const { getUserByEmail, getUserById: _getUserById } = useUserRepo();
+  const {
+    getUserByEmail,
+    getUserById: _getUserById,
+    updateUserSIDById: _updateUserSIDById
+  } = useUserRepo();
   const { getByToken, deleteByToken } = useSessionRepo();
   const expiresIn = "15m";
   const { setCache, delCache } = (0, import_node_server_utils13.useCache)("sessions");
@@ -3898,7 +3926,9 @@ function useAuthService() {
       }
       const sid = (0, import_uuid.v4)();
       const cacheKey = `sid:${sid}`;
-      setCache(cacheKey, user, 14400).then(() => {
+      await _updateUserSIDById(user._id, sid);
+      const updatedUser = await _getUserById(user._id);
+      setCache(cacheKey, updatedUser, 14400).then(() => {
         console.log("Session ID cached successfully");
       }).catch((error) => {
         console.error("Error caching session ID:", error);
@@ -6063,7 +6093,8 @@ function useUserService() {
     getUserById,
     getUserByEmail,
     updatePassword,
-    updateUserFieldById: _updateUserFieldById
+    updateUserFieldById: _updateUserFieldById,
+    resetPassword: _resetPassword
   } = useUserRepo();
   const { getRoleByName, addRole } = useRoleRepo();
   const { add: addMember } = useMemberRepo();
@@ -6239,8 +6270,12 @@ function useUserService() {
         throw new import_node_server_utils24.InternalServerError("Invalid user ID.");
       }
       await updateStatusById(id, "complete", session);
-      await updatePassword(
-        { _id: user._id.toString(), password: hashedPassword },
+      await _resetPassword(
+        {
+          _id: user._id.toString(),
+          password: hashedPassword,
+          sid: user.sid
+        },
         session
       );
       await session?.commitTransaction();
@@ -8924,7 +8959,7 @@ var import_node_server_utils42 = require("@7365admin1/node-server-utils");
 var import_zod = require("zod");
 var import_mongodb26 = require("mongodb");
 var import_node_server_utils41 = require("@7365admin1/node-server-utils");
-function toObjectId3(value) {
+function toObjectId4(value) {
   if (typeof value === "string") {
     if (!/^[a-fA-F0-9]{24}$/.test(value)) {
       throw new import_node_server_utils41.BadRequestError(`Invalid ObjectId format: ${value}`);
@@ -8976,7 +9011,7 @@ var TInvoice = import_zod.z.object({
       message: "Invalid ObjectId: Must be a 24-character hex string."
     }),
     import_zod.z.instanceof(import_mongodb26.ObjectId, { message: "Invalid ObjectId instance." })
-  ]).optional().transform((val) => val ? toObjectId3(val) : void 0),
+  ]).optional().transform((val) => val ? toObjectId4(val) : void 0),
   invoiceNumber: import_zod.z.string({ required_error: "Invoice number is required." }),
   type: TInvoiceType.default("other"),
   amount: import_zod.z.number().min(0, { message: "Invoice amount must be at least 0." }),
@@ -13429,21 +13464,21 @@ function MVisitorTransaction(value) {
     try {
       value.org = new import_mongodb39.ObjectId(value.org);
     } catch (error2) {
-      throw new Error("Invalid ID.");
+      throw new Error("Invalid org ID.");
     }
   }
   if (value.site && typeof value.site === "string") {
     try {
       value.site = new import_mongodb39.ObjectId(value.site);
     } catch (error2) {
-      throw new Error("Invalid ID.");
+      throw new Error("Invalid site ID.");
     }
   }
   if (value.unit && typeof value.unit === "string") {
     try {
       value.unit = new import_mongodb39.ObjectId(value.unit);
     } catch (error2) {
-      throw new Error("Invalid ID.");
+      throw new Error("Invalid unit ID.");
     }
   }
   if (value.manualCheckout && typeof value.manualCheckout === "string") {
@@ -13473,6 +13508,13 @@ function MVisitorTransaction(value) {
       return p;
     });
   }
+  if (value.invitedId && typeof value.invitedId === "string") {
+    try {
+      value.invitedId = new import_mongodb39.ObjectId(value.invitedId);
+    } catch (error2) {
+      throw new Error("Invalid invited ID.");
+    }
+  }
   const newDate = (/* @__PURE__ */ new Date()).toISOString();
   return {
     _id: value._id,
@@ -13513,11 +13555,11 @@ function MVisitorTransaction(value) {
     numberOfPassengers: value.numberOfPassengers ?? null,
     email: value.email,
     isOvernightParking: value.isOvernightParking ?? false,
-    invitedId: new import_mongodb39.ObjectId(String(value.invitedId)) ?? null,
+    invitedId: value.invitedId ?? "",
     overnightParking: value.isOvernightParking == true ? {
       status: "pending approval",
       remarks: "",
-      updatedBy: new import_mongodb39.ObjectId(String(value.invitedId)) ?? null
+      updatedBy: value.invitedId ?? ""
     } : null
   };
 }
@@ -48309,9 +48351,25 @@ function useAuthServiceV2() {
       throw new import_node_server_utils222.InternalServerError("Error deleting token");
     }
   }
+  async function verifyPassword(_id, password) {
+    try {
+      const user = await _getUserById(_id);
+      const isPasswordMatch = await (0, import_node_server_utils222.comparePassword)(password, user.password);
+      if (!isPasswordMatch) {
+        throw new import_node_server_utils222.BadRequestError("Invalid credentials");
+      }
+      return "Verification successful.";
+    } catch (error) {
+      if (error instanceof import_node_server_utils222.BadRequestError) {
+        throw error;
+      }
+      throw new import_node_server_utils222.InternalServerError("Error during password verification");
+    }
+  }
   return {
     login,
-    logout
+    logout,
+    verifyPassword
   };
 }
 
@@ -48519,7 +48577,11 @@ function useUserServiceV2() {
 // src/controllers/auth-v2.controller.ts
 function useAuthControllerV2() {
   const { signUp: _signUp } = useVerificationServiceV2();
-  const { login: _login, logout: _logout } = useAuthServiceV2();
+  const {
+    login: _login,
+    logout: _logout,
+    verifyPassword: _verifyPassword
+  } = useAuthServiceV2();
   const { resetPassword: _resetPassword } = useUserServiceV2();
   async function signUp(req, res, next) {
     try {
@@ -48633,11 +48695,38 @@ function useAuthControllerV2() {
       return;
     }
   }
+  async function verifyPassword(req, res, next) {
+    const schema2 = import_joi127.default.object({
+      _id: import_joi127.default.string().hex().required(),
+      password: import_joi127.default.string().required().min(8)
+    });
+    const { error, value } = schema2.validate(
+      { _id: req.params.id, ...req.body },
+      { abortEarly: false }
+    );
+    if (error) {
+      const messages = error.details.map((d) => d.message);
+      import_node_server_utils224.logger.log({ level: "error", message: messages.join(", ") });
+      next(new import_node_server_utils224.BadRequestError(messages.join(", ")));
+      return;
+    }
+    const { _id, password } = value;
+    try {
+      const message = await _verifyPassword(_id, password);
+      res.json({ message });
+      return;
+    } catch (error2) {
+      import_node_server_utils224.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     signUp,
     login,
     logout,
-    resetPassword
+    resetPassword,
+    verifyPassword
   };
 }