diff --git a/lib/plausible/pageview/schema.ex b/lib/plausible/pageview/schema.ex index 775982ee2..f5b80932f 100644 --- a/lib/plausible/pageview/schema.ex +++ b/lib/plausible/pageview/schema.ex @@ -5,15 +5,12 @@ defmodule Plausible.Pageview do schema "pageviews" do field :hostname, :string field :pathname, :string - field :referrer, :string - field :raw_referrer, :string - field :user_agent, :string - field :screen_width, :integer - field :screen_size, :string field :new_visitor, :boolean field :user_id, :binary_id - field :country_code, :string + field :referrer, :string + field :screen_size, :string + field :country_code, :string field :operating_system, :string field :browser, :string field :referrer_source, :string @@ -23,7 +20,7 @@ defmodule Plausible.Pageview do def changeset(pageview, attrs) do pageview - |> cast(attrs, [:hostname, :pathname, :referrer, :raw_referrer, :user_agent, :new_visitor, :screen_width, :user_id, :operating_system, :browser, :referrer_source, :country_code, :screen_size]) + |> cast(attrs, [:hostname, :pathname, :referrer, :new_visitor, :user_id, :operating_system, :browser, :referrer_source, :country_code, :screen_size]) |> validate_required([:hostname, :pathname, :new_visitor, :user_id]) end end diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index 11fe92b1a..dc75cb112 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -45,14 +45,11 @@ defmodule PlausibleWeb.Api.ExternalController do pageview_attrs = %{ hostname: strip_www(uri.host), pathname: uri.path, - user_agent: user_agent, new_visitor: params["new_visitor"], - screen_width: params["screen_width"], country_code: country_code, user_id: params["uid"], operating_system: ua && os_name(ua), browser: ua && browser_name(ua), - raw_referrer: params["referrer"], referrer_source: ref && referrer_source(uri, ref), referrer: ref && clean_referrer(params["referrer"]), screen_size: calculate_screen_size(params["screen_width"]) diff --git a/priv/repo/migrations/20190618165016_add_public_sites.exs b/priv/repo/migrations/20190618165016_add_public_sites.exs index a4bcc892c..a92d2acd5 100644 --- a/priv/repo/migrations/20190618165016_add_public_sites.exs +++ b/priv/repo/migrations/20190618165016_add_public_sites.exs @@ -1,6 +1,5 @@ defmodule Plausible.Repo.Migrations.AddPublicSites do use Ecto.Migration - alias Plausible.Repo def change do alter table(:sites) do diff --git a/priv/repo/migrations/20190910120900_add_email_address_to_settings.exs b/priv/repo/migrations/20190910120900_add_email_address_to_settings.exs index bff4f428e..3ffea2983 100644 --- a/priv/repo/migrations/20190910120900_add_email_address_to_settings.exs +++ b/priv/repo/migrations/20190910120900_add_email_address_to_settings.exs @@ -1,7 +1,6 @@ defmodule Plausible.Repo.Migrations.AddEmailAddressToSettings do use Ecto.Migration use Plausible.Repo - alias Plausible.Site.EmailSettings def change do alter table(:email_settings) do @@ -9,12 +8,6 @@ defmodule Plausible.Repo.Migrations.AddEmailAddressToSettings do 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 diff --git a/priv/repo/migrations/20191015072730_remove_unused_fields.exs b/priv/repo/migrations/20191015072730_remove_unused_fields.exs new file mode 100644 index 000000000..a69b3fc69 --- /dev/null +++ b/priv/repo/migrations/20191015072730_remove_unused_fields.exs @@ -0,0 +1,11 @@ +defmodule Plausible.Repo.Migrations.RemoveUnusedFields do + use Ecto.Migration + + def change do + alter table(:pageviews) do + remove :raw_referrer + remove :screen_width + remove :user_agent + end + end +end diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs index 28094aba3..64d116e33 100644 --- a/test/plausible_web/controllers/api/external_controller_test.exs +++ b/test/plausible_web/controllers/api/external_controller_test.exs @@ -27,8 +27,6 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do assert pageview.hostname == "gigride.live" assert pageview.pathname == "/" assert pageview.new_visitor == true - assert pageview.user_agent == @user_agent - assert pageview.screen_width == params[:screen_width] assert pageview.country_code == @country_code end @@ -174,7 +172,6 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do pageview = Repo.one(Plausible.Pageview) assert pageview.referrer == "indiehackers.com/page" - assert pageview.raw_referrer == "https://www.indiehackers.com/page?query=param#hash" end test "?ref= query param controls the referrer source", %{conn: conn} do