@7365admin1/core 3.12.0 → 3.13.0

package/dist/index.mjs

@@ -10150,6 +10150,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 ObjectId13(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 ObjectId13(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(() => {
+        logger9.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger9.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return result;
+    } catch (error) {
+      throw new InternalServerError8("Failed to complete pending invites.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -10159,7 +10209,8 @@ function useVerificationRepo() {
     getByIdByType,
     updateStatusById,
     getByStatus,
-    findOne
+    findOne,
+    completePendingInvites
   };
 }
 
@@ -11769,6 +11820,61 @@ function useVerificationRepoV2() {
       throw new InternalServerError11("Failed to update verification code.");
     }
   }
+  async function completePendingInvites({
+    email,
+    orgId,
+    siteId,
+    app,
+    session
+  }) {
+    const orgCandidates = [orgId];
+    try {
+      orgCandidates.push(new ObjectId18(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 ObjectId18(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(() => {
+        logger13.info(`Cache cleared for namespace: ${namespace_collection}`);
+      }).catch((err) => {
+        logger13.error(
+          `Failed to clear cache for namespace: ${namespace_collection}`,
+          err
+        );
+      });
+      return result;
+    } catch (error) {
+      throw new InternalServerError11("Failed to complete pending invites.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -11780,7 +11886,8 @@ function useVerificationRepoV2() {
     updateStatusById,
     countPendingOrgInvites,
     getPendingVerificationByEmail,
-    updateVerificationCodeById
+    updateVerificationCodeById,
+    completePendingInvites
   };
 }
 
@@ -13893,7 +14000,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();
@@ -13997,6 +14104,13 @@ function useMemberService() {
           session
         );
       }
+      await completePendingInvites({
+        email: user.email,
+        orgId,
+        siteId,
+        app,
+        session
+      });
       await session?.commitTransaction();
       return { member };
     } catch (error) {
@@ -21059,6 +21173,7 @@ async function convertObjectIdUtil2(id, fieldName) {
       throw new Error(`Invalid ID conversion to ObjectId of ${fieldName}.`);
     return new ObjectId40(id);
   } catch (_) {
+    console.log(`Invalid ID conversion to ObjectId of ${fieldName}. : `, id);
     throw new Error(`Invalid ID conversion to ObjectId of ${fieldName}.`);
   }
 }
@@ -33473,12 +33588,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)
@@ -33486,9 +33617,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 },
@@ -33514,7 +33650,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) {
@@ -33879,40 +34019,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 = useAtlas50.getClient()?.startSession();
     const allowedPersonTypes = [
@@ -34048,7 +34154,9 @@ function useVisitorTransactionService() {
                   value.site,
                   session,
                   void 0,
-                  visitorId
+                  visitorId,
+                  void 0,
+                  true
                 );
               }
               for (const item of preparedPassKeys) {
@@ -34060,7 +34168,11 @@ function useVisitorTransactionService() {
                     visitorId
                   },
                   value.site,
-                  session
+                  session,
+                  void 0,
+                  visitorId,
+                  void 0,
+                  true
                 );
               }
             })
@@ -34116,7 +34228,9 @@ function useVisitorTransactionService() {
             value.site,
             session,
             void 0,
-            result
+            result,
+            void 0,
+            true
           );
         }
       }
@@ -34128,7 +34242,9 @@ function useVisitorTransactionService() {
             value.site,
             session,
             void 0,
-            result
+            result,
+            void 0,
+            true
           );
         }
       }
@@ -34264,7 +34380,8 @@ function useVisitorTransactionService() {
               value.site,
               session,
               void 0,
-              id
+              id,
+              true
             );
             delete item.receivedDate;
             item.lastUpdate = /* @__PURE__ */ new Date();
@@ -34311,7 +34428,8 @@ function useVisitorTransactionService() {
               value.site,
               session,
               void 0,
-              id
+              id,
+              true
             );
             delete item.receivedDate;
             item.lastUpdate = /* @__PURE__ */ new Date();
@@ -34482,63 +34600,12 @@ function useVisitorTransactionService() {
       session?.endSession();
     }
   }
-  async function changeVisitorTransactionKeysById(id, visitorPass, passKeys) {
-    const session = useAtlas50.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();
-      logger80.error("Error in visitor transaction change keys by id:", error);
-      throw error;
-    } finally {
-      session.endSession();
-    }
-  }
   return {
     add,
     updateVisitorTransactionById,
     processTransactionDahuaStatus,
-    inviteVisitor,
-    changeVisitorTransactionKeysById
+    inviteVisitor
+    // changeVisitorTransactionKeysById,
   };
 }
 
@@ -34549,8 +34616,8 @@ function useVisitorTransactionController() {
   const {
     add: _add,
     updateVisitorTransactionById: _updateVisitorTransactionById,
-    inviteVisitor: _inviteVisitor,
-    changeVisitorTransactionKeysById: _changeVisitorTransactionKeysById
+    inviteVisitor: _inviteVisitor
+    // changeVisitorTransactionKeysById: _changeVisitorTransactionKeysById,
   } = useVisitorTransactionService();
   const {
     getAll: _getAll,
@@ -34707,7 +34774,12 @@ function useVisitorTransactionController() {
       return;
     } catch (error2) {
       logger81.log({ level: "error", message: error2.message });
-      next(error2);
+      console.log("error", error2);
+      if (error2?.message) {
+        next(new BadRequestError101(error2?.message));
+      } else {
+        next(error2);
+      }
       return;
     }
   }
@@ -34800,61 +34872,14 @@ function useVisitorTransactionController() {
       }
     }
   }
-  async function changeVisitorTransactionKeysById(req, res, next) {
-    const idValidation = Joi57.string().hex().length(24).required();
-    const bodyValidation = Joi57.object({
-      visitorPass: Joi57.array().items(
-        Joi57.object({
-          keyId: Joi57.string().hex().length(24).required()
-        })
-      ).optional(),
-      passKeys: Joi57.array().items(
-        Joi57.object({
-          keyId: Joi57.string().hex().length(24).required()
-        })
-      ).optional()
-    }).or("visitorPass", "passKeys");
-    const _id = req.params.id;
-    const { error: idError } = idValidation.validate(_id);
-    if (idError) {
-      logger81.log({ level: "error", message: idError.message });
-      next(new BadRequestError101(idError.message));
-      return;
-    }
-    const { error, value } = bodyValidation.validate(req.body, {
-      abortEarly: false
-    });
-    if (error) {
-      const message = error.details.map((d) => d.message).join(", ");
-      logger81.log({ level: "error", message });
-      next(new BadRequestError101(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) {
-      logger81.log({ level: "error", message: error2.message });
-      next(error2);
-      return;
-    }
-  }
   return {
     add,
     getAll,
     updateVisitorTansactionById,
     deleteVisitorTransaction,
     inviteVisitor,
-    getVisitorTransactionById,
-    changeVisitorTransactionKeysById
+    getVisitorTransactionById
+    // changeVisitorTransactionKeysById,
   };
 }
 
@@ -70055,6 +70080,7 @@ export {
   useManpowerSitesSrvc,
   useMemberController,
   useMemberRepo,
+  useMemberService,
   useNewDashboardController,
   useNewDashboardRepo,
   useNfcPatrolLogController,