@7365admin1/core 3.25.0 → 3.26.0

package/dist/index.mjs

@@ -12122,19 +12122,22 @@ function useVerificationService() {
     orgId,
     siteId,
     siteName,
+    app,
     inviteType
   }) {
     const schema2 = Joi11.object({
       email: Joi11.string().email().lowercase().required(),
       orgId: Joi11.string().hex().length(24).required(),
       siteId: Joi11.string().hex().length(24).required(),
-      siteName: Joi11.string().required()
+      siteName: Joi11.string().required(),
+      app: Joi11.string().required()
     });
     const { error } = schema2.validate({
       email,
       orgId,
       siteId,
-      siteName
+      siteName,
+      app
     });
     if (error) {
       const messages = error.details.map((d) => d.message).join(", ");
@@ -12149,7 +12152,8 @@ function useVerificationService() {
       metadata: {
         siteId,
         siteName,
-        org: orgId
+        org: orgId,
+        app
       },
       expireAt: new Date(
         (/* @__PURE__ */ new Date()).getTime() + 72 * 60 * 60 * 1e3
@@ -12169,7 +12173,7 @@ function useVerificationService() {
       const res = await _add(value);
       const dir = __dirname;
       const filePath = getDirectory(dir, `./public/handlebars/${value.type}`);
-      const link = `${APP_MAIN}/verify/${value.type}/${res}`;
+      const link = `${APP_MAIN}/verify/service-provider-invite/${res}`;
       const emailContent = compileHandlebar({
         context: {
           email,
@@ -14763,6 +14767,7 @@ function useVerificationController() {
       orgId: Joi16.string().hex().required(),
       siteId: Joi16.string().hex().required(),
       siteName: Joi16.string().required(),
+      app: Joi16.string().required(),
       inviteType: Joi16.string().valid("create-org", "organization-invite").required()
     });
     const { error } = validation.validate(payload);
@@ -14779,6 +14784,7 @@ function useVerificationController() {
       orgId,
       siteId,
       siteName,
+      app,
       inviteType
     } = payload;
     try {
@@ -14787,6 +14793,7 @@ function useVerificationController() {
         orgId,
         siteId,
         siteName,
+        app,
         inviteType
       });
       const cookieOptions = {
@@ -21252,7 +21259,8 @@ function MVisitorTransaction(value) {
       updatedBy: value.inviterId ?? ""
     } : null,
     arrivalTime: value.arrivalTime,
-    duration: value.duration
+    duration: value.duration,
+    members: value.members
   };
 }
 
@@ -34297,7 +34305,7 @@ var KeyRepo = class {
           findOptions
         );
         console.log("visitorId", visitorId.toString());
-        console.log("latestHistory.visitorId", latestHistory?.visitorId.toString());
+        console.log("latestHistory.visitorId", latestHistory?.visitorId?.toString());
         if (latestHistory?.visitorId && latestHistory.visitorId?.toString() !== visitorId.toString()) {
           console.log("Not updating keyId", keyId);
           return;
@@ -34370,70 +34378,59 @@ var KeyRepo = class {
       return Promise.reject("Failed to delete key");
     }
   }
-  static async getById2(id) {
-    return this.collection().aggregate([
-      { $match: { _id: new ObjectId62(id) } },
-      {
-        $lookup: {
-          from: "qr-code-templates",
-          localField: "template",
-          foreignField: "_id",
-          as: "QRTemplateInfo"
-        }
-      },
-      {
-        $unwind: {
-          path: "$QRTemplateInfo",
-          preserveNullAndEmptyArrays: true
-        }
-      },
-      {
-        $addFields: {
-          prefixPass: { $toUpper: "$QRTemplateInfo.prefixPass" },
-          prefixKey: { $toUpper: "$QRTemplateInfo.prefixKey" },
-          templateName: "$QRTemplateInfo.name"
-        }
-      },
-      {
-        $addFields: {
-          prefixAndName: {
-            $cond: {
-              if: { $or: [{ $not: "$prefixPass" }, { $not: "$prefixKey" }] },
-              then: "$name",
-              else: {
-                $cond: {
-                  if: { $eq: ["$passType", "pass-key"] },
-                  then: { $concat: ["$prefixKey", "$name"] },
-                  else: { $concat: ["$prefixPass", "$name"] }
+  static async getById2(id, session) {
+    return this.collection().aggregate(
+      [
+        { $match: { _id: new ObjectId62(id) } },
+        {
+          $lookup: {
+            from: "qr-code-templates",
+            localField: "template",
+            foreignField: "_id",
+            as: "QRTemplateInfo"
+          }
+        },
+        {
+          $unwind: {
+            path: "$QRTemplateInfo",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        {
+          $addFields: {
+            prefixPass: { $toUpper: "$QRTemplateInfo.prefixPass" },
+            prefixKey: { $toUpper: "$QRTemplateInfo.prefixKey" },
+            templateName: "$QRTemplateInfo.name"
+          }
+        },
+        {
+          $addFields: {
+            prefixAndName: {
+              $cond: {
+                if: { $or: [{ $not: "$prefixPass" }, { $not: "$prefixKey" }] },
+                then: "$name",
+                else: {
+                  $cond: {
+                    if: { $eq: ["$passType", "pass-key"] },
+                    then: { $concat: ["$prefixKey", "$name"] },
+                    else: { $concat: ["$prefixPass", "$name"] }
+                  }
                 }
               }
             }
           }
         }
-      }
-    ]).toArray().then((results) => results.length ? results[0] : null);
+      ],
+      { session }
+    ).toArray().then((results) => results.length ? results[0] : null);
   }
-  static async checkPassKeyAvailability(visitorPass, passKeys) {
-    if (Array.isArray(visitorPass) && visitorPass.length > 0) {
-      for (let i = 0; i < visitorPass.length; i++) {
-        let pass = await convertObjectIdUtil2(visitorPass[i].keyId, "Pass ID");
-        const getPass = await this.getById2(pass);
-        if (!getPass)
-          throw new Error("Pass not found");
-        if (getPass?.status && getPass?.status.toLowerCase() != "Available".toLowerCase())
-          throw new Error(`Pass ${getPass?.prefixAndName} is ${getPass?.status}`);
-      }
-    }
-    if (Array.isArray(passKeys) && passKeys.length > 0) {
-      for (let i = 0; i < passKeys.length; i++) {
-        let key = await convertObjectIdUtil2(passKeys[i].keyId, "Key ID");
-        const getPass = await this.getById2(key);
-        if (!getPass)
-          throw new Error(`Key not found`);
-        if (getPass?.status && getPass?.status.toLowerCase() != "Available".toLowerCase())
-          throw new Error(`Pass ${getPass?.prefixAndName} is ${getPass?.status}`);
-      }
-    }
+  static async checkPassOrKeyAvailability(passOrKeyId, type, session) {
+    let passOrKeyObjectId = await convertObjectIdUtil2(passOrKeyId, `${type} Id`);
+    const getPassOrKey = await this.getById2(passOrKeyObjectId, session);
+    if (!getPassOrKey)
+      throw new Error(`${type} not found`);
+    if (getPassOrKey?.status && getPassOrKey?.status.toLowerCase() != "Available".toLowerCase())
+      throw new Error(`${type} ${getPassOrKey?.prefixAndName} is ${getPassOrKey?.status}`);
   }
 };
 
@@ -34798,9 +34795,6 @@ function useVisitorTransactionService() {
         } = value;
         for (let i = 0; i < value.members.length; i += chunkSize) {
           const chunk = value.members.slice(i, i + chunkSize);
-          for (const member of chunk) {
-            await KeyRepo.checkPassKeyAvailability(member.visitorPass, member.passKeys);
-          }
           await Promise.all(
             chunk.map(async (member) => {
               const clonedMember = structuredClone(member);
@@ -34841,6 +34835,7 @@ function useVisitorTransactionService() {
               );
               console.log("visitorId service", visitorId);
               for (const item of preparedVisitorPass) {
+                await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Pass", session);
                 await KeyRepo.updateKeyById(
                   item.keyId,
                   {
@@ -34856,6 +34851,7 @@ function useVisitorTransactionService() {
                 );
               }
               for (const item of preparedPassKeys) {
+                await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Key", session);
                 await KeyRepo.updateKeyById(
                   item.keyId,
                   {
@@ -34898,7 +34894,6 @@ function useVisitorTransactionService() {
         if (found === 1)
           throw new BadRequestError100("This plate number is blocklisted");
       }
-      await KeyRepo.checkPassKeyAvailability(value.visitorPass, value.passKeys);
       if (Array.isArray(value.visitorPass)) {
         for (const item of value.visitorPass) {
           item.receivedDate = /* @__PURE__ */ new Date();
@@ -34918,6 +34913,7 @@ function useVisitorTransactionService() {
       const result = await _add(value, session);
       if (Array.isArray(value.visitorPass)) {
         for (const item of value.visitorPass) {
+          await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Pass", session);
           await KeyRepo.updateKeyById(
             item.keyId,
             { status: "In Use" /* IN_USE */, updatedBy: value.createdBy },
@@ -34932,6 +34928,7 @@ function useVisitorTransactionService() {
       }
       if (Array.isArray(value.passKeys)) {
         for (const item of value.passKeys) {
+          await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Key", session);
           await KeyRepo.updateKeyById(
             item.keyId,
             { status: "In Use" /* IN_USE */, updatedBy: value.createdBy },
@@ -35028,6 +35025,12 @@ function useVisitorTransactionService() {
       if (value.site) {
         value.site = typeof value.site === "string" ? new ObjectId63(value.site) : value.site;
       }
+      if (value?.block) {
+        value.block = await convertObjectIdUtil2(value.block, "block Id");
+      }
+      if (value?.level) {
+        value.level = await convertObjectIdUtil2(value.level, "level Id");
+      }
       if (value.unit) {
         value.unit = typeof value.unit === "string" ? new ObjectId63(value.unit) : value.unit;
         const unit = await _getUnitById(value.unit);
@@ -35039,6 +35042,7 @@ function useVisitorTransactionService() {
       if (Array.isArray(value.visitorPass)) {
         for (const item of value.visitorPass) {
           if (item.add) {
+            await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Pass", session);
             await KeyRepo.updateKeyById(
               item.keyId,
               {
@@ -35087,6 +35091,7 @@ function useVisitorTransactionService() {
       if (Array.isArray(value.passKeys)) {
         for (const item of value.passKeys) {
           if (item.add) {
+            await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Key", session);
             await KeyRepo.updateKeyById(
               item.keyId,
               {
@@ -57951,12 +57956,9 @@ function useNewDashboardRepo() {
   function getDateRange(p) {
     const now = moment2().tz("Asia/Singapore");
     if (p === "thisWeek" /* THIS_WEEK */) {
-      const rollingStart = now.clone().subtract(6, "days").startOf("day");
-      const monthStart = now.clone().startOf("month");
-      const start = moment2.max(rollingStart, monthStart);
       return {
-        $gte: start.toDate(),
-        $lte: now.clone().endOf("day").toDate()
+        $gte: now.clone().startOf("isoWeek").toDate(),
+        $lte: now.clone().endOf("isoWeek").toDate()
       };
     }
     if (p === "thisMonth" /* THIS_MONTH */) {
@@ -57970,6 +57972,12 @@ function useNewDashboardRepo() {
       $lte: now.clone().endOf("day").toDate()
     };
   }
+  function getSiteDayRange(date = moment2.tz("Asia/Singapore")) {
+    return {
+      $gte: date.clone().startOf("day").toDate(),
+      $lte: date.clone().endOf("day").toDate()
+    };
+  }
   const calculatePercentageChange = (currentCount, previousCount) => {
     if (previousCount === 0) {
       return currentCount > 0 ? 100 : 0;
@@ -58396,24 +58404,27 @@ function useNewDashboardRepo() {
     const siteIdObj = toObjectId16(siteId);
     const startOfToday = moment2.tz("Asia/Singapore").startOf("day").toDate();
     const endOfToday = moment2.tz("Asia/Singapore").endOf("day").toDate();
-    const localTodayStr = moment2.tz("Asia/Singapore").format("YYYY-MM-DD");
-    const facilityTodayStart = moment2.utc(`${localTodayStr}T00:00:00.000Z`).toDate();
-    const facilityTodayEnd = moment2.utc(`${localTodayStr}T23:59:59.999Z`).toDate();
-    const localYesterdayStr = moment2.tz("Asia/Singapore").subtract(1, "day").format("YYYY-MM-DD");
-    const facilityYesterdayStart = moment2.utc(`${localYesterdayStr}T00:00:00.000Z`).toDate();
-    const facilityYesterdayEnd = moment2.utc(`${localYesterdayStr}T23:59:59.999Z`).toDate();
-    let facilityPeriodRange = { $gte: facilityTodayStart, $lte: facilityTodayEnd };
+    const facilityTodayRange = getSiteDayRange();
+    const facilityYesterdayRange = getSiteDayRange(
+      moment2.tz("Asia/Singapore").subtract(1, "day")
+    );
+    const facilityTodayStart = facilityTodayRange.$gte;
+    const facilityTodayEnd = facilityTodayRange.$lte;
+    const facilityYesterdayStart = facilityYesterdayRange.$gte;
+    const facilityYesterdayEnd = facilityYesterdayRange.$lte;
+    let facilityPeriodRange = {
+      $gte: facilityTodayStart,
+      $lte: facilityTodayEnd
+    };
     if (period === "thisWeek" /* THIS_WEEK */) {
-      const startStr = moment2.tz("Asia/Singapore").subtract(7, "days").format("YYYY-MM-DD");
       facilityPeriodRange = {
-        $gte: moment2.utc(`${startStr}T00:00:00.000Z`).toDate(),
-        $lte: facilityTodayEnd
+        $gte: moment2.tz("Asia/Singapore").startOf("isoWeek").toDate(),
+        $lte: moment2.tz("Asia/Singapore").endOf("isoWeek").toDate()
       };
     } else if (period === "thisMonth" /* THIS_MONTH */) {
-      const startStr = moment2.tz("Asia/Singapore").subtract(30, "days").format("YYYY-MM-DD");
       facilityPeriodRange = {
-        $gte: moment2.utc(`${startStr}T00:00:00.000Z`).toDate(),
-        $lte: facilityTodayEnd
+        $gte: moment2.tz("Asia/Singapore").startOf("month").toDate(),
+        $lte: moment2.tz("Asia/Singapore").endOf("month").toDate()
       };
     }
     const upcomingEvents = await db.collection(events_namespace_collection).find({
@@ -58497,6 +58508,18 @@ function useNewDashboardRepo() {
     const facilityCollection = db.collection(
       facility_bookings_namespace_collection2
     );
+    const facilityBookingStatuses = [
+      "Pending",
+      "Approved",
+      "Ongoing",
+      "For Review",
+      "With Balance",
+      "For Refund",
+      "With Refund",
+      "Completed",
+      "Rejected",
+      "Cancelled"
+    ];
     const [
       workOrderReport,
       yesterdayWorkOrderReport,
@@ -58647,7 +58670,7 @@ function useNewDashboardRepo() {
                 }
               }
             ],
-            status: { $nin: ["deleted", "Deleted"] }
+            status: { $in: facilityBookingStatuses }
           }
         },
         {
@@ -58672,6 +58695,25 @@ function useNewDashboardRepo() {
                 }
               },
               { $count: "count" }
+            ],
+            byStatus: [
+              {
+                $match: {
+                  status: { $in: facilityBookingStatuses }
+                }
+              },
+              {
+                $group: {
+                  _id: {
+                    $cond: [
+                      { $eq: ["$status", "For Refund"] },
+                      "With Refund",
+                      "$status"
+                    ]
+                  },
+                  count: { $sum: 1 }
+                }
+              }
             ]
           }
         }
@@ -58682,7 +58724,12 @@ function useNewDashboardRepo() {
             site: { $in: [siteIdObj, siteId] },
             ...facilityMatchObj,
             $or: [
-              { date: { $gte: facilityYesterdayStart, $lte: facilityYesterdayEnd } },
+              {
+                date: {
+                  $gte: facilityYesterdayStart,
+                  $lte: facilityYesterdayEnd
+                }
+              },
               {
                 date: {
                   $gte: facilityYesterdayStart.toISOString(),
@@ -58690,7 +58737,7 @@ function useNewDashboardRepo() {
                 }
               }
             ],
-            status: { $nin: ["deleted", "Deleted"] }
+            status: { $in: facilityBookingStatuses }
           }
         },
         { $count: "count" }
@@ -58709,7 +58756,7 @@ function useNewDashboardRepo() {
                 }
               }
             ],
-            status: { $nin: ["deleted", "Deleted"] }
+            status: { $in: facilityBookingStatuses }
           }
         },
         { $count: "count" }
@@ -58733,8 +58780,25 @@ function useNewDashboardRepo() {
     const fFacet = facilityReport[0] ?? {
       total: [],
       ongoing: [],
-      waitingApproval: []
+      waitingApproval: [],
+      byStatus: []
+    };
+    const facilityBookingStatusCounts = {
+      Pending: 0,
+      Approved: 0,
+      Ongoing: 0,
+      "For Review": 0,
+      "With Balance": 0,
+      "With Refund": 0,
+      Completed: 0,
+      Rejected: 0,
+      Cancelled: 0
     };
+    for (const item of fFacet.byStatus ?? []) {
+      if (typeof item?._id === "string" && item._id in facilityBookingStatusCounts) {
+        facilityBookingStatusCounts[item._id] = item.count ?? 0;
+      }
+    }
     const workOrderStatus = {
       pending: 0,
       inProgress: 0,
@@ -58781,6 +58845,7 @@ function useNewDashboardRepo() {
         count: fFacet.total[0]?.count ?? 0,
         ongoing: fFacet.ongoing[0]?.count ?? 0,
         waitingApproval: fFacet.waitingApproval[0]?.count ?? 0,
+        byStatus: facilityBookingStatusCounts,
         percentage: calculatePercentageChange(
           todayFacilityReport[0]?.count ?? 0,
           yesterdayFacilityReport[0]?.count ?? 0
@@ -63568,9 +63633,12 @@ var useRedDotPaymentRepo = () => {
       }
       const now = /* @__PURE__ */ new Date();
       const unitUpdate = {
+        method: payload.method,
+        message: payload.message,
         updatedAt: now.toISOString(),
         paymentStatus: payload.paymentStatus,
-        transaction_id: payload.transaction_id
+        transaction_id: payload.transaction_id,
+        paidBy: paymentInfo.paidBy
       };
       const paymentUpdate = {
         updatedAt: now.toISOString(),