Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Fix APP-2NA (#3119)

hq19debcdee241f
diff --git a/lib/workers/send_email_report.ex b/lib/workers/send_email_report.ex
index c834f85da3..5076a6c469 100644
--- a/lib/workers/send_email_report.ex
+++ b/lib/workers/send_email_report.ex
@@ -7,19 +7,24 @@ defmodule Plausible.Workers.SendEmailReport do
@impl Oban.Worker
def perform(%Oban.Job{args: %{"interval" => "weekly", "site_id" => site_id}}) do
site = Repo.get(Plausible.Site, site_id) |> Repo.preload(:weekly_report)
- today = Timex.now(site.timezone) |> DateTime.to_date()
- date = Timex.shift(today, weeks: -1) |> Timex.end_of_week() |> Date.to_iso8601()
- query = Query.from(site, %{"period" => "7d", "date" => date})
- for email <- site.weekly_report.recipients do
- unsubscribe_link =
- PlausibleWeb.Endpoint.url() <>
- "/sites/#{URI.encode_www_form(site.domain)}/weekly-report/unsubscribe?email=#{email}"
+ if site do
+ today = Timex.now(site.timezone) |> DateTime.to_date()
+ date = Timex.shift(today, weeks: -1) |> Timex.end_of_week() |> Date.to_iso8601()
+ query = Query.from(site, %{"period" => "7d", "date" => date})
- send_report(email, site, "Weekly", unsubscribe_link, query)
- end
+ for email <- site.weekly_report.recipients do
+ unsubscribe_link =
+ PlausibleWeb.Endpoint.url() <>
+ "/sites/#{URI.encode_www_form(site.domain)}/weekly-report/unsubscribe?email=#{email}"
- :ok
+ send_report(email, site, "Weekly", unsubscribe_link, query)
+ end
+
+ :ok
+ else
+ :discard
+ end
end
@impl Oban.Worker
diff --git a/test/workers/send_email_report_test.exs b/test/workers/send_email_report_test.exs
index ed3a77cb60..97c2b2968f 100644
--- a/test/workers/send_email_report_test.exs
+++ b/test/workers/send_email_report_test.exs
@@ -23,6 +23,11 @@ defmodule Plausible.Workers.SendEmailReportTest do
)
end
+ test "does not crash for deleted sites" do
+ assert :discard =
+ perform_job(SendEmailReport, %{"site_id" => 28_378_237, "interval" => "weekly"})
+ end
+
test "calculates timezone correctly" do
site =
insert(:site,