FEATURE: change in_discord role based on condition (#1324)

* FEATURE: true/false in_discord role based on recieve data from RDS and Discord

* TEST: fix failing test

* FEATURE: add userUpdatedWithInDiscordFalse in response

* REFACTOR: syncExternalAccountData condition

* REFACTOR: syncExternalAccountData function

* FIX: order of arguments in addOrUpdate function call

* Update controllers/external-accounts.js

Co-authored-by: Randhir Kumar Singh <[email protected]>

---------

Co-authored-by: Randhir Kumar Singh <[email protected]>

Author: sahsisunny

controllers/external-accounts.js

@@ -55,6 +55,7 @@ const syncExternalAccountData = async (req, res) => {
     const [discordUserData, rdsUserData] = await Promise.all([getDiscordMembers(), retrieveDiscordUsers()]);
     const rdsUserDataMap = {};
     const updateUserDataPromises = [];
+    const userUpdatedWithInDiscordFalse = [];
 
     rdsUserData.forEach((rdsUser) => {
       rdsUserDataMap[rdsUser.discordId] = {
@@ -63,25 +64,36 @@ const syncExternalAccountData = async (req, res) => {
       };
     });
 
-    discordUserData.forEach((discordUser) => {
-      const mappedRdsUser = rdsUserDataMap[discordUser.user.id];
-      if (mappedRdsUser) {
-        const userData = {
+    for (const rdsUser of rdsUserData) {
+      const discordUser = discordUserData.find((discordUser) => discordUser.user.id === rdsUser.discordId);
+
+      let userData = {};
+      if (rdsUser.roles?.in_discord && !discordUser) {
+        userData = {
+          roles: {
+            ...rdsUser.roles,
+            in_discord: false,
+          },
+        };
+        userUpdatedWithInDiscordFalse.push(rdsUser);
+      } else if (discordUser) {
+        userData = {
           discordJoinedAt: discordUser.joined_at,
           roles: {
-            ...mappedRdsUser.roles,
+            ...rdsUser.roles,
             in_discord: true,
           },
         };
-        updateUserDataPromises.push(addOrUpdate(userData, mappedRdsUser.id));
       }
-    });
+      updateUserDataPromises.push(addOrUpdate(userData, rdsUser.id));
+    }
 
     await Promise.all(updateUserDataPromises);
 
     return res.json({
       rdsUsers: rdsUserData.length,
       discordUsers: discordUserData.length,
+      userUpdatedWithInDiscordFalse: userUpdatedWithInDiscordFalse.length,
       message: "Data Sync Complete",
     });
   } catch (err) {

models/users.js

@@ -552,7 +552,7 @@ const getDiscordUsers = async () => {
     const users = [];
     usersRef.forEach((user) => {
       const userData = user.data();
-      if (userData?.discordId && userData.roles?.in_discord === false)
+      if (userData?.discordId)
         users.push({
           id: user.id,
           ...userData,

test/integration/external-accounts.test.js

@@ -262,8 +262,9 @@ describe("External Accounts", function () {
           }
           expect(res).to.have.status(200);
           expect(res.body).to.deep.equal({
-            rdsUsers: 2,
+            rdsUsers: 3,
             discordUsers: 2,
+            userUpdatedWithInDiscordFalse: 1,
             message: "Data Sync Complete",
           });
           return done();