diff --git a/lib/mix/tasks/send_check_stats_emails.ex b/lib/mix/tasks/send_check_stats_emails.ex index 802da282f..065935687 100644 --- a/lib/mix/tasks/send_check_stats_emails.ex +++ b/lib/mix/tasks/send_check_stats_emails.ex @@ -20,11 +20,14 @@ defmodule Mix.Tasks.SendCheckStatsEmails do where: u.inserted_at > fragment("(now() at time zone 'utc') - '14 days'::interval") and u.inserted_at < fragment("(now() at time zone 'utc') - '7 days'::interval") and - u.last_seen < fragment("(now() at time zone 'utc') - '7 days'::interval") + u.last_seen < fragment("(now() at time zone 'utc') - '7 days'::interval"), + preload: [sites: :weekly_report] ) for user <- Repo.all(q) do - if Plausible.Auth.user_completed_setup?(user) do + enabled_report = Enum.any?(user.sites, fn site -> site.weekly_report end) + + if Plausible.Auth.user_completed_setup?(user) && !enabled_report do send_check_stats_email(args, user) end end diff --git a/test/mix/tasks/send_check_stats_emails_test.exs b/test/mix/tasks/send_check_stats_emails_test.exs index d88ec2ad7..9a3e5ed16 100644 --- a/test/mix/tasks/send_check_stats_emails_test.exs +++ b/test/mix/tasks/send_check_stats_emails_test.exs @@ -22,6 +22,17 @@ defmodule Mix.Tasks.SendCheckStatsEmailsTest do assert_no_emails_delivered() end + test "does not send an email if the user has configured a weekly report" do + user = insert(:user, inserted_at: days_ago(9), last_seen: days_ago(7)) + site = insert(:site, members: [user]) + insert(:weekly_report, site: site, recipients: ["user@email.com"]) + insert(:pageview, domain: site.domain) + + Mix.Tasks.SendCheckStatsEmails.execute() + + assert_no_emails_delivered() + end + test "sends an email after a week of signup if the user hasn't logged in" do user = insert(:user, inserted_at: days_ago(8), last_seen: days_ago(8)) site = insert(:site, members: [user])