Skip to content

fix: filter out demo emails and validate email format before sending reminders #1238

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
Artuomka merged 3 commits into from
Jul 2, 2025
Merged

fix: filter out demo emails and validate email format before sending reminders #1238

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c8b218
fix: filter out demo emails and validate email format before sending …
Artuomka Jul 2, 2025
6030cd5
refactor: improve email validation logic using ValidationHelper
Artuomka Jul 2, 2025
621039d
Merge branch 'main' into backend_slack_message_fixes
Artuomka Jul 2, 2025
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
16 changes: 12 additions & 4 deletions backend/src/entities/cron-jobs/cron-jobs.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ import { InjectRepository } from '@nestjs/typeorm';
import Sentry from '@sentry/minimal';
import { Repository } from 'typeorm';
import { UseCaseType } from '../../common/data-injection.tokens.js';
import { slackPostMessage } from '../../helpers/index.js';
import { Constants } from '../../helpers/constants/constants.js';
import { slackPostMessage } from '../../helpers/index.js';
import { ValidationHelper } from '../../helpers/validators/validation-helper.js';
import { EmailService, ICronMessagingResults } from '../email/email/email.service.js';
import {
ICheckUsersActionsAndMailingUsers,
ICheckUsersLogsAndUpdateActionsUseCase,
} from '../user-actions/use-cases/use-cases-interfaces.js';
import { JobListEntity } from './job-list.entity.js';
import { EmailService, ICronMessagingResults } from '../email/email/email.service.js';
@Injectable()
export class CronJobsService {
constructor(
Expand Down Expand Up @@ -59,8 +60,15 @@ export class CronJobsService {
Constants.EXCEPTIONS_CHANNELS,
);

const emails = await this.checkUsersActionsAndMailingUsersUseCase.execute();
await slackPostMessage(`found ${emails.length} emails. starting messaging`, Constants.EXCEPTIONS_CHANNELS);
let emails = await this.checkUsersActionsAndMailingUsersUseCase.execute();
emails = emails.filter((email) => {
if (email && /^demo_.*@rocketadmin\.com$/i.test(email)) {
return false;
}
return ValidationHelper.isValidEmail(email);
});

await slackPostMessage(`found ${emails.length} valid emails. starting messaging`, Constants.EXCEPTIONS_CHANNELS);
const mailingResults = await this.emailService.sendRemindersToUsers(emails);
if (mailingResults.length === 0) {
const mailingResultToString = 'Sending emails triggered, but no emails sent (no users found)';
Expand Down
Loading