@7365admin1/core 3.25.0 → 3.26.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.26.0
+
+### Minor Changes
+
+- 3ce77c8: release changes in nfc patrol api, soa api, billing api, vehicle api, etc.
+
 ## 3.25.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -476,11 +476,12 @@ declare function useVerificationService(): {
         metadata: TKeyValuePair;
     }) => Promise<bson.ObjectId>;
     createForgetPassword: (email: string) => Promise<string>;
-    createServiceProviderInvite: ({ email, orgId, siteId, siteName, inviteType, }: {
+    createServiceProviderInvite: ({ email, orgId, siteId, siteName, app, inviteType, }: {
         email: string;
         orgId: string;
         siteId: string;
         siteName: string;
+        app: string;
         inviteType: "create-org" | "organization-invite";
     }) => Promise<bson.ObjectId>;
     getById: (id: string) => Promise<TVerification>;
@@ -2923,6 +2924,13 @@ declare function MVisitorTransaction(value: TVisitorTransaction): {
     } | null;
     arrivalTime: string | null | undefined;
     duration: number | null | undefined;
+    members: {
+        name: string;
+        nric: string;
+        visitorPass?: TKeyRef[] | null | undefined;
+        passKeys?: TKeyRef[] | null | undefined;
+        contact: string;
+    }[] | undefined;
 };
 
 declare const visitors_namespace_collection = "visitor.transactions";
@@ -6099,6 +6107,17 @@ declare function useNewDashboardRepo(): {
             count: any;
             ongoing: any;
             waitingApproval: any;
+            byStatus: {
+                Pending: number;
+                Approved: number;
+                Ongoing: number;
+                "For Review": number;
+                "With Balance": number;
+                "With Refund": number;
+                Completed: number;
+                Rejected: number;
+                Cancelled: number;
+            };
             percentage: number;
         };
         workOrderStatus: {

package/dist/index.js

@@ -12520,19 +12520,22 @@ function useVerificationService() {
     orgId,
     siteId,
     siteName,
+    app,
     inviteType
   }) {
     const schema2 = import_joi11.default.object({
       email: import_joi11.default.string().email().lowercase().required(),
       orgId: import_joi11.default.string().hex().length(24).required(),
       siteId: import_joi11.default.string().hex().length(24).required(),
-      siteName: import_joi11.default.string().required()
+      siteName: import_joi11.default.string().required(),
+      app: import_joi11.default.string().required()
     });
     const { error } = schema2.validate({
       email,
       orgId,
       siteId,
-      siteName
+      siteName,
+      app
     });
     if (error) {
       const messages = error.details.map((d) => d.message).join(", ");
@@ -12547,7 +12550,8 @@ function useVerificationService() {
       metadata: {
         siteId,
         siteName,
-        org: orgId
+        org: orgId,
+        app
       },
       expireAt: new Date(
         (/* @__PURE__ */ new Date()).getTime() + 72 * 60 * 60 * 1e3
@@ -12567,7 +12571,7 @@ function useVerificationService() {
       const res = await _add(value);
       const dir = __dirname;
       const filePath = (0, import_node_server_utils21.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 = (0, import_node_server_utils21.compileHandlebar)({
         context: {
           email,
@@ -15136,6 +15140,7 @@ function useVerificationController() {
       orgId: import_joi16.default.string().hex().required(),
       siteId: import_joi16.default.string().hex().required(),
       siteName: import_joi16.default.string().required(),
+      app: import_joi16.default.string().required(),
       inviteType: import_joi16.default.string().valid("create-org", "organization-invite").required()
     });
     const { error } = validation.validate(payload);
@@ -15152,6 +15157,7 @@ function useVerificationController() {
       orgId,
       siteId,
       siteName,
+      app,
       inviteType
     } = payload;
     try {
@@ -15160,6 +15166,7 @@ function useVerificationController() {
         orgId,
         siteId,
         siteName,
+        app,
         inviteType
       });
       const cookieOptions = {
@@ -21515,7 +21522,8 @@ function MVisitorTransaction(value) {
       updatedBy: value.inviterId ?? ""
     } : null,
     arrivalTime: value.arrivalTime,
-    duration: value.duration
+    duration: value.duration,
+    members: value.members
   };
 }
 
@@ -34452,7 +34460,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;
@@ -34525,70 +34533,59 @@ var KeyRepo = class {
       return Promise.reject("Failed to delete key");
     }
   }
-  static async getById2(id) {
-    return this.collection().aggregate([
-      { $match: { _id: new import_mongodb62.ObjectId(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 import_mongodb62.ObjectId(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}`);
   }
 };
 
@@ -34953,9 +34950,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);
@@ -34996,6 +34990,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,
                   {
@@ -35011,6 +35006,7 @@ function useVisitorTransactionService() {
                 );
               }
               for (const item of preparedPassKeys) {
+                await KeyRepo.checkPassOrKeyAvailability(item.keyId, "Key", session);
                 await KeyRepo.updateKeyById(
                   item.keyId,
                   {
@@ -35053,7 +35049,6 @@ function useVisitorTransactionService() {
         if (found === 1)
           throw new import_node_server_utils107.BadRequestError("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();
@@ -35073,6 +35068,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 },
@@ -35087,6 +35083,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 },
@@ -35183,6 +35180,12 @@ function useVisitorTransactionService() {
       if (value.site) {
         value.site = typeof value.site === "string" ? new import_mongodb63.ObjectId(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 import_mongodb63.ObjectId(value.unit) : value.unit;
         const unit = await _getUnitById(value.unit);
@@ -35194,6 +35197,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,
               {
@@ -35242,6 +35246,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,
               {
@@ -57814,12 +57819,9 @@ function useNewDashboardRepo() {
   function getDateRange(p) {
     const now = (0, import_moment.default)().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 = import_moment.default.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 */) {
@@ -57833,6 +57835,12 @@ function useNewDashboardRepo() {
       $lte: now.clone().endOf("day").toDate()
     };
   }
+  function getSiteDayRange(date = import_moment.default.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;
@@ -58259,24 +58267,27 @@ function useNewDashboardRepo() {
     const siteIdObj = (0, import_node_server_utils201.toObjectId)(siteId);
     const startOfToday = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
     const endOfToday = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
-    const localTodayStr = import_moment.default.tz("Asia/Singapore").format("YYYY-MM-DD");
-    const facilityTodayStart = import_moment.default.utc(`${localTodayStr}T00:00:00.000Z`).toDate();
-    const facilityTodayEnd = import_moment.default.utc(`${localTodayStr}T23:59:59.999Z`).toDate();
-    const localYesterdayStr = import_moment.default.tz("Asia/Singapore").subtract(1, "day").format("YYYY-MM-DD");
-    const facilityYesterdayStart = import_moment.default.utc(`${localYesterdayStr}T00:00:00.000Z`).toDate();
-    const facilityYesterdayEnd = import_moment.default.utc(`${localYesterdayStr}T23:59:59.999Z`).toDate();
-    let facilityPeriodRange = { $gte: facilityTodayStart, $lte: facilityTodayEnd };
+    const facilityTodayRange = getSiteDayRange();
+    const facilityYesterdayRange = getSiteDayRange(
+      import_moment.default.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 = import_moment.default.tz("Asia/Singapore").subtract(7, "days").format("YYYY-MM-DD");
       facilityPeriodRange = {
-        $gte: import_moment.default.utc(`${startStr}T00:00:00.000Z`).toDate(),
-        $lte: facilityTodayEnd
+        $gte: import_moment.default.tz("Asia/Singapore").startOf("isoWeek").toDate(),
+        $lte: import_moment.default.tz("Asia/Singapore").endOf("isoWeek").toDate()
       };
     } else if (period === "thisMonth" /* THIS_MONTH */) {
-      const startStr = import_moment.default.tz("Asia/Singapore").subtract(30, "days").format("YYYY-MM-DD");
       facilityPeriodRange = {
-        $gte: import_moment.default.utc(`${startStr}T00:00:00.000Z`).toDate(),
-        $lte: facilityTodayEnd
+        $gte: import_moment.default.tz("Asia/Singapore").startOf("month").toDate(),
+        $lte: import_moment.default.tz("Asia/Singapore").endOf("month").toDate()
       };
     }
     const upcomingEvents = await db.collection(events_namespace_collection).find({
@@ -58360,6 +58371,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,
@@ -58510,7 +58533,7 @@ function useNewDashboardRepo() {
                 }
               }
             ],
-            status: { $nin: ["deleted", "Deleted"] }
+            status: { $in: facilityBookingStatuses }
           }
         },
         {
@@ -58535,6 +58558,25 @@ function useNewDashboardRepo() {
                 }
               },
               { $count: "count" }
+            ],
+            byStatus: [
+              {
+                $match: {
+                  status: { $in: facilityBookingStatuses }
+                }
+              },
+              {
+                $group: {
+                  _id: {
+                    $cond: [
+                      { $eq: ["$status", "For Refund"] },
+                      "With Refund",
+                      "$status"
+                    ]
+                  },
+                  count: { $sum: 1 }
+                }
+              }
             ]
           }
         }
@@ -58545,7 +58587,12 @@ function useNewDashboardRepo() {
             site: { $in: [siteIdObj, siteId] },
             ...facilityMatchObj,
             $or: [
-              { date: { $gte: facilityYesterdayStart, $lte: facilityYesterdayEnd } },
+              {
+                date: {
+                  $gte: facilityYesterdayStart,
+                  $lte: facilityYesterdayEnd
+                }
+              },
               {
                 date: {
                   $gte: facilityYesterdayStart.toISOString(),
@@ -58553,7 +58600,7 @@ function useNewDashboardRepo() {
                 }
               }
             ],
-            status: { $nin: ["deleted", "Deleted"] }
+            status: { $in: facilityBookingStatuses }
           }
         },
         { $count: "count" }
@@ -58572,7 +58619,7 @@ function useNewDashboardRepo() {
                 }
               }
             ],
-            status: { $nin: ["deleted", "Deleted"] }
+            status: { $in: facilityBookingStatuses }
           }
         },
         { $count: "count" }
@@ -58596,8 +58643,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,
@@ -58644,6 +58708,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
@@ -63374,9 +63439,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(),