@7365admin1/core 3.11.0 → 3.13.0

package/dist/index.js

@@ -6267,6 +6267,7 @@ __export(src_exports, {
   useManpowerSitesSrvc: () => useManpowerSitesSrvc,
   useMemberController: () => useMemberController,
   useMemberRepo: () => useMemberRepo,
+  useMemberService: () => useMemberService,
   useNewDashboardController: () => useNewDashboardController,
   useNewDashboardRepo: () => useNewDashboardRepo,
   useNfcPatrolLogController: () => useNfcPatrolLogController,
@@ -10577,6 +10578,56 @@ function useVerificationRepo() {
   async function findOne(query) {
     return await collection.findOne(query);
   }
+  async function completePendingInvites({
+    email,
+    orgId,
+    siteId,
+    app,
+    session
+  }) {
+    const orgCandidates = [orgId];
+    try {
+      orgCandidates.push(new import_mongodb13.ObjectId(orgId));
+    } catch {
+    }
+    const query = {
+      email: { $regex: `^${email}$`, $options: "i" },
+      status: "pending",
+      type: {
+        $in: ["user-invite" /* USER_INVITE */, "member-invite" /* MEMBER_INVITE */]
+      },
+      "metadata.org": { $in: orgCandidates }
+    };
+    if (siteId) {
+      const siteCandidates = [siteId];
+      try {
+        siteCandidates.push(new import_mongodb13.ObjectId(siteId));
+      } catch {
+      }
+      query["metadata.siteId"] = { $in: siteCandidates };
+    }
+    if (app) {
+      query["metadata.app"] = app;
+    }
+    try {
+      const result = await collection.updateMany(
+        query,
+        { $set: { status: "complete", updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      delNamespace().then(() => {
+        import_node_server_utils15.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        import_node_server_utils15.logger.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return result;
+    } catch (error) {
+      throw new import_node_server_utils15.InternalServerError("Failed to complete pending invites.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -10586,7 +10637,8 @@ function useVerificationRepo() {
     getByIdByType,
     updateStatusById,
     getByStatus,
-    findOne
+    findOne,
+    completePendingInvites
   };
 }
 
@@ -12163,6 +12215,61 @@ function useVerificationRepoV2() {
       throw new import_node_server_utils20.InternalServerError("Failed to update verification code.");
     }
   }
+  async function completePendingInvites({
+    email,
+    orgId,
+    siteId,
+    app,
+    session
+  }) {
+    const orgCandidates = [orgId];
+    try {
+      orgCandidates.push(new import_mongodb18.ObjectId(orgId));
+    } catch {
+    }
+    const query = {
+      email: { $regex: `^${email}$`, $options: "i" },
+      status: "pending" /* PENDING */,
+      type: {
+        $in: ["user-invite" /* USER_INVITE */, "member-invite" /* MEMBER_INVITE */]
+      },
+      "metadata.org": { $in: orgCandidates }
+    };
+    if (siteId) {
+      const siteCandidates = [siteId];
+      try {
+        siteCandidates.push(new import_mongodb18.ObjectId(siteId));
+      } catch {
+      }
+      query["metadata.siteId"] = { $in: siteCandidates };
+    }
+    if (app) {
+      query["metadata.app"] = app;
+    }
+    try {
+      const result = await collection.updateMany(
+        query,
+        {
+          $set: {
+            status: "complete" /* COMPLETE */,
+            updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+          }
+        },
+        { session }
+      );
+      delNamespace().then(() => {
+        import_node_server_utils20.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        import_node_server_utils20.logger.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return result;
+    } catch (error) {
+      throw new import_node_server_utils20.InternalServerError("Failed to complete pending invites.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -12174,7 +12281,8 @@ function useVerificationRepoV2() {
     updateStatusById,
     countPendingOrgInvites,
     getPendingVerificationByEmail,
-    updateVerificationCodeById
+    updateVerificationCodeById,
+    completePendingInvites
   };
 }
 
@@ -14262,7 +14370,7 @@ function useMemberService() {
     getAllByUserId: _getAllByUserId,
     completeOnboardingById: _completeOnboardingById
   } = useMemberRepo();
-  const { getById: _getVerificationById, updateStatusById } = useVerificationRepo();
+  const { getById: _getVerificationById, updateStatusById, completePendingInvites } = useVerificationRepo();
   const { getUserByEmail, updateDefaultOrgByEmail, getUserById } = useUserRepo();
   const { getById: getOrgById } = useOrgRepo();
   const { getSiteById } = useSiteRepo();
@@ -14366,6 +14474,13 @@ function useMemberService() {
           session
         );
       }
+      await completePendingInvites({
+        email: user.email,
+        orgId,
+        siteId,
+        app,
+        session
+      });
       await session?.commitTransaction();
       return { member };
     } catch (error) {
@@ -21126,14 +21241,20 @@ var schemaUpdateVisTrans = import_joi37.default.object({
     import_joi37.default.object({
       keyId: import_joi37.default.string().hex().length(24).required(),
       status: import_joi37.default.string().optional().allow(null, ""),
-      remarks: import_joi37.default.string().optional().allow(null, "")
+      remarks: import_joi37.default.string().optional().allow(null, ""),
+      receivedDate: import_joi37.default.string().optional().allow(null, ""),
+      lastUpdate: import_joi37.default.string().optional().allow(null, ""),
+      add: import_joi37.default.boolean().optional().allow(null, "")
     })
   ).optional().allow(null),
   passKeys: import_joi37.default.array().items(
     import_joi37.default.object({
       keyId: import_joi37.default.string().hex().length(24).required(),
       status: import_joi37.default.string().optional().allow(null, ""),
-      remarks: import_joi37.default.string().optional().allow(null, "")
+      remarks: import_joi37.default.string().optional().allow(null, ""),
+      receivedDate: import_joi37.default.string().optional().allow(null, ""),
+      lastUpdate: import_joi37.default.string().optional().allow(null, ""),
+      add: import_joi37.default.boolean().optional().allow(null, "")
     })
   ).optional().allow(null),
   checkInRemarks: import_joi37.default.string().optional().allow("", null),
@@ -21307,6 +21428,16 @@ async function convertObjectIdUtil(id) {
   }
 }
 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 (_) {
+    console.log(`Invalid ID conversion to ObjectId of ${fieldName}. : `, id);
+    throw new Error(`Invalid ID conversion to ObjectId of ${fieldName}.`);
+  }
+}
+function convertObjectIdUtilNonAsync(id, fieldName) {
   try {
     if (!id)
       throw new Error(`Invalid ID conversion to ObjectId of ${fieldName}.`);
@@ -21508,6 +21639,7 @@ function useVisitorTransactionRepo() {
               preserveNullAndEmptyArrays: true
             }
           },
+          // 1. Lookup visitorPass into a temporary field
           {
             $lookup: {
               from: "keys",
@@ -21519,48 +21651,66 @@ function useVisitorTransactionRepo() {
                     from: "qr-code-templates",
                     localField: "template",
                     foreignField: "_id",
-                    pipeline: [
-                      {
-                        $project: {
-                          _id: 1,
-                          prefixPass: 1,
-                          name: 1,
-                          remarks: 1
-                        }
-                      }
-                    ],
+                    pipeline: [{ $project: { prefixPass: 1, name: 1 } }],
                     as: "template"
                   }
                 },
                 {
                   $project: {
-                    _id: 0,
-                    keyId: "$_id",
-                    status: 1,
-                    description: 1,
-                    remarks: {
-                      $arrayElemAt: ["$template.remarks", 0]
-                    },
-                    templatePrefixPass: {
-                      $arrayElemAt: ["$template.prefixPass", 0]
-                    },
+                    _id: 1,
+                    // Kept only for matching purposes
                     prefixAndName: {
                       $concat: [
-                        {
-                          $ifNull: [
-                            { $arrayElemAt: ["$template.prefixPass", 0] },
-                            ""
-                          ]
-                        },
+                        { $ifNull: [{ $arrayElemAt: ["$template.prefixPass", 0] }, ""] },
                         { $ifNull: ["$name", ""] }
                       ]
                     }
                   }
                 }
               ],
-              as: "visitorPass"
+              as: "visitorPass_lookup"
             }
           },
+          // 2. Map through original array, keep all fields, and inject prefixAndName
+          {
+            $addFields: {
+              visitorPass: {
+                $map: {
+                  input: "$visitorPass",
+                  as: "original",
+                  in: {
+                    // Explicitly retain all original fields from your document
+                    keyId: "$$original.keyId",
+                    receivedDate: "$$original.receivedDate",
+                    status: "$$original.status",
+                    lastUpdate: "$$original.lastUpdate",
+                    remarks: "$$original.remarks",
+                    // Find and extract ONLY the prefixAndName string from lookup
+                    prefixAndName: {
+                      $let: {
+                        vars: {
+                          matched: {
+                            $arrayElemAt: [
+                              {
+                                $filter: {
+                                  input: "$visitorPass_lookup",
+                                  as: "lookup",
+                                  cond: { $eq: ["$$lookup._id", "$$original.keyId"] }
+                                }
+                              },
+                              0
+                            ]
+                          }
+                        },
+                        in: "$$matched.prefixAndName"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          // 3. Lookup passKeys into a temporary field
           {
             $lookup: {
               from: "keys",
@@ -21572,46 +21722,69 @@ function useVisitorTransactionRepo() {
                     from: "qr-code-templates",
                     localField: "template",
                     foreignField: "_id",
-                    pipeline: [
-                      {
-                        $project: {
-                          _id: 1,
-                          prefixPass: 1,
-                          name: 1,
-                          remarks: 1
-                        }
-                      }
-                    ],
+                    pipeline: [{ $project: { prefixPass: 1, name: 1 } }],
                     as: "template"
                   }
                 },
                 {
                   $project: {
-                    _id: 0,
-                    keyId: "$_id",
-                    status: 1,
-                    description: 1,
-                    remarks: {
-                      $arrayElemAt: ["$template.remarks", 0]
-                    },
-                    templatePrefixPass: {
-                      $arrayElemAt: ["$template.prefixPass", 0]
-                    },
+                    _id: 1,
                     prefixAndName: {
                       $concat: [
-                        {
-                          $ifNull: [
-                            { $arrayElemAt: ["$template.prefixPass", 0] },
-                            ""
-                          ]
-                        },
+                        { $ifNull: [{ $arrayElemAt: ["$template.prefixPass", 0] }, ""] },
                         { $ifNull: ["$name", ""] }
                       ]
                     }
                   }
                 }
               ],
-              as: "passKeys"
+              as: "passKeys_lookup"
+            }
+          },
+          // 4. Map through original passKeys array, keep all fields, inject prefixAndName
+          {
+            $addFields: {
+              passKeys: {
+                $map: {
+                  input: "$passKeys",
+                  as: "original",
+                  in: {
+                    // Explicitly retain all original fields from your document
+                    keyId: "$$original.keyId",
+                    receivedDate: "$$original.receivedDate",
+                    status: "$$original.status",
+                    lastUpdate: "$$original.lastUpdate",
+                    remarks: "$$original.remarks",
+                    // Find and extract ONLY the prefixAndName string from lookup
+                    prefixAndName: {
+                      $let: {
+                        vars: {
+                          matched: {
+                            $arrayElemAt: [
+                              {
+                                $filter: {
+                                  input: "$passKeys_lookup",
+                                  as: "lookup",
+                                  cond: { $eq: ["$$lookup._id", "$$original.keyId"] }
+                                }
+                              },
+                              0
+                            ]
+                          }
+                        },
+                        in: "$$matched.prefixAndName"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          // 5. Cleanup temporary arrays
+          {
+            $project: {
+              visitorPass_lookup: 0,
+              passKeys_lookup: 0
             }
           },
           {
@@ -21808,6 +21981,7 @@ function useVisitorTransactionRepo() {
     }
     try {
       const updateFields = {};
+      const pushFields = {};
       const arrayFilters = [];
       Object.keys(value).forEach((key) => {
         if (key !== "visitorPass" && key !== "passKeys") {
@@ -21817,34 +21991,63 @@ function useVisitorTransactionRepo() {
       });
       if (Array.isArray(value.visitorPass)) {
         value.visitorPass.forEach((item, index) => {
-          const elementKey = `vElem${index}`;
-          Object.keys(item).forEach((itemKey) => {
-            if (itemKey !== "keyId") {
-              const typedItemKey = itemKey;
-              let itemValue = item[typedItemKey];
-              updateFields[`visitorPass.$[${elementKey}].${itemKey}`] = itemValue;
+          if (item.add === true) {
+            const { add: add2, ...cleanItem } = item;
+            cleanItem.keyId = convertObjectIdUtilNonAsync(cleanItem.keyId, "Pass Id");
+            if (!pushFields["visitorPass"]) {
+              pushFields["visitorPass"] = { $each: [] };
             }
-          });
-          arrayFilters.push({ [`${elementKey}.keyId`]: new import_mongodb41.ObjectId(item.keyId) });
+            pushFields["visitorPass"].$each.push(cleanItem);
+          } else {
+            const elementKey = `vElem${index}`;
+            Object.keys(item).forEach((itemKey) => {
+              if (itemKey !== "keyId") {
+                const typedItemKey = itemKey;
+                let itemValue = item[typedItemKey];
+                updateFields[`visitorPass.$[${elementKey}].${itemKey}`] = itemValue;
+              }
+            });
+            arrayFilters.push({ [`${elementKey}.keyId`]: new import_mongodb41.ObjectId(item.keyId) });
+          }
         });
       }
       if (Array.isArray(value.passKeys)) {
         value.passKeys.forEach((item, index) => {
-          const elementKey = `pElem${index}`;
-          Object.keys(item).forEach((itemKey) => {
-            if (itemKey !== "keyId") {
-              const typedItemKey = itemKey;
-              let itemValue = item[typedItemKey];
-              updateFields[`passKeys.$[${elementKey}].${itemKey}`] = itemValue;
+          if (item.add === true) {
+            const { add: add2, ...cleanItem } = item;
+            cleanItem.keyId = convertObjectIdUtilNonAsync(cleanItem.keyId, "Key Id");
+            if (!pushFields["passKeys"]) {
+              pushFields["passKeys"] = { $each: [] };
             }
-          });
-          arrayFilters.push({ [`${elementKey}.keyId`]: new import_mongodb41.ObjectId(item.keyId) });
+            pushFields["passKeys"].$each.push(cleanItem);
+          } else {
+            const elementKey = `pElem${index}`;
+            Object.keys(item).forEach((itemKey) => {
+              if (itemKey !== "keyId") {
+                const typedItemKey = itemKey;
+                let itemValue = item[typedItemKey];
+                updateFields[`passKeys.$[${elementKey}].${itemKey}`] = itemValue;
+              }
+            });
+            arrayFilters.push({ [`${elementKey}.keyId`]: new import_mongodb41.ObjectId(item.keyId) });
+          }
         });
       }
+      const updatePayload = {};
+      if (Object.keys(updateFields).length > 0) {
+        updatePayload.$set = updateFields;
+      }
+      if (Object.keys(pushFields).length > 0) {
+        updatePayload.$push = pushFields;
+      }
       const result = await collection.updateOne(
         { _id: new import_mongodb41.ObjectId(_id) },
-        { $set: updateFields },
-        { arrayFilters, session }
+        updatePayload,
+        {
+          ...arrayFilters.length > 0 && { arrayFilters },
+          // Only pass if not empty
+          session
+        }
       );
       return result;
     } catch (error) {
@@ -33537,12 +33740,28 @@ var KeyRepo = class {
       return Promise.reject("Server internal error.");
     }
   }
-  static async updateKeyById(keyId, key, site, session, isChild, visitorId) {
+  static async updateKeyById(keyId, key, site, session, isChild, visitorId, isDifferentStatus, isPassKeyVisitorAdd) {
     keyId = await convertObjectIdUtil2(keyId, "keyId");
     if (site)
       site = await convertObjectIdUtil2(site, "Site");
-    if (visitorId)
-      visitorId = await convertObjectIdUtil2(visitorId, "visitor Id");
+    if (visitorId) {
+      visitorId = await convertObjectIdUtil2(visitorId, "Visitor Id");
+      if (!isPassKeyVisitorAdd) {
+        const findOptions = { sort: { _id: -1 } };
+        const latestHistory = await this.collectionDynamic("keys-histories").findOne(
+          { passOrKeyId: keyId },
+          findOptions
+        );
+        console.log("visitorId", visitorId.toString());
+        console.log("latestHistory.visitorId", latestHistory?.visitorId.toString());
+        if (latestHistory?.visitorId && latestHistory.visitorId?.toString() !== visitorId.toString()) {
+          console.log("Not updating keyId", keyId);
+          return;
+        } else {
+          console.log("updating keyId", keyId);
+        }
+      }
+    }
     if (key.updatedBy)
       key.updatedBy = await convertObjectIdUtil2(key.updatedBy, "Updated By");
     if (!key.status)
@@ -33550,9 +33769,14 @@ var KeyRepo = class {
     try {
       key.updatedAt = /* @__PURE__ */ new Date();
       const query = { _id: keyId, ...site && { site } };
-      let find = query;
-      if (isChild)
+      let find = { ...query };
+      if (isChild) {
         find = { parentId: keyId, site };
+      } else {
+        if (isDifferentStatus && typeof key?.status == "string") {
+          find.status = { $ne: key.status };
+        }
+      }
       const result = await this.collection().updateMany(
         find,
         { $set: key },
@@ -33578,7 +33802,11 @@ var KeyRepo = class {
           session
         });
       } else {
-        throw new Error("Failed Updating Keys");
+        if (visitorId) {
+          console.log(`visitorId: ${visitorId} keyId: ${keyId} Not Updated`);
+        } else {
+          throw new Error("Failed Updating Keys");
+        }
       }
       return result;
     } catch (error) {
@@ -33943,40 +34171,6 @@ function useVisitorTransactionService() {
     }
     return normalized;
   }
-  async function syncTransactionKeys({
-    current,
-    incoming,
-    site,
-    session
-  }) {
-    const currentIds = current.map((item) => item.keyId.toString());
-    const incomingIds = incoming.map((item) => item.keyId.toString());
-    const currentSet = new Set(currentIds);
-    const incomingSet = new Set(incomingIds);
-    const removedIds = currentIds.filter((id) => !incomingSet.has(id));
-    const addedIds = incomingIds.filter((id) => !currentSet.has(id));
-    for (const keyId of removedIds) {
-      const existingKey = await KeyRepo.getById(keyId);
-      if (!existingKey)
-        continue;
-      if (existingKey.status === "In Use" /* IN_USE */) {
-        await KeyRepo.updateKeyById(
-          keyId,
-          { status: "Available" /* AVAILABLE */ },
-          site,
-          session
-        );
-      }
-    }
-    for (const keyId of addedIds) {
-      await KeyRepo.updateKeyById(
-        keyId,
-        { status: "In Use" /* IN_USE */ },
-        site,
-        session
-      );
-    }
-  }
   async function add(value) {
     const session = import_node_server_utils106.useAtlas.getClient()?.startSession();
     const allowedPersonTypes = [
@@ -34112,7 +34306,9 @@ function useVisitorTransactionService() {
                   value.site,
                   session,
                   void 0,
-                  visitorId
+                  visitorId,
+                  void 0,
+                  true
                 );
               }
               for (const item of preparedPassKeys) {
@@ -34124,7 +34320,11 @@ function useVisitorTransactionService() {
                     visitorId
                   },
                   value.site,
-                  session
+                  session,
+                  void 0,
+                  visitorId,
+                  void 0,
+                  true
                 );
               }
             })
@@ -34155,43 +34355,49 @@ function useVisitorTransactionService() {
           throw new import_node_server_utils106.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();
+          item.status = "Not Returned" /* NOT_RETURNED */;
+          item.lastUpdate = null;
+          item.remarks = "";
+        }
+      }
+      if (Array.isArray(value.passKeys)) {
+        for (const item of value.passKeys) {
+          item.receivedDate = /* @__PURE__ */ new Date();
+          item.status = "Not Returned" /* NOT_RETURNED */;
+          item.lastUpdate = null;
+          item.remarks = "";
+        }
+      }
       const result = await _add(value, session);
       if (Array.isArray(value.visitorPass)) {
         for (const item of value.visitorPass) {
           await KeyRepo.updateKeyById(
             item.keyId,
-            {
-              status: "In Use" /* IN_USE */,
-              updatedBy: value.createdBy
-            },
+            { status: "In Use" /* IN_USE */, updatedBy: value.createdBy },
             value.site,
             session,
             void 0,
-            result
+            result,
+            void 0,
+            true
           );
-          item.receivedDate = /* @__PURE__ */ new Date();
-          item.status = "Not Returned" /* NOT_RETURNED */;
-          item.lastUpdate = null;
-          item.remarks = "";
         }
       }
       if (Array.isArray(value.passKeys)) {
         for (const item of value.passKeys) {
           await KeyRepo.updateKeyById(
             item.keyId,
-            {
-              status: "In Use" /* IN_USE */,
-              updatedBy: value.createdBy
-            },
+            { status: "In Use" /* IN_USE */, updatedBy: value.createdBy },
             value.site,
             session,
             void 0,
-            result
+            result,
+            void 0,
+            true
           );
-          item.receivedDate = /* @__PURE__ */ new Date();
-          item.status = "Not Returned" /* NOT_RETURNED */;
-          item.lastUpdate = null;
-          item.remarks = "";
         }
       }
       await session?.commitTransaction();
@@ -34288,54 +34494,98 @@ function useVisitorTransactionService() {
       }
       if (Array.isArray(value.visitorPass)) {
         for (const item of value.visitorPass) {
-          let status = "Invalid";
-          if (item?.status == "Returned" /* RETURNED */) {
-            status = "Available" /* AVAILABLE */;
-          } else if (item?.status == "Not Returned" /* NOT_RETURNED */) {
-            status = "In Use" /* IN_USE */;
-          } else if (item?.status && VALID_STATUSES.has(item.status)) {
-            status = item.status;
+          if (item.add) {
+            await KeyRepo.updateKeyById(
+              item.keyId,
+              {
+                status: "In Use" /* IN_USE */,
+                updatedBy: value.updatedBy
+              },
+              value.site,
+              session,
+              void 0,
+              id
+            );
+            item.receivedDate = /* @__PURE__ */ new Date();
+            item.status = "Not Returned" /* NOT_RETURNED */;
+            item.lastUpdate = null;
+            item.remarks = "";
           } else {
-            throw new Error("Invalid Visitor Pass Status");
+            let status = "Invalid";
+            if (item?.status == "Returned" /* RETURNED */) {
+              status = "Available" /* AVAILABLE */;
+            } else if (item?.status == "Removed" /* REMOVED */) {
+              status = "Available" /* AVAILABLE */;
+            } else if (item?.status == "Not Returned" /* NOT_RETURNED */) {
+              status = "In Use" /* IN_USE */;
+            } else if (item?.status && VALID_STATUSES.has(item.status)) {
+              status = item.status;
+            } else {
+              throw new Error("Invalid Visitor Pass Status");
+            }
+            await KeyRepo.updateKeyById(
+              item.keyId,
+              {
+                status,
+                updatedBy: value.updatedBy
+              },
+              value.site,
+              session,
+              void 0,
+              id,
+              true
+            );
+            delete item.receivedDate;
+            item.lastUpdate = /* @__PURE__ */ new Date();
           }
-          await KeyRepo.updateKeyById(
-            item.keyId,
-            {
-              status,
-              updatedBy: value.updatedBy
-            },
-            value.site,
-            session,
-            void 0,
-            id
-          );
-          item.lastUpdate = /* @__PURE__ */ new Date();
         }
       }
       if (Array.isArray(value.passKeys)) {
         for (const item of value.passKeys) {
-          let status = "Invalid";
-          if (item?.status == "Returned" /* RETURNED */) {
-            status = "Available" /* AVAILABLE */;
-          } else if (item?.status == "Not Returned" /* NOT_RETURNED */) {
-            status = "In Use" /* IN_USE */;
-          } else if (item?.status && VALID_STATUSES.has(item.status)) {
-            status = item.status;
+          if (item.add) {
+            await KeyRepo.updateKeyById(
+              item.keyId,
+              {
+                status: "In Use" /* IN_USE */,
+                updatedBy: value.updatedBy
+              },
+              value.site,
+              session,
+              void 0,
+              id
+            );
+            item.receivedDate = /* @__PURE__ */ new Date();
+            item.status = "Not Returned" /* NOT_RETURNED */;
+            item.lastUpdate = null;
+            item.remarks = "";
           } else {
-            throw new Error("Invalid Visitor Pass Status");
+            let status = "Invalid";
+            if (item?.status == "Returned" /* RETURNED */) {
+              status = "Available" /* AVAILABLE */;
+            } else if (item?.status == "Removed" /* REMOVED */) {
+              status = "Available" /* AVAILABLE */;
+            } else if (item?.status == "Not Returned" /* NOT_RETURNED */) {
+              status = "In Use" /* IN_USE */;
+            } else if (item?.status && VALID_STATUSES.has(item.status)) {
+              status = item.status;
+            } else {
+              throw new Error("Invalid Visitor Pass Status");
+            }
+            await KeyRepo.updateKeyById(
+              item.keyId,
+              {
+                status,
+                updatedBy: value.updatedBy
+              },
+              value.site,
+              session,
+              void 0,
+              id,
+              true
+            );
+            delete item.receivedDate;
+            item.lastUpdate = /* @__PURE__ */ new Date();
           }
-          await KeyRepo.updateKeyById(
-            item.keyId,
-            {
-              status,
-              updatedBy: value.updatedBy
-            },
-            value.site,
-            session,
-            void 0,
-            id
-          );
-          item.lastUpdate = /* @__PURE__ */ new Date();
         }
       }
       await _updateVisitorTansactionById(id, value, session);
@@ -34502,63 +34752,12 @@ function useVisitorTransactionService() {
       session?.endSession();
     }
   }
-  async function changeVisitorTransactionKeysById(id, visitorPass, passKeys) {
-    const session = import_node_server_utils106.useAtlas.getClient()?.startSession();
-    if (!session) {
-      throw new Error(
-        "Unable to start session for visitor transaction service."
-      );
-    }
-    try {
-      session.startTransaction();
-      const visitorTransaction = await _getVisitorTransactionById(id);
-      if (!visitorTransaction) {
-        throw new Error("Visitor transaction not found.");
-      }
-      const updatePayload = {};
-      if (visitorPass !== void 0) {
-        const currentVisitorPass = normalizeKeyRefs(
-          visitorTransaction.visitorPass
-        );
-        const incomingVisitorPass = normalizeKeyRefs(visitorPass);
-        await syncTransactionKeys({
-          current: currentVisitorPass,
-          incoming: incomingVisitorPass,
-          site: visitorTransaction.site,
-          session
-        });
-        updatePayload.visitorPass = incomingVisitorPass;
-      }
-      if (passKeys !== void 0) {
-        const currentPassKeys = normalizeKeyRefs(visitorTransaction.passKeys);
-        const incomingPassKeys = normalizeKeyRefs(passKeys);
-        await syncTransactionKeys({
-          current: currentPassKeys,
-          incoming: incomingPassKeys,
-          site: visitorTransaction.site,
-          session
-        });
-        updatePayload.passKeys = incomingPassKeys;
-      }
-      if (Object.keys(updatePayload).length > 0) {
-        await _updateVisitorTansactionById(id, updatePayload, session);
-      }
-      await session.commitTransaction();
-      return "Successfully changed visitor transaction keys.";
-    } catch (error) {
-      await session.abortTransaction();
-      import_node_server_utils106.logger.error("Error in visitor transaction change keys by id:", error);
-      throw error;
-    } finally {
-      session.endSession();
-    }
-  }
   return {
     add,
     updateVisitorTransactionById,
     processTransactionDahuaStatus,
-    inviteVisitor,
-    changeVisitorTransactionKeysById
+    inviteVisitor
+    // changeVisitorTransactionKeysById,
   };
 }
 
@@ -34569,8 +34768,8 @@ function useVisitorTransactionController() {
   const {
     add: _add,
     updateVisitorTransactionById: _updateVisitorTransactionById,
-    inviteVisitor: _inviteVisitor,
-    changeVisitorTransactionKeysById: _changeVisitorTransactionKeysById
+    inviteVisitor: _inviteVisitor
+    // changeVisitorTransactionKeysById: _changeVisitorTransactionKeysById,
   } = useVisitorTransactionService();
   const {
     getAll: _getAll,
@@ -34727,7 +34926,12 @@ function useVisitorTransactionController() {
       return;
     } catch (error2) {
       import_node_server_utils107.logger.log({ level: "error", message: error2.message });
-      next(error2);
+      console.log("error", error2);
+      if (error2?.message) {
+        next(new import_node_server_utils107.BadRequestError(error2?.message));
+      } else {
+        next(error2);
+      }
       return;
     }
   }
@@ -34820,61 +35024,14 @@ function useVisitorTransactionController() {
       }
     }
   }
-  async function changeVisitorTransactionKeysById(req, res, next) {
-    const idValidation = import_joi57.default.string().hex().length(24).required();
-    const bodyValidation = import_joi57.default.object({
-      visitorPass: import_joi57.default.array().items(
-        import_joi57.default.object({
-          keyId: import_joi57.default.string().hex().length(24).required()
-        })
-      ).optional(),
-      passKeys: import_joi57.default.array().items(
-        import_joi57.default.object({
-          keyId: import_joi57.default.string().hex().length(24).required()
-        })
-      ).optional()
-    }).or("visitorPass", "passKeys");
-    const _id = req.params.id;
-    const { error: idError } = idValidation.validate(_id);
-    if (idError) {
-      import_node_server_utils107.logger.log({ level: "error", message: idError.message });
-      next(new import_node_server_utils107.BadRequestError(idError.message));
-      return;
-    }
-    const { error, value } = bodyValidation.validate(req.body, {
-      abortEarly: false
-    });
-    if (error) {
-      const message = error.details.map((d) => d.message).join(", ");
-      import_node_server_utils107.logger.log({ level: "error", message });
-      next(new import_node_server_utils107.BadRequestError(message));
-      return;
-    }
-    try {
-      const { visitorPass, passKeys } = value;
-      const result = await _changeVisitorTransactionKeysById(
-        _id,
-        visitorPass,
-        passKeys
-      );
-      res.status(200).json({
-        message: result || "Successfully changed visitor transaction keys."
-      });
-      return;
-    } catch (error2) {
-      import_node_server_utils107.logger.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
   return {
     add,
     getAll,
     updateVisitorTansactionById,
     deleteVisitorTransaction,
     inviteVisitor,
-    getVisitorTransactionById,
-    changeVisitorTransactionKeysById
+    getVisitorTransactionById
+    // changeVisitorTransactionKeysById,
   };
 }
 
@@ -69637,6 +69794,7 @@ function useHidAmicoController() {
   useManpowerSitesSrvc,
   useMemberController,
   useMemberRepo,
+  useMemberService,
   useNewDashboardController,
   useNewDashboardRepo,
   useNfcPatrolLogController,