@goweekdays/core 2.11.16 → 2.11.17

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @goweekdays/core
 
+## 2.11.17
+
+### Patch Changes
+
+- 029e07e: Add getByUserOrg to member repo and update verification logic
+
 ## 2.11.16
 
 ### Patch Changes

package/dist/index.d.ts

@@ -345,6 +345,7 @@ declare function useMemberRepo(): {
     deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<string>;
     updateStatusByOrg: (org: string | ObjectId, status: string, session?: ClientSession) => Promise<string>;
     countUserByOrg: (org: string | ObjectId) => Promise<any>;
+    getByUserOrg: (user: string | ObjectId, org: string | ObjectId) => Promise<TMember | null>;
 };
 
 declare function useMemberController(): {

package/dist/index.js

@@ -2066,6 +2066,49 @@ function useMemberRepo() {
       );
     }
   }
+  async function getByUserOrg(user, org) {
+    try {
+      org = new import_mongodb7.ObjectId(org);
+    } catch (error) {
+      throw new import_utils7.BadRequestError("Invalid organization ID.");
+    }
+    try {
+      user = new import_mongodb7.ObjectId(user);
+    } catch (error) {
+      throw new import_utils7.BadRequestError("Invalid user ID.");
+    }
+    try {
+      const cacheKey = (0, import_utils7.makeCacheKey)(namespace_collection, {
+        user: String(user),
+        org: String(org)
+      });
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        import_utils7.logger.log({
+          level: "info",
+          message: `Cache hit for getByUserOrg member: ${cacheKey}`
+        });
+        return cached;
+      }
+      const data = await collection.findOne({ user, org });
+      setCache(cacheKey, data, 300).then(() => {
+        import_utils7.logger.log({
+          level: "info",
+          message: `Cache set for member by user and org: ${cacheKey}`
+        });
+      }).catch((err) => {
+        import_utils7.logger.log({
+          level: "error",
+          message: `Failed to set cache for member by user and org: ${err.message}`
+        });
+      });
+      return data;
+    } catch (error) {
+      throw new import_utils7.InternalServerError(
+        "Internal server error, failed to retrieve member."
+      );
+    }
+  }
   return {
     createIndexes,
     add,
@@ -2085,7 +2128,8 @@ function useMemberRepo() {
     updateStatusById,
     deleteById,
     updateStatusByOrg,
-    countUserByOrg
+    countUserByOrg,
+    getByUserOrg
   };
 }
 
@@ -10781,7 +10825,11 @@ function useVerificationService() {
     getVerifications: _getVerifications
   } = useVerificationRepo();
   const { getUserByEmail } = useUserRepo();
-  const { add: addMember, countUserByOrg } = useMemberRepo();
+  const {
+    add: addMember,
+    countUserByOrg,
+    getByUserOrg: getMemberByUserOrg
+  } = useMemberRepo();
   const { getById: getOrgById } = useOrgRepo();
   const { getById: getRoleById } = useRoleRepo();
   async function createUserInvite({
@@ -11113,8 +11161,17 @@ function useVerificationService() {
           );
         }
       }
+      const user = await getUserByEmail(value.email);
+      let userId = "";
+      if (user) {
+        userId = String(user._id);
+      }
       const memberCount = await countUserByOrg(String(value.org));
-      if (subscription.seats <= memberCount) {
+      const existingMember = await getMemberByUserOrg(
+        userId,
+        String(value.org)
+      );
+      if (subscription.seats <= memberCount && !existingMember) {
         throw new import_utils53.BadRequestError(
           "Organization has reached the maximum number of members for its subscription plan."
         );