Skip to content

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

Clean up after V2 migration (#2868)

hq171ef0bd04343
diff --git a/config/runtime.exs b/config/runtime.exs
index 82d8ceb6d5..0a75943721 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -131,8 +131,6 @@ runtime_metadata = [
config :plausible, :runtime_metadata, runtime_metadata
-config :plausible, :v2_migration_done, true
-
sentry_dsn = get_var_from_path_or_env(config_dir, "SENTRY_DSN")
honeycomb_api_key = get_var_from_path_or_env(config_dir, "HONEYCOMB_API_KEY")
honeycomb_dataset = get_var_from_path_or_env(config_dir, "HONEYCOMB_DATASET")
diff --git a/lib/plausible.ex b/lib/plausible.ex
index 0dbc04bf0d..ebdaaaaedb 100644
--- a/lib/plausible.ex
+++ b/lib/plausible.ex
@@ -6,9 +6,4 @@ defmodule Plausible do
Contexts are also responsible for managing your data, regardless
if it comes from the database, an external API or others.
"""
-
- @spec v2?() :: boolean()
- def v2?() do
- Plausible.DataMigration.NumericIDs.ready?()
- end
end
diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.ex
index 9967c8a87f..f10d8fcb26 100644
--- a/lib/plausible/billing/billing.ex
+++ b/lib/plausible/billing/billing.ex
@@ -114,35 +114,19 @@ defmodule Plausible.Billing do
def last_two_billing_months_usage(user, today \\ Timex.today()) do
{first, second} = last_two_billing_cycles(user, today)
- if Plausible.v2?() do
- site_ids = Plausible.Sites.owned_site_ids(user)
+ site_ids = Plausible.Sites.owned_site_ids(user)
- usage_for_sites = fn site_ids, date_range ->
- {pageviews, custom_events} =
- Plausible.Stats.Clickhouse.usage_breakdown(site_ids, date_range)
+ usage_for_sites = fn site_ids, date_range ->
+ {pageviews, custom_events} =
+ Plausible.Stats.Clickhouse.usage_breakdown(site_ids, date_range)
- pageviews + custom_events
- end
-
- {
- usage_for_sites.(site_ids, first),
- usage_for_sites.(site_ids, second)
- }
- else
- domains = Plausible.Sites.owned_sites_domains(user)
-
- usage_for_sites = fn domains, date_range ->
- {pageviews, custom_events} =
- Plausible.Stats.Clickhouse.usage_breakdown(domains, date_range)
-
- pageviews + custom_events
- end
-
- {
- usage_for_sites.(domains, first),
- usage_for_sites.(domains, second)
- }
+ pageviews + custom_events
end
+
+ {
+ usage_for_sites.(site_ids, first),
+ usage_for_sites.(site_ids, second)
+ }
end
def last_two_billing_cycles(user, today \\ Timex.today()) do
@@ -166,13 +150,8 @@ defmodule Plausible.Billing do
end
def usage_breakdown(user) do
- if Plausible.v2?() do
- site_ids = Plausible.Sites.owned_site_ids(user)
- Plausible.Stats.Clickhouse.usage_breakdown(site_ids)
- else
- domains = Plausible.Sites.owned_sites_domains(user)
- Plausible.Stats.Clickhouse.usage_breakdown(domains)
- end
+ site_ids = Plausible.Sites.owned_site_ids(user)
+ Plausible.Stats.Clickhouse.usage_breakdown(site_ids)
end
@doc """
diff --git a/lib/plausible/clickhouse_event.ex b/lib/plausible/clickhouse_event.ex
deleted file mode 100644
index ae8ab148a0..0000000000
--- a/lib/plausible/clickhouse_event.ex
+++ /dev/null
@@ -1,73 +0,0 @@
-defmodule Plausible.ClickhouseEvent do
- use Ecto.Schema
- import Ecto.Changeset
-
- @primary_key false
- schema "events" do
- field :name, :string
- field :domain, :string
- field :hostname, :string
- field :pathname, :string
- field :user_id, Ch.Types.UInt64
- field :session_id, Ch.Types.UInt64
- field :timestamp, :naive_datetime
-
- field :referrer, :string
- field :referrer_source, :string
- field :utm_medium, :string
- field :utm_source, :string
- field :utm_campaign, :string
- field :utm_content, :string
- field :utm_term, :string
-
- field :country_code, Ch.Types.FixedString, size: 2
- field :subdivision1_code, :string
- field :subdivision2_code, :string
- field :city_geoname_id, Ch.Types.UInt32
-
- field :screen_size, :string
- field :operating_system, :string
- field :operating_system_version, :string
- field :browser, :string
- field :browser_version, :string
-
- field :"meta.key", {:array, :string}
- field :"meta.value", {:array, :string}
- field :transferred_from, :string
- end
-
- def new(attrs) do
- %__MODULE__{}
- |> cast(
- attrs,
- [
- :name,
- :domain,
- :hostname,
- :pathname,
- :user_id,
- :timestamp,
- :operating_system,
- :operating_system_version,
- :browser,
- :browser_version,
- :referrer,
- :referrer_source,
- :utm_medium,
- :utm_source,
- :utm_campaign,
- :utm_content,
- :utm_term,
- :country_code,
- :subdivision1_code,
- :subdivision2_code,
- :city_geoname_id,
- :screen_size,
- :"meta.key",
- :"meta.value"
- ],
- empty_values: [nil, ""]
- )
- |> validate_required([:name, :domain, :hostname, :pathname, :user_id, :timestamp])
- end
-end
diff --git a/lib/plausible/clickhouse_session.ex b/lib/plausible/clickhouse_session.ex
deleted file mode 100644
index 5f5a3c02b6..0000000000
--- a/lib/plausible/clickhouse_session.ex
+++ /dev/null
@@ -1,49 +0,0 @@
-defmodule Plausible.ClickhouseSession do
- use Ecto.Schema
-
- @primary_key false
- schema "sessions" do
- field :hostname, :string
- field :domain, :string
- field :user_id, Ch.Types.UInt64
- field :session_id, Ch.Types.UInt64
-
- field :start, :naive_datetime
- field :duration, Ch.Types.UInt32
- field :is_bounce, :boolean
- field :entry_page, :string
- field :exit_page, :string
- field :pageviews, Ch.Types.Int32
- field :events, Ch.Types.Int32
- field :sign, Ch.Types.Int8
-
- field :"entry_meta.key", {:array, :string}
- field :"entry_meta.value", {:array, :string}
-
- field :utm_medium, :string
- field :utm_source, :string
- field :utm_campaign, :string
- field :utm_content, :string
- field :utm_term, :string
- field :referrer, :string
- field :referrer_source, :string
-
- field :country_code, Ch.Types.FixedString, size: 2
- field :subdivision1_code, :string
- field :subdivision2_code, :string
- field :city_geoname_id, Ch.Types.UInt32
-
- field :screen_size, :string
- field :operating_system, :string
- field :operating_system_version, :string
- field :browser, :string
- field :browser_version, :string
- field :timestamp, :naive_datetime
-
- field :transferred_from, :string
- end
-
- def random_uint64() do
- :crypto.strong_rand_bytes(8) |> :binary.decode_unsigned()
- end
-end
diff --git a/lib/plausible/data_migration/numeric_ids.ex b/lib/plausible/data_migration/numeric_ids.ex
index f8e859f0f7..34cf0fdf21 100644
--- a/lib/plausible/data_migration/numeric_ids.ex
+++ b/lib/plausible/data_migration/numeric_ids.ex
@@ -20,10 +20,6 @@ defmodule Plausible.DataMigration.NumericIDs do
@table_settings "SETTINGS index_granularity = 8192"
- def ready?() do
- Application.get_env(:plausible, :v2_migration_done) || false
- end
-
# credo:disable-for-next-line Credo.Check.Refactor.CyclomaticComplexity
def run(opts \\ []) do
interactive? = Keyword.get(opts, :interactive?, true)
diff --git a/lib/plausible/event/write_buffer.ex b/lib/plausible/event/write_buffer.ex
index f6af74b17e..37a9cd39b0 100644
--- a/lib/plausible/event/write_buffer.ex
+++ b/lib/plausible/event/write_buffer.ex
@@ -65,11 +65,7 @@ defmodule Plausible.Event.WriteBuffer do
Logger.info("Flushing #{length(events)} events")
events = Enum.map(events, &(Map.from_struct(&1) |> Map.delete(:__meta__)))
- if Plausible.v2?() do
- IngestRepo.insert_all(Plausible.ClickhouseEventV2, events)
- else
- IngestRepo.insert_all(Plausible.ClickhouseEvent, events)
- end
+ IngestRepo.insert_all(Plausible.ClickhouseEventV2, events)
end
end
diff --git a/lib/plausible/ingestion/event.ex b/lib/plausible/ingestion/event.ex
index 00a475892b..c969027310 100644
--- a/lib/plausible/ingestion/event.ex
+++ b/lib/plausible/ingestion/event.ex
@@ -6,7 +6,6 @@ defmodule Plausible.Ingestion.Event do
(e.g. due to spam blocklist) from the processing pipeline.
"""
alias Plausible.Ingestion.Request
- alias Plausible.ClickhouseEvent
alias Plausible.ClickhouseEventV2
alias Plausible.Site.GateKeeper
@@ -30,7 +29,7 @@ defmodule Plausible.Ingestion.Event do
domain: String.t() | nil,
site_id: pos_integer() | nil,
clickhouse_event_attrs: map(),
- clickhouse_event: %ClickhouseEvent{} | %ClickhouseEventV2{} | nil,
+ clickhouse_event: %ClickhouseEventV2{} | nil,
dropped?: boolean(),
drop_reason: drop_reason(),
request: Request.t(),
@@ -225,15 +224,9 @@ defmodule Plausible.Ingestion.Event do
defp validate_clickhouse_event(%__MODULE__{} = event) do
clickhouse_event =
- if Plausible.v2?() do
- event
- |> Map.fetch!(:clickhouse_event_attrs)
- |> ClickhouseEventV2.new()
- else
- event
- |> Map.fetch!(:clickhouse_event_attrs)
- |> ClickhouseEvent.new()
- end
+ event
+ |> Map.fetch!(:clickhouse_event_attrs)
+ |> ClickhouseEventV2.new()
case Ecto.Changeset.apply_action(clickhouse_event, nil) do
{:ok, valid_clickhouse_event} ->
diff --git a/lib/plausible/session/cache_store.ex b/lib/plausible/session/cache_store.ex
index 3563673ed3..3350936ffa 100644
--- a/lib/plausible/session/cache_store.ex
+++ b/lib/plausible/session/cache_store.ex
@@ -22,12 +22,7 @@ defmodule Plausible.Session.CacheStore do
defp find_session(_domain, nil), do: nil
defp find_session(event, user_id) do
- from_cache =
- if Plausible.v2?() do
- Cachex.get(:sessions, {event.site_id, user_id})
- else
- Cachex.get(:sessions, {event.domain, user_id})
- end
+ from_cache = Cachex.get(:sessions, {event.site_id, user_id})
case from_cache do
{:ok, nil} ->
@@ -45,13 +40,7 @@ defmodule Plausible.Session.CacheStore do
end
defp persist_session(session) do
- key =
- if Plausible.v2?() do
- {session.site_id, session.user_id}
- else
- {session.domain, session.user_id}
- end
-
+ key = {session.site_id, session.user_id}
Cachex.put(:sessions, key, session, ttl: :timer.minutes(30))
session
end
@@ -81,74 +70,38 @@ defmodule Plausible.Session.CacheStore do
end
defp new_session_from_event(event) do
- if Plausible.v2?() do
- %Plausible.ClickhouseSessionV2{
- sign: 1,
- session_id: Plausible.ClickhouseSession.random_uint64(),
- hostname: event.hostname,
- site_id: event.site_id,
- user_id: event.user_id,
- entry_page: event.pathname,
- exit_page: event.pathname,
- is_bounce: true,
- duration: 0,
- pageviews: if(event.name == "pageview", do: 1, else: 0),
- events: 1,
- referrer: event.referrer,
- referrer_source: event.referrer_source,
- utm_medium: event.utm_medium,
- utm_source: event.utm_source,
- utm_campaign: event.utm_campaign,
- utm_content: event.utm_content,
- utm_term: event.utm_term,
- country_code: event.country_code,
- subdivision1_code: event.subdivision1_code,
- subdivision2_code: event.subdivision2_code,
- city_geoname_id: event.city_geoname_id,
- screen_size: event.screen_size,
- operating_system: event.operating_system,
- operating_system_version: event.operating_system_version,
- browser: event.browser,
- browser_version: event.browser_version,
- timestamp: event.timestamp,
- start: event.timestamp,
- "entry_meta.key": Map.get(event, :"meta.key"),
- "entry_meta.value": Map.get(event, :"meta.value")
- }
- else
- %Plausible.ClickhouseSession{
- sign: 1,
- session_id: Plausible.ClickhouseSession.random_uint64(),
- hostname: event.hostname,
- domain: event.domain,
- user_id: event.user_id,
- entry_page: event.pathname,
- exit_page: event.pathname,
- is_bounce: true,
- duration: 0,
- pageviews: if(event.name == "pageview", do: 1, else: 0),
- events: 1,
- referrer: event.referrer,
- referrer_source: event.referrer_source,
- utm_medium: event.utm_medium,
- utm_source: event.utm_source,
- utm_campaign: event.utm_campaign,
- utm_content: event.utm_content,
- utm_term: event.utm_term,
- country_code: event.country_code,
- subdivision1_code: event.subdivision1_code,
- subdivision2_code: event.subdivision2_code,
- city_geoname_id: event.city_geoname_id,
- screen_size: event.screen_size,
- operating_system: event.operating_system,
- operating_system_version: event.operating_system_version,
- browser: event.browser,
- browser_version: event.browser_version,
- timestamp: event.timestamp,
- start: event.timestamp,
- "entry_meta.key": Map.get(event, :"meta.key"),
- "entry_meta.value": Map.get(event, :"meta.value")
- }
- end
+ %Plausible.ClickhouseSessionV2{
+ sign: 1,
+ session_id: Plausible.ClickhouseSessionV2.random_uint64(),
+ hostname: event.hostname,
+ site_id: event.site_id,
+ user_id: event.user_id,
+ entry_page: event.pathname,
+ exit_page: event.pathname,
+ is_bounce: true,
+ duration: 0,
+ pageviews: if(event.name == "pageview", do: 1, else: 0),
+ events: 1,
+ referrer: event.referrer,
+ referrer_source: event.referrer_source,
+ utm_medium: event.utm_medium,
+ utm_source: event.utm_source,
+ utm_campaign: event.utm_campaign,
+ utm_content: event.utm_content,
+ utm_term: event.utm_term,
+ country_code: event.country_code,
+ subdivision1_code: event.subdivision1_code,
+ subdivision2_code: event.subdivision2_code,
+ city_geoname_id: event.city_geoname_id,
+ screen_size: event.screen_size,
+ operating_system: event.operating_system,
+ operating_system_version: event.operating_system_version,
+ browser: event.browser,
+ browser_version: event.browser_version,
+ timestamp: event.timestamp,
+ start: event.timestamp,
+ "entry_meta.key": Map.get(event, :"meta.key"),
+ "entry_meta.value": Map.get(event, :"meta.value")
+ }
end
end
diff --git a/lib/plausible/session/write_buffer.ex b/lib/plausible/session/write_buffer.ex
index 598dc83933..770fc965c1 100644
--- a/lib/plausible/session/write_buffer.ex
+++ b/lib/plausible/session/write_buffer.ex
@@ -69,11 +69,7 @@ defmodule Plausible.Session.WriteBuffer do
|> Enum.map(&(Map.from_struct(&1) |> Map.delete(:__meta__)))
|> Enum.reverse()
- if Plausible.v2?() do
- IngestRepo.insert_all(Plausible.ClickhouseSessionV2, sessions)
- else
- IngestRepo.insert_all(Plausible.ClickhouseSession, sessions)
- end
+ IngestRepo.insert_all(Plausible.ClickhouseSessionV2, sessions)
end
end
diff --git a/lib/plausible/site.ex b/lib/plausible/site.ex
index 75e6c4bad8..da226a02a4 100644
--- a/lib/plausible/site.ex
+++ b/lib/plausible/site.ex
@@ -74,13 +74,6 @@ defmodule Plausible.Site do
|> Keyword.get(:at, NaiveDateTime.utc_now())
|> NaiveDateTime.truncate(:second)
- attrs =
- if Plausible.v2?() do
- attrs
- else
- Map.delete(attrs, :domain)
- end
-
site
|> changeset(attrs)
|> handle_domain_change(at)
diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex
index 02436a8c30..d93624ef61 100644
--- a/lib/plausible/stats/base.ex
+++ b/lib/plausible/stats/base.ex
@@ -35,19 +35,11 @@ defmodule Plausible.Stats.Base do
{first_datetime, last_datetime} = utc_boundaries(query, site)
q =
- if Plausible.v2?() do
- from(
- e in "events_v2",
- where: e.site_id == ^site.id,
- where: e.timestamp >= ^first_datetime and e.timestamp < ^last_datetime
- )
- else
- from(
- e in "events",
- where: e.domain == ^site.domain,
- where: e.timestamp >= ^first_datetime and e.timestamp < ^last_datetime
- )
- end
+ from(
+ e in "events_v2",
+ where: e.site_id == ^site.id,
+ where: e.timestamp >= ^first_datetime and e.timestamp < ^last_datetime
+ )
|> add_sample_hint(query)
q =
@@ -198,19 +190,11 @@ defmodule Plausible.Stats.Base do
{first_datetime, last_datetime} = utc_boundaries(query, site)
sessions_q =
- if Plausible.v2?() do
- from(
- s in "sessions_v2",
- where: s.site_id == ^site.id,
- where: s.start >= ^first_datetime and s.start < ^last_datetime
- )
- else
- from(
- s in "sessions",
- where: s.domain == ^site.domain,
- where: s.start >= ^first_datetime and s.start < ^last_datetime
- )
- end
+ from(
+ s in "sessions_v2",
+ where: s.site_id == ^site.id,
+ where: s.start >= ^first_datetime and s.start < ^last_datetime
+ )
|> add_sample_hint(query)
|> filter_by_entry_props(query)
diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex
index 5ce0ed4360..ef28e052b6 100644
--- a/lib/plausible/stats/clickhouse.ex
+++ b/lib/plausible/stats/clickhouse.ex
@@ -8,23 +8,13 @@ defmodule Plausible.Stats.Clickhouse do
@spec pageview_start_date_local(Plausible.Site.t()) :: Date.t() | nil
def pageview_start_date_local(site) do
datetime =
- if Plausible.v2?() do
- ClickhouseRepo.one(
- from(e in "events_v2",
- select: fragment("min(?)", e.timestamp),
- where: e.site_id == ^site.id,
- where: e.timestamp >= ^site.native_stats_start_at
- )
- )
- else
- ClickhouseRepo.one(
- from(e in "events",
- select: fragment("min(?)", e.timestamp),
- where: e.domain == ^site.domain,
- where: e.timestamp >= ^site.native_stats_start_at
- )
+ ClickhouseRepo.one(
+ from(e in "events_v2",
+ select: fragment("min(?)", e.timestamp),
+ where: e.site_id == ^site.id,
+ where: e.timestamp >= ^site.native_stats_start_at
)
- end
+ )
case datetime do
# no stats for this domain yet
@@ -193,60 +183,34 @@ defmodule Plausible.Stats.Clickhouse do
end
def has_pageviews?(site) do
- if Plausible.v2?() do
- ClickhouseRepo.exists?(
- from(e in "events_v2",
- where:
- e.site_id == ^site.id and
- e.name == "pageview" and
- e.timestamp >=
- ^site.native_stats_start_at
- )
- )
- else
- ClickhouseRepo.exists?(
- from(e in "events",
- where:
- e.domain == ^site.domain and
- e.name == "pageview" and
- e.timestamp >=
- ^site.native_stats_start_at
- )
+ ClickhouseRepo.exists?(
+ from(e in "events_v2",
+ where:
+ e.site_id == ^site.id and
+ e.name == "pageview" and
+ e.timestamp >=
+ ^site.native_stats_start_at
)
- end
+ )
end
def last_24h_visitors([]), do: %{}
def last_24h_visitors(sites) do
- if Plausible.v2?() do
- site_id_to_domain_mapping = for site <- sites, do: {site.id, site.domain}, into: %{}
-
- ClickhouseRepo.all(
- from(e in "events_v2",
- group_by: e.site_id,
- where: e.site_id in ^Map.keys(site_id_to_domain_mapping),
- where: e.timestamp > fragment("now() - INTERVAL 24 HOUR"),
- select: {e.site_id, fragment("uniq(user_id)")}
- )
- )
- |> Enum.map(fn {site_id, user_id} ->
- {site_id_to_domain_mapping[site_id], user_id}
- end)
- |> Enum.into(%{})
- else
- domains = Enum.map(sites, & &1.domain)
-
- ClickhouseRepo.all(
- from(e in "events",
- group_by: e.domain,
- where: e.domain in ^domains,
- where: e.timestamp > fragment("now() - INTERVAL 24 HOUR"),
- select: {e.domain, fragment("uniq(user_id)")}
- )
+ site_id_to_domain_mapping = for site <- sites, do: {site.id, site.domain}, into: %{}
+
+ ClickhouseRepo.all(
+ from(e in "events_v2",
+ group_by: e.site_id,
+ where: e.site_id in ^Map.keys(site_id_to_domain_mapping),
+ where: e.timestamp > fragment("now() - INTERVAL 24 HOUR"),
+ select: {e.site_id, fragment("uniq(user_id)")}
)
- |> Enum.into(%{})
- end
+ )
+ |> Enum.map(fn {site_id, user_id} ->
+ {site_id_to_domain_mapping[site_id], user_id}
+ end)
+ |> Enum.into(%{})
end
# credo:disable-for-next-line Credo.Check.Refactor.CyclomaticComplexity
@@ -254,19 +218,11 @@ defmodule Plausible.Stats.Clickhouse do
{first_datetime, last_datetime} = utc_boundaries(query, site)
q =
- if Plausible.v2?() do
- from(s in "sessions_v2",
- hints: ["SAMPLE 10000000"],
- where: s.site_id == ^site.id,
- where: s.timestamp >= ^first_datetime and s.start < ^last_datetime
- )
- else
- from(s in "sessions",
- hints: ["SAMPLE 10000000"],
- where: s.domain == ^site.domain,
- where: s.timestamp >= ^first_datetime and s.start < ^last_datetime
- )
- end
+ from(s in "sessions_v2",
+ hints: ["SAMPLE 10000000"],
+ where: s.site_id == ^site.id,
+ where: s.timestamp >= ^first_datetime and s.start < ^last_datetime
+ )
q =
if query.filters["source"] do
@@ -382,19 +338,11 @@ defmodule Plausible.Stats.Clickhouse do
{first_datetime, last_datetime} = utc_boundaries(query, site)
q =
- if Plausible.v2?() do
- from(e in "events_v2",
- hints: ["SAMPLE 10000000"],
- where: e.site_id == ^site.id,
- where: e.timestamp >= ^first_datetime and e.timestamp < ^last_datetime
- )
- else
- from(e in "events",
- hints: ["SAMPLE 10000000"],
- where: e.domain == ^site.domain,
- where: e.timestamp >= ^first_datetime and e.timestamp < ^last_datetime
- )
- end
+ from(e in "events_v2",
+ hints: ["SAMPLE 10000000"],
+ where: e.site_id == ^site.id,
+ where: e.timestamp >= ^first_datetime and e.timestamp < ^last_datetime
+ )
q =
if query.filters["screen"] do
diff --git a/lib/plausible/stats/current_visitors.ex b/lib/plausible/stats/current_visitors.ex
index ef36b47956..4af1466912 100644
--- a/lib/plausible/stats/current_visitors.ex
+++ b/lib/plausible/stats/current_visitors.ex
@@ -8,20 +8,11 @@ defmodule Plausible.Stats.CurrentVisitors do
|> Timex.shift(minutes: -5)
|> NaiveDateTime.truncate(:second)
- if Plausible.v2?() do
- ClickhouseRepo.one(
- from e in "events_v2",
- where: e.site_id == ^site.id,
- where: e.timestamp >= ^first_datetime,
- select: uniq(e.user_id)
- )
- else
- ClickhouseRepo.one(
- from e in "events",
- where: e.domain == ^site.domain,
- where: e.timestamp >= ^first_datetime,
- select: uniq(e.user_id)
- )
- end
+ ClickhouseRepo.one(
+ from e in "events_v2",
+ where: e.site_id == ^site.id,
+ where: e.timestamp >= ^first_datetime,
+ select: uniq(e.user_id)
+ )
end
end
diff --git a/lib/plausible_web/controllers/api/external_sites_controller.ex b/lib/plausible_web/controllers/api/external_sites_controller.ex
index 96d1398ad5..92d7b14c14 100644
--- a/lib/plausible_web/controllers/api/external_sites_controller.ex
+++ b/lib/plausible_web/controllers/api/external_sites_controller.ex
@@ -53,7 +53,7 @@ defmodule PlausibleWeb.Api.ExternalSitesController do
# for now this only allows to change the domain
site = Sites.get_for_user(conn.assigns[:current_user].id, site_id, [:owner, :admin])
- if site && Plausible.v2?() do
+ if site do
case Plausible.Site.Domain.change(site, params["domain"]) do
{:ok, site} ->
json(conn, site)
diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex
index 2fceccd4c8..57c8503801 100644
--- a/lib/plausible_web/controllers/site_controller.ex
+++ b/lib/plausible_web/controllers/site_controller.ex
@@ -874,36 +874,28 @@ defmodule PlausibleWeb.SiteController do
end
def change_domain(conn, _params) do
- if Plausible.v2?() do
- changeset = Plausible.Site.update_changeset(conn.assigns.site)
+ changeset = Plausible.Site.update_changeset(conn.assigns.site)
- render(conn, "change_domain.html",
- changeset: changeset,
- layout: {PlausibleWeb.LayoutView, "focus.html"}
- )
- else
- render_error(conn, 404)
- end
+ render(conn, "change_domain.html",
+ changeset: changeset,
+ layout: {PlausibleWeb.LayoutView, "focus.html"}
+ )
end
def change_domain_submit(conn, %{"site" => %{"domain" => new_domain}}) do
- if Plausible.v2?() do
- case Plausible.Site.Domain.change(conn.assigns.site, new_domain) do
- {:ok, updated_site} ->
- conn
- |> put_flash(:success, "Website domain changed successfully")
- |> redirect(
- to: Routes.site_path(conn, :add_snippet_after_domain_change, updated_site.domain)
- )
+ case Plausible.Site.Domain.change(conn.assigns.site, new_domain) do
+ {:ok, updated_site} ->
+ conn
+ |> put_flash(:success, "Website domain changed successfully")
+ |> redirect(
+ to: Routes.site_path(conn, :add_snippet_after_domain_change, updated_site.domain)
+ )
- {:error, changeset} ->
- render(conn, "change_domain.html",
- changeset: changeset,
- layout: {PlausibleWeb.LayoutView, "focus.html"}
- )
- end
- else
- render_error(conn, 404)
+ {:error, changeset} ->
+ render(conn, "change_domain.html",
+ changeset: changeset,
+ layout: {PlausibleWeb.LayoutView, "focus.html"}
+ )
end
end
diff --git a/lib/plausible_web/templates/site/settings_general.html.eex b/lib/plausible_web/templates/site/settings_general.html.eex
index 8a9d438777..da7d693314 100644
--- a/lib/plausible_web/templates/site/settings_general.html.eex
+++ b/lib/plausible_web/templates/site/settings_general.html.eex
@@ -1,4 +1,3 @@
-<%= if Plausible.v2?() do %>
<div class="shadow sm:rounded-md sm:overflow-hidden">
<div class="bg-white dark:bg-gray-800 py-6 px-4 space-y-6 sm:p-6">
<header class="relative">
@@ -19,7 +18,6 @@
</span>
</div>
</div>
-<% end %>
<%= form_for @changeset, "/#{URI.encode_www_form(@site.domain)}/settings", fn f -> %>
<div class="shadow sm:rounded-md sm:overflow-hidden">
diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs
index 4dcb53db27..b7e3f1423e 100644
--- a/priv/repo/seeds.exs
+++ b/priv/repo/seeds.exs
@@ -84,31 +84,17 @@ Enum.flat_map(-720..0, fn day_index ->
Enum.map(number_of_events, fn _ ->
geolocation = Enum.random(geolocations)
- if Plausible.v2?() do
- [
- site_id: site.id,
- hostname: site.domain,
- timestamp: put_random_time.(date, day_index),
- referrer_source: Enum.random(["", "Facebook", "Twitter", "DuckDuckGo", "Google"]),
- browser: Enum.random(["Edge", "Chrome", "Safari", "Firefox", "Vivaldi"]),
- browser_version: to_string(Enum.random(0..50)),
- screen_size: Enum.random(["Mobile", "Tablet", "Desktop", "Laptop"]),
- operating_system: Enum.random(["Windows", "macOS", "Linux"]),
- operating_system_version: to_string(Enum.random(0..15))
- ]
- else
- [
- domain: site.domain,
- hostname: site.domain,
- timestamp: put_random_time.(date, day_index),
- referrer_source: Enum.random(["", "Facebook", "Twitter", "DuckDuckGo", "Google"]),
- browser: Enum.random(["Edge", "Chrome", "Safari", "Firefox", "Vivaldi"]),
- browser_version: to_string(Enum.random(0..50)),
- screen_size: Enum.random(["Mobile", "Tablet", "Desktop", "Laptop"]),
- operating_system: Enum.random(["Windows", "macOS", "Linux"]),
- operating_system_version: to_string(Enum.random(0..15))
- ]
- end
+ [
+ site_id: site.id,
+ hostname: site.domain,
+ timestamp: put_random_time.(date, day_index),
+ referrer_source: Enum.random(["", "Facebook", "Twitter", "DuckDuckGo", "Google"]),
+ browser: Enum.random(["Edge", "Chrome", "Safari", "Firefox", "Vivaldi"]),
+ browser_version: to_string(Enum.random(0..50)),
+ screen_size: Enum.random(["Mobile", "Tablet", "Desktop", "Laptop"]),
+ operating_system: Enum.random(["Windows", "macOS", "Linux"]),
+ operating_system_version: to_string(Enum.random(0..15))
+ ]
|> Keyword.merge(geolocation)
|> then(&Plausible.Factory.build(:pageview, &1))
end)
diff --git a/test/plausible/goals_test.exs b/test/plausible/goals_test.exs
index 28cc38a240..93838a257a 100644
--- a/test/plausible/goals_test.exs
+++ b/test/plausible/goals_test.exs
@@ -22,7 +22,6 @@ defmodule Plausible.GoalsTest do
assert [%{event_name: "Signup"}, %{page_path: "/Signup"}] = goals
end
- @tag :v2_only
test "goals are present after domain change" do
site = insert(:site)
insert(:goal, %{site: site, event_name: " Signup "})
diff --git a/test/plausible/session/cache_store_test.exs b/test/plausible/session/cache_store_test.exs
index 6b8d212700..689d6264f6 100644
--- a/test/plausible/session/cache_store_test.exs
+++ b/test/plausible/session/cache_store_test.exs
@@ -40,11 +40,7 @@ defmodule Plausible.Session.CacheStoreTest do
assert [session] = sessions
assert session.hostname == event.hostname
- if Plausible.v2?() do
- assert session.site_id == event.site_id
- else
- assert session.domain == event.domain
- end
+ assert session.site_id == event.site_id
assert session.user_id == event.user_id
assert session.entry_page == event.pathname
diff --git a/test/plausible/site/cache_test.exs b/test/plausible/site/cache_test.exs
index 5a121418c0..f150e3ad97 100644
--- a/test/plausible/site/cache_test.exs
+++ b/test/plausible/site/cache_test.exs
@@ -115,7 +115,6 @@ defmodule Plausible.Site.CacheTest do
assert %Site{domain: ^domain2} = Cache.get(domain2, cache_opts)
end
- @tag :v2_only
test "sites with recently changed domains are refreshed", %{test: test} do
{:ok, _} = start_test_cache(test)
cache_opts = [cache_name: test, force?: true]
diff --git a/test/plausible/site/domain_test.exs b/test/plausible/site/domain_test.exs
index 51eb37f826..15a629337d 100644
--- a/test/plausible/site/domain_test.exs
+++ b/test/plausible/site/domain_test.exs
@@ -4,8 +4,6 @@ defmodule Plausible.Site.DomainTest do
use Plausible.DataCase, async: true
- @moduletag :v2_only
-
test "successful change" do
site = insert(:site)
assert {:ok, updated} = Domain.change(site, "new-domain.example.com")
diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs
index 547bc5911d..495e1ffb76 100644
--- a/test/plausible_web/controllers/api/external_controller_test.exs
+++ b/test/plausible_web/controllers/api/external_controller_test.exs
@@ -30,11 +30,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
assert response(conn, 202) == "ok"
assert pageview.hostname == "gigride.live"
- if Plausible.v2?() do
- assert pageview.site_id == site.id
- else
- assert pageview.domain == site.domain
- end
+ assert pageview.site_id == site.id
assert pageview.pathname == "/"
end
@@ -56,11 +52,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
assert response(conn, 202) == "ok"
assert pageview.hostname == "gigride.live"
- if Plausible.v2?() do
- assert pageview.site_id == site.id
- else
- assert pageview.domain == site.domain
- end
+ assert pageview.site_id == site.id
assert pageview.pathname == "/"
end
@@ -139,11 +131,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
pageview = get_event(site)
- if Plausible.v2?() do
- assert pageview.site_id == site.id
- else
- assert pageview.domain == site.domain
- end
+ assert pageview.site_id == site.id
end
test "www. is stripped from hostname", %{conn: conn, site: site} do
@@ -1251,40 +1239,22 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
defp get_event(site) do
Plausible.Event.WriteBuffer.flush()
- if Plausible.v2?() do
- ClickhouseRepo.one(
- from(e in Plausible.ClickhouseEventV2,
- where: e.site_id == ^site.id,
- order_by: [desc: e.timestamp]
- )
+ ClickhouseRepo.one(
+ from(e in Plausible.ClickhouseEventV2,
+ where: e.site_id == ^site.id,
+ order_by: [desc: e.timestamp]
)
- else
- ClickhouseRepo.one(
- from(e in Plausible.ClickhouseEvent,
- where: e.domain == ^site.domain,
- order_by: [desc: e.timestamp]
- )
- )
- end
+ )
end
defp get_events(site) do
Plausible.Event.WriteBuffer.flush()
- if Plausible.v2?() do
- ClickhouseRepo.all(
- from(e in Plausible.ClickhouseEventV2,
- where: e.site_id == ^site.id,
- order_by: [desc: e.timestamp]
- )
+ ClickhouseRepo.all(
+ from(e in Plausible.ClickhouseEventV2,
+ where: e.site_id == ^site.id,
+ order_by: [desc: e.timestamp]
)
- else
- ClickhouseRepo.all(
- from(e in Plausible.ClickhouseEvent,
- where: e.domain == ^site.domain,
- order_by: [desc: e.timestamp]
- )
- )
- end
+ )
end
end
diff --git a/test/plausible_web/controllers/api/external_sites_controller_test.exs b/test/plausible_web/controllers/api/external_sites_controller_test.exs
index 0a73e8466d..bb4b72018c 100644
--- a/test/plausible_web/controllers/api/external_sites_controller_test.exs
+++ b/test/plausible_web/controllers/api/external_sites_controller_test.exs
@@ -103,7 +103,6 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do
assert json_response(conn, 200) == %{"deleted" => true}
end
- @tag :v2_only
test "delete a site by its old domain after domain change", %{conn: conn, site: site} do
old_domain = site.domain
new_domain = "new.example.com"
@@ -159,7 +158,6 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do
assert String.starts_with?(res["url"], "http://")
end
- @tag :v2_only
test "can add a shared link to a site using the old site id after domain change", %{
conn: conn,
site: site
@@ -273,7 +271,6 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do
assert res["domain"] == site.domain
end
- @tag :v2_only
test "can add a goal using old site_id after domain change", %{conn: conn, site: site} do
old_domain = site.domain
new_domain = "new.example.com"
@@ -414,7 +411,6 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do
assert json_response(conn, 200) == %{"deleted" => true}
end
- @tag :v2_only
test "delete a goal using old site_id after domain change", %{conn: conn, site: site} do
old_domain = site.domain
new_domain = "new.example.com"
@@ -490,7 +486,6 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do
assert json_response(conn, 200) == %{"domain" => site.domain, "timezone" => site.timezone}
end
- @tag :v2_only
test "get a site by old site_id after domain change", %{conn: conn, site: site} do
old_domain = site.domain
new_domain = "new.example.com"
@@ -512,7 +507,6 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do
describe "PUT /api/v1/sites/:site_id" do
setup :create_new_site
- @tag :v2_only
test "can change domain name", %{conn: conn, site: site} do
old_domain = site.domain
assert old_domain != "new.example.com"
@@ -533,7 +527,6 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do
assert site.domain_changed_from == old_domain
end
- @tag :v2_only
test "can't make a no-op change", %{conn: conn, site: site} do
conn =
put(conn, "/api/v1/sites/#{site.domain}", %{
@@ -545,7 +538,6 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do
}
end
- @tag :v2_only
test "domain parameter is required", %{conn: conn, site: site} do
conn = put(conn, "/api/v1/sites/#{site.domain}", %{})
diff --git a/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs b/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs
index 4fa249163a..908cfc9683 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/aggregate_test.exs
@@ -793,7 +793,6 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AggregateTest do
} do
create_sessions([
%{
- domain: site.domain,
site_id: site.id,
session_id: 1000,
country_code: "EE",
@@ -801,7 +800,6 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AggregateTest do
events: 1
},
%{
- domain: site.domain,
site_id: site.id,
session_id: 1000,
country_code: "EE",
@@ -809,7 +807,6 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AggregateTest do
events: 1
},
%{
- domain: site.domain,
site_id: site.id,
session_id: 1000,
country_code: "EE",
@@ -820,21 +817,18 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AggregateTest do
create_events([
%{
- domain: site.domain,
site_id: site.id,
session_id: 1000,
country_code: "EE",
name: "pageview"
},
%{
- domain: site.domain,
site_id: site.id,
session_id: 1000,
country_code: "EE",
name: "pageview"
},
%{
- domain: site.domain,
site_id: site.id,
session_id: 1000,
country_code: "EE",
diff --git a/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs b/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs
index bc88b14f7a..1c6117aa7f 100644
--- a/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs
+++ b/test/plausible_web/controllers/api/external_stats_controller/auth_test.exs
@@ -123,7 +123,6 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AuthTest do
)
end
- @tag :v2_only
test "can access with either site_id after domain change", %{
conn: conn,
user: user,
diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exs
index 3b170be4f3..960e97fb5a 100644
--- a/test/plausible_web/controllers/site_controller_test.exs
+++ b/test/plausible_web/controllers/site_controller_test.exs
@@ -419,7 +419,7 @@ defmodule PlausibleWeb.SiteControllerTest do
delete(conn, "/#{site.domain}")
- refute Repo.exists?(from s in Plausible.Site, where: s.id == ^site.id)
+ refute Repo.exists?(from(s in Plausible.Site, where: s.id == ^site.id))
end
test "fails to delete a site with insufficient permissions", %{conn: conn, user: user} do
@@ -431,7 +431,7 @@ defmodule PlausibleWeb.SiteControllerTest do
conn = delete(conn, "/#{site.domain}")
assert conn.status == 404
- assert Repo.exists?(from s in Plausible.Site, where: s.id == ^site.id)
+ assert Repo.exists?(from(s in Plausible.Site, where: s.id == ^site.id))
end
test "fails to delete a foreign site", %{conn: my_conn, user: me} do
@@ -446,7 +446,7 @@ defmodule PlausibleWeb.SiteControllerTest do
my_conn = delete(my_conn, "/#{other_site.domain}")
assert my_conn.status == 404
- assert Repo.exists?(from s in Plausible.Site, where: s.id == ^other_site.id)
+ assert Repo.exists?(from(s in Plausible.Site, where: s.id == ^other_site.id))
end
end
@@ -1170,7 +1170,6 @@ defmodule PlausibleWeb.SiteControllerTest do
describe "domain change" do
setup [:create_user, :log_in, :create_site]
- @tag :v2_only
test "shows domain change in the settings form", %{conn: conn, site: site} do
conn = get(conn, Routes.site_path(conn, :settings_general, site.domain))
resp = html_response(conn, 200)
@@ -1180,7 +1179,6 @@ defmodule PlausibleWeb.SiteControllerTest do
assert resp =~ Routes.site_path(conn, :change_domain, site.domain)
end
- @tag :v2_only
test "domain change form renders", %{conn: conn, site: site} do
conn = get(conn, Routes.site_path(conn, :change_domain, site.domain))
resp = html_response(conn, 200)
@@ -1190,7 +1188,6 @@ defmodule PlausibleWeb.SiteControllerTest do
"Once you change your domain, you must update the JavaScript snippet on your site within 72 hours"
end
- @tag :v2_only
test "domain change form submission when no change is made", %{conn: conn, site: site} do
conn =
put(conn, Routes.site_path(conn, :change_domain_submit, site.domain), %{
@@ -1201,7 +1198,6 @@ defmodule PlausibleWeb.SiteControllerTest do
assert resp =~ "New domain must be different than the current one"
end
- @tag :v2_only
test "domain change form submission to an existing domain", %{conn: conn, site: site} do
another_site = insert(:site)
@@ -1218,7 +1214,6 @@ defmodule PlausibleWeb.SiteControllerTest do
assert is_nil(site.domain_changed_from)
end
- @tag :v2_only
test "domain change form submission to a domain in transition period", %{
conn: conn,
site: site
@@ -1238,7 +1233,6 @@ defmodule PlausibleWeb.SiteControllerTest do
assert is_nil(site.domain_changed_from)
end
- @tag :v2_only
test "domain change succcessful form submission redirects to snippet change info", %{
conn: conn,
site: site
@@ -1258,7 +1252,6 @@ defmodule PlausibleWeb.SiteControllerTest do
assert site.domain_changed_from == original_domain
end
- @tag :v2_only
test "snippet info after domain change", %{
conn: conn,
site: site
diff --git a/test/support/factory.ex b/test/support/factory.ex
index c2e9ecf768..fc74a57bd8 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -38,35 +38,19 @@ defmodule Plausible.Factory do
def ch_session_factory do
hostname = sequence(:domain, &"example-#{&1}.com")
- if Plausible.v2?() do
- %Plausible.ClickhouseSessionV2{
- sign: 1,
- session_id: SipHash.hash!(hash_key(), Ecto.UUID.generate()),
- user_id: SipHash.hash!(hash_key(), Ecto.UUID.generate()),
- hostname: hostname,
- site_id: Enum.random(1000..10_000),
- entry_page: "/",
- pageviews: 1,
- events: 1,
- start: Timex.now(),
- timestamp: Timex.now(),
- is_bounce: false
- }
- else
- %Plausible.ClickhouseSession{
- sign: 1,
- session_id: SipHash.hash!(hash_key(), Ecto.UUID.generate()),
- user_id: SipHash.hash!(hash_key(), Ecto.UUID.generate()),
- hostname: hostname,
- domain: hostname,
- entry_page: "/",
- pageviews: 1,
- events: 1,
- start: Timex.now(),
- timestamp: Timex.now(),
- is_bounce: false
- }
- end
+ %Plausible.ClickhouseSessionV2{
+ sign: 1,
+ session_id: SipHash.hash!(hash_key(), Ecto.UUID.generate()),
+ user_id: SipHash.hash!(hash_key(), Ecto.UUID.generate()),
+ hostname: hostname,
+ site_id: Enum.random(1000..10_000),
+ entry_page: "/",
+ pageviews: 1,
+ events: 1,
+ start: Timex.now(),
+ timestamp: Timex.now(),
+ is_bounce: false
+ }
end
def pageview_factory do
@@ -81,25 +65,14 @@ defmodule Plausible.Factory do
def event_factory do
hostname = sequence(:domain, &"example-#{&1}.com")
- if Plausible.v2?() do
- %Plausible.ClickhouseEventV2{
- hostname: hostname,
- site_id: Enum.random(1000..10_000),
- pathname: "/",
- timestamp: NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second),
- user_id: SipHash.hash!(hash_key(), Ecto.UUID.generate()),
- session_id: SipHash.hash!(hash_key(), Ecto.UUID.generate())
- }
- else
- %Plausible.ClickhouseEvent{
- hostname: hostname,
- domain: hostname,
- pathname: "/",
- timestamp: NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second),
- user_id: SipHash.hash!(hash_key(), Ecto.UUID.generate()),
- session_id: SipHash.hash!(hash_key(), Ecto.UUID.generate())
- }
- end
+ %Plausible.ClickhouseEventV2{
+ hostname: hostname,
+ site_id: Enum.random(1000..10_000),
+ pathname: "/",
+ timestamp: NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second),
+ user_id: SipHash.hash!(hash_key(), Ecto.UUID.generate()),
+ session_id: SipHash.hash!(hash_key(), Ecto.UUID.generate())
+ }
end
def goal_factory do
diff --git a/test/support/test_utils.ex b/test/support/test_utils.ex
index 0cf49d40ef..8de90e5c03 100644
--- a/test/support/test_utils.ex
+++ b/test/support/test_utils.ex
@@ -73,15 +73,9 @@ defmodule Plausible.TestUtils do
pageviews =
Enum.map(pageviews, fn pageview ->
pageview =
- if Plausible.v2?() do
- pageview
- |> Map.delete(:site)
- |> Map.put(:site_id, pageview.site.id)
- else
- pageview
- |> Map.delete(:site)
- |> Map.put(:domain, pageview.site.domain)
- end
+ pageview
+ |> Map.delete(:site)
+ |> Map.put(:site_id, pageview.site.id)
Factory.build(:pageview, pageview)
|> Map.from_struct()
@@ -89,46 +83,24 @@ defmodule Plausible.TestUtils do
|> update_in([:timestamp], &to_naive_truncate/1)
end)
- if Plausible.v2?() do
- Plausible.IngestRepo.insert_all(Plausible.ClickhouseEventV2, pageviews)
- else
- Plausible.IngestRepo.insert_all(Plausible.ClickhouseEvent, pageviews)
- end
+ Plausible.IngestRepo.insert_all(Plausible.ClickhouseEventV2, pageviews)
end
def create_events(events) do
events =
Enum.map(events, fn event ->
- event =
- if Plausible.v2?() do
- Map.delete(event, :domain)
- else
- Map.delete(event, :site_id)
- end
-
Factory.build(:event, event)
|> Map.from_struct()
|> Map.delete(:__meta__)
|> update_in([:timestamp], &to_naive_truncate/1)
end)
- if Plausible.v2?() do
- Plausible.IngestRepo.insert_all(Plausible.ClickhouseEventV2, events)
- else
- Plausible.IngestRepo.insert_all(Plausible.ClickhouseEvent, events)
- end
+ Plausible.IngestRepo.insert_all(Plausible.ClickhouseEventV2, events)
end
def create_sessions(sessions) do
sessions =
Enum.map(sessions, fn session ->
- session =
- if Plausible.v2?() do
- Map.delete(session, :domain)
- else
- Map.delete(session, :site_id)
- end
-
Factory.build(:ch_session, session)
|> Map.from_struct()
|> Map.delete(:__meta__)
@@ -136,11 +108,7 @@ defmodule Plausible.TestUtils do
|> update_in([:start], &to_naive_truncate/1)
end)
- if Plausible.v2?() do
- Plausible.IngestRepo.insert_all(Plausible.ClickhouseSessionV2, sessions)
- else
- Plausible.IngestRepo.insert_all(Plausible.ClickhouseSession, sessions)
- end
+ Plausible.IngestRepo.insert_all(Plausible.ClickhouseSessionV2, sessions)
end
def log_in(%{user: user, conn: conn}) do
@@ -173,9 +141,6 @@ defmodule Plausible.TestUtils do
%Plausible.ClickhouseEventV2{} ->
Map.put(event, :site_id, site.id)
- %Plausible.ClickhouseEvent{} ->
- Map.put(event, :domain, site.domain)
-
_ ->
Map.put(event, :site_id, site.id)
end
@@ -200,9 +165,6 @@ defmodule Plausible.TestUtils do
%Plausible.ClickhouseEventV2{} ->
true
- %Plausible.ClickhouseEvent{} ->
- true
-
_ ->
false
end
@@ -216,22 +178,11 @@ defmodule Plausible.TestUtils do
sessions =
Enum.reduce(events, %{}, fn event, sessions ->
session_id = Plausible.Session.CacheStore.on_event(event, nil)
-
- if Plausible.v2?() do
- Map.put(sessions, {event.site_id, event.user_id}, session_id)
- else
- Map.put(sessions, {event.domain, event.user_id}, session_id)
- end
+ Map.put(sessions, {event.site_id, event.user_id}, session_id)
end)
Enum.each(events, fn event ->
- event =
- if Plausible.v2?() do
- Map.put(event, :session_id, sessions[{event.site_id, event.user_id}])
- else
- Map.put(event, :session_id, sessions[{event.domain, event.user_id}])
- end
-
+ event = Map.put(event, :session_id, sessions[{event.site_id, event.user_id}])
Plausible.Event.WriteBuffer.insert(event)
end)
diff --git a/test/test_helper.exs b/test/test_helper.exs
index ec6ec62282..795c7ce28e 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -3,15 +3,4 @@ Mox.defmock(Plausible.HTTPClient.Mock, for: Plausible.HTTPClient.Interface)
FunWithFlags.enable(:visits_metric)
Application.ensure_all_started(:double)
Ecto.Adapters.SQL.Sandbox.mode(Plausible.Repo, :manual)
-
-if Plausible.v2?() do
- ExUnit.configure(exclude: [:slow])
-
- IO.puts("Running tests against v2 schema")
-else
- ExUnit.configure(exclude: [:v2_only, :slow])
-
- IO.puts(
- "Running tests against v1 schema. Use: `V2_MIGRATION_DONE=1 mix test` for secondary run."
- )
-end
+ExUnit.configure(exclude: [:slow])
diff --git a/test/workers/expire_domain_change_transitions_test.exs b/test/workers/expire_domain_change_transitions_test.exs
index a2de6fb7f3..8e582610a2 100644
--- a/test/workers/expire_domain_change_transitions_test.exs
+++ b/test/workers/expire_domain_change_transitions_test.exs
@@ -6,8 +6,6 @@ defmodule Plausible.Workers.ExpireDomainChangeTransitionsTest do
import ExUnit.CaptureLog
- @moduletag :v2_only
-
test "doesn't log when there is nothing to do" do
log =
capture_log(fn ->