Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Fix email report sentry errors (#4381)
Uku Taht49bb57f6018c
diff --git a/lib/plausible_web/controllers/unsubscribe_controller.ex b/lib/plausible_web/controllers/unsubscribe_controller.exindex eb38813b8b..ed34c05637 100644--- a/lib/plausible_web/controllers/unsubscribe_controller.ex+++ b/lib/plausible_web/controllers/unsubscribe_controller.ex@@ -22,6 +22,10 @@ defmodule PlausibleWeb.UnsubscribeController do)end+ def weekly_report(conn, _) do+ render_error(conn, 400)+ end+def monthly_report(conn, %{"website" => website, "email" => email}) dosite = Repo.get_by(Plausible.Site, domain: website)monthly_report = site && Repo.get_by(MonthlyReport, site_id: site.id)@@ -40,4 +44,8 @@ defmodule PlausibleWeb.UnsubscribeController dolayout: {PlausibleWeb.LayoutView, "focus.html"})end++ def monthly_report(conn, _) do+ render_error(conn, 400)+ endenddiff --git a/lib/workers/send_email_report.ex b/lib/workers/send_email_report.exindex dbaa138d5c..6b7bab38fa 100644--- a/lib/workers/send_email_report.ex+++ b/lib/workers/send_email_report.ex@@ -7,7 +7,7 @@ defmodule Plausible.Workers.SendEmailReport dodef perform(%Oban.Job{args: %{"interval" => "weekly", "site_id" => site_id}}) dosite = Repo.get(Plausible.Site, site_id) |> Repo.preload(:weekly_report)- if site do+ if site && site.weekly_report do%{site: site}|> Map.put(:type, :weekly)|> Map.put(:name, "Weekly")@@ -23,7 +23,7 @@ defmodule Plausible.Workers.SendEmailReport dodef perform(%Oban.Job{args: %{"interval" => "monthly", "site_id" => site_id}}) dosite = Repo.get(Plausible.Site, site_id) |> Repo.preload(:monthly_report)- if site do+ if site && site.monthly_report do%{site: site}|> Map.put(:type, :monthly)|> put_last_month_query()diff --git a/test/plausible_web/controllers/unsubscribe_controller_test.exs b/test/plausible_web/controllers/unsubscribe_controller_test.exsindex 4d398e7b20..c87365422c 100644--- a/test/plausible_web/controllers/unsubscribe_controller_test.exs+++ b/test/plausible_web/controllers/unsubscribe_controller_test.exs@@ -24,6 +24,13 @@ defmodule PlausibleWeb.UnsubscribeControllerTest doassert html_response(conn, 200) =~ "Unsubscribe successful"end++ test "renders failure if email parameter not provided", %{conn: conn} do+ conn =+ get(conn, "/sites/nonexistent.com/weekly-report/unsubscribe")++ assert html_response(conn, 400) =~ "Bad Request"+ endenddescribe "GET /sites/:website/monthly-report/unsubscribe" do@@ -46,5 +53,12 @@ defmodule PlausibleWeb.UnsubscribeControllerTest doassert html_response(conn, 200) =~ "Unsubscribe successful"end++ test "renders failure if email parameter not provided", %{conn: conn} do+ conn =+ get(conn, "/sites/nonexistent.com/monthly-report/unsubscribe")++ assert html_response(conn, 400) =~ "Bad Request"+ endendenddiff --git a/test/workers/send_email_report_test.exs b/test/workers/send_email_report_test.exsindex 4c518634c1..543c0d2d40 100644--- a/test/workers/send_email_report_test.exs+++ b/test/workers/send_email_report_test.exs@@ -32,6 +32,13 @@ defmodule Plausible.Workers.SendEmailReportTest doperform_job(SendEmailReport, %{"site_id" => 28_378_237, "interval" => "weekly"})end+ test "does not crash when weekly report has been deleted since scheduling job" do+ site = insert(:site, domain: "test-site.com", timezone: "US/Eastern")++ assert :discard =+ perform_job(SendEmailReport, %{"site_id" => site.id, "interval" => "weekly"})+ end+test "calculates timezone correctly" dosite =insert(:site,@@ -229,5 +236,12 @@ defmodule Plausible.Workers.SendEmailReportTest doto: [nil: "[email protected]"])end++ test "does not crash when monthly report has been deleted since scheduling job" do+ site = insert(:site, domain: "test-site.com", timezone: "US/Eastern")++ assert :discard =+ perform_job(SendEmailReport, %{"site_id" => site.id, "interval" => "monthly"})+ endendend