@7365admin1/core 2.35.0 → 2.35.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 2.35.1
+
+### Patch Changes
+
+- 9157cc3: Improve dob search entry / fix visitor transaction pick up
+
 ## 2.35.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -2602,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;
 };
 

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}`);
@@ -13477,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") {
@@ -13521,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,
@@ -13561,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
   };
 }