@7365admin1/core 3.32.2-staging.2 → 3.32.2-staging.4

package/dist/index.d.ts

@@ -2965,7 +2965,7 @@ declare function useVisitorTransactionRepo(): {
         pageRange: string;
     }>;
     getOpenByPlateNumber: (plateNumber: string, site: string | ObjectId) => Promise<TVisitorTransaction | null | undefined>;
-    updateById: (_id: string | ObjectId, value: Partial<TVisitorTransaction>, session?: ClientSession, isManualCheckOut?: boolean) => Promise<mongodb.UpdateResult<bson.Document>>;
+    updateById: (_id: string | ObjectId, value: Partial<TVisitorTransaction>, session?: ClientSession, isManualCheckOut?: boolean) => Promise<mongodb.UpdateResult<bson.Document> | undefined>;
     deleteVisitorTransaction: (_id: string | ObjectId) => Promise<number>;
     createTextIndex: () => Promise<void>;
     getDeliveryPickupTransactions: () => Promise<mongodb.WithId<bson.Document>[]>;

package/dist/index.js

@@ -22137,7 +22137,14 @@ function useVisitorTransactionRepo() {
         }
       });
       if (Array.isArray(value.visitorPass)) {
-        value.visitorPass.forEach((item, index) => {
+        const visitorPassMap = /* @__PURE__ */ new Map();
+        value.visitorPass.forEach((item) => {
+          if (item.keyId) {
+            visitorPassMap.set(item.keyId.toString(), item);
+          }
+        });
+        const uniqueVisitorPass = Array.from(visitorPassMap.values());
+        uniqueVisitorPass.forEach((item, index) => {
           if (item.add === true) {
             const { add: add2, ...cleanItem } = item;
             cleanItem.keyId = convertObjectIdUtilNonAsync(cleanItem.keyId, "Pass Id");
@@ -22150,8 +22157,7 @@ function useVisitorTransactionRepo() {
             Object.keys(item).forEach((itemKey) => {
               if (itemKey !== "keyId") {
                 const typedItemKey = itemKey;
-                let itemValue = item[typedItemKey];
-                updateFields[`visitorPass.$[${elementKey}].${itemKey}`] = itemValue;
+                updateFields[`visitorPass.$[${elementKey}].${itemKey}`] = item[typedItemKey];
               }
             });
             arrayFilters.push({ [`${elementKey}.keyId`]: new import_mongodb41.ObjectId(item.keyId) });
@@ -22159,7 +22165,14 @@ function useVisitorTransactionRepo() {
         });
       }
       if (Array.isArray(value.passKeys)) {
-        value.passKeys.forEach((item, index) => {
+        const passKeysMap = /* @__PURE__ */ new Map();
+        value.passKeys.forEach((item) => {
+          if (item.keyId) {
+            passKeysMap.set(item.keyId.toString(), item);
+          }
+        });
+        const uniquePassKeys = Array.from(passKeysMap.values());
+        uniquePassKeys.forEach((item, index) => {
           if (item.add === true) {
             const { add: add2, ...cleanItem } = item;
             cleanItem.keyId = convertObjectIdUtilNonAsync(cleanItem.keyId, "Key Id");
@@ -22172,32 +22185,34 @@ function useVisitorTransactionRepo() {
             Object.keys(item).forEach((itemKey) => {
               if (itemKey !== "keyId") {
                 const typedItemKey = itemKey;
-                let itemValue = item[typedItemKey];
-                updateFields[`passKeys.$[${elementKey}].${itemKey}`] = itemValue;
+                updateFields[`passKeys.$[${elementKey}].${itemKey}`] = item[typedItemKey];
               }
             });
             arrayFilters.push({ [`${elementKey}.keyId`]: new import_mongodb41.ObjectId(item.keyId) });
           }
         });
       }
-      const updatePayload = {};
+      let result;
       if (Object.keys(updateFields).length > 0) {
-        updatePayload.$set = updateFields;
+        result = await collection.updateOne(
+          { _id: new import_mongodb41.ObjectId(_id) },
+          { $set: updateFields },
+          {
+            ...arrayFilters.length > 0 && { arrayFilters },
+            session
+          }
+        );
       }
       if (Object.keys(pushFields).length > 0) {
-        updatePayload.$push = pushFields;
+        result = await collection.updateOne(
+          { _id: new import_mongodb41.ObjectId(_id) },
+          { $push: pushFields },
+          { session }
+        );
       }
-      const result = await collection.updateOne(
-        { _id: new import_mongodb41.ObjectId(_id) },
-        updatePayload,
-        {
-          ...arrayFilters.length > 0 && { arrayFilters },
-          // Only pass if not empty
-          session
-        }
-      );
       return result;
     } catch (error) {
+      console.log("Error in updateById visitor transaction repo", error);
       throw error;
     }
   }
@@ -26986,7 +27001,8 @@ function useVehicleService() {
         throw new Error("Unable to start session for vehicle service.");
       }
     }
-    const [_vehiclePlateNumber] = value.plateNumber;
+    const plateNumbers = Array.isArray(value.plateNumber) ? value.plateNumber : value.plateNumber ? [value.plateNumber] : [];
+    const [_vehiclePlateNumber] = plateNumbers;
     const [existingPlateNumber, org] = await Promise.all([
       _getVehicleByPlateNumber(_vehiclePlateNumber),
       _getById(value.org)
@@ -27051,7 +27067,6 @@ function useVehicleService() {
       }
     }
     const owner = value.name;
-    const plateNumbers = value.plateNumber;
     try {
       if (!isExternalSession) {
         session.startTransaction();
@@ -27268,7 +27283,10 @@ function useVehicleService() {
         const dahuaResponse = await _addPlateNumber(dahuaPayload);
         if (dahuaResponse?.statusCode != 200) {
           console.log("dahuaResponse", dahuaResponse);
-          console.log("approveVehicleById dahuaResponse dahuaResponse?.statusCode != 200", dahuaResponse?.statusCode);
+          console.log(
+            "approveVehicleById dahuaResponse dahuaResponse?.statusCode != 200",
+            dahuaResponse?.statusCode
+          );
           throw new import_node_server_utils78.BadRequestError("Failed to add plate number to ANPR");
         }
         const responseData = dahuaResponse?.data.toString("utf-8");
@@ -27475,7 +27493,19 @@ function useVehicleService() {
       if (value.peopleId) {
         value.peopleId = new import_mongodb49.ObjectId(value.peopleId);
       }
-      const { name, plateNumber, start, end, recNo, type, unit, site, block, level, ...rest } = value;
+      const {
+        name,
+        plateNumber,
+        start,
+        end,
+        recNo,
+        type,
+        unit,
+        site,
+        block,
+        level,
+        ...rest
+      } = value;
       if (_name != name || _plateNumber != plateNumber) {
         const startDahua = value.start ? formatDahuaDate(new Date(value.start)) : formatDahuaDate(new Date(_start));
         const endDahua = value.end ? formatDahuaDate(new Date(value.end)) : formatDahuaDate(new Date(_end));
@@ -27502,7 +27532,11 @@ function useVehicleService() {
           for (const camera of siteCameras) {
             const { host, username, password } = camera;
             if (_plateNumber != plateNumber) {
-              console.log("updateVehicleById _plateNumber != plateNumber", _plateNumber, plateNumber);
+              console.log(
+                "updateVehicleById _plateNumber != plateNumber",
+                _plateNumber,
+                plateNumber
+              );
               const removePlateNumber = {
                 host,
                 username,
@@ -27549,7 +27583,11 @@ function useVehicleService() {
                 );
               }
             } else {
-              console.log("updateVehicleById _plateNumber == plateNumber", _plateNumber, plateNumber);
+              console.log(
+                "updateVehicleById _plateNumber == plateNumber",
+                _plateNumber,
+                plateNumber
+              );
               const dahuaPayload = {
                 host,
                 username,
@@ -35446,7 +35484,7 @@ function useVisitorTransactionService() {
             } else if (item?.status && VALID_STATUSES.has(item.status)) {
               status = item.status;
             } else {
-              throw new Error("Invalid Visitor Pass Status");
+              throw new Error("Invalid Key Status");
             }
             await KeyRepo.updateKeyById(
               item.keyId,