@7365admin1/core 3.49.1-staging.213 → 3.49.1-staging.214

package/dist/index.d.ts

@@ -4487,7 +4487,9 @@ declare enum VisitorStatus {
     UNREGISTERED = "unregistered",
     PENDING = "pending",
     APPROVED = "approved",
-    REJECTED = "rejected"
+    REJECTED = "rejected",
+    PENDING_APPROVAL = "Pending Approval",
+    APPROVAL_REJECTED = "Approval Rejected"
 }
 type TKeyRef = {
     keyId: string | ObjectId;
@@ -4527,11 +4529,14 @@ type TVisitorTransaction = {
     manualCheckout?: boolean;
     direction?: string;
     members?: {
+        _id?: ObjectId;
         name: string;
         nric: string;
         visitorPass?: TKeyRef[] | null;
         passKeys?: TKeyRef[] | null;
         contact: string;
+        email?: string;
+        plateNumber?: string;
     }[];
     visitorPass?: TKeyRef[] | null;
     passKeys?: TKeyRef[] | null;
@@ -4548,6 +4553,7 @@ type TVisitorTransaction = {
     deletedAt?: string | Date;
     purpose?: string;
     inviterId?: string | ObjectId;
+    leadId?: ObjectId | null;
     createdBy?: string | ObjectId;
     updatedBy?: string | ObjectId;
     isMembersAdded?: boolean;
@@ -4604,6 +4610,7 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
     email: string | undefined;
     isOvernightParking: boolean;
     inviterId: string | ObjectId;
+    leadId: ObjectId | null;
     overnightParking: {
         status: string;
         remarks: string;
@@ -4612,11 +4619,14 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
     arrivalTime: string | null | undefined;
     duration: number | null | undefined;
     members: {
+        _id?: ObjectId | undefined;
         name: string;
         nric: string;
         visitorPass?: TKeyRef[] | null | undefined;
         passKeys?: TKeyRef[] | null | undefined;
         contact: string;
+        email?: string | undefined;
+        plateNumber?: string | undefined;
     }[] | undefined;
 };
 
@@ -4663,7 +4673,7 @@ declare function useVisitorTransactionService(): {
     add: (value: TVisitorTransaction) => Promise<any>;
     updateVisitorTransactionById: (id: string | ObjectId, value: TVisitorTransaction) => Promise<string>;
     processTransactionDahuaStatus: () => Promise<void>;
-    inviteVisitor: (value: TVisitorTransaction, userId: string) => Promise<any>;
+    inviteVisitor: (value: TVisitorTransaction, userId: string) => Promise<ObjectId[]>;
     deleteVisitorTransaction: (id: string) => Promise<void>;
 };
 

package/dist/index.js

@@ -19497,6 +19497,8 @@ var VisitorStatus = /* @__PURE__ */ ((VisitorStatus2) => {
   VisitorStatus2["PENDING"] = "pending";
   VisitorStatus2["APPROVED"] = "approved";
   VisitorStatus2["REJECTED"] = "rejected";
+  VisitorStatus2["PENDING_APPROVAL"] = "Pending Approval";
+  VisitorStatus2["APPROVAL_REJECTED"] = "Approval Rejected";
   return VisitorStatus2;
 })(VisitorStatus || {});
 var schemaVisitorTransaction = import_joi21.default.object({
@@ -19812,6 +19814,7 @@ function MVisitorTransaction(value) {
     email: value.email,
     isOvernightParking: value.isOvernightParking ?? false,
     inviterId: value.inviterId ?? "",
+    leadId: value.leadId ?? null,
     overnightParking: value.isOvernightParking == true ? {
       status: "pending approval",
       remarks: "",
@@ -49468,6 +49471,21 @@ function useHidAmicoService() {
   };
 }
 
+// src/repositories/settings-resident-contractors.repository.ts
+var SettingsResidentContractorsRepo = class {
+  static collection() {
+    return getDB().collection("settings-resident-contractors");
+  }
+  static async getSettings(site) {
+    try {
+      const siteId = await convertObjectIdUtil2(site, "site");
+      return await this.collection().findOne({ site: siteId });
+    } catch (error) {
+      throw new Error(error.message || error);
+    }
+  }
+};
+
 // src/services/visitor-transaction.service.ts
 function useVisitorTransactionService() {
   const MailerConfig = {
@@ -50258,6 +50276,10 @@ function useVisitorTransactionService() {
       session.startTransaction();
       const inviter = await _getByUserId(userId);
       const unit = await getById(inviter?.unit);
+      const settings = await SettingsResidentContractorsRepo.getSettings(
+        inviter?.site
+      );
+      const isAutoApprovedInvitation = settings?.isAutoApprovedInvitation === true;
       value.checkIn = null;
       const payload = {
         ...value,
@@ -50267,12 +50289,35 @@ function useVisitorTransactionService() {
         unitName: unit?.name,
         org: inviter?.org?.toString(),
         site: inviter?.site.toString(),
-        status: "approved" /* APPROVED */,
+        status: value?.type === "contractor" ? isAutoApprovedInvitation ? "approved" /* APPROVED */ : "Pending Approval" /* PENDING_APPROVAL */ : "Pending Approval" /* PENDING_APPROVAL */,
         inviterId: userId
       };
-      const result = await _add(payload);
+      const leadId = new import_mongodb85.ObjectId();
+      const insertedIds = [];
+      const { members, ...memberPayload } = payload;
+      if (Array.isArray(members) && members.length > 0 && isAutoApprovedInvitation) {
+        for (const member of members) {
+          const memberId = await _add(
+            {
+              ...memberPayload,
+              ...structuredClone(member),
+              name: member.name ?? "",
+              nric: member.nric ?? "",
+              contact: member.contact ?? "",
+              email: member.email ?? "",
+              plateNumber: member.plateNumber ?? "",
+              leadId
+            },
+            session
+          );
+          member._id = memberId;
+          insertedIds.push(memberId);
+        }
+      }
+      const result = await _add({ ...payload, _id: leadId }, session);
+      insertedIds.push(result);
       await session?.commitTransaction();
-      return result;
+      return insertedIds;
     } catch (error) {
       import_node_server_utils134.logger.error("Error in visitor transaction invite visitor:", error);
       await session.abortTransaction();
@@ -54670,7 +54715,19 @@ function useVisitorTransactionController() {
       isOvernightParking: import_joi65.default.boolean().optional().default(false),
       numberOfPassengers: import_joi65.default.number().integer().optional().allow(null, ""),
       purpose: import_joi65.default.string().optional().allow(null, ""),
-      inviterUserId: import_joi65.default.string().hex().length(24).required()
+      inviterUserId: import_joi65.default.string().hex().length(24).required(),
+      type: import_joi65.default.string().valid("contractor", "guest").optional().allow(null, ""),
+      contractorType: import_joi65.default.string().valid("home-contractor", "house-mover").optional().allow(null, ""),
+      members: import_joi65.default.array().items(
+        import_joi65.default.object({
+          name: import_joi65.default.string().optional().allow(null, ""),
+          nric: import_joi65.default.string().optional().allow(null, ""),
+          contact: import_joi65.default.string().optional().allow(null, ""),
+          email: import_joi65.default.string().email().optional().allow(null, ""),
+          plateNumber: import_joi65.default.string().optional().allow(null, "")
+        })
+      ).optional().allow(null),
+      company: import_joi65.default.string().optional().allow(null, "")
     });
     const { error, value } = schema2.validate(
       { inviterUserId: req.params.inviterId, ...req.body },
@@ -54693,7 +54750,11 @@ function useVisitorTransactionController() {
       isOvernightParking,
       numberOfPassengers,
       purpose,
-      inviterUserId
+      inviterUserId,
+      type,
+      contractorType,
+      members,
+      company
     } = value;
     const rest = {
       expectedCheckIn,
@@ -54705,17 +54766,26 @@ function useVisitorTransactionController() {
       plateNumber,
       isOvernightParking,
       numberOfPassengers,
-      purpose
+      purpose,
+      type,
+      contractorType,
+      members,
+      company
     };
     try {
       const result = await _inviteVisitor(rest, inviterUserId);
-      if (result) {
-        await resendEmailInvitedResident(result, inviterUserId).catch((error2) => {
+      for (const insertedId of result) {
+        resendEmailInvitedResident(String(insertedId), inviterUserId).catch((error2) => {
           console.error(`Failed to send invitation email: ${error2.message}`);
           import_node_server_utils137.logger.log({ level: "error", message: `Failed to send invitation email: ${error2.message}` });
         });
       }
-      res.status(200).json({ insertedId: result });
+      const leadId = result[result.length - 1];
+      if (!leadId) {
+        next(new import_node_server_utils137.InternalServerError("Failed to create visitor invitation."));
+        return;
+      }
+      res.status(200).json({ insertedId: leadId });
       return;
     } catch (error2) {
       import_node_server_utils137.logger.log({ level: "error", message: error2.message });