Skip to content

Backend Release to Main [2.95] #2124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
one-community merged 2 commits into from
Mar 25, 2026
Merged

Backend Release to Main [2.95] #2124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c870e6
fix: Fixed Weekly Summary Email Cron
DiyaWadhwani Mar 25, 2026
11c9a86
Merge pull request #2123 from OneCommunityGlobal/Diya_Fix_WeeklyEmail…
one-community Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/helpers/userHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const Team = require('../models/team');
const BlueSquareEmailAssignmentModel = require('../models/BlueSquareEmailAssignment');
const myTeam = require('./helperModels/myTeam');
const dashboardHelper = require('./dashboardhelper')();
const reportHelper = require('./reporthelper')();

// eslint-disable-next-line no-promise-executor-return
const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
Expand Down Expand Up @@ -287,14 +288,14 @@ const userHelper = function () {
try {
const results = await reportHelper.weeklySummaries(weekIndex, weekIndex);
// checks for userProfiles who are eligible to receive the weeklySummary Reports
await userProfile
.find({ getWeeklyReport: true }, { email: 1, teamCode: 1, _id: 0 })
// eslint-disable-next-line no-shadow
.then((results) => {
mappedResults = results.map((ele) => ele.email);
mappedResults.push('onecommunityglobal@gmail.com', 'onecommunityhospitality@gmail.com');
mappedResults = mappedResults.toString();
});
const userProfileResults = await userProfile.find(
{ getWeeklyReport: true },
{ email: 1, teamCode: 1, _id: 0 },
);

mappedResults = userProfileResults.map((ele) => ele.email);
mappedResults.push('onecommunityglobal@gmail.com', 'onecommunityhospitality@gmail.com');
mappedResults = mappedResults.toString();

let emailBody = '<h2>Weekly Summaries for all active users:</h2>';

Expand All @@ -305,7 +306,7 @@ const userHelper = function () {
'<div><b>Weekly Summary:</b> <span style="color: green;"> Not required for this user </span></div>';

results.sort((a, b) =>
`${a.firstName} ${a.lastName}`.localeCompare(`${b.firstName} ${b.lastname}`),
`${a.firstName} ${a.lastName}`.localeCompare(`${b.firstName} ${b.lastName}`),
);

for (let i = 0; i < results.length; i += 1) {
Expand Down
Loading