@7365admin1/core 3.7.0 → 3.7.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.7.1
+
+### Patch Changes
+
+- 79d1fd3: Hotfix issue for accepting already blocklisted vehicles
+
 ## 3.7.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -428,12 +428,12 @@ type TKeyValuePair<K extends string | number | symbol = string, V = any> = {
 };
 
 declare function useVerificationService(): {
-    createUserInvite: ({ email, metadata }: {
+    createUserInvite: ({ email, metadata, }: {
         email: string;
         metadata: TKeyValuePair;
     }) => Promise<bson.ObjectId>;
     createForgetPassword: (email: string) => Promise<string>;
-    createServiceProviderInvite: ({ email, orgId, siteId, siteName }: {
+    createServiceProviderInvite: ({ email, orgId, siteId, siteName, }: {
         email: string;
         orgId: string;
         siteId: string;
@@ -443,20 +443,20 @@ declare function useVerificationService(): {
     verify: (id: string) => Promise<TVerification>;
     cancelUserInvitation: (id: string) => Promise<void>;
     updateStatusById: (_id: string, status: string) => Promise<string>;
-    signUp: ({ email, metadata }: {
+    signUp: ({ email, metadata, }: {
         email: string;
         metadata: TKeyValuePair;
     }) => Promise<bson.ObjectId>;
     checkExpiredInvitation: () => Promise<string>;
-    createSimpleUserInvite: ({ email, metadata }: {
+    createSimpleUserInvite: ({ email, metadata, }: {
         email: string;
         metadata: TKeyValuePair;
     }) => Promise<string[]>;
-    createSimpleMemberInvite: ({ email, metadata }: {
+    createSimpleMemberInvite: ({ email, metadata, }: {
         email: string;
         metadata: TKeyValuePair;
     }) => Promise<bson.ObjectId>;
-    createSimpleServiceProviderInvite: ({ email, app, name, role, orgId, siteId, siteName }: {
+    createSimpleServiceProviderInvite: ({ email, app, name, role, orgId, siteId, siteName, }: {
         email: string;
         app?: string | undefined;
         name?: string | undefined;
@@ -2357,6 +2357,7 @@ declare function useVehicleRepo(): {
         pageRange: string;
     }>;
     getVehicleBySiteAndPlateNumber: (plateNumber: string, site: string | ObjectId, category: string | ObjectId, status: string) => Promise<TVehicle | null>;
+    getBlocklistedVehicleByPlateNumber: (plateNumber: string, site?: string) => Promise<bson.Document>;
 };
 
 declare function formatDahuaDate(date: Date): string;

package/dist/index.js

@@ -12253,9 +12253,7 @@ function useVerificationService() {
           ...metadata,
           app
         },
-        expireAt: new Date(
-          Date.now() + 72 * 60 * 60 * 1e3
-        ).toISOString(),
+        expireAt: new Date(Date.now() + 72 * 60 * 60 * 1e3).toISOString(),
         createdAt: (/* @__PURE__ */ new Date()).toISOString()
       };
       const createdId = await add(value);
@@ -12274,10 +12272,7 @@ function useVerificationService() {
           hasPestControl: app === "pest_control_services",
           hasPoolMaintenance: app === "pool_maintenance_services"
         },
-        filePath: (0, import_node_server_utils21.getDirectory)(
-          __dirname,
-          "./public/handlebars/user-invite"
-        )
+        filePath: (0, import_node_server_utils21.getDirectory)(__dirname, "./public/handlebars/user-invite")
       });
       await mailer.sendMail({
         to: email,
@@ -12420,7 +12415,15 @@ function useVerificationService() {
       throw error2;
     }
   }
-  async function createSimpleServiceProviderInvite({ email, app, name, role, orgId, siteId, siteName }) {
+  async function createSimpleServiceProviderInvite({
+    email,
+    app,
+    name,
+    role,
+    orgId,
+    siteId,
+    siteName
+  }) {
     const schema2 = import_joi11.default.object({
       email: import_joi11.default.string().email().lowercase().required(),
       app: import_joi11.default.string().allow("", null),
@@ -12462,7 +12465,10 @@ function useVerificationService() {
     };
     try {
       const id = await _add(value);
-      const filePath = (0, import_node_server_utils21.getDirectory)(__dirname, `./public/handlebars/${value.type}`);
+      const filePath = (0, import_node_server_utils21.getDirectory)(
+        __dirname,
+        `./public/handlebars/${value.type}`
+      );
       const link = `${APP_MAIN}/verify/${value.type}/${id}`;
       const emailContent = (0, import_node_server_utils21.compileHandlebar)({
         context: {
@@ -21254,6 +21260,15 @@ async function convertObjectIdUtil(id) {
     return Promise.reject("Invalid ID conversion to ObjectId");
   }
 }
+async function convertObjectIdUtil2(id, fieldName) {
+  try {
+    if (!id)
+      throw new Error(`Invalid ID conversion to ObjectId of ${fieldName}.`);
+    return new import_mongodb40.ObjectId(id);
+  } catch (_) {
+    throw new Error(`Invalid ID conversion to ObjectId of ${fieldName}.`);
+  }
+}
 
 // src/repositories/visitor-transaction.repo.ts
 var import_moment_timezone = __toESM(require("moment-timezone"));
@@ -23047,6 +23062,38 @@ function useVehicleRepo() {
       throw error;
     }
   }
+  async function getBlocklistedVehicleByPlateNumber(plateNumber, site) {
+    if (!plateNumber) {
+      throw new import_node_server_utils71.BadRequestError("Plate number is required");
+    }
+    const baseQuery = {
+      type: "blocklist" /* BLOCKLIST */,
+      plateNumber,
+      ...site && {
+        site: typeof site === "string" ? new import_mongodb43.ObjectId(site) : site
+      }
+    };
+    try {
+      const pipeline = [
+        { $match: baseQuery },
+        {
+          $addFields: {
+            latestDate: { $max: ["$createdAt", "$updatedAt"] }
+          }
+        },
+        { $sort: { latestDate: -1 } },
+        {
+          $project: {
+            latestDate: 0
+          }
+        }
+      ];
+      const [result] = await collection.aggregate(pipeline).toArray();
+      return result;
+    } catch (error) {
+      throw error;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -23065,7 +23112,8 @@ function useVehicleRepo() {
     bulkUpsertVehicles,
     getSpecificVehicleById,
     getBlocklistedVehicles,
-    getVehicleBySiteAndPlateNumber
+    getVehicleBySiteAndPlateNumber,
+    getBlocklistedVehicleByPlateNumber
   };
 }
 
@@ -33400,6 +33448,71 @@ var KeyRepo = class {
       return Promise.reject("Failed to delete key");
     }
   }
+  static async getById2(id) {
+    return this.collection().aggregate([
+      { $match: { _id: new import_mongodb61.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);
+  }
+  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}`);
+      }
+    }
+  }
 };
 
 // src/services/visitor-transaction.service.ts
@@ -33436,7 +33549,9 @@ function useVisitorTransactionService() {
   } = useDahuaService();
   const { getAllSites: _getAllSites } = useSiteRepo();
   const { getByUserId: _getByUserId } = usePersonRepo();
-  const { add: addVehicle } = useVehicleRepo();
+  const {
+    getBlocklistedVehicleByPlateNumber: _getBlocklistedVehicleByPlateNumber
+  } = useVehicleRepo();
   const { getById: _getUnitById } = useBuildingUnitRepo();
   function extractKeyId(item) {
     if (!item)
@@ -33514,6 +33629,13 @@ function useVisitorTransactionService() {
     const start = value.checkIn ? new Date(value.checkIn) : /* @__PURE__ */ new Date();
     try {
       session?.startTransaction();
+      if (value.plateNumber) {
+        const result2 = await _getBlocklistedVehicleByPlateNumber(
+          value.plateNumber
+        );
+        if (result2)
+          throw new import_node_server_utils106.BadRequestError("Plate number is blocklisted");
+      }
       let camera;
       if (value.site && value.plateNumber) {
         try {
@@ -33579,6 +33701,7 @@ function useVisitorTransactionService() {
         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);
             if (member.visitorPass && Array.isArray(member.visitorPass) && member.visitorPass.length > 0) {
               for (const vp of member.visitorPass) {
                 try {
@@ -33665,6 +33788,7 @@ function useVisitorTransactionService() {
         if (found === 1)
           throw new import_node_server_utils106.BadRequestError("This plate number is blocklisted");
       }
+      await KeyRepo.checkPassKeyAvailability(value.visitorPass, value.passKeys);
       if (value.visitorPass && Array.isArray(value.visitorPass) && value.visitorPass.length > 0 && value.visitorPass) {
         for (const vp of value.visitorPass) {
           try {
@@ -33712,7 +33836,9 @@ function useVisitorTransactionService() {
             password,
             plateNumber: value?.plateNumber
           });
-          import_node_server_utils106.logger.info(`Barrier command sent successfully to ${host}`, { response: openBarrier });
+          import_node_server_utils106.logger.info(`Barrier command sent successfully to ${host}`, {
+            response: openBarrier
+          });
         } catch (error) {
           import_node_server_utils106.logger.error(
             `Failed to open barrier at host ${host}. Critical system error:`,
@@ -33852,7 +33978,9 @@ function useVisitorTransactionService() {
             password,
             plateNumber: value?.plateNumber
           });
-          import_node_server_utils106.logger.info(`Barrier command sent successfully to ${host}`, { response: openBarrier });
+          import_node_server_utils106.logger.info(`Barrier command sent successfully to ${host}`, {
+            response: openBarrier
+          });
         } catch (error) {
           import_node_server_utils106.logger.error(
             `Failed to open barrier at host ${host}. Critical system error:`,
@@ -34065,7 +34193,12 @@ function useVisitorTransactionController() {
       return;
     } catch (error) {
       import_node_server_utils107.logger.log({ level: "error", message: error.message });
-      next(error);
+      console.log("error", error);
+      if (error?.message) {
+        next(new import_node_server_utils107.BadRequestError(error?.message));
+      } else {
+        next(error);
+      }
       return;
     }
   }