Skip to content

Commit 30f7254

Browse files
committed
Make enrichGroupDataWithMembershipInfo use the stubbed function
1 parent 1d38a1c commit 30f7254

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

models/discordactions.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const { generateDiscordProfileImageUrl } = require("../utils/discord-actions");
1+
const discordService = require("../services/discordService");
2+
const { addRoleToUser, removeRoleFromUser } = discordService;
23
const firestore = require("../utils/firestore");
34
const discordRoleModel = firestore.collection("discord-roles");
45
const memberRoleModel = firestore.collection("member-group-roles");
@@ -14,13 +15,13 @@ const { ONE_DAY_IN_MS, SIMULTANEOUS_WORKER_CALLS } = require("../constants/users
1415
const userModel = firestore.collection("users");
1516
const photoVerificationModel = firestore.collection("photo-verification");
1617
const dataAccess = require("../services/dataAccessLayer");
17-
const { getDiscordMembers, addRoleToUser, removeRoleFromUser } = require("../services/discordService");
1818
const discordDeveloperRoleId = config.get("discordDeveloperRoleId");
1919
const discordMavenRoleId = config.get("discordMavenRoleId");
2020
const discordMissedUpdatesRoleId = config.get("discordMissedUpdatesRoleId");
2121

2222
const userStatusModel = firestore.collection("usersStatus");
2323
const usersUtils = require("../utils/users");
24+
const { generateDiscordProfileImageUrl } = require("../utils/discord-actions");
2425
const { getUsersBasedOnFilter, fetchUser } = require("./users");
2526
const {
2627
convertDaysToMilliseconds,
@@ -329,7 +330,7 @@ const enrichGroupDataWithMembershipInfo = async (discordId, groups = []) => {
329330
});
330331

331332
// Discord live role membership (used for memberCount)
332-
const discordMembers = await getDiscordMembers();
333+
const discordMembers = await discordService.getDiscordMembers();
333334
const liveRoleIdToCountMap = new Map();
334335

335336
discordMembers.forEach((member) => {
@@ -411,7 +412,7 @@ const updateIdleUsersOnDiscord = async (dev) => {
411412
groupIdleRoleId = groupIdleRole.role.roleid;
412413
if (!groupIdleRole.roleExists) throw new Error("Idle Role does not exist");
413414
const { allUserStatus } = await getAllUserStatus({ state: userState.IDLE });
414-
const discordUsers = await getDiscordMembers();
415+
const discordUsers = await discordService.getDiscordMembers();
415416
const usersHavingIdleRole = [];
416417
discordUsers?.forEach((discordUser) => {
417418
const isDeveloper = discordUser.roles.includes(discordDeveloperRoleId);
@@ -636,7 +637,7 @@ const updateIdle7dUsersOnDiscord = async (dev) => {
636637
if (!groupIdle7dRole.roleExists) throw new Error("Idle Role does not exist");
637638

638639
const { allUserStatus } = await getAllUserStatus({ state: userState.IDLE });
639-
const discordUsers = await getDiscordMembers();
640+
const discordUsers = await discordService.getDiscordMembers();
640641
const usersHavingIdle7dRole = [];
641642

642643
discordUsers?.forEach((discordUser) => {
@@ -826,7 +827,7 @@ const updateUsersWith31DaysPlusOnboarding = async () => {
826827
allOnboardingUsers31DaysCompleted
827828
);
828829

829-
const discordMembers = await getDiscordMembers();
830+
const discordMembers = await discordService.getDiscordMembers();
830831
const groupOnboardingRole = await getGroupRole("group-onboarding-31d+");
831832
const groupOnboardingRoleId = groupOnboardingRole.role.roleid;
832833
if (!groupOnboardingRole.roleExists) throw new Error("Role does not exist");
@@ -985,7 +986,7 @@ const getMissedProgressUpdatesUsers = async (options = {}) => {
985986
filteredByOoo: 0,
986987
};
987988
try {
988-
const discordUsersPromise = getDiscordMembers();
989+
const discordUsersPromise = discordService.getDiscordMembers();
989990
const missedUpdatesRoleId = discordMissedUpdatesRoleId;
990991

991992
const normalizedExcludedWeekdays = new Set(

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"typescript": "5.3.3"
7979
},
8080
"engines": {
81-
"node": "22.10.0"
81+
"node": "^22.10.0"
8282
},
8383
"pre-commit": [
8484
"lint"

test/unit/services/discordService.test.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ const discordMembersArray = require("../../fixtures/discordResponse/discord-resp
1616
// const { func } = require("joi");
1717
let fetchStub;
1818
describe("Discord services", function () {
19+
before(function () {
20+
process.env.DISCORD_BASE_URL = "http://localhost:8080";
21+
});
22+
1923
describe("setInDiscordFalseScript", function () {
2024
beforeEach(async function () {
2125
const addUsersPromises = [];

0 commit comments

Comments
 (0)