From 38f444e88570131d5260ba36cc157bf2c8c4f4c9 Mon Sep 17 00:00:00 2001
From: Anish Pawaskar <anishpawaskar@gmail.com>
Date: Thu, 5 Oct 2023 00:44:44 +0530
Subject: [PATCH 1/3] add sync idle 7d+ users on discord button (#538)

* add sync idle 7d+ users on discord button

* fix test

* fix typo

* fix test

* revert headless to false

* fix failing test

* revert headless to new
---
 __tests__/home/home.test.js | 71 +++++++++++++++++++++++++++++++++++++
 constants.js                |  2 ++
 index.html                  |  8 +++++
 script.js                   | 15 ++++++++
 4 files changed, 96 insertions(+)

diff --git a/__tests__/home/home.test.js b/__tests__/home/home.test.js
index 0f4cf2d5..545b19f2 100644
--- a/__tests__/home/home.test.js
+++ b/__tests__/home/home.test.js
@@ -31,6 +31,38 @@ describe('Home Page', () => {
       } else if (
         url ===
         `https://api.realdevsquad.com/discord-actions/nicknames/sync?dev=true`
+      ) {
+        interceptedRequest.respond({
+          status: 200,
+          ok: true,
+          contentType: 'application/json',
+          headers: {
+            'Access-Control-Allow-Origin': '*',
+            'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
+            'Access-Control-Allow-Headers': 'Content-Type, Authorization',
+          },
+          body: JSON.stringify({
+            message: 'All Idle 7d+ Users updated successfully.',
+            totalArchivedUsers: 1,
+            totalGroupIdle7dRolesApplied: {
+              count: 3,
+              response: [
+                { message: 'Role added successfully' },
+                { message: 'Role added successfully' },
+                { message: 'Role added successfully' },
+              ],
+            },
+            totalGroupIdle7dRolesNotApplied: { count: 0, errors: [] },
+            totalGroupIdle7dRolesNotRemoved: { count: 0, errors: [] },
+            totalGroupIdle7dRolesRemoved: { count: 0, response: [] },
+            totalIdle7dUsers: 4,
+            totalUserRoleToBeAdded: 4,
+            totalUserRoleToBeRemoved: 0,
+            totalUsersHavingNoDiscordId: 0,
+          }),
+        });
+      } else if (
+        url === `https://api.realdevsquad.com/discord-actions/group-idle-7d`
       ) {
         interceptedRequest.respond({
           status: 200,
@@ -155,6 +187,45 @@ describe('Home Page', () => {
     expect(latestSyncStatusText).not.toBe(`Last Sync: In progress`);
   });
 
+  it('should display the Sync Idle 7d+ Users On Discord button', async () => {
+    const syncIdle7dPlusUsersButton = await page.$('#sync-idle-7d-Plus-users');
+    expect(syncIdle7dPlusUsersButton).toBeTruthy();
+
+    const spinnerInsideSyncIdle7dPlusUsers = await syncIdle7dPlusUsersButton.$(
+      '.spinner',
+    );
+    expect(spinnerInsideSyncIdle7dPlusUsers).toBeTruthy();
+
+    const syncIdle7dPlusUsersUpdate = await page.$(
+      '#sync-idle-7d-Plus-users-update',
+    );
+    expect(syncIdle7dPlusUsersUpdate).toBeTruthy();
+  });
+
+  it('should display the latest sync date when a super_user clicks on the Sync Idle 7d+ Users On Discord button', async () => {
+    await page.evaluate(() => {
+      document.querySelector('#sync-idle-7d-Plus-users').click();
+    });
+    await page.waitForNetworkIdle();
+
+    const latestSyncStatusElement = await page.waitForSelector(
+      '#sync-idle-7d-Plus-users-update',
+    );
+
+    expect(latestSyncStatusElement).toBeTruthy();
+
+    const latestSyncStatusText = await page.evaluate(
+      (element) => element.textContent,
+      latestSyncStatusElement,
+    );
+
+    expect(latestSyncStatusText).not.toBe(`Last Sync: Failed`);
+    expect(latestSyncStatusText).not.toBe(
+      `Last Sync: Synced Data Not Available`,
+    );
+    expect(latestSyncStatusText).not.toBe(`Last Sync: In progress`);
+  });
+
   it('should display the Create Goals anchor button', async () => {
     const createGoalsButton = await page.$('#create-goal');
     expect(createGoalsButton).toBeTruthy();
diff --git a/constants.js b/constants.js
index dd5b8ce0..14d3280c 100644
--- a/constants.js
+++ b/constants.js
@@ -14,6 +14,8 @@ const SYNC_EXTERNAL_ACCOUNTS_UPDATE = 'sync-external-accounts-update';
 const SYNC_UNVERIFIED_USERS_UPDATE = 'sync-unverified-users-update';
 const SYNC_NICKNAMES = 'sync-nicknames';
 const SYNC_NICKNAMES_STATUS_UPDATE = 'sync-nicknames-status-update';
+const SYNC_IDLE_7D_Plus_USERS = 'sync-idle-7d-Plus-users';
+const SYNC_IDLE_7D_Plus_USERS_UPDATE = 'sync-idle-7d-Plus-users-update';
 const SYNC_IN_PROGRESS = 'Last Sync: In progress';
 const SYNC_SUCCESSFUL = 'Last Sync: Successful';
 const SYNC_FAILED = 'Last Sync: Failed';
diff --git a/index.html b/index.html
index 1c1d701f..66a47ff7 100644
--- a/index.html
+++ b/index.html
@@ -75,6 +75,14 @@
         <div class="status" id="sync-idle-users-update"></div>
       </div>
 
+      <div class="button-container">
+        <button class="action-button" id="sync-idle-7d-Plus-users">
+          <span class="spinner"></span>
+          Sync Idle 7d+ Users On Discord
+        </button>
+        <div class="status" id="sync-idle-7d-Plus-users-update"></div>
+      </div>
+
       <div class="button-container">
         <button class="action-button" id="sync-nicknames">
           <span class="spinner"></span>
diff --git a/script.js b/script.js
index db35697b..94dfb575 100644
--- a/script.js
+++ b/script.js
@@ -13,6 +13,10 @@ const syncNicknamesButton = document.getElementById(SYNC_NICKNAMES);
 const syncUsersStatusUpdate = document.getElementById(SYNC_USERS_STATUS_UPDATE);
 const syncIdleUsersButton = document.getElementById(SYNC_IDLE_USERS);
 const syncIdleUsersUpdate = document.getElementById(SYNC_IDLE_USERS_UPDATE);
+const syncIdle7dUsersButton = document.getElementById(SYNC_IDLE_7D_Plus_USERS);
+const syncIdle7dUsersUpdate = document.getElementById(
+  SYNC_IDLE_7D_Plus_USERS_UPDATE,
+);
 const repoSyncStatusUpdate = document.getElementById(SYNC_REPO_STATUS_UPDATE);
 
 const syncNicknamesStatusUpdate = document.getElementById(
@@ -54,6 +58,10 @@ export async function showSuperUserOptions(...privateBtns) {
       syncIdleUsersUpdate.textContent = `Last Sync: ${
         localStorage.getItem('lastSyncIdleUsers') || 'Synced Data Not Available'
       }`;
+      syncIdle7dUsersUpdate.textContent = `Last Sync: ${
+        localStorage.getItem('lastSyncIdle7dUsers') ||
+        'Synced Data Not Available'
+      }`;
       syncNicknamesStatusUpdate.textContent = `Last Sync: ${
         localStorage.getItem('lastSyncNicknames') || 'Synced Data Not Available'
       }`;
@@ -319,3 +327,10 @@ addClickEventListener(
   syncNicknamesStatusUpdate,
   'POST',
 );
+addClickEventListener(
+  syncIdle7dUsersButton,
+  '/discord-actions/group-idle-7d',
+  'lastSyncIdle7dUsers',
+  syncIdle7dUsersUpdate,
+  'PUT',
+);

From afb266952547e4280c4906cd97af2227ab5cd2c7 Mon Sep 17 00:00:00 2001
From: Vishal kamat <48379860+meanwhile7@users.noreply.github.com>
Date: Fri, 6 Oct 2023 23:01:22 +0530
Subject: [PATCH 2/3] Added remove functionality (#537)

* added remove functionality

* added toaster message alert in place of alert message

* removed console log and comments

* added console error

* added console error

* removed alert instead used console error

* removed console.err
---
 __tests__/groups/group.test.js | 28 ++++++++++++++++++++++
 groups/index.html              |  4 +++-
 groups/script.js               | 43 ++++++++++++++++++++++++++++++----
 groups/style.css               | 38 ++++++++++++++++++++++++++++++
 groups/utils.js                | 18 ++++++++++++++
 5 files changed, 126 insertions(+), 5 deletions(-)

diff --git a/__tests__/groups/group.test.js b/__tests__/groups/group.test.js
index 70849be4..a86db644 100644
--- a/__tests__/groups/group.test.js
+++ b/__tests__/groups/group.test.js
@@ -116,6 +116,21 @@ describe('Discord Groups Page', () => {
         } else {
           interceptedRequest.continue();
         }
+      } else if (interceptedRequest.method() === 'DELETE') {
+        if (url === `${BASE_URL}/discord-actions/roles`) {
+          interceptedRequest.respond({
+            status: 200,
+            contentType: 'application/json',
+            headers: {
+              'Access-Control-Allow-Origin': '*',
+              'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
+              'Access-Control-Allow-Headers': 'Content-Type, Authorization',
+            },
+            body: JSON.stringify({ message: 'Role deleted successfully' }),
+          });
+        } else {
+          interceptedRequest.continue();
+        }
       } else {
         interceptedRequest.continue();
       }
@@ -208,6 +223,19 @@ describe('Discord Groups Page', () => {
     expect(buttonText).toBe('Remove me from this group');
   });
 
+  test('Should show role deleted', async () => {
+    await page.$$eval('.group-role', (elements) => {
+      elements[1].click();
+    });
+    // Wait for the btn-add-role and click it
+    const addRoleBtn = await page.$('.btn-add-role');
+    await addRoleBtn.click();
+
+    await page.waitForNetworkIdle();
+    const toast = await page.$('.toaster-container');
+    expect(toast).toBeTruthy();
+  });
+
   test('Should display an error message if the role name contains "group"', async () => {
     createGroup = await page.$('.create-groups-tab');
     await createGroup.click();
diff --git a/groups/index.html b/groups/index.html
index 92e1b068..cd28f444 100644
--- a/groups/index.html
+++ b/groups/index.html
@@ -42,7 +42,9 @@ <h3 class="not-verified-tag hidden">
           <h2 id="no-results-message">No results found.</h2>
         </main>
       </div>
-
+      <div class="toaster-container">
+        <div id="toaster" class="toaster-message hidden"></div>
+      </div>
       <div class="create-group hidden">
         <div class="group-fields">
           <label for="new-group" class="label-for-new-group"
diff --git a/groups/script.js b/groups/script.js
index 2cea9bea..e6b2ac06 100644
--- a/groups/script.js
+++ b/groups/script.js
@@ -8,6 +8,7 @@ import {
   removeGroupKeywordFromDiscordRoleName,
   getDiscordGroups,
   addGroupRoleToMember,
+  removeRoleFromMember,
   createDiscordGroupRole,
   getUserSelf,
   getUserGroupRoles,
@@ -196,6 +197,18 @@ function debounce(func, delay) {
   };
 }
 
+function showToaster(message) {
+  const toaster = document.getElementById('toaster');
+  toaster.innerText = message;
+  toaster.classList.add('show');
+  toaster.classList.remove('hidden');
+
+  setTimeout(() => {
+    toaster.classList.remove('show');
+    toaster.classList.add('hidden');
+  }, 3000);
+}
+
 searchInput.addEventListener(
   'input',
   debounce(() => {
@@ -245,16 +258,22 @@ async function addrole() {
       if (currentCount !== null && currentCount !== undefined) {
         groupNameElement.setAttribute('data-member-count', +currentCount + 1);
       }
-      alert(res.message);
       if (isDev) {
         // After adding the role, re-fetch the user group data to update it
         UserGroupData = await getUserGroupRoles();
 
         // Update the button state with the refreshed data
         updateButtonState();
+        showToaster(res.message);
+      } else {
+        alert(res.message);
       }
     } catch (err) {
-      alert(err.message);
+      if (isDev) {
+        showToaster(err.message);
+      } else {
+        alert(err.message);
+      }
     } finally {
       loader.classList.add('hidden');
     }
@@ -264,10 +283,26 @@ async function addrole() {
 /**
  * TO REMOVE YOURSELF OF A ROLE
  */
+
 async function removeRoleHandler() {
-  console.log('Remove function to be added after this pr');
+  if (memberAddRoleBody?.userid && memberAddRoleBody?.roleid !== '') {
+    loader.classList.remove('hidden');
 
-  // TODO: REMOVE ME BUTTON FUNCTIONALITY TO BE ADDED
+    try {
+      // Remove the role from the member
+      const res = await removeRoleFromMember(
+        memberAddRoleBody.roleid,
+        memberAddRoleBody.userid,
+      );
+      showToaster(res.message);
+      UserGroupData = await getUserGroupRoles();
+      updateButtonState();
+    } catch (err) {
+      showToaster(err.message);
+    } finally {
+      loader.classList.add('hidden');
+    }
+  }
 }
 
 /**
diff --git a/groups/style.css b/groups/style.css
index 540f5dd8..9e17b9bf 100644
--- a/groups/style.css
+++ b/groups/style.css
@@ -55,6 +55,44 @@
   background-color: var(--color-active-groups-background);
 }
 
+/*
+    FOR Message toaster box
+*/
+
+.toaster-container {
+  position: fixed;
+  top: 20px;
+  right: 20px;
+  width: 300px;
+}
+
+.toaster-message {
+  padding: 15px;
+  background-color: #4caf50;
+  color: white;
+  border-radius: 5px;
+  margin-bottom: 10px;
+  display: none;
+}
+
+.hidden {
+  display: none;
+}
+
+.show {
+  display: block;
+  animation: fadeOut 2s forwards;
+}
+
+@keyframes fadeOut {
+  0% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+
 /*
     FOR MANAGE GROUPS
 */
diff --git a/groups/utils.js b/groups/utils.js
index 868d1708..7b2b9efb 100644
--- a/groups/utils.js
+++ b/groups/utils.js
@@ -104,6 +104,23 @@ async function addGroupRoleToMember(memberRoleBody) {
   }
 }
 
+async function removeRoleFromMember(roleId, discordId) {
+  try {
+    const res = await fetch(`${BASE_URL}/discord-actions/roles`, {
+      method: 'DELETE',
+      credentials: 'include',
+      headers: {
+        'Content-type': 'application/json',
+      },
+      body: JSON.stringify({ roleid: roleId, userid: discordId }),
+    });
+
+    return await res.json();
+  } catch (err) {
+    throw err;
+  }
+}
+
 function removeGroupKeywordFromDiscordRoleName(groupName) {
   if (/^group.*/.test(groupName)) {
     const splitNames = groupName.split('-');
@@ -134,6 +151,7 @@ export {
   getDiscordGroups,
   createDiscordGroupRole,
   addGroupRoleToMember,
+  removeRoleFromMember,
   removeGroupKeywordFromDiscordRoleName,
   getSearchValueFromURL,
 };

From a1fb6893487eb0c6847be613dbbe9b66383321e4 Mon Sep 17 00:00:00 2001
From: AnjaliDeshwani <deshwanianjali@gmail.com>
Date: Sun, 8 Oct 2023 11:25:45 +0530
Subject: [PATCH 3/3] feat: added sync onboarding 31 days plus users button
 (#547)

---
 __tests__/home/home.test.js | 114 +++++++++++++++++++++++++++++++++++-
 constants.js                |   3 +
 index.html                  |   8 +++
 script.js                   |  19 ++++++
 4 files changed, 141 insertions(+), 3 deletions(-)

diff --git a/__tests__/home/home.test.js b/__tests__/home/home.test.js
index 545b19f2..6252da33 100644
--- a/__tests__/home/home.test.js
+++ b/__tests__/home/home.test.js
@@ -29,8 +29,7 @@ describe('Home Page', () => {
           body: JSON.stringify(superUserData),
         });
       } else if (
-        url ===
-        `https://api.realdevsquad.com/discord-actions/nicknames/sync?dev=true`
+        url === `https://api.realdevsquad.com/discord-actions/group-idle-7d`
       ) {
         interceptedRequest.respond({
           status: 200,
@@ -62,7 +61,8 @@ describe('Home Page', () => {
           }),
         });
       } else if (
-        url === `https://api.realdevsquad.com/discord-actions/group-idle-7d`
+        url ===
+        `https://api.realdevsquad.com/discord-actions/nicknames/sync?dev=true`
       ) {
         interceptedRequest.respond({
           status: 200,
@@ -78,6 +78,74 @@ describe('Home Page', () => {
             message: 'Users Nicknames updated successfully',
           }),
         });
+      } else if (
+        url ===
+        `https://api.realdevsquad.com/discord-actions/group-onboarding-31d-plus`
+      ) {
+        interceptedRequest.respond({
+          status: 200,
+          ok: true,
+          contentType: 'application/json',
+          headers: {
+            'Access-Control-Allow-Origin': '*',
+            'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
+            'Access-Control-Allow-Headers': 'Content-Type, Authorization',
+          },
+          body: JSON.stringify({
+            message:
+              'All Users with 31 Days Plus Onboarding are updated successfully.',
+            totalOnboardingUsers31DaysCompleted: {
+              users: [
+                {
+                  userId: 'R4qppGmmAvJzQXI4jvuc',
+                  discordId: '799600467218923521',
+                  username: 'AnishPawaskar',
+                },
+                {
+                  userId: 'W7hqS6BJqWzNW2ejeimC',
+                  discordId: '700385688557715456',
+                  username: 'amandixit',
+                },
+              ],
+              count: 2,
+            },
+            totalUsersHavingNoDiscordId: 0,
+            totalArchivedUsers: 0,
+            usersAlreadyHavingOnboaring31DaysRole: {
+              users: [],
+              count: 0,
+            },
+            totalOnboarding31dPlusRoleApplied: {
+              count: 2,
+              response: [
+                {
+                  message: 'Role added successfully',
+                  discordId: '799600467218923521',
+                },
+                {
+                  message: 'Role added successfully',
+                  discordId: '700385688557715456',
+                },
+              ],
+            },
+            totalOnboarding31dPlusRoleNoteApplied: {
+              count: 0,
+              errors: [],
+            },
+            totalOnboarding31dPlusRoleRemoved: {
+              count: 0,
+              response: [],
+            },
+            totalOnboarding31dPlusRoleNotRemoved: {
+              count: 0,
+              errors: [],
+            },
+            errorInFetchingUserDetailsForRoleRemoval: {
+              count: 0,
+              errors: [],
+            },
+          }),
+        });
       } else {
         interceptedRequest.continue();
       }
@@ -318,4 +386,44 @@ describe('Home Page', () => {
     const repoLinkStyle = await page.evaluate((el) => el.style, repoLink);
     expect(repoLinkStyle).toBeTruthy();
   });
+
+  it('should display the Sync Onboarding 31d+ button', async () => {
+    const syncOnboarding31dPlusUsersButton = await page.$(
+      '#sync-onboarding-31d-plus-users',
+    );
+    expect(syncOnboarding31dPlusUsersButton).toBeTruthy();
+
+    const spinnerInsideSyncOnboarding31dPlusUsers =
+      await syncOnboarding31dPlusUsersButton.$('.spinner');
+    expect(spinnerInsideSyncOnboarding31dPlusUsers).toBeTruthy();
+
+    const syncOnboarding31dPlusUsersUpdate = await page.$(
+      '#sync-onboarding-31d-plus-users-update',
+    );
+    expect(syncOnboarding31dPlusUsersUpdate).toBeTruthy();
+  });
+
+  it('should display the latest sync date when a super_user clicks on the  Sync Onboarding 31d+ button', async () => {
+    await page.evaluate(() => {
+      document.querySelector('#sync-onboarding-31d-plus-users').click();
+    });
+    await page.waitForNetworkIdle();
+
+    const latestSyncStatusElement = await page.waitForSelector(
+      '#sync-onboarding-31d-plus-users-update',
+    );
+
+    expect(latestSyncStatusElement).toBeTruthy();
+
+    const latestSyncStatusText = await page.evaluate(
+      (element) => element.textContent,
+      latestSyncStatusElement,
+    );
+
+    expect(latestSyncStatusText).not.toBe(`Last Sync: Failed`);
+    expect(latestSyncStatusText).not.toBe(
+      `Last Sync: Synced Data Not Available`,
+    );
+    expect(latestSyncStatusText).not.toBe(`Last Sync: In progress`);
+  });
 });
diff --git a/constants.js b/constants.js
index 14d3280c..d315cacb 100644
--- a/constants.js
+++ b/constants.js
@@ -16,6 +16,9 @@ const SYNC_NICKNAMES = 'sync-nicknames';
 const SYNC_NICKNAMES_STATUS_UPDATE = 'sync-nicknames-status-update';
 const SYNC_IDLE_7D_Plus_USERS = 'sync-idle-7d-Plus-users';
 const SYNC_IDLE_7D_Plus_USERS_UPDATE = 'sync-idle-7d-Plus-users-update';
+const SYNC_ONBOARDING_31D_PLUS_USERS = 'sync-onboarding-31d-plus-users';
+const SYNC_ONBOARDING_31D_PLUS_USERS_UPDATE =
+  'sync-onboarding-31d-plus-users-update';
 const SYNC_IN_PROGRESS = 'Last Sync: In progress';
 const SYNC_SUCCESSFUL = 'Last Sync: Successful';
 const SYNC_FAILED = 'Last Sync: Failed';
diff --git a/index.html b/index.html
index 66a47ff7..985abe5b 100644
--- a/index.html
+++ b/index.html
@@ -90,6 +90,14 @@
         </button>
         <div class="status" id="sync-nicknames-status-update"></div>
       </div>
+
+      <div class="button-container">
+        <button class="action-button" id="sync-onboarding-31d-plus-users">
+          <span class="spinner"></span>
+          Sync Onboarding 31d+ Users
+        </button>
+        <div class="status" id="sync-onboarding-31d-plus-users-update"></div>
+      </div>
     </section>
 
     <section class="buttonSection">
diff --git a/script.js b/script.js
index 94dfb575..fd75bf04 100644
--- a/script.js
+++ b/script.js
@@ -31,6 +31,13 @@ const syncUnverifiedUsersUpdate = document.getElementById(
 );
 const buttonSection = document.getElementById('sync-buttons');
 
+const syncOnboarding31dPlusUsersButton = document.getElementById(
+  SYNC_ONBOARDING_31D_PLUS_USERS,
+);
+const syncOnboarding31dPlusUsersUpdate = document.getElementById(
+  SYNC_ONBOARDING_31D_PLUS_USERS_UPDATE,
+);
+
 function getCurrentTimestamp() {
   return new Date().toLocaleString();
 }
@@ -65,6 +72,10 @@ export async function showSuperUserOptions(...privateBtns) {
       syncNicknamesStatusUpdate.textContent = `Last Sync: ${
         localStorage.getItem('lastSyncNicknames') || 'Synced Data Not Available'
       }`;
+      syncOnboarding31dPlusUsersUpdate.textContent = `Last Sync: ${
+        localStorage.getItem('lastSyncOnboarding31dPlusUsers') ||
+        'Synced Data Not Available'
+      }`;
     }
   } catch (err) {
     console.log(err);
@@ -334,3 +345,11 @@ addClickEventListener(
   syncIdle7dUsersUpdate,
   'PUT',
 );
+
+addClickEventListener(
+  syncOnboarding31dPlusUsersButton,
+  '/discord-actions/group-onboarding-31d-plus',
+  'lastSyncOnboarding31dPlusUsers',
+  syncOnboarding31dPlusUsersUpdate,
+  'PUT',
+);