Merge pull request #1342 from Real-Dev-Squad/main

Main to Dev Sync

Author: RitikJaiswal75

controllers/users.js

@@ -324,8 +324,11 @@ const markUnverified = async (req, res) => {
     });
 
     usersInRdsDiscordServer.forEach((discordUser) => {
-      const found = discordUser.roles.find((role) => role === discordDeveloperRoleId);
-      if (found && !rdsUserMap[discordUser.user.id]) {
+      const isDeveloper = discordUser.roles.includes(discordDeveloperRoleId);
+      const isMissingUnverifiedRole = !discordUser.roles.includes(unverifiedRoleId);
+      const isUserUnverified = !rdsUserMap[discordUser.user.id]; // Doesn't have discordId in RDS user object
+
+      if (isDeveloper && isUserUnverified && isMissingUnverifiedRole) {
         usersToApplyUnverifiedRole.push(discordUser.user.id);
       }
     });