@7365admin1/core 3.52.0 → 3.52.1-staging.231

package/dist/index.d.ts

@@ -4664,6 +4664,7 @@ type TVisitorTransaction = {
     status?: VisitorStatus;
     nric?: string;
     remarks?: string;
+    invitationNote?: string;
     org?: string | ObjectId;
     site?: string | ObjectId;
     plateNumber?: string;
@@ -4743,6 +4744,7 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
     checkOut: string | Date | null | undefined;
     status: VisitorStatus | undefined;
     remarks: string | undefined;
+    invitationNote: string | undefined;
     deliveryType: string | undefined;
     attachments: string[] | undefined;
     snapshotEntryImage: string | undefined;
@@ -4822,7 +4824,7 @@ declare function useVisitorTransactionRepo(): {
     checkOutBySiteAndPlate: (site: string | ObjectId, plateNumber: string, session?: ClientSession) => Promise<mongodb.WithId<bson.Document> | null>;
     resendEmailInvitedResident: (visitorId: string, updatedBy: string | ObjectId) => Promise<any>;
     getSelfServiceVisitorPreview: (id: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | null>;
-    patchFields: (id: string | ObjectId, fields: Record<string, any>) => Promise<void>;
+    patchFields: (id: string | ObjectId, fields: Record<string, any>, session?: ClientSession) => Promise<void>;
     updateStatusByLeadId: (leadId: string | ObjectId, status: string) => Promise<void>;
 };
 
@@ -4831,6 +4833,7 @@ declare function useVisitorTransactionService(): {
     updateVisitorTransactionById: (id: string | ObjectId, value: TVisitorTransaction) => Promise<string>;
     processTransactionDahuaStatus: () => Promise<void>;
     inviteVisitor: (value: TVisitorTransaction, userId: string) => Promise<ObjectId[]>;
+    createInvitedMemberDocuments: (leadId: string | ObjectId, status: VisitorStatus) => Promise<ObjectId[]>;
     deleteVisitorTransaction: (id: string) => Promise<void>;
 };
 
@@ -7022,6 +7025,10 @@ interface AdditionalSettings {
             vendorId: string | null | number;
             productId: string | null | number;
         };
+        invitationNote?: {
+            isEnabled: boolean;
+            text: string;
+        };
     };
 }
 type TAccessMngmntSettings = {

package/dist/index.js

@@ -19589,6 +19589,7 @@ var schemaVisitorTransaction = import_joi21.default.object({
   deliveryType: import_joi21.default.string().optional().allow(null, ""),
   status: import_joi21.default.string().optional().valid(...Object.values(VisitorStatus)).default("registered" /* REGISTERED */),
   remarks: import_joi21.default.string().optional().allow(null, ""),
+  invitationNote: import_joi21.default.string().optional().allow(null, ""),
   members: import_joi21.default.array().items(
     import_joi21.default.object({
       name: import_joi21.default.string().optional().allow(null, ""),
@@ -19899,6 +19900,7 @@ function MVisitorTransaction(value) {
     checkOut: value.checkOut,
     status: value.status,
     remarks: value.remarks,
+    invitationNote: value.invitationNote,
     deliveryType: value.deliveryType,
     attachments: value.attachments,
     snapshotEntryImage: value.snapshotEntryImage,
@@ -20842,6 +20844,7 @@ function useVisitorTransactionRepo() {
             arrivalTime: 1,
             duration: 1,
             purpose: 1,
+            invitationNote: 1,
             checkIn: 1
           }
         }
@@ -20850,10 +20853,10 @@ function useVisitorTransactionRepo() {
       throw new Error(error.message);
     }
   }
-  async function patchFields(id, fields) {
+  async function patchFields(id, fields, session) {
     const _id = (0, import_node_server_utils48.toObjectId)(id);
     try {
-      await collection.updateOne({ _id }, { $set: fields });
+      await collection.updateOne({ _id }, { $set: fields }, { session });
     } catch (error) {
       throw new Error(error.message);
     }
@@ -50480,7 +50483,8 @@ function useVisitorTransactionService() {
     getExpiredCheckedOutTransactionsBySite: _getExpiredCheckedOutTransactionsBySite,
     updateManyDahuaSyncStatus: _updateManyDahuaSyncStatus,
     getVisitorTransactionById: _getVisitorTransactionById,
-    deleteVisitorTransaction: _deleteVisitorTransaction
+    deleteVisitorTransaction: _deleteVisitorTransaction,
+    patchFields: _patchFields
   } = useVisitorTransactionRepo();
   const { getById } = useBuildingUnitRepo();
   const {
@@ -50608,6 +50612,7 @@ function useVisitorTransactionService() {
           type: type2,
           company: company2,
           remarks,
+          invitationNote,
           contractorType,
           unitName
         } = value;
@@ -50654,6 +50659,10 @@ function useVisitorTransactionService() {
                   type: type2,
                   company: company2,
                   remarks,
+                  // Every member holds their OWN invitation/pass link, so the
+                  // site's note has to ride along to each of them - otherwise
+                  // only the lead contractor ever sees it.
+                  invitationNote,
                   contractorType,
                   checkIn: start,
                   visitorPass: preparedVisitorPass,
@@ -51321,6 +51330,79 @@ function useVisitorTransactionService() {
       session?.endSession();
     }
   }
+  async function createInvitedMemberDocuments(leadId, status) {
+    const lead = await _getVisitorTransactionById(String(leadId));
+    if (!lead)
+      return [];
+    const members = Array.isArray(lead.members) ? lead.members : [];
+    if (members.length === 0)
+      return [];
+    if (!members.every((member) => !member._id))
+      return [];
+    const session = import_node_server_utils134.useAtlas.getClient()?.startSession();
+    if (!session) {
+      throw new Error("Unable to start session for people service.");
+    }
+    try {
+      session.startTransaction();
+      const memberPayload = {
+        block: lead.block ? String(lead.block) : void 0,
+        level: lead.level ? String(lead.level) : void 0,
+        unit: lead.unit ? String(lead.unit) : void 0,
+        unitName: lead.unitName,
+        org: lead.org ? String(lead.org) : void 0,
+        site: lead.site ? String(lead.site) : void 0,
+        type: lead.type,
+        contractorType: lead.contractorType,
+        company: lead.company,
+        purpose: lead.purpose,
+        expectedCheckIn: lead.expectedCheckIn ? new Date(lead.expectedCheckIn).toISOString() : void 0,
+        arrivalTime: lead.arrivalTime,
+        duration: lead.duration,
+        isOvernightParking: lead.isOvernightParking,
+        numberOfPassengers: lead.numberOfPassengers,
+        // Site-configured note from the self-service settings. Each member
+        // holds their own pass link, so the note has to ride along to all of
+        // them - the same thing the creation-time fan-out does. Absent on
+        // resident invitations, which never set it.
+        invitationNote: lead.invitationNote,
+        status,
+        ...lead.inviterId ? { inviterId: String(lead.inviterId) } : {},
+        leadId: String(lead._id),
+        // Explicit - MVisitorTransaction defaults an undefined checkIn to now,
+        // and an approved invitation hasn't arrived yet.
+        checkIn: null
+      };
+      const insertedIds = [];
+      for (const member of members) {
+        const memberId = await _add(
+          {
+            ...memberPayload,
+            name: member.name ?? "",
+            nric: member.nric ?? "",
+            contact: member.contact ?? "",
+            email: member.email ?? "",
+            plateNumber: member.plateNumber ?? ""
+          },
+          session
+        );
+        member._id = memberId;
+        insertedIds.push(memberId);
+      }
+      await _patchFields(leadId, { members }, session);
+      await session.commitTransaction();
+      return insertedIds;
+    } catch (error) {
+      import_node_server_utils134.logger.error(
+        "Error creating member documents for approved invitation:",
+        error
+      );
+      await session.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
   async function deleteVisitorTransaction(id) {
     const visitor = await _getVisitorTransactionById(id);
     if (!visitor) {
@@ -51353,6 +51435,7 @@ function useVisitorTransactionService() {
     updateVisitorTransactionById,
     processTransactionDahuaStatus,
     inviteVisitor,
+    createInvitedMemberDocuments,
     deleteVisitorTransaction
     // changeVisitorTransactionKeysById,
   };
@@ -55312,6 +55395,7 @@ function useVisitorTransactionController() {
     add: _add,
     updateVisitorTransactionById: _updateVisitorTransactionById,
     inviteVisitor: _inviteVisitor,
+    createInvitedMemberDocuments: _createInvitedMemberDocuments,
     deleteVisitorTransaction: _deleteVisitorTransaction
     // changeVisitorTransactionKeysById: _changeVisitorTransactionKeysById,
   } = useVisitorTransactionService();
@@ -55375,12 +55459,17 @@ function useVisitorTransactionController() {
         return;
       }
       const leadId = new import_mongodb88.ObjectId();
+      const invitationNote = value.type === "contractor" /* CONTRACTOR */ && onboardingSettings?.invitationNote?.isEnabled === true ? String(onboardingSettings.invitationNote.text ?? "").trim() : "";
+      const members = Array.isArray(value.members) ? value.members : [];
+      const deferMembers = value.type === "contractor" /* CONTRACTOR */ && members.length > 0 && status !== "approved" /* APPROVED */;
+      const { members: _deferredMembers, ...valueWithoutMembers } = value;
       const insertedId = await _add({
-        ...value,
+        ...deferMembers ? valueWithoutMembers : value,
         _id: leadId.toString(),
         org: site.orgId.toString(),
         site: siteId,
         status,
+        ...invitationNote ? { invitationNote } : {},
         // MVisitorTransaction() defaults checkIn to "now" whenever it's
         // undefined - correct for the staff "walk-in" flow, where creating
         // the record IS the check-in event, but wrong here: a self-service
@@ -55389,8 +55478,10 @@ function useVisitorTransactionController() {
         // checked in later (inline button / Guests-tab action menu).
         checkIn: null
       });
-      const members = Array.isArray(value.members) ? value.members : [];
-      if (value.type === "contractor" /* CONTRACTOR */ && members.length) {
+      if (deferMembers) {
+        await _patchFields(insertedId, { members });
+      }
+      if (!deferMembers && value.type === "contractor" /* CONTRACTOR */ && members.length) {
         await Promise.all(
           members.filter((m) => m._id).map((m) => _patchFields(m._id, { checkIn: null, status }))
         );
@@ -55475,6 +55566,11 @@ function useVisitorTransactionController() {
           arrivalTime: data.arrivalTime || null,
           duration: data.duration ?? null,
           purpose: data.purpose || null,
+          // Set by the site, not the registrant - see the Invitation Note
+          // block in `createSelfServiceVisitor`. Safe to hand back here:
+          // this is exactly the invitation link the note was written for,
+          // and it's only reachable by someone already holding the ID.
+          invitationNote: data.invitationNote || null,
           // Public response exposes whether check-in happened, not the raw
           // timestamp - the preview page needs it to know an already-arrived
           // visitor's lapsed arrival window isn't the same thing as an
@@ -55636,8 +55732,36 @@ function useVisitorTransactionController() {
       const remarks = approval?.remarks ?? req.body.remarks;
       const isApprovalTransition = nextStatus === "approved" /* APPROVED */ || nextStatus === "rejected" /* REJECTED */;
       const current = isApprovalTransition ? await _getVisitorTransactionById(_id) : null;
-      const updateBody = approval ? { ...req.body, status: nextStatus } : req.body;
+      const needsMemberFanOut = nextStatus === "approved" /* APPROVED */ && (!!current?.inviterId || current?.type === "contractor" /* CONTRACTOR */) && Array.isArray(current?.members) && current.members.length > 0 && current.members.every((member) => !member._id);
+      const { members: _unusedMembers, ...bodyWithoutMembers } = req.body;
+      const baseBody = needsMemberFanOut ? bodyWithoutMembers : req.body;
+      const updateBody = approval ? { ...baseBody, status: nextStatus } : baseBody;
       await _updateVisitorTransactionById(_id, updateBody);
+      let invitedMemberIds = [];
+      if (needsMemberFanOut) {
+        try {
+          invitedMemberIds = await _createInvitedMemberDocuments(
+            _id,
+            nextStatus
+          );
+        } catch (fanOutError) {
+          import_node_server_utils137.logger.log({
+            level: "error",
+            message: `Failed to create member documents for approved invitation ${_id}: ${fanOutError?.message}`
+          });
+        }
+      }
+      for (const insertedId of current?.inviterId ? invitedMemberIds : []) {
+        resendEmailInvitedResident(
+          String(insertedId),
+          String(current?.inviterId)
+        ).catch((error2) => {
+          import_node_server_utils137.logger.log({
+            level: "error",
+            message: `Failed to send invitation email: ${error2?.message}`
+          });
+        });
+      }
       if (isApprovalTransition && current && current.type === "contractor" /* CONTRACTOR */) {
         try {
           await _updateStatusByLeadId(_id, nextStatus);
@@ -67962,7 +68086,14 @@ function useAccessManagementController() {
         return res.status(400).json({ message: error.message });
       }
       const result = await getOnboardingSettingsSvc(site);
-      return res.status(200).json({ message: "Success", data: result });
+      return res.status(200).json({
+        message: "Success",
+        data: {
+          enabled: result?.enabled ?? false,
+          header: result?.header ?? "",
+          subText: result?.subText ?? ""
+        }
+      });
     } catch (error) {
       return res.status(500).json({
         data: null,