Skip to content

Commit 1d38a1c

Browse files
committed
Fix group member count using live Discord roles
1 parent 8d6a58b commit 1d38a1c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

models/discordactions.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const {
3030
const { chunks } = require("../utils/array");
3131
const tasksModel = firestore.collection("tasks");
3232
const { FIRESTORE_IN_CLAUSE_SIZE } = require("../constants/users");
33-
const discordService = require("../services/discordService");
33+
3434
const { buildTasksQueryForMissedUpdates } = require("../utils/tasks");
3535
const { buildProgressQueryForMissedUpdates } = require("../utils/progresses");
3636
const { getRequestByKeyValues } = require("./requests");
@@ -350,7 +350,8 @@ const enrichGroupDataWithMembershipInfo = async (discordId, groups = []) => {
350350
firstName: groupCreator?.first_name,
351351
lastName: groupCreator?.last_name,
352352
image: groupCreator?.picture?.url,
353-
memberCount: liveRoleIdToCountMap.get(group.roleid) || 0, // Live count from Discord role membership
353+
// Member count from Firestore mapping
354+
memberCount: roleIdToCountMap[group.roleid] || 0,
354355
isMember: subscribedGroupIds.has(group.roleid),
355356
};
356357
});
@@ -984,7 +985,7 @@ const getMissedProgressUpdatesUsers = async (options = {}) => {
984985
filteredByOoo: 0,
985986
};
986987
try {
987-
const discordUsersPromise = discordService.getDiscordMembers();
988+
const discordUsersPromise = getDiscordMembers();
988989
const missedUpdatesRoleId = discordMissedUpdatesRoleId;
989990

990991
const normalizedExcludedWeekdays = new Set(

test/unit/models/discordactions.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@ describe("discordactions", function () {
460460
});
461461

462462
after(async function () {
463+
sinon.restore();
463464
await cleanDb();
464465
});
465466

0 commit comments

Comments
 (0)