Customize email address for email reports

pull/13/head
Uku Taht 7 years ago
parent e3c6e28785
commit 7b8b48982b

@ -15,19 +15,19 @@ defmodule Mix.Tasks.SendEmailReports do
def execute(args \\ []) do
sites = Repo.all(
from s in Plausible.Site,
join: es in "email_settings", on: es.site_id == s.id,
join: es in Plausible.Site.EmailSettings, on: es.site_id == s.id,
left_join: se in "sent_email_reports", on: se.site_id == s.id and se.year == fragment("EXTRACT(year from (now() at time zone ?))", s.timezone) and se.week == fragment("EXTRACT(week from (now() at time zone ?))", s.timezone),
where: is_nil(se), # We haven't sent a report for this site on this week
where: fragment("EXTRACT(dow from (now() at time zone ?))", s.timezone) == 1, # It's monday in the local timezone
where: fragment("EXTRACT(hour from (now() at time zone ?))", s.timezone) >= 9, # It's after 9am
select: s,
preload: :members
preload: [email_settings: es]
)
for site <- sites do
[owner] = site.members
IO.puts("Sending email report for #{site.domain} to #{owner.email}")
send_report(owner.email, site)
email = site.email_settings.email
IO.puts("Sending email report for #{site.domain} to #{email}")
send_report(email, site)
end
end

@ -1,8 +1,10 @@
defmodule Plausible.Site.EmailSettings do
use Ecto.Schema
import Ecto.Changeset
@mail_regex ~r/^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/
schema "email_settings" do
field :email, :string
belongs_to :site, Plausible.Site
timestamps()
@ -10,8 +12,9 @@ defmodule Plausible.Site.EmailSettings do
def changeset(settings, attrs \\ %{}) do
settings
|> cast(attrs, [:site_id])
|> validate_required([:site_id])
|> cast(attrs, [:site_id, :email])
|> validate_required([:site_id, :email])
|> validate_format(:email, @mail_regex)
|> unique_constraint(:site)
end
end

@ -11,6 +11,7 @@ defmodule Plausible.Site do
many_to_many :members, User, join_through: Plausible.Site.Membership
has_one :google_auth, GoogleAuth
has_one :email_settings, Plausible.Site.EmailSettings
timestamps()
end

@ -40,19 +40,33 @@ defmodule PlausibleWeb.SiteController do
!google_site["error"]
end
weekly_report_enabled = Repo.exists?(from es in "email_settings", where: es.site_id == ^site.id)
report_changeset = Repo.get_by(Plausible.Site.EmailSettings, site_id: site.id)
|> Plausible.Site.EmailSettings.changeset(%{})
changeset = Plausible.Site.changeset(site, %{})
conn
|> assign(:skip_plausible_tracking, true)
|> render("settings.html",
site: site,
weekly_report_enabled: weekly_report_enabled,
report_changeset: report_changeset,
google_search_console_verified: google_search_console_verified,
changeset: changeset
)
end
def update_email_settings(conn, %{"website" => website, "email_settings" => email_settings}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
Repo.get_by(Plausible.Site.EmailSettings, site_id: site.id)
|> Plausible.Site.EmailSettings.changeset(email_settings)
|> Repo.update!
conn
|> put_flash(:success, "Email address saved succesfully")
|> redirect(to: "/#{site.domain}/settings")
end
def update_settings(conn, %{"website" => website, "site" => site_params}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
changeset = site |> Plausible.Site.changeset(site_params)

@ -87,6 +87,7 @@ defmodule PlausibleWeb.Router do
post "/sites/:website/make-private", SiteController, :make_private
post "/sites/:website/email-report/enable", SiteController, :enable_email_report
post "/sites/:website/email-report/disable", SiteController, :disable_email_report
put "/sites/:website/email-report", SiteController, :update_email_settings
get "/:website/snippet", SiteController, :add_snippet
get "/:website/settings", SiteController, :settings
put "/:website/settings", SiteController, :update_settings

@ -95,14 +95,14 @@
</div>
<div class="max-w-md mx-auto bg-white shadow-md rounded rounded-t-none border-t-2 border-indigo-lightest px-8 pt-6 pb-8 mt-10" id="google-auth">
<div class="flex items-center justify-between">
<div>
<h2>Email reports</h2>
</div>
<div class="my-4 border-b border-grey-light"></div>
<div class="my-4 flex items-center">
<%= if @weekly_report_enabled do %>
<div class="my-8 flex items-center">
<%= if @report_changeset do %>
<%= button(to: "/sites/#{@site.domain}/email-report/disable", method: :post, class: "border rounded-full border-grey flex items-center cursor-pointer w-8 bg-green justify-end") do %>
<span class="rounded-full border w-4 h-4 border-grey shadow-inner bg-white shadow"></span>
<% end %>
@ -114,9 +114,19 @@
<span class="ml-2">Receive a weekly email report every Monday</span>
<% end %>
</div>
<div class="text-sm text-grey-darker mt-6">
Configured email: <%= @conn.assigns[:current_user].email %>
</div>
<%= if @report_changeset do %>
<div class="my-4 border-b border-grey-light"></div>
<div class="text-sm text-grey-darker mt-6">
<%= form_for @report_changeset, "/sites/#{@site.domain}/email-report", [class: "max-w-xs"], fn f -> %>
<div class="my-4">
<%= label f, :email, "Email address", class: "block text-grey-darker text-sm font-bold mb-2" %>
<%= email_input f, :email, class: "transition bg-grey-lighter appearance-none border border-transparent rounded w-full p-2 text-grey-darker leading-normal appearance-none focus:outline-none focus:border-grey-light" %>
<%= error_tag f, :email %>
</div>
<%= submit "Set email address", class: "button mt-2" %>
<% end %>
</div>
<% end %>
</div>
<%= form_for @conn, "/", [class: "bg-white max-w-md mx-auto shadow-md rounded rounded-t-none border-t-2 border-indigo-lightest px-8 pt-6 pb-8 mb-4 mt-16"], fn f -> %>

@ -0,0 +1,23 @@
defmodule Plausible.Repo.Migrations.AddEmailAddressToSettings do
use Ecto.Migration
use Plausible.Repo
alias Plausible.Site.EmailSettings
def change do
alter table(:email_settings) do
add :email, :citext
end
flush()
all = Repo.all(EmailSettings)
for settings <- all do
mem = Repo.get_by(Plausible.Site.Membership, site_id: settings.site_id) |> Repo.preload(:user)
EmailSettings.changeset(settings, %{email: mem.user.email}) |> Repo.update!
end
alter table(:email_settings) do
modify :email, :citext, null: false
end
end
end
Loading…
Cancel
Save