@7365admin1/core 3.50.1-staging.219 → 3.50.1-staging.220

package/dist/index.d.ts

@@ -4504,7 +4504,7 @@ type TKeyRef = {
     add?: boolean;
 };
 type TVisitorTransaction = {
-    _id?: ObjectId;
+    _id?: ObjectId | string;
     name?: string;
     contact?: string;
     type?: PersonTypes;
@@ -4533,7 +4533,7 @@ type TVisitorTransaction = {
     manualCheckout?: boolean;
     direction?: string;
     members?: {
-        _id?: ObjectId;
+        _id?: ObjectId | string;
         name: string;
         nric: string;
         visitorPass?: TKeyRef[] | null;
@@ -4557,7 +4557,7 @@ type TVisitorTransaction = {
     deletedAt?: string | Date;
     purpose?: string;
     inviterId?: string | ObjectId;
-    leadId?: ObjectId | null;
+    leadId?: string | ObjectId | null;
     createdBy?: string | ObjectId;
     updatedBy?: string | ObjectId;
     isMembersAdded?: boolean;
@@ -4620,7 +4620,7 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
     email: string | undefined;
     isOvernightParking: boolean;
     inviterId: string | ObjectId;
-    leadId: ObjectId | null;
+    leadId: string | ObjectId | null;
     overnightParking: {
         status: string;
         remarks: string;
@@ -4629,7 +4629,7 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
     arrivalTime: string | null | undefined;
     duration: number | null | undefined;
     members: {
-        _id?: ObjectId | undefined;
+        _id?: string | ObjectId | undefined;
         name: string;
         nric: string;
         visitorPass?: TKeyRef[] | null | undefined;

package/dist/index.js

@@ -19570,7 +19570,10 @@ var schemaVisitorTransaction = import_joi21.default.object({
           remarks: import_joi21.default.string().optional().allow(null, "")
         })
       ).optional().allow(null),
-      contact: import_joi21.default.string().optional().allow(null, "")
+      contact: import_joi21.default.string().optional().allow(null, ""),
+      _id: import_joi21.default.string().hex().length(24).optional().allow(null, ""),
+      email: import_joi21.default.string().email().optional().allow(null, ""),
+      plateNumber: import_joi21.default.string().optional().allow(null, "")
     })
   ).optional().allow(null),
   unitName: import_joi21.default.string().optional().allow(null, ""),
@@ -19605,7 +19608,8 @@ var schemaVisitorTransaction = import_joi21.default.object({
   expectedCheckIn: import_joi21.default.string().isoDate().optional(),
   purpose: import_joi21.default.string().optional().allow(null, ""),
   inviterId: import_joi21.default.any().optional().allow(null, ""),
-  createdBy: import_joi21.default.string().hex().length(24).optional().allow(null, "")
+  createdBy: import_joi21.default.string().hex().length(24).optional().allow(null, ""),
+  leadId: import_joi21.default.string().hex().length(24).optional().allow(null, "")
 });
 var schemaSelfServiceVisitor = import_joi21.default.object({
   // Only "Visitor" (wire value "guest", matching where staff already expect
@@ -19808,8 +19812,27 @@ function MVisitorTransaction(value) {
       throw new Error("Invalid inviter ID.");
     }
   }
+  if (value.leadId && typeof value.leadId === "string") {
+    try {
+      value.leadId = new import_mongodb39.ObjectId(value.leadId);
+    } catch (error2) {
+      throw new Error("Invalid lead ID.");
+    }
+  }
+  if (Array.isArray(value.members)) {
+    value.members = value.members.map((m) => {
+      if (!m._id || typeof m._id !== "string")
+        return m;
+      try {
+        return { ...m, _id: new import_mongodb39.ObjectId(m._id) };
+      } catch (error2) {
+        throw new Error("Invalid member ID.");
+      }
+    });
+  }
   const newDate = /* @__PURE__ */ new Date();
   return {
+    // guaranteed to be an ObjectId by the string cast above
     _id: value._id,
     name: value.name,
     type: value.type ?? "guest" /* GUEST */,
@@ -19932,11 +19955,11 @@ function useVisitorTransactionRepo() {
   }
   async function add(value, session, returnValue = false) {
     try {
-      value = MVisitorTransaction(value);
-      const res = await collection.insertOne(value, { session });
+      const doc = MVisitorTransaction(value);
+      const res = await collection.insertOne(doc, { session });
       if (returnValue) {
         return {
-          ...value,
+          ...doc,
           _id: res.insertedId
         };
       } else {
@@ -19980,10 +20003,11 @@ function useVisitorTransactionRepo() {
   }) {
     page = page > 0 ? page - 1 : 0;
     const skip = page * limit;
-    const isApprovedOnly = Array.isArray(status) ? status.length === 1 && status[0] === "approved" : status === "approved";
+    const isGuest = Array.isArray(status) && status.includes("approved") && status.includes("pending");
+    console.log("isGuest: ", isGuest);
     const checkInFilter = {};
     const expectedCheckInFilter = {};
-    if (!isApprovedOnly) {
+    if (!isGuest) {
       if (dateFrom)
         checkInFilter.$gte = new Date(dateFrom);
       if (dateTo)
@@ -50813,11 +50837,11 @@ function useVisitorTransactionService() {
               contact: member.contact ?? "",
               email: member.email ?? "",
               plateNumber: member.plateNumber ?? "",
-              leadId
+              leadId: leadId.toString()
             },
             session
           );
-          member._id = memberId;
+          member._id = memberId.toString();
           insertedIds.push(memberId);
         }
       }
@@ -54979,10 +55003,6 @@ function useVisitorTransactionController() {
         page: import_joi65.default.number().integer().min(1).allow("", null).default(1),
         limit: import_joi65.default.number().integer().min(1).max(100).allow("", null).default(10),
         sort: import_joi65.default.string().valid(...Object.values(VisitorSort)).optional().allow(null, ""),
-        // Comma-separated, same shape as `type` below - the Guests tab needs
-        // both "approved" and "pending" rows in one request so a
-        // self-service submission awaiting Approve/Reject shows up
-        // alongside already-approved guests.
         status: import_joi65.default.alternatives().try(
           import_joi65.default.array().items(
             import_joi65.default.string().valid(...Object.values(VisitorStatus))