Skip to content
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

Jump to bottom

Don't send new users the monthly activity email #4494

Merged
merged 2 commits into from
May 8, 2024
Merged

Don't send new users the monthly activity email #4494

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee7dc42
Don't send new users the monthly activity email
Vinnl May 7, 2024
63b3e24
Merge branch 'main' into MNTOR-3186-new-users-activity-email
Vinnl May 8, 2024
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
8 changes: 7 additions & 1 deletion src/db/tables/subscribers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,16 +322,22 @@ async function getSubscribersWaitingForMonthlyEmail (options = {}) {

let query = knex('subscribers')
.select()
// Only send to users who haven't opted out of the monthly activity email...
.where((builder) => builder.whereNull("monthly_monitor_report").orWhere("monthly_monitor_report", true))
.andWhere(builder => builder.whereNull("monthly_monitor_report_at").orWhereRaw('"monthly_monitor_report_at" < NOW() - INTERVAL \'30 days\''));
// ...who haven't received the email in the last 30 days...
.andWhere(builder => builder.whereNull("monthly_monitor_report_at").orWhereRaw('"monthly_monitor_report_at" < NOW() - INTERVAL \'30 days\''))
// ...and whose account is older than 30 days.
.andWhereRaw('"created_at" < NOW() - INTERVAL \'30 days\'');

if (Array.isArray(flag.allow_list) && flag.allow_list.length > 0) {
// If the feature flag has an allowlist, only send to users on that list.
// The `.andWhereIn` alias doesn't exist:
// https://github.com/knex/knex/issues/1881#issuecomment-275433906
query = query.whereIn("primary_email", flag.allow_list)
}

if (options.plusOnly) {
// And optionally, only send it to users who have a Plus subscription.
// Note: This will only match people of whom the Monitor database knows that
// they have a Plus subscription. SubPlat is the source of truth, but
// our database is updated via a webhook and whenever the user logs
Expand Down
Loading