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
Reduce reliance on `Timex` and use native time API where feasible (#5712)
Adrian Gruntkowski8d6d828d1d9e
diff --git a/lib/plausible/auth/totp.ex b/lib/plausible/auth/totp.exindex e12f6ebc71..d6b6c95dd8 100644--- a/lib/plausible/auth/totp.ex+++ b/lib/plausible/auth/totp.ex@@ -336,7 +336,9 @@ defmodule Plausible.Auth.TOTP do|> Repo.one()if datetime do- Timex.to_unix(datetime)+ datetime+ |> DateTime.from_naive!("Etc/UTC")+ |> DateTime.to_unix()endenddiff --git a/lib/plausible/billing/subscriptions.ex b/lib/plausible/billing/subscriptions.exindex 1293196545..c8543df2e2 100644--- a/lib/plausible/billing/subscriptions.ex+++ b/lib/plausible/billing/subscriptions.ex@@ -27,7 +27,7 @@ defmodule Plausible.Billing.Subscriptions dodef expired?(%Subscription{next_bill_date: next_bill_date} = subscription) dodeleted? = Subscription.Status.deleted?(subscription)- expired? = Timex.compare(next_bill_date, Date.utc_today()) < 0+ expired? = Date.before?(next_bill_date, Date.utc_today())deleted? && expired?enddiff --git a/lib/plausible/data_migration/populate_event_session_columns.ex b/lib/plausible/data_migration/populate_event_session_columns.exindex 3f911e96a0..fdf04fa1f4 100644--- a/lib/plausible/data_migration/populate_event_session_columns.ex+++ b/lib/plausible/data_migration/populate_event_session_columns.ex@@ -150,8 +150,6 @@ defmodule Plausible.DataMigration.PopulateEventSessionColumns doenddefp format_duration(seconds) do- seconds- |> Timex.Duration.from_seconds()- |> Timex.format_duration(Timex.Format.Duration.Formatters.Humanized)+ Plausible.Times.humanize_seconds(seconds)endenddiff --git a/lib/plausible/exports.ex b/lib/plausible/exports.exindex a701b1a024..ba6bdcfbcd 100644--- a/lib/plausible/exports.ex+++ b/lib/plausible/exports.ex@@ -154,7 +154,7 @@ defmodule Plausible.Exports do["expiry-date=", expiry_date, ", rule-id=", _rule_id] =String.split(x_amz_expiration, "\"", trim: true)- Timex.parse!(expiry_date, "{RFC1123}")+ Plausible.Times.parse!(expiry_date, "{RFC1123}")end%{diff --git a/lib/plausible/google/api.ex b/lib/plausible/google/api.exindex b91505490a..c1ab562d3d 100644--- a/lib/plausible/google/api.ex+++ b/lib/plausible/google/api.ex@@ -3,8 +3,6 @@ defmodule Plausible.Google.API doAPI to Google services."""- use Timex-alias Plausible.Google.HTTPalias Plausible.Google.SearchConsolealias Plausible.Stats.Querydiff --git a/lib/plausible/google/ga4/http.ex b/lib/plausible/google/ga4/http.exindex aedbf5f929..5f3a1fccc8 100644--- a/lib/plausible/google/ga4/http.ex+++ b/lib/plausible/google/ga4/http.ex@@ -269,7 +269,7 @@ defmodule Plausible.Google.GA4.HTTP dodate =case report["rows"] do[%{"dimensionValues" => [%{"value" => date_str}]}] ->- Timex.parse!(date_str, "%Y%m%d", :strftime) |> NaiveDateTime.to_date()+ Plausible.Times.parse!(date_str, "%Y%m%d", :strftime) |> NaiveDateTime.to_date()_ ->nildiff --git a/lib/plausible/imported/google_analytics4.ex b/lib/plausible/imported/google_analytics4.exindex ab98384792..31a5166620 100644--- a/lib/plausible/imported/google_analytics4.ex+++ b/lib/plausible/imported/google_analytics4.ex@@ -337,7 +337,7 @@ defmodule Plausible.Imported.GoogleAnalytics4 dodefp get_date(%{dimensions: %{"date" => date}}) dodate- |> Timex.parse!("%Y%m%d", :strftime)+ |> Plausible.Times.parse!("%Y%m%d", :strftime)|> NaiveDateTime.to_date()enddiff --git a/lib/plausible/site.ex b/lib/plausible/site.exindex 8a235582a8..7aec34d6d1 100644--- a/lib/plausible/site.ex+++ b/lib/plausible/site.ex@@ -222,7 +222,7 @@ defmodule Plausible.Site dodefp validate_timezone(changeset) dotz = get_field(changeset, :timezone)- if Timex.is_valid_timezone?(tz) do+ if Plausible.Timezones.valid?(tz) dochangesetelseadd_error(changeset, :timezone, "is invalid")diff --git a/lib/plausible/stats/filters/query_parser.ex b/lib/plausible/stats/filters/query_parser.exindex a7411880a1..d0eae7b1ee 100644--- a/lib/plausible/stats/filters/query_parser.ex+++ b/lib/plausible/stats/filters/query_parser.ex@@ -197,8 +197,12 @@ defmodule Plausible.Stats.Filters.QueryParser doenddefp parse_date(site, date_string, _date, _now) when is_binary(date_string) do- case Date.from_iso8601(date_string) do- {:ok, date} -> {:ok, date, DateTime.new!(date, ~T[00:00:00], site.timezone)}+ with {:ok, date} <- Date.from_iso8601(date_string),+ {:ok, datetime} <- DateTime.new(date, ~T[00:00:00], site.timezone) do+ {:ok, date, datetime}+ else+ {:gap, just_before, _just_after} -> just_before+ {:ambiguous, first_datetime, _second_datetime} -> first_datetime_ -> {:error, "Invalid date '#{date_string}'."}endend@@ -231,8 +235,8 @@ defmodule Plausible.Stats.Filters.QueryParser doenddefp parse_time_range(site, "year", date, _now) do- last = date |> Timex.end_of_year()- first = last |> Timex.beginning_of_year()+ last = date |> Plausible.Times.end_of_year()+ first = last |> Plausible.Times.beginning_of_year(){:ok, DateTimeRange.new!(first, last, site.timezone)}enddiff --git a/lib/plausible/stats/interval.ex b/lib/plausible/stats/interval.exindex 34018037fc..64d607f482 100644--- a/lib/plausible/stats/interval.ex+++ b/lib/plausible/stats/interval.ex@@ -42,7 +42,7 @@ defmodule Plausible.Stats.Interval do"""def default_for_date_range(%DateTimeRange{first: first, last: last}) docond do- Timex.diff(last, first, :months) > 0 ->+ Plausible.Times.diff(last, first, :month) > 0 ->"month"DateTime.diff(last, first, :day) > 0 ->@@ -75,7 +75,7 @@ defmodule Plausible.Stats.Interval dotable =with %Date{} = from <- Keyword.get(opts, :from),%Date{} = to <- Keyword.get(opts, :to),- true <- abs(Timex.diff(from, to, :months)) > 12 do+ true <- abs(Plausible.Times.diff(from, to, :month)) > 12 doMap.replace(@valid_by_period, "custom", ["week", "month"])else_ ->@@ -83,7 +83,7 @@ defmodule Plausible.Stats.Interval doendwith %Date{} = stats_start <- Plausible.Sites.stats_start_date(site),- true <- abs(Timex.diff(Date.utc_today(), stats_start, :months)) > 12 do+ true <- abs(Plausible.Times.diff(Date.utc_today(), stats_start, :month)) > 12 doMap.replace(table, "all", ["week", "month"])else_ ->diff --git a/lib/plausible/stats/legacy/legacy_query_builder.ex b/lib/plausible/stats/legacy/legacy_query_builder.exindex b0140b99e1..fdb643462f 100644--- a/lib/plausible/stats/legacy/legacy_query_builder.ex+++ b/lib/plausible/stats/legacy/legacy_query_builder.ex@@ -157,9 +157,9 @@ defmodule Plausible.Stats.Legacy.QueryBuilder dodefp put_input_date_range(query, site, %{"period" => "year"} = params) doend_date =parse_single_date(query, params)- |> Timex.end_of_year()+ |> Plausible.Times.end_of_year()- start_date = Timex.beginning_of_year(end_date)+ start_date = Plausible.Times.beginning_of_year(end_date)datetime_range =DateTimeRange.new!(start_date, end_date, site.timezone)@@ -304,12 +304,12 @@ defmodule Plausible.Stats.Legacy.QueryBuilder doenddefp today(query) do- query.now |> Timex.to_date()+ query.now |> DateTime.to_date()enddefp parse_single_date(query, params) docase params["date"] do- "today" -> query.now |> Timex.to_date()+ "today" -> query.now |> DateTime.to_date()date when is_binary(date) -> Date.from_iso8601!(date)_ -> today(query)enddiff --git a/lib/plausible/stats/query_optimizer.ex b/lib/plausible/stats/query_optimizer.exindex 30e43bcef9..23ebae1baa 100644--- a/lib/plausible/stats/query_optimizer.ex+++ b/lib/plausible/stats/query_optimizer.ex@@ -95,7 +95,7 @@ defmodule Plausible.Stats.QueryOptimizer docond doDateTime.diff(last, first, :hour) <= 48 -> "time:hour"DateTime.diff(last, first, :day) <= 40 -> "time:day"- Timex.diff(last, first, :weeks) <= 52 -> "time:week"+ Plausible.Times.diff(last, first, :week) <= 52 -> "time:week"true -> "time:month"endenddiff --git a/lib/plausible/stats/time.ex b/lib/plausible/stats/time.exindex cf5d7ea3c3..91758784f8 100644--- a/lib/plausible/stats/time.ex+++ b/lib/plausible/stats/time.ex@@ -53,10 +53,10 @@ defmodule Plausible.Stats.Time dodate_range = Query.date_range(query)n_buckets =- Timex.diff(+ Plausible.Times.diff(date_range.last,Date.beginning_of_month(date_range.first),- :months+ :month)Enum.map(n_buckets..0//-1, fn shift ->@@ -71,10 +71,10 @@ defmodule Plausible.Stats.Time dodate_range = Query.date_range(query)n_buckets =- Timex.diff(+ Plausible.Times.diff(date_range.last,Date.beginning_of_week(date_range.first),- :weeks+ :week)Enum.map(0..n_buckets, fn shift ->diff --git a/lib/plausible/teams/billing.ex b/lib/plausible/teams/billing.exindex 7bd75713cd..02af0ff637 100644--- a/lib/plausible/teams/billing.ex+++ b/lib/plausible/teams/billing.ex@@ -435,7 +435,7 @@ defmodule Plausible.Teams.Billing dolast_bill_date = team.subscription.last_bill_datenormalized_last_bill_date =- Date.shift(last_bill_date, month: Timex.diff(today, last_bill_date, :months))+ Date.shift(last_bill_date, month: Plausible.Times.diff(today, last_bill_date, :month))date_range =case cycle dodiff --git a/lib/plausible/times.ex b/lib/plausible/times.exnew file mode 100644index 0000000000..345b380ad5--- /dev/null+++ b/lib/plausible/times.ex@@ -0,0 +1,76 @@+defmodule Plausible.Times do+ @moduledoc """+ API for working with time wrapping around external libraries where necessary.+ """++ @spec today(String.t()) :: Date.t()+ def today(tz) do+ tz+ |> DateTime.now!()+ |> DateTime.to_date()+ end++ @spec diff(Date.t() | DateTime.t(), Date.t() | DateTime.t(), :month | :week) :: integer()+ def diff(a, b, unit) do+ unit =+ case unit do+ :week -> :weeks+ :month -> :months+ end++ Timex.diff(a, b, unit)+ end++ @spec parse!(String.t(), String.t(), :default | :strftime) :: DateTime.t() | NaiveDateTime.t()+ def parse!(str, format, tokenizer \\ :default)++ def parse!(str, "{RFC1123}" = format, :default) do+ Timex.parse!(str, format)+ end++ def parse!(str, format, :strftime) do+ Timex.parse!(str, format, :strftime)+ end++ @spec beginning_of_week(DateTime.t()) :: DateTime.t()+ def beginning_of_week(dt) do+ Timex.beginning_of_week(dt)+ end++ @spec beginning_of_month(DateTime.t()) :: DateTime.t()+ def beginning_of_month(dt) do+ Timex.beginning_of_month(dt)+ end++ @spec beginning_of_year(Date.t()) :: Date.t()+ def beginning_of_year(d) do+ Timex.beginning_of_year(d)+ end++ @spec end_of_week(DateTime.t()) :: DateTime.t()+ def end_of_week(dt) do+ Timex.end_of_week(dt)+ end++ @spec end_of_month(DateTime.t()) :: DateTime.t()+ def end_of_month(dt) do+ Timex.end_of_month(dt)+ end++ @spec end_of_year(Date.t()) :: Date.t()+ def end_of_year(t) do+ Timex.end_of_year(t)+ end++ @spec humanize(DateTime.t()) :: String.t()+ def humanize(%DateTime{} = dt) do+ Timex.Format.DateTime.Formatters.Relative.format!(dt, "{relative}")+ end++ @spec humanize_seconds(pos_integer()) :: String.t()+ def humanize_seconds(seconds) do+ seconds+ |> Timex.Duration.from_seconds()+ |> Timex.format_duration(Timex.Format.Duration.Formatters.Humanized)+ end+enddiff --git a/lib/plausible/timezones.ex b/lib/plausible/timezones.exindex 3ebbf7c55c..030c41c95b 100644--- a/lib/plausible/timezones.ex+++ b/lib/plausible/timezones.ex@@ -1,4 +1,13 @@defmodule Plausible.Timezones do+ @moduledoc """+ API for working with timezones wrapping around external libraries where necessary.+ """++ @spec valid?(String.t()) :: boolean()+ def valid?(tz) do+ Timex.is_valid_timezone?(tz)+ end+@spec options(DateTime.t()) :: [{:key, String.t()}, {:value, String.t()}, {:offset, integer()}]def options(now \\ DateTime.utc_now()) doTzdata.zone_list()diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.exindex 7b88f13985..8f33d6570e 100644--- a/lib/plausible_web/controllers/api/stats_controller.ex+++ b/lib/plausible_web/controllers/api/stats_controller.ex@@ -148,7 +148,7 @@ defmodule PlausibleWeb.Api.StatsController dolabels) dodate_range = Query.date_range(query)- build_intervals(labels, date_range, &Timex.beginning_of_week/1, &Timex.end_of_week/1)+ build_intervals(labels, date_range, &Date.beginning_of_week/1, &Date.end_of_week/1)enddefp build_full_intervals(@@ -156,7 +156,7 @@ defmodule PlausibleWeb.Api.StatsController dolabels) dodate_range = Query.date_range(query)- build_intervals(labels, date_range, &Timex.beginning_of_month/1, &Timex.end_of_month/1)+ build_intervals(labels, date_range, &Date.beginning_of_month/1, &Date.end_of_month/1)enddefp build_full_intervals(_query, _labels) do@@ -243,7 +243,7 @@ defmodule PlausibleWeb.Api.StatsController do"day" ->current_date =DateTime.now!(site.timezone)- |> Timex.to_date()+ |> DateTime.to_date()|> Date.to_string()Enum.find_index(dates, &(&1 == current_date))@@ -253,7 +253,7 @@ defmodule PlausibleWeb.Api.StatsController docurrent_date =DateTime.now!(site.timezone)- |> Timex.to_date()+ |> DateTime.to_date()|> Time.date_or_weekstart(date_range)|> Date.to_string()@@ -262,8 +262,8 @@ defmodule PlausibleWeb.Api.StatsController do"month" ->current_date =DateTime.now!(site.timezone)- |> Timex.to_date()- |> Timex.beginning_of_month()+ |> DateTime.to_date()+ |> Date.beginning_of_month()|> Date.to_string()Enum.find_index(dates, &(&1 == current_date))diff --git a/lib/plausible_web/email.ex b/lib/plausible_web/email.exindex 8e49f56ffa..d30920bc83 100644--- a/lib/plausible_web/email.ex+++ b/lib/plausible_web/email.ex@@ -487,10 +487,7 @@ defmodule PlausibleWeb.Email dodef export_success(user, site, expires_at) doexpires_in =if expires_at do- Timex.Format.DateTime.Formatters.Relative.format!(- expires_at,- "{relative}"- )+ Plausible.Times.humanize(expires_at)enddownload_url =diff --git a/lib/plausible_web/live/csv_export.ex b/lib/plausible_web/live/csv_export.exindex bc8f830059..a83d19f8b3 100644--- a/lib/plausible_web/live/csv_export.ex+++ b/lib/plausible_web/live/csv_export.ex@@ -188,7 +188,7 @@ defmodule PlausibleWeb.Live.CSVExport do<p :if={@export.expires_at} class="text-sm">Note: this file will expire<.hint message={@export.expires_at}>- {Timex.Format.DateTime.Formatters.Relative.format!(@export.expires_at, "{relative}")}.+ {Plausible.Times.humanize(@export.expires_at)}.</.hint></p>diff --git a/lib/plausible_web/live/csv_import.ex b/lib/plausible_web/live/csv_import.exindex 4b41b97aba..3242276de6 100644--- a/lib/plausible_web/live/csv_import.ex+++ b/lib/plausible_web/live/csv_import.ex@@ -311,7 +311,7 @@ defmodule PlausibleWeb.Live.CSVImport donative_stats_start_date: native_stats_start_date} = socket.assigns- cutoff_date = native_stats_start_date || Timex.today(site.timezone)+ cutoff_date = native_stats_start_date || Plausible.Times.today(site.timezone)case Imported.clamp_dates(occupied_ranges, cutoff_date, start_date, end_date) do{:ok, start_date, end_date} -> Date.range(start_date, end_date)diff --git a/lib/workers/schedule_email_reports.ex b/lib/workers/schedule_email_reports.exindex 1551618741..91f2090f9a 100644--- a/lib/workers/schedule_email_reports.ex+++ b/lib/workers/schedule_email_reports.ex@@ -52,7 +52,7 @@ defmodule Plausible.Workers.ScheduleEmailReports dodef monday_9am(timezone) doDateTime.now!(timezone)|> DateTime.shift(week: 1)- |> Timex.beginning_of_week()+ |> Plausible.Times.beginning_of_week()|> DateTime.shift(hour: 9)end@@ -93,7 +93,7 @@ defmodule Plausible.Workers.ScheduleEmailReports dodef first_of_month_9am(timezone) doDateTime.now!(timezone)|> DateTime.shift(month: 1)- |> Timex.beginning_of_month()+ |> Plausible.Times.beginning_of_month()|> DateTime.shift(hour: 9)endenddiff --git a/test/plausible/auth/totp_test.exs b/test/plausible/auth/totp_test.exsindex 4b2d7bf778..e73268f985 100644--- a/test/plausible/auth/totp_test.exs+++ b/test/plausible/auth/totp_test.exs@@ -330,7 +330,12 @@ defmodule Plausible.Auth.TOTPTest doassert {:ok, user} = TOTP.validate_code(user, new_code, allow_reuse?: true)- assert_in_delta Timex.to_unix(user.totp_last_used_at), System.os_time(:second), 2+ totp_last_used_at =+ user.totp_last_used_at+ |> DateTime.from_naive!("Etc/UTC")+ |> DateTime.to_unix()++ assert_in_delta totp_last_used_at, System.os_time(:second), 2endtest "fails when trying to reuse the same code twice" dodiff --git a/test/plausible/billing/billing_test.exs b/test/plausible/billing/billing_test.exsindex fd8377d343..d946e29900 100644--- a/test/plausible/billing/billing_test.exs+++ b/test/plausible/billing/billing_test.exs@@ -437,7 +437,10 @@ defmodule Plausible.BillingTest doendtest "if teams's grace period has ended, upgrading will unlock sites and remove grace period" do- grace_period = %Plausible.Teams.GracePeriod{end_date: Timex.shift(Timex.today(), days: -1)}+ grace_period = %Plausible.Teams.GracePeriod{+ end_date: Date.shift(Date.utc_today(), day: -1)+ }+user = new_user(team: [grace_period: grace_period])subscribe_to_growth_plan(user)@@ -571,7 +574,7 @@ defmodule Plausible.BillingTest doBilling.subscription_payment_succeeded(%{"alert_name" => "subscription_payment_succeeded","subscription_id" => "nonexistent_subscription_id",- "next_bill_date" => Timex.shift(Timex.today(), days: 30),+ "next_bill_date" => Date.shift(Date.utc_today(), day: 30),"unit_price" => "12.00"})diff --git a/test/plausible/billing/quota_test.exs b/test/plausible/billing/quota_test.exsindex f566181580..f8b6d7b89f 100644--- a/test/plausible/billing/quota_test.exs+++ b/test/plausible/billing/quota_test.exs@@ -710,12 +710,12 @@ defmodule Plausible.Billing.QuotaTest donow = NaiveDateTime.utc_now()populate_stats(site, [- build(:event, timestamp: Timex.shift(now, days: -40), name: "custom"),- build(:event, timestamp: Timex.shift(now, days: -10), name: "custom"),- build(:event, timestamp: Timex.shift(now, days: -9), name: "pageview"),- build(:event, timestamp: Timex.shift(now, days: -8), name: "pageview"),- build(:event, timestamp: Timex.shift(now, days: -7), name: "pageview"),- build(:event, timestamp: Timex.shift(now, days: -6), name: "custom")+ build(:event, timestamp: NaiveDateTime.shift(now, day: -40), name: "custom"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -10), name: "custom"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -9), name: "pageview"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -8), name: "pageview"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -7), name: "pageview"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -6), name: "custom")])assert %{@@ -735,9 +735,9 @@ defmodule Plausible.Billing.QuotaTest donow = NaiveDateTime.utc_now()populate_stats(site, [- build(:event, timestamp: Timex.shift(now, days: -8), name: "custom"),- build(:pageview, user_id: 199, timestamp: Timex.shift(now, days: -5, minutes: -2)),- build(:engagement, user_id: 199, timestamp: Timex.shift(now, days: -5))+ build(:event, timestamp: NaiveDateTime.shift(now, day: -8), name: "custom"),+ build(:pageview, user_id: 199, timestamp: NaiveDateTime.shift(now, day: -5, minute: -2)),+ build(:engagement, user_id: 199, timestamp: NaiveDateTime.shift(now, day: -5))])assert %{@@ -761,12 +761,12 @@ defmodule Plausible.Billing.QuotaTest donow = NaiveDateTime.utc_now()populate_stats(site, [- build(:event, timestamp: Timex.shift(now, days: -40), name: "custom"),- build(:event, timestamp: Timex.shift(now, days: -10), name: "custom"),- build(:event, timestamp: Timex.shift(now, days: -9), name: "pageview"),- build(:event, timestamp: Timex.shift(now, days: -8), name: "pageview"),- build(:event, timestamp: Timex.shift(now, days: -7), name: "pageview"),- build(:event, timestamp: Timex.shift(now, days: -6), name: "custom")+ build(:event, timestamp: NaiveDateTime.shift(now, day: -40), name: "custom"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -10), name: "custom"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -9), name: "pageview"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -8), name: "pageview"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -7), name: "pageview"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -6), name: "custom")])assert %{@@ -806,12 +806,12 @@ defmodule Plausible.Billing.QuotaTest dofor site <- [site1, site2, site3] dopopulate_stats(site, [- build(:event, timestamp: Timex.shift(now, days: -40), name: "custom"),- build(:event, timestamp: Timex.shift(now, days: -10), name: "custom"),- build(:event, timestamp: Timex.shift(now, days: -9), name: "pageview"),- build(:event, timestamp: Timex.shift(now, days: -8), name: "pageview"),- build(:event, timestamp: Timex.shift(now, days: -7), name: "pageview"),- build(:event, timestamp: Timex.shift(now, days: -6), name: "custom")+ build(:event, timestamp: NaiveDateTime.shift(now, day: -40), name: "custom"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -10), name: "custom"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -9), name: "pageview"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -8), name: "pageview"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -7), name: "pageview"),+ build(:event, timestamp: NaiveDateTime.shift(now, day: -6), name: "custom")])enddiff --git a/test/plausible/billing/site_locker_test.exs b/test/plausible/billing/site_locker_test.exsindex 9fcb4820a5..0ccd14bf9b 100644--- a/test/plausible/billing/site_locker_test.exs+++ b/test/plausible/billing/site_locker_test.exs@@ -52,7 +52,9 @@ defmodule Plausible.Billing.SiteLockerTest doendtest "does not lock team which has an active subscription and is on grace period" do- grace_period = %Plausible.Teams.GracePeriod{end_date: Timex.shift(Timex.today(), days: 1)}+ grace_period = %Plausible.Teams.GracePeriod{+ end_date: Date.shift(Date.utc_today(), day: 1)+ }user =new_user(team: [grace_period: grace_period])@@ -101,7 +103,10 @@ defmodule Plausible.Billing.SiteLockerTest doendtest "locks all sites if team has an active subscription but grace period has ended (still over limits)" do- grace_period = %Plausible.Teams.GracePeriod{end_date: Timex.shift(Timex.today(), days: -1)}+ grace_period = %Plausible.Teams.GracePeriod{+ end_date: Date.shift(Date.utc_today(), day: -1)+ }+user = new_user(team: [grace_period: grace_period])subscribe_to_plan(user, @v4_growth_plan_id)site = new_site(owner: user)@@ -116,7 +121,10 @@ defmodule Plausible.Billing.SiteLockerTest doendtest "does not lock sites (and removes grace period), when on active subscription and grace period ended, but usage now within limits" do- grace_period = %Plausible.Teams.GracePeriod{end_date: Timex.shift(Timex.today(), days: -1)}+ grace_period = %Plausible.Teams.GracePeriod{+ end_date: Date.shift(Date.utc_today(), day: -1)+ }+user = new_user(team: [grace_period: grace_period])subscribe_to_plan(user, @v4_growth_plan_id)site = new_site(owner: user)@@ -130,7 +138,10 @@ defmodule Plausible.Billing.SiteLockerTest doendtest "sends email to all billing members if grace period has ended and still over limits" do- grace_period = %Plausible.Teams.GracePeriod{end_date: Timex.shift(Timex.today(), days: -1)}+ grace_period = %Plausible.Teams.GracePeriod{+ end_date: Date.shift(Date.utc_today(), day: -1)+ }+user = new_user(team: [grace_period: grace_period])subscribe_to_plan(user, @v4_growth_plan_id)new_site(owner: user)@@ -159,7 +170,7 @@ defmodule Plausible.Billing.SiteLockerTest dotest "does not send grace period email if site is already locked" dograce_period = %Plausible.Teams.GracePeriod{- end_date: Timex.shift(Timex.today(), days: -1),+ end_date: Date.shift(Date.utc_today(), day: -1),is_over: false}@@ -193,7 +204,7 @@ defmodule Plausible.Billing.SiteLockerTest dotest "unlocks already ended grace periods when they still have an active subscription and went within limits again" dograce_period = %Plausible.Teams.GracePeriod{- end_date: Timex.shift(Timex.today(), days: -7),+ end_date: Date.shift(Date.utc_today(), day: -7),is_over: true}diff --git a/test/plausible/plugins/api/token_test.exs b/test/plausible/plugins/api/token_test.exsindex 8b91efbba9..c109d7ada3 100644--- a/test/plausible/plugins/api/token_test.exs+++ b/test/plausible/plugins/api/token_test.exs@@ -79,18 +79,18 @@ defmodule Plausible.Plugins.API.TokenTest donow = NaiveDateTime.utc_now()last_seen = fn shift ->- Token.last_used_humanize(%Token{last_used_at: Timex.shift(now, shift)})+ Token.last_used_humanize(%Token{last_used_at: NaiveDateTime.shift(now, shift)})endassert Token.last_used_humanize(%Token{}) == "Not yet"- assert last_seen.(minutes: -1) == "Just recently"- assert last_seen.(minutes: -4) == "Just recently"- assert last_seen.(minutes: -6) == "Several minutes ago"- assert last_seen.(hours: -1) == "An hour ago"- assert last_seen.(hours: -7) == "Hours ago"- assert last_seen.(days: -1) == "Yesterday"- assert last_seen.(days: -3) == "Sometime this week"- assert last_seen.(months: -1) == "Long time ago"+ assert last_seen.(minute: -1) == "Just recently"+ assert last_seen.(minute: -4) == "Just recently"+ assert last_seen.(minute: -6) == "Several minutes ago"+ assert last_seen.(hour: -1) == "An hour ago"+ assert last_seen.(hour: -7) == "Hours ago"+ assert last_seen.(day: -1) == "Yesterday"+ assert last_seen.(day: -3) == "Sometime this week"+ assert last_seen.(month: -1) == "Long time ago"endenddiff --git a/test/plausible/plugins/api/tokens_test.exs b/test/plausible/plugins/api/tokens_test.exsindex 223e92ddb3..74e68ce55f 100644--- a/test/plausible/plugins/api/tokens_test.exs+++ b/test/plausible/plugins/api/tokens_test.exs@@ -81,11 +81,11 @@ defmodule Plausible.Plugins.API.TokensTest donow = NaiveDateTime.utc_now(){:ok, token1} = Tokens.update_last_seen(token0, now)- {:ok, token2} = Tokens.update_last_seen(token1, Timex.shift(now, minutes: 2))+ {:ok, token2} = Tokens.update_last_seen(token1, NaiveDateTime.shift(now, minute: 2))assert token1.last_used_at == token2.last_used_at- {:ok, token3} = Tokens.update_last_seen(token2, Timex.shift(now, minutes: 6))+ {:ok, token3} = Tokens.update_last_seen(token2, NaiveDateTime.shift(now, minute: 6))assert NaiveDateTime.compare(token3.last_used_at, token2.last_used_at) == :gtenddiff --git a/test/plausible/purge_test.exs b/test/plausible/purge_test.exsindex e34ceadfeb..5641fe11b6 100644--- a/test/plausible/purge_test.exs+++ b/test/plausible/purge_test.exs@@ -9,7 +9,7 @@ defmodule Plausible.PurgeTest doimport_params = %{source: :universal_analytics,start_date: ~D[2005-01-01],- end_date: Timex.today()+ end_date: Date.utc_today()}[site_import1, site_import2] =diff --git a/test/plausible/session/cache_store_test.exs b/test/plausible/session/cache_store_test.exsindex 7ca4aa7453..8efb8c90cb 100644--- a/test/plausible/session/cache_store_test.exs+++ b/test/plausible/session/cache_store_test.exs@@ -247,8 +247,10 @@ defmodule Plausible.Session.CacheStoreTest doendtest "updates session counters", %{buffer: buffer} do- timestamp = Timex.now()- event1 = build(:event, name: "pageview", timestamp: timestamp |> Timex.shift(seconds: -10))+ timestamp = DateTime.utc_now()++ event1 =+ build(:event, name: "pageview", timestamp: timestamp |> NaiveDateTime.shift(second: -10))event2 = %{event1@@ -352,7 +354,7 @@ defmodule Plausible.Session.CacheStoreTest dosite_id: site_id,pathname: "/path/1",hostname: "whatever.example.com",- timestamp: Timex.shift(Timex.now(), seconds: -5),+ timestamp: DateTime.shift(DateTime.utc_now(), second: -5),user_id: 1),build(:event,@@ -379,7 +381,7 @@ defmodule Plausible.Session.CacheStoreTest dosite_id: site_id,pathname: "/landing",hostname: "example.com",- timestamp: Timex.shift(Timex.now(), seconds: -5),+ timestamp: DateTime.shift(DateTime.utc_now(), second: -5),user_id: 1),build(:event,@@ -406,7 +408,7 @@ defmodule Plausible.Session.CacheStoreTest dosite_id: site_id,pathname: "/landing",hostname: "example.com",- timestamp: Timex.shift(Timex.now(), seconds: -5),+ timestamp: DateTime.shift(DateTime.utc_now(), second: -5),user_id: 1),build(:event,@@ -414,7 +416,7 @@ defmodule Plausible.Session.CacheStoreTest dosite_id: site_id,pathname: "/path/1",hostname: "analytics.example.com",- timestamp: Timex.shift(Timex.now(), seconds: -3),+ timestamp: DateTime.shift(DateTime.utc_now(), second: -3),user_id: 1),build(:event,@@ -497,8 +499,10 @@ defmodule Plausible.Session.CacheStoreTest doendtest "calculates duration correctly for out-of-order events", %{buffer: buffer} do- timestamp = Timex.now()- event1 = build(:event, name: "pageview", timestamp: timestamp |> Timex.shift(seconds: 10))+ timestamp = DateTime.utc_now()++ event1 =+ build(:event, name: "pageview", timestamp: timestamp |> NaiveDateTime.shift(second: 10))event2 = %{event1 | timestamp: timestamp}diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exsindex 662ff9257d..75d5fb79f4 100644--- a/test/plausible/site/sites_test.exs+++ b/test/plausible/site/sites_test.exs@@ -159,7 +159,7 @@ defmodule Plausible.SitesTest dobuild(:pageview)])- assert Sites.stats_start_date(site) == Timex.today(site.timezone)+ assert Sites.stats_start_date(site) == Plausible.Times.today(site.timezone)endtest "memoizes value of start date" do@@ -171,8 +171,8 @@ defmodule Plausible.SitesTest dobuild(:pageview)])- assert Sites.stats_start_date(site) == Timex.today(site.timezone)- assert Repo.reload!(site).stats_start_date == Timex.today(site.timezone)+ assert Sites.stats_start_date(site) == Plausible.Times.today(site.timezone)+ assert Repo.reload!(site).stats_start_date == Plausible.Times.today(site.timezone)endend@@ -190,7 +190,7 @@ defmodule Plausible.SitesTest dobuild(:pageview)])- assert Sites.native_stats_start_date(site) == Timex.today(site.timezone)+ assert Sites.native_stats_start_date(site) == Plausible.Times.today(site.timezone)endtest "ignores imported stats" dodiff --git a/test/plausible/stats/interval_test.exs b/test/plausible/stats/interval_test.exsindex 204914a531..6ce90ccdd6 100644--- a/test/plausible/stats/interval_test.exs+++ b/test/plausible/stats/interval_test.exs@@ -42,7 +42,7 @@ defmodule Plausible.Stats.IntervalTest doendtest "for a site with stats starting over 12m ago" do- site = build(:site, stats_start_date: Timex.shift(Date.utc_today(), months: -13))+ site = build(:site, stats_start_date: Date.shift(Date.utc_today(), month: -13))assert valid_by_period(site: site) == %{"realtime" => ["minute"],@@ -61,7 +61,7 @@ defmodule Plausible.Stats.IntervalTest doendtest "for a query range exceeding 12m" do- ago_13m = Timex.shift(Date.utc_today(), months: -13)+ ago_13m = Date.shift(Date.utc_today(), month: -13)site = build(:site, stats_start_date: ago_13m)assert valid_by_period(site: site, from: ago_13m, to: Date.utc_today()) == %{@@ -124,7 +124,7 @@ defmodule Plausible.Stats.IntervalTest doendtest "for a site with stats starting over 12m ago" do- site = build(:site, stats_start_date: Timex.shift(Date.utc_today(), months: -13))+ site = build(:site, stats_start_date: Date.shift(Date.utc_today(), month: -13))refute valid_for_period?("all", "day", site: site)assert valid_for_period?("custom", "day",diff --git a/test/plausible/teams/invitations/accept_test.exs b/test/plausible/teams/invitations/accept_test.exsindex 9530e27b95..871c6760ca 100644--- a/test/plausible/teams/invitations/accept_test.exs+++ b/test/plausible/teams/invitations/accept_test.exs@@ -396,8 +396,8 @@ defmodule Plausible.Teams.Invitations.AcceptTest donew_owner_site = new_site(owner: new_owner)old_owner_site = new_site(owner: old_owner)- somewhere_last_month = NaiveDateTime.utc_now() |> Timex.shift(days: -5)- somewhere_penultimate_month = NaiveDateTime.utc_now() |> Timex.shift(days: -35)+ somewhere_last_month = NaiveDateTime.utc_now() |> NaiveDateTime.shift(day: -5)+ somewhere_penultimate_month = NaiveDateTime.utc_now() |> NaiveDateTime.shift(day: -35)generate_usage_for(new_owner_site, 5_000, somewhere_last_month)generate_usage_for(new_owner_site, 1_000, somewhere_penultimate_month)@@ -421,8 +421,8 @@ defmodule Plausible.Teams.Invitations.AcceptTest donew_owner_site = new_site(owner: new_owner)old_owner_site = new_site(owner: old_owner)- somewhere_last_month = NaiveDateTime.utc_now() |> Timex.shift(days: -5)- somewhere_penultimate_month = NaiveDateTime.utc_now() |> Timex.shift(days: -35)+ somewhere_last_month = NaiveDateTime.utc_now() |> NaiveDateTime.shift(day: -5)+ somewhere_penultimate_month = NaiveDateTime.utc_now() |> NaiveDateTime.shift(day: -35)generate_usage_for(new_owner_site, 5_000, somewhere_last_month)generate_usage_for(new_owner_site, 1_000, somewhere_penultimate_month)@@ -471,7 +471,7 @@ defmodule Plausible.Teams.Invitations.AcceptTest donew_user()|> subscribe_to_growth_plan(status: Plausible.Billing.Subscription.Status.deleted(),- next_bill_date: Timex.shift(Timex.today(), days: -1)+ next_bill_date: Date.shift(Date.utc_today(), day: -1))user_on_paused_subscription =@@ -572,7 +572,7 @@ defmodule Plausible.Teams.Invitations.AcceptTest donew_user()|> subscribe_to_growth_plan(status: Plausible.Billing.Subscription.Status.deleted(),- next_bill_date: Timex.shift(Timex.today(), days: -1)+ next_bill_date: Date.shift(Date.utc_today(), day: -1))user_on_paused_subscription =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.exsindex b2ad7103c2..6a3c3b19a3 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@@ -418,7 +418,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.AggregateTest dotest "can compare conversion_rate with previous period", %{conn: conn, site: site} dotoday = ~N[2023-05-05 12:00:00]- yesterday = Timex.shift(today, days: -1)+ yesterday = NaiveDateTime.shift(today, day: -1)populate_stats(site, [build(:event, name: "Signup", timestamp: yesterday),diff --git a/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs b/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exsindex 7251682ebc..87acbfda51 100644--- a/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs+++ b/test/plausible_web/controllers/api/external_stats_controller/breakdown_test.exs@@ -361,7 +361,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest doinsert(:site_import,site: site,start_date: ~D[2005-01-01],- end_date: Timex.today(),+ end_date: Date.utc_today(),source: :universal_analytics)@@ -554,7 +554,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest doinsert(:site_import,site: site,start_date: ~D[2005-01-01],- end_date: Timex.today(),+ end_date: Date.utc_today(),source: :universal_analytics)@@ -879,7 +879,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest doinsert(:site_import,site: site,start_date: ~D[2005-01-01],- end_date: Timex.today(),+ end_date: Date.utc_today(),source: :universal_analytics)@@ -2521,7 +2521,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.BreakdownTest doinsert(:site_import,site: site,start_date: ~D[2005-01-01],- end_date: Timex.today(),+ end_date: Date.utc_today(),source: :universal_analytics)diff --git a/test/plausible_web/controllers/api/external_stats_controller/query_imported_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_imported_test.exsindex ca48404cb0..98941b1350 100644--- a/test/plausible_web/controllers/api/external_stats_controller/query_imported_test.exs+++ b/test/plausible_web/controllers/api/external_stats_controller/query_imported_test.exs@@ -344,7 +344,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryImportedTest doinsert(:site_import,site: site,start_date: ~D[2005-01-01],- end_date: Timex.today(),+ end_date: Date.utc_today(),source: :universal_analytics)@@ -401,7 +401,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryImportedTest doinsert(:site_import,site: site,start_date: ~D[2005-01-01],- end_date: Timex.today(),+ end_date: Date.utc_today(),source: :universal_analytics)@@ -460,7 +460,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryImportedTest doinsert(:site_import,site: site,start_date: ~D[2005-01-01],- end_date: Timex.today(),+ end_date: Date.utc_today(),source: :universal_analytics)diff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exsindex 2ccd26ddc0..194cd32a5a 100644--- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs@@ -1205,7 +1205,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest dosite_import =insert(:site_import,start_date: ~D[2005-01-01],- end_date: Timex.today(),+ end_date: Date.utc_today(),source: :universal_analytics)@@ -1244,7 +1244,7 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest doinsert(:site_import,site: site,start_date: ~D[2005-01-01],- end_date: Timex.today(),+ end_date: Date.utc_today(),source: :universal_analytics)diff --git a/test/plausible_web/controllers/api/stats_controller/imported_test.exs b/test/plausible_web/controllers/api/stats_controller/imported_test.exsindex 6c029b424c..81c3535fd5 100644--- a/test/plausible_web/controllers/api/stats_controller/imported_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/imported_test.exs@@ -1,6 +1,5 @@defmodule PlausibleWeb.Api.StatsController.ImportedTest douse PlausibleWeb.ConnCase- use Timex@user_id Enum.random(1000..9999)@@ -19,7 +18,7 @@ defmodule PlausibleWeb.Api.StatsController.ImportedTest do%{source: :google_analytics_4,start_date: ~D[2005-01-01],- end_date: Timex.today(),+ end_date: Date.utc_today(),legacy: unquote(import_type) == :new_and_legacy}diff --git a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exsindex e703430afb..6ffc46e8f9 100644--- a/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/main_graph_test.exs@@ -9,7 +9,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest dotest "displays pageviews for the last 30 minutes in realtime graph", %{conn: conn, site: site} dopopulate_stats(site, [- build(:pageview, timestamp: relative_time(minutes: -5))+ build(:pageview, timestamp: relative_time(minute: -5))])conn = get(conn, "/api/stats/#{site.domain}/main-graph?period=realtime&metric=pageviews")@@ -29,7 +29,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest do|> Plausible.Repo.update()populate_stats(site, [- build(:pageview, timestamp: relative_time(minutes: -5))+ build(:pageview, timestamp: relative_time(minute: -5))])conn = get(conn, "/api/stats/#{site.domain}/main-graph?period=realtime&metric=pageviews")@@ -412,8 +412,8 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest doconn = get(conn, "/api/stats/#{site.domain}/main-graph?period=30d&metric=visitors")assert %{"labels" => labels} = json_response(conn, 200)- {:ok, first} = Timex.today() |> Timex.shift(days: -30) |> Timex.format("{ISOdate}")- {:ok, last} = Timex.today() |> Timex.shift(days: -1) |> Timex.format("{ISOdate}")+ first = Date.utc_today() |> Date.shift(day: -30) |> Date.to_iso8601()+ last = Date.utc_today() |> Date.shift(day: -1) |> Date.to_iso8601()assert List.first(labels) == firstassert List.last(labels) == lastend@@ -422,8 +422,8 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest doconn = get(conn, "/api/stats/#{site.domain}/main-graph?period=7d&metric=visitors")assert %{"labels" => labels} = json_response(conn, 200)- {:ok, first} = Timex.today() |> Timex.shift(days: -7) |> Timex.format("{ISOdate}")- {:ok, last} = Timex.today() |> Timex.shift(days: -1) |> Timex.format("{ISOdate}")+ first = Date.utc_today() |> Date.shift(day: -7) |> Date.to_iso8601()+ last = Date.utc_today() |> Date.shift(day: -1) |> Date.to_iso8601()assert List.first(labels) == firstassert List.last(labels) == lastend@@ -526,12 +526,12 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest dosite: site} dopopulate_stats(site, [- build(:pageview, timestamp: relative_time(minutes: -35), user_id: 1),- build(:pageview, timestamp: relative_time(minutes: -20), user_id: 1),- build(:pageview, timestamp: relative_time(minutes: -25), user_id: 2),- build(:pageview, timestamp: relative_time(minutes: -15), user_id: 2),- build(:pageview, timestamp: relative_time(minutes: -5), user_id: 3),- build(:pageview, timestamp: relative_time(minutes: -3), user_id: 3)+ build(:pageview, timestamp: relative_time(minute: -35), user_id: 1),+ build(:pageview, timestamp: relative_time(minute: -20), user_id: 1),+ build(:pageview, timestamp: relative_time(minute: -25), user_id: 2),+ build(:pageview, timestamp: relative_time(minute: -15), user_id: 2),+ build(:pageview, timestamp: relative_time(minute: -5), user_id: 3),+ build(:pageview, timestamp: relative_time(minute: -3), user_id: 3)])conn =@@ -1444,14 +1444,14 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest doassert %{"labels" => labels, "comparison_labels" => comparison_labels} =json_response(conn, 200)- {:ok, first} = Timex.today() |> Timex.shift(days: -30) |> Timex.format("{ISOdate}")- {:ok, last} = Timex.today() |> Timex.shift(days: -1) |> Timex.format("{ISOdate}")+ first = Date.utc_today() |> Date.shift(day: -30) |> Date.to_iso8601()+ last = Date.utc_today() |> Date.shift(day: -1) |> Date.to_iso8601()assert List.first(labels) == firstassert List.last(labels) == last- {:ok, first} = Timex.today() |> Timex.shift(days: -60) |> Timex.format("{ISOdate}")- {:ok, last} = Timex.today() |> Timex.shift(days: -31) |> Timex.format("{ISOdate}")+ first = Date.utc_today() |> Date.shift(day: -60) |> Date.to_iso8601()+ last = Date.utc_today() |> Date.shift(day: -31) |> Date.to_iso8601()assert List.first(comparison_labels) == firstassert List.last(comparison_labels) == last@@ -1540,7 +1540,7 @@ defmodule PlausibleWeb.Api.StatsController.MainGraphTest dosite = new_site(owner: user, timezone: "America/Santiago")populate_stats(site, [- build(:pageview, timestamp: relative_time(minutes: -5))+ build(:pageview, timestamp: relative_time(minute: -5))])conn =diff --git a/test/plausible_web/controllers/api/stats_controller/regions_test.exs b/test/plausible_web/controllers/api/stats_controller/regions_test.exsindex 68da149376..a78fea91f1 100644--- a/test/plausible_web/controllers/api/stats_controller/regions_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/regions_test.exs@@ -103,7 +103,7 @@ defmodule PlausibleWeb.Api.StatsController.RegionsTest dosite = new_site(owner: user, timezone: "Atlantic/Azores")populate_stats(site, [- build(:pageview, timestamp: relative_time(minutes: -5))+ build(:pageview, timestamp: relative_time(minute: -5))])conn =diff --git a/test/plausible_web/controllers/api/stats_controller/sources_test.exs b/test/plausible_web/controllers/api/stats_controller/sources_test.exsindex b2c1bb0a89..db3a6bd2f6 100644--- a/test/plausible_web/controllers/api/stats_controller/sources_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/sources_test.exs@@ -422,17 +422,17 @@ defmodule PlausibleWeb.Api.StatsController.SourcesTest dobuild(:pageview,referrer_source: "Google",referrer: "google.com",- timestamp: relative_time(minutes: -3)+ timestamp: relative_time(minute: -3)),build(:pageview,referrer_source: "Google",referrer: "google.com",- timestamp: relative_time(minutes: -2)+ timestamp: relative_time(minute: -2)),build(:pageview,referrer_source: "DuckDuckGo",referrer: "duckduckgo.com",- timestamp: relative_time(minutes: -1)+ timestamp: relative_time(minute: -1))])diff --git a/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs b/test/plausible_web/controllers/api/stats_controller/top_stats_test.exsindex 4a30cdf59e..ed2dd5c51f 100644--- a/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs+++ b/test/plausible_web/controllers/api/stats_controller/top_stats_test.exs@@ -843,9 +843,9 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest dotest "shows current visitors (last 5 minutes)", %{conn: conn, site: site} dopopulate_stats(site, [- build(:pageview, timestamp: relative_time(minutes: -10)),- build(:pageview, timestamp: relative_time(minutes: -4)),- build(:pageview, timestamp: relative_time(minutes: -1))+ build(:pageview, timestamp: relative_time(minute: -10)),+ build(:pageview, timestamp: relative_time(minute: -4)),+ build(:pageview, timestamp: relative_time(minute: -1))])conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=realtime")@@ -859,9 +859,9 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest dotest "shows unique visitors (last 30 minutes)", %{conn: conn, site: site} dopopulate_stats(site, [- build(:pageview, timestamp: relative_time(minutes: -45)),- build(:pageview, timestamp: relative_time(minutes: -25)),- build(:pageview, timestamp: relative_time(minutes: -1))+ build(:pageview, timestamp: relative_time(minute: -45)),+ build(:pageview, timestamp: relative_time(minute: -25)),+ build(:pageview, timestamp: relative_time(minute: -1))])conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=realtime")@@ -877,10 +877,10 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest dotest "shows pageviews (last 30 minutes)", %{conn: conn, site: site} dopopulate_stats(site, [- build(:pageview, user_id: @user_id, timestamp: relative_time(minutes: -45)),- build(:pageview, user_id: @user_id, timestamp: relative_time(minutes: -25)),- build(:pageview, user_id: @user_id, timestamp: relative_time(minutes: -20)),- build(:pageview, timestamp: relative_time(minutes: -1))+ build(:pageview, user_id: @user_id, timestamp: relative_time(minute: -45)),+ build(:pageview, user_id: @user_id, timestamp: relative_time(minute: -25)),+ build(:pageview, user_id: @user_id, timestamp: relative_time(minute: -20)),+ build(:pageview, timestamp: relative_time(minute: -1))])conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=realtime")@@ -894,10 +894,10 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest dotest "shows current visitors (last 5 min) with goal filter", %{conn: conn, site: site} dopopulate_stats(site, [- build(:pageview, timestamp: relative_time(minutes: -10)),- build(:pageview, timestamp: relative_time(minutes: -3)),- build(:event, name: "Signup", timestamp: relative_time(minutes: -2)),- build(:event, name: "Signup", timestamp: relative_time(minutes: -1))+ build(:pageview, timestamp: relative_time(minute: -10)),+ build(:pageview, timestamp: relative_time(minute: -3)),+ build(:event, name: "Signup", timestamp: relative_time(minute: -2)),+ build(:event, name: "Signup", timestamp: relative_time(minute: -1))])filters = Jason.encode!([[:is, "event:goal", ["Signup"]]])@@ -916,11 +916,11 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest dosite: site} dopopulate_stats(site, [- build(:event, name: "Signup", timestamp: relative_time(minutes: -45)),- build(:event, name: "Signup", timestamp: relative_time(minutes: -25)),- build(:event, name: "Signup", user_id: @user_id, timestamp: relative_time(minutes: -22)),- build(:event, name: "Signup", user_id: @user_id, timestamp: relative_time(minutes: -21)),- build(:event, name: "Signup", user_id: @user_id, timestamp: relative_time(minutes: -20))+ build(:event, name: "Signup", timestamp: relative_time(minute: -45)),+ build(:event, name: "Signup", timestamp: relative_time(minute: -25)),+ build(:event, name: "Signup", user_id: @user_id, timestamp: relative_time(minute: -22)),+ build(:event, name: "Signup", user_id: @user_id, timestamp: relative_time(minute: -21)),+ build(:event, name: "Signup", user_id: @user_id, timestamp: relative_time(minute: -20))])insert(:goal, site: site, event_name: "Signup")diff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exsindex 547630b11d..ba655dd796 100644--- a/test/plausible_web/controllers/auth_controller_test.exs+++ b/test/plausible_web/controllers/auth_controller_test.exs@@ -329,7 +329,7 @@ defmodule PlausibleWeb.AuthControllerTest dotest "regenerates an activation pin even if there's one already", %{conn: conn, user: user} dofive_minutes_ago =NaiveDateTime.utc_now()- |> Timex.shift(minutes: -5)+ |> NaiveDateTime.shift(minute: -5)|> NaiveDateTime.truncate(:second){:ok, verification} = Auth.EmailVerification.issue_code(user, five_minutes_ago)@@ -380,7 +380,7 @@ defmodule PlausibleWeb.AuthControllerTest dotest "with expired pin - reloads the form with error", %{conn: conn, user: user} doone_day_ago =NaiveDateTime.utc_now()- |> Timex.shift(days: -1)+ |> NaiveDateTime.shift(day: -1)|> NaiveDateTime.truncate(:second){:ok, verification} = Auth.EmailVerification.issue_code(user, one_day_ago)diff --git a/test/plausible_web/controllers/billing_controller_test.exs b/test/plausible_web/controllers/billing_controller_test.exsindex 2c15718acd..e25337a98d 100644--- a/test/plausible_web/controllers/billing_controller_test.exs+++ b/test/plausible_web/controllers/billing_controller_test.exs@@ -69,8 +69,8 @@ defmodule PlausibleWeb.BillingControllerTest dosite = new_site(owner: user)now = NaiveDateTime.utc_now()- generate_usage_for(site, 11_000, Timex.shift(now, days: -5))- generate_usage_for(site, 11_000, Timex.shift(now, days: -35))+ generate_usage_for(site, 11_000, NaiveDateTime.shift(now, day: -5))+ generate_usage_for(site, 11_000, NaiveDateTime.shift(now, day: -35))conn1 = post(conn, Routes.billing_path(conn, :change_plan, @v4_growth_plan))diff --git a/test/plausible_web/controllers/settings_controller_test.exs b/test/plausible_web/controllers/settings_controller_test.exsindex b9f2f4630d..e173b28460 100644--- a/test/plausible_web/controllers/settings_controller_test.exs+++ b/test/plausible_web/controllers/settings_controller_test.exs@@ -270,13 +270,19 @@ defmodule PlausibleWeb.SettingsControllerTest dosite = new_site(owner: user)populate_stats(site, [- build(:event, name: "pageview", timestamp: Timex.shift(Timex.now(), days: -5)),- build(:event, name: "customevent", timestamp: Timex.shift(Timex.now(), days: -20)),- build(:event, name: "pageview", timestamp: Timex.shift(Timex.now(), days: -50)),- build(:event, name: "customevent", timestamp: Timex.shift(Timex.now(), days: -50))+ build(:event, name: "pageview", timestamp: DateTime.shift(DateTime.utc_now(), day: -5)),+ build(:event,+ name: "customevent",+ timestamp: DateTime.shift(DateTime.utc_now(), day: -20)+ ),+ build(:event, name: "pageview", timestamp: DateTime.shift(DateTime.utc_now(), day: -50)),+ build(:event,+ name: "customevent",+ timestamp: DateTime.shift(DateTime.utc_now(), day: -50)+ )])- last_bill_date = Timex.shift(Timex.today(), days: -10)+ last_bill_date = Date.shift(Date.utc_today(), day: -10)subscribe_to_plan(user, @v4_plan_id, last_bill_date: last_bill_date, status: :deleted)@@ -288,21 +294,21 @@ defmodule PlausibleWeb.SettingsControllerTest doassert text_of_element(html, "#billing_cycle_tab_current_cycle") =~Date.range(last_bill_date,- Timex.shift(last_bill_date, months: 1, days: -1)+ Date.shift(last_bill_date, month: 1, day: -1))|> PlausibleWeb.TextHelpers.format_date_range()assert text_of_element(html, "#billing_cycle_tab_last_cycle") =~Date.range(- Timex.shift(last_bill_date, months: -1),- Timex.shift(last_bill_date, days: -1)+ Date.shift(last_bill_date, month: -1),+ Date.shift(last_bill_date, day: -1))|> PlausibleWeb.TextHelpers.format_date_range()assert text_of_element(html, "#billing_cycle_tab_penultimate_cycle") =~Date.range(- Timex.shift(last_bill_date, months: -2),- Timex.shift(last_bill_date, months: -1, days: -1)+ Date.shift(last_bill_date, month: -2),+ Date.shift(last_bill_date, month: -1, day: -1))|> PlausibleWeb.TextHelpers.format_date_range()@@ -340,7 +346,7 @@ defmodule PlausibleWeb.SettingsControllerTest dosubscribe_to_plan(user, @v4_plan_id,status: :active,- last_bill_date: Timex.shift(Timex.now(), months: -6)+ last_bill_date: Date.shift(Date.utc_today(), month: -6))subscription =@@ -368,7 +374,7 @@ defmodule PlausibleWeb.SettingsControllerTest dosubscription|> Plausible.Billing.Subscription.changeset(%{status: :deleted,- next_bill_date: Timex.shift(Timex.now(), months: 6)+ next_bill_date: Date.shift(Date.utc_today(), month: 6)})|> Repo.update!()@@ -383,11 +389,14 @@ defmodule PlausibleWeb.SettingsControllerTest dosite = new_site(owner: user)populate_stats(site, [- build(:event, name: "pageview", timestamp: Timex.shift(Timex.now(), days: -5)),- build(:event, name: "customevent", timestamp: Timex.shift(Timex.now(), days: -20))+ build(:event, name: "pageview", timestamp: DateTime.shift(DateTime.utc_now(), day: -5)),+ build(:event,+ name: "customevent",+ timestamp: DateTime.shift(DateTime.utc_now(), day: -20)+ )])- last_bill_date = Timex.shift(Timex.today(), days: -10)+ last_bill_date = Date.shift(Date.utc_today(), day: -10)subscribe_to_plan(user, @v4_plan_id, last_bill_date: last_bill_date)@@ -407,7 +416,7 @@ defmodule PlausibleWeb.SettingsControllerTest doconn: conn,user: user} do- subscribe_to_plan(user, @v4_plan_id, last_bill_date: Timex.shift(Timex.today(), days: -1))+ subscribe_to_plan(user, @v4_plan_id, last_bill_date: Date.shift(Date.utc_today(), day: -1))html =conn@@ -427,9 +436,15 @@ defmodule PlausibleWeb.SettingsControllerTest dosite = new_site(owner: user)populate_stats(site, [- build(:event, name: "pageview", timestamp: Timex.shift(Timex.now(), days: -1)),- build(:event, name: "customevent", timestamp: Timex.shift(Timex.now(), days: -10)),- build(:event, name: "customevent", timestamp: Timex.shift(Timex.now(), days: -20))+ build(:event, name: "pageview", timestamp: DateTime.shift(DateTime.utc_now(), day: -1)),+ build(:event,+ name: "customevent",+ timestamp: DateTime.shift(DateTime.utc_now(), day: -10)+ ),+ build(:event,+ name: "customevent",+ timestamp: DateTime.shift(DateTime.utc_now(), day: -20)+ )])assert_usage = fn doc ->diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex 894bd9866f..ffc2ee503f 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -1758,7 +1758,7 @@ defmodule PlausibleWeb.SiteControllerTest dosite,user,start_date: ~D[2022-01-01],- end_date: Timex.today()+ end_date: Date.utc_today())%{args: %{import_id: import_id}} = job@@ -1829,7 +1829,7 @@ defmodule PlausibleWeb.SiteControllerTest dosite,user,start_date: ~D[2022-01-01],- end_date: Timex.today()+ end_date: Date.utc_today())populate_stats(site, [@@ -1850,7 +1850,7 @@ defmodule PlausibleWeb.SiteControllerTest dosite,user,start_date: ~D[2022-01-01],- end_date: Timex.today()+ end_date: Date.utc_today())populate_stats(site, [diff --git a/test/plausible_web/controllers/stats_controller_test.exs b/test/plausible_web/controllers/stats_controller_test.exsindex 0f1c079c58..f3a21b9032 100644--- a/test/plausible_web/controllers/stats_controller_test.exs+++ b/test/plausible_web/controllers/stats_controller_test.exs@@ -992,7 +992,8 @@ defmodule PlausibleWeb.StatsControllerTest douser_id: 123,pathname: "/",timestamp:- Timex.shift(~N[2021-10-20 12:00:00], minutes: -1) |> NaiveDateTime.truncate(:second),+ NaiveDateTime.shift(~N[2021-10-20 12:00:00], minute: -1)+ |> NaiveDateTime.truncate(:second),country_code: "EE",subdivision1_code: "EE-37",city_geoname_id: 588_409,@@ -1013,7 +1014,8 @@ defmodule PlausibleWeb.StatsControllerTest douser_id: 123,pathname: "/some-other-page",timestamp:- Timex.shift(~N[2021-10-20 12:00:00], minutes: -2) |> NaiveDateTime.truncate(:second),+ NaiveDateTime.shift(~N[2021-10-20 12:00:00], minute: -2)+ |> NaiveDateTime.truncate(:second),country_code: "EE",subdivision1_code: "EE-37",city_geoname_id: 588_409,@@ -1023,7 +1025,8 @@ defmodule PlausibleWeb.StatsControllerTest douser_id: 123,pathname: "/some-other-page",timestamp:- Timex.shift(~N[2021-10-20 12:00:00], minutes: -1) |> NaiveDateTime.truncate(:second),+ NaiveDateTime.shift(~N[2021-10-20 12:00:00], minute: -1)+ |> NaiveDateTime.truncate(:second),engagement_time: 60_000,scroll_depth: 30,country_code: "EE",@@ -1035,7 +1038,7 @@ defmodule PlausibleWeb.StatsControllerTest douser_id: 100,pathname: "/",timestamp:- Timex.shift(~N[2021-10-20 12:00:00], days: -1) |> NaiveDateTime.truncate(:second),+ NaiveDateTime.shift(~N[2021-10-20 12:00:00], day: -1) |> NaiveDateTime.truncate(:second),utm_medium: "search",utm_campaign: "ads",utm_source: "google",@@ -1050,7 +1053,7 @@ defmodule PlausibleWeb.StatsControllerTest douser_id: 100,pathname: "/",timestamp:- Timex.shift(~N[2021-10-20 12:00:00], days: -1, minutes: 1)+ NaiveDateTime.shift(~N[2021-10-20 12:00:00], day: -1, minute: 1)|> NaiveDateTime.truncate(:second),engagement_time: 30_000,scroll_depth: 30,@@ -1067,7 +1070,8 @@ defmodule PlausibleWeb.StatsControllerTest dobuild(:pageview,user_id: 200,timestamp:- Timex.shift(~N[2021-10-20 12:00:00], months: -1) |> NaiveDateTime.truncate(:second),+ NaiveDateTime.shift(~N[2021-10-20 12:00:00], month: -1)+ |> NaiveDateTime.truncate(:second),country_code: "EE",browser: "Firefox",browser_version: "120",@@ -1077,7 +1081,7 @@ defmodule PlausibleWeb.StatsControllerTest dobuild(:engagement,user_id: 200,timestamp:- Timex.shift(~N[2021-10-20 12:00:00], months: -1, minutes: 1)+ NaiveDateTime.shift(~N[2021-10-20 12:00:00], month: -1, minute: 1)|> NaiveDateTime.truncate(:second),engagement_time: 30_000,scroll_depth: 20,@@ -1090,7 +1094,8 @@ defmodule PlausibleWeb.StatsControllerTest dobuild(:pageview,user_id: 300,timestamp:- Timex.shift(~N[2021-10-20 12:00:00], months: -5) |> NaiveDateTime.truncate(:second),+ NaiveDateTime.shift(~N[2021-10-20 12:00:00], month: -5)+ |> NaiveDateTime.truncate(:second),utm_campaign: "ads",country_code: "EE",referrer_source: "Google",@@ -1101,7 +1106,7 @@ defmodule PlausibleWeb.StatsControllerTest dobuild(:engagement,user_id: 300,timestamp:- Timex.shift(~N[2021-10-20 12:00:00], months: -5, minutes: 1)+ NaiveDateTime.shift(~N[2021-10-20 12:00:00], month: -5, minute: 1)|> NaiveDateTime.truncate(:second),engagement_time: 30_000,scroll_depth: 20,@@ -1115,7 +1120,7 @@ defmodule PlausibleWeb.StatsControllerTest dobuild(:pageview,user_id: 456,timestamp:- Timex.shift(~N[2021-10-20 12:00:00], days: -1, minutes: -1)+ NaiveDateTime.shift(~N[2021-10-20 12:00:00], day: -1, minute: -1)|> NaiveDateTime.truncate(:second),pathname: "/signup","meta.key": ["variant"],@@ -1124,7 +1129,7 @@ defmodule PlausibleWeb.StatsControllerTest dobuild(:engagement,user_id: 456,timestamp:- Timex.shift(~N[2021-10-20 12:00:00], days: -1) |> NaiveDateTime.truncate(:second),+ NaiveDateTime.shift(~N[2021-10-20 12:00:00], day: -1) |> NaiveDateTime.truncate(:second),pathname: "/signup",engagement_time: 60_000,scroll_depth: 20,@@ -1134,7 +1139,7 @@ defmodule PlausibleWeb.StatsControllerTest dobuild(:event,user_id: 456,timestamp:- Timex.shift(~N[2021-10-20 12:00:00], days: -1) |> NaiveDateTime.truncate(:second),+ NaiveDateTime.shift(~N[2021-10-20 12:00:00], day: -1) |> NaiveDateTime.truncate(:second),name: "Signup","meta.key": ["variant"],"meta.value": ["A"]diff --git a/test/plausible_web/live/choose_plan_test.exs b/test/plausible_web/live/choose_plan_test.exsindex b95366d0e2..f581dbb52a 100644--- a/test/plausible_web/live/choose_plan_test.exs+++ b/test/plausible_web/live/choose_plan_test.exs@@ -858,8 +858,8 @@ defmodule PlausibleWeb.Live.ChoosePlanTest do} donow = NaiveDateTime.utc_now()- generate_usage_for(site, 11_000, Timex.shift(now, days: -5))- generate_usage_for(site, 11_000, Timex.shift(now, days: -35))+ generate_usage_for(site, 11_000, NaiveDateTime.shift(now, day: -5))+ generate_usage_for(site, 11_000, NaiveDateTime.shift(now, day: -35))user|> team_of()@@ -1052,7 +1052,9 @@ defmodule PlausibleWeb.Live.ChoosePlanTest do|> team_of()|> Repo.preload(:subscription)|> Map.fetch!(:subscription)- |> Subscription.changeset(%{next_bill_date: Timex.shift(Timex.now(), months: -2)})+ |> Subscription.changeset(%{+ next_bill_date: DateTime.shift(DateTime.utc_now(), month: -2)+ })|> Repo.update!():okdiff --git a/test/support/factory.ex b/test/support/factory.exindex ff17bdb3d5..52055b455a 100644--- a/test/support/factory.ex+++ b/test/support/factory.ex@@ -6,7 +6,7 @@ defmodule Plausible.Factory dodef team_factory do%Plausible.Teams.Team{name: Plausible.Teams.default_name(),- trial_expiry_date: Timex.today() |> Timex.shift(days: 30),+ trial_expiry_date: Date.utc_today() |> Date.shift(day: 30),setup_complete: true,setup_at: NaiveDateTime.utc_now()}@@ -114,8 +114,8 @@ defmodule Plausible.Factory doentry_page: "/",pageviews: 1,events: 1,- start: Timex.now(),- timestamp: Timex.now(),+ start: DateTime.utc_now(),+ timestamp: DateTime.utc_now(),is_bounce: false}end@@ -185,8 +185,8 @@ defmodule Plausible.Factory doupdate_url: "cancel.com",status: Subscription.Status.active(),next_bill_amount: "6.00",- next_bill_date: Timex.today(),- last_bill_date: Timex.today(),+ next_bill_date: Date.utc_today(),+ last_bill_date: Date.utc_today(),currency_code: "USD"}end@@ -219,7 +219,7 @@ defmodule Plausible.Factory doemail: sequence(:google_auth_email, &"email-#{&1}@example.com"),refresh_token: "123",access_token: "123",- expires: Timex.now() |> Timex.shift(days: 1)+ expires: DateTime.utc_now() |> DateTime.shift(day: 1)}end@@ -252,7 +252,7 @@ defmodule Plausible.Factory dodef imported_visitors_factory do%{table: "imported_visitors",- date: Timex.today(),+ date: Date.utc_today(),visitors: 1,pageviews: 1,bounces: 0,@@ -264,7 +264,7 @@ defmodule Plausible.Factory dodef imported_sources_factory do%{table: "imported_sources",- date: Timex.today(),+ date: Date.utc_today(),source: "",visitors: 1,visits: 1,@@ -276,7 +276,7 @@ defmodule Plausible.Factory dodef imported_pages_factory do%{table: "imported_pages",- date: Timex.today(),+ date: Date.utc_today(),page: "",visitors: 1,pageviews: 1,@@ -289,7 +289,7 @@ defmodule Plausible.Factory dodef imported_entry_pages_factory do%{table: "imported_entry_pages",- date: Timex.today(),+ date: Date.utc_today(),entry_page: "",visitors: 1,entrances: 1,@@ -301,7 +301,7 @@ defmodule Plausible.Factory dodef imported_exit_pages_factory do%{table: "imported_exit_pages",- date: Timex.today(),+ date: Date.utc_today(),exit_page: "",visitors: 1,exits: 1@@ -311,7 +311,7 @@ defmodule Plausible.Factory dodef imported_custom_events_factory do%{table: "imported_custom_events",- date: Timex.today(),+ date: Date.utc_today(),name: "",link_url: "",visitors: 1,@@ -322,7 +322,7 @@ defmodule Plausible.Factory dodef imported_locations_factory do%{table: "imported_locations",- date: Timex.today(),+ date: Date.utc_today(),country: "",region: "",city: 0,@@ -336,7 +336,7 @@ defmodule Plausible.Factory dodef imported_devices_factory do%{table: "imported_devices",- date: Timex.today(),+ date: Date.utc_today(),device: "",visitors: 1,visits: 1,@@ -348,7 +348,7 @@ defmodule Plausible.Factory dodef imported_browsers_factory do%{table: "imported_browsers",- date: Timex.today(),+ date: Date.utc_today(),browser: "",visitors: 1,visits: 1,@@ -360,7 +360,7 @@ defmodule Plausible.Factory dodef imported_operating_systems_factory do%{table: "imported_operating_systems",- date: Timex.today(),+ date: Date.utc_today(),operating_system: "",visitors: 1,visits: 1,diff --git a/test/support/test_utils.ex b/test/support/test_utils.exindex cfaa46b633..2b136d43c1 100644--- a/test/support/test_utils.ex+++ b/test/support/test_utils.ex@@ -75,7 +75,7 @@ defmodule Plausible.TestUtils doFactory.insert(:site_import,site: site,start_date: ~D[2005-01-01],- end_date: Timex.today(),+ end_date: Date.utc_today(),source: :universal_analytics,legacy: opts[:create_legacy_import?] == true)@@ -222,7 +222,7 @@ defmodule Plausible.TestUtils dodef relative_time(shifts) doNaiveDateTime.utc_now()- |> Timex.shift(shifts)+ |> NaiveDateTime.shift(shifts)|> NaiveDateTime.truncate(:second)enddiff --git a/test/workers/check_usage_test.exs b/test/workers/check_usage_test.exsindex df45b43d21..7d1763a862 100644--- a/test/workers/check_usage_test.exs+++ b/test/workers/check_usage_test.exs@@ -10,7 +10,7 @@ defmodule Plausible.Workers.CheckUsageTest dosetup [:create_user, :create_site]@paddle_id_10k "558018"- @date_range Date.range(Timex.today(), Timex.today())+ @date_range Date.range(Date.utc_today(), Date.utc_today())@accepted_status_values [Plausible.Billing.Subscription.Status.active(),@@ -144,7 +144,7 @@ defmodule Plausible.Workers.CheckUsageTest dosubscribe_to_plan(user,@paddle_id_10k,- last_bill_date: Timex.shift(Timex.today(), days: -1),+ last_bill_date: Date.shift(Date.utc_today(), day: -1),status: Plausible.Billing.Subscription.Status.paused())@@ -157,7 +157,7 @@ defmodule Plausible.Workers.CheckUsageTest dodescribe "#{status} subscription, regular customers" dotest "ignores user with subscription but no usage", %{user: user} dosubscribe_to_plan(user, @paddle_id_10k,- last_bill_date: Timex.shift(Timex.today(), days: -1),+ last_bill_date: Date.shift(Date.utc_today(), day: -1),status: unquote(status))@@ -180,7 +180,7 @@ defmodule Plausible.Workers.CheckUsageTest doend)subscribe_to_plan(user, @paddle_id_10k,- last_bill_date: Timex.shift(Timex.today(), days: -1),+ last_bill_date: Date.shift(Date.utc_today(), day: -1),status: unquote(status))@@ -203,7 +203,7 @@ defmodule Plausible.Workers.CheckUsageTest doend)subscribe_to_plan(user, @paddle_id_10k,- last_bill_date: Timex.shift(Timex.today(), days: -1),+ last_bill_date: Date.shift(Date.utc_today(), day: -1),status: unquote(status))@@ -241,7 +241,7 @@ defmodule Plausible.Workers.CheckUsageTest do)assert Repo.reload(team_of(user)).grace_period.end_date ==- Timex.shift(Timex.today(), days: 7)+ Date.shift(Date.utc_today(), day: 7)endtest "sends an email suggesting enterprise plan when usage is greater than 10M ", %{@@ -259,7 +259,7 @@ defmodule Plausible.Workers.CheckUsageTest dosubscribe_to_plan(user,@paddle_id_10k,- last_bill_date: Timex.shift(Timex.today(), days: -1),+ last_bill_date: Date.shift(Date.utc_today(), day: -1),status: unquote(status))@@ -284,7 +284,7 @@ defmodule Plausible.Workers.CheckUsageTest doend)subscribe_to_plan(user, @paddle_id_10k,- last_bill_date: Timex.shift(Timex.today(), days: -1),+ last_bill_date: Date.shift(Date.utc_today(), day: -1),status: unquote(status))@@ -309,7 +309,7 @@ defmodule Plausible.Workers.CheckUsageTest dosubscribe_to_plan(user,@paddle_id_10k,- last_bill_date: Timex.shift(Timex.today(), days: -1),+ last_bill_date: Date.shift(Date.utc_today(), day: -1),status: unquote(status))@@ -375,7 +375,7 @@ defmodule Plausible.Workers.CheckUsageTest dosubscribe_to_enterprise_plan(user,monthly_pageview_limit: 1_000_000,subscription: [- last_bill_date: Timex.shift(Timex.today(), days: -1),+ last_bill_date: Date.shift(Date.utc_today(), day: -1),status: unquote(status)])@@ -403,7 +403,7 @@ defmodule Plausible.Workers.CheckUsageTest douser,monthly_pageview_limit: 1_000_000,subscription: [- last_bill_date: Timex.shift(Timex.today(), days: -1),+ last_bill_date: Date.shift(Date.utc_today(), day: -1),status: unquote(status)])@@ -433,7 +433,7 @@ defmodule Plausible.Workers.CheckUsageTest douser,monthly_pageview_limit: 1_000_000,subscription: [- last_bill_date: Timex.shift(Timex.today(), days: -1),+ last_bill_date: Date.shift(Date.utc_today(), day: -1),status: unquote(status),# non-matching IDpaddle_plan_id: @paddle_id_10k@@ -464,7 +464,7 @@ defmodule Plausible.Workers.CheckUsageTest dosubscribe_to_enterprise_plan(user,site_limit: 2,subscription: [- last_bill_date: Timex.shift(Timex.today(), days: -1),+ last_bill_date: Date.shift(Date.utc_today(), day: -1),status: unquote(status)])@@ -495,7 +495,7 @@ defmodule Plausible.Workers.CheckUsageTest douser,monthly_pageview_limit: 1_000_000,subscription: [- last_bill_date: Timex.shift(Timex.today(), days: -1),+ last_bill_date: Date.shift(Date.utc_today(), day: -1),status: unquote(status)])diff --git a/test/workers/import_analytics_test.exs b/test/workers/import_analytics_test.exsindex f50e618f34..f89337142e 100644--- a/test/workers/import_analytics_test.exs+++ b/test/workers/import_analytics_test.exs@@ -14,8 +14,8 @@ defmodule Plausible.Workers.ImportAnalyticsTest dosetup do%{import_opts: [- start_date: Timex.today() |> Timex.shift(days: -7),- end_date: Timex.today()+ start_date: Date.utc_today() |> Date.shift(day: -7),+ end_date: Date.utc_today()]}end@@ -23,7 +23,7 @@ defmodule Plausible.Workers.ImportAnalyticsTest dotest "updates site import after successful import", %{import_opts: import_opts} do- user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: user){:ok, job} = Plausible.Imported.NoopImporter.new_import(site, user, import_opts)@@ -48,7 +48,7 @@ defmodule Plausible.Workers.ImportAnalyticsTest dotest "clears stats_start_date field for the site after successful import", %{import_opts: import_opts} do- user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: user, stats_start_date: ~D[2005-01-01]){:ok, job} = Plausible.Imported.NoopImporter.new_import(site, user, import_opts)@@ -65,7 +65,7 @@ defmodule Plausible.Workers.ImportAnalyticsTest doendtest "sends email to owner after successful import", %{import_opts: import_opts} do- user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: user){:ok, job} = Plausible.Imported.NoopImporter.new_import(site, user, import_opts)@@ -84,7 +84,7 @@ defmodule Plausible.Workers.ImportAnalyticsTest dotest "send email after successful import only to the user who ran the import", %{import_opts: import_opts} do- owner = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ owner = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: owner)importing_user = new_user()@@ -110,7 +110,7 @@ defmodule Plausible.Workers.ImportAnalyticsTest doendtest "updates site import record after failed import", %{import_opts: import_opts} do- user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: user)import_opts = Keyword.put(import_opts, :error, true)@@ -125,7 +125,7 @@ defmodule Plausible.Workers.ImportAnalyticsTest doendtest "clears any orphaned data during import", %{import_opts: import_opts} do- user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: user)import_opts = Keyword.put(import_opts, :error, true)@@ -150,7 +150,7 @@ defmodule Plausible.Workers.ImportAnalyticsTest doendtest "sends email to owner after failed import", %{import_opts: import_opts} do- user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: user)import_opts = Keyword.put(import_opts, :error, true)@@ -170,7 +170,7 @@ defmodule Plausible.Workers.ImportAnalyticsTest dotest "sends email after failed import only to the user who ran the import", %{import_opts: import_opts} do- owner = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ owner = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: owner)import_opts = Keyword.put(import_opts, :error, true)@@ -211,8 +211,8 @@ defmodule Plausible.Workers.ImportAnalyticsTest do%{import_opts: [- start_date: Timex.today() |> Timex.shift(days: -7),- end_date: Timex.today()+ start_date: Date.utc_today() |> Date.shift(day: -7),+ end_date: Date.utc_today()]}end@@ -221,7 +221,7 @@ defmodule Plausible.Workers.ImportAnalyticsTest doimport_opts: import_opts} doEcto.Adapters.SQL.Sandbox.unboxed_run(Plausible.Repo, fn ->- user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: user)site_id = site.idimport_opts = Keyword.put(import_opts, :listen?, true)@@ -242,7 +242,7 @@ defmodule Plausible.Workers.ImportAnalyticsTest doimport_opts: import_opts} doEcto.Adapters.SQL.Sandbox.unboxed_run(Plausible.Repo, fn ->- user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: user)site_id = site.id@@ -267,7 +267,7 @@ defmodule Plausible.Workers.ImportAnalyticsTest doimport_opts: import_opts} doEcto.Adapters.SQL.Sandbox.unboxed_run(Plausible.Repo, fn ->- user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: user)site_id = site.id@@ -304,7 +304,7 @@ defmodule Plausible.Workers.ImportAnalyticsTest doimport_opts: import_opts} doEcto.Adapters.SQL.Sandbox.unboxed_run(Plausible.Repo, fn ->- user = new_user(trial_expiry_date: Timex.today() |> Timex.shift(days: 1))+ user = new_user(trial_expiry_date: Date.utc_today() |> Date.shift(day: 1))site = new_site(owner: user)site_id = site.iddiff --git a/test/workers/notify_annual_renewal_test.exs b/test/workers/notify_annual_renewal_test.exsindex 04dc557d1a..19cef4b5a8 100644--- a/test/workers/notify_annual_renewal_test.exs+++ b/test/workers/notify_annual_renewal_test.exs@@ -134,10 +134,12 @@ defmodule Plausible.Workers.NotifyAnnualRenewalTest dotest "does not send multiple notifications on second year", %{user: user} dosubscribe_to_plan(user, @yearly_plan, next_bill_date: Date.shift(Date.utc_today(), day: 7))+ year_ago = Date.shift(Date.utc_today(), year: -1)+Repo.insert_all("sent_renewal_notifications", [%{user_id: user.id,- timestamp: Timex.shift(Timex.today(), years: -1) |> Timex.to_naive_datetime()+ timestamp: NaiveDateTime.new!(year_ago, ~T[00:00:00])}])diff --git a/test/workers/send_check_stats_emails_test.exs b/test/workers/send_check_stats_emails_test.exsindex ac6f6b43af..6d3e915eb6 100644--- a/test/workers/send_check_stats_emails_test.exs+++ b/test/workers/send_check_stats_emails_test.exs@@ -50,8 +50,7 @@ defmodule Plausible.Workers.SendCheckStatsEmailsTest doenddefp days_ago(days) do- NaiveDateTime.utc_now()- |> NaiveDateTime.truncate(:second)- |> Timex.shift(days: -days)+ NaiveDateTime.utc_now(:second)+ |> NaiveDateTime.shift(day: -days)endenddiff --git a/test/workers/send_email_report_test.exs b/test/workers/send_email_report_test.exsindex 37fa29b362..2ec864bb60 100644--- a/test/workers/send_email_report_test.exs+++ b/test/workers/send_email_report_test.exs@@ -5,7 +5,6 @@ defmodule Plausible.Workers.SendEmailReportTest douse Oban.Testing, repo: Plausible.Repoimport Plausible.Test.Support.HTMLalias Plausible.Workers.SendEmailReport- alias Timex.Timezone@green "#15803d"@red "#b91c1c"@@ -46,25 +45,25 @@ defmodule Plausible.Workers.SendEmailReportTest doinsert(:weekly_report, site: site, recipients: ["[email protected]"])- now = Timex.now(site.timezone)- last_monday = Timex.shift(now, weeks: -1) |> Timex.beginning_of_week()- last_sunday = Timex.shift(now, weeks: -1) |> Timex.end_of_week()- sunday_before_last = Timex.shift(last_monday, minutes: -1)- this_monday = Timex.beginning_of_week(now)+ now = DateTime.now!(site.timezone)+ last_monday = DateTime.shift(now, week: -1) |> Plausible.Times.beginning_of_week()+ last_sunday = DateTime.shift(now, week: -1) |> Plausible.Times.end_of_week()+ sunday_before_last = DateTime.shift(last_monday, minute: -1)+ this_monday = Plausible.Times.beginning_of_week(now)populate_stats(site, [# Sunday before last, not counted- build(:pageview, timestamp: Timezone.convert(sunday_before_last, "UTC")),+ build(:pageview, timestamp: DateTime.shift_zone!(sunday_before_last, "UTC")),# Sunday before last, not counted- build(:pageview, timestamp: Timezone.convert(sunday_before_last, "UTC")),+ build(:pageview, timestamp: DateTime.shift_zone!(sunday_before_last, "UTC")),# Last monday, counted- build(:pageview, timestamp: Timezone.convert(last_monday, "UTC")),+ build(:pageview, timestamp: DateTime.shift_zone!(last_monday, "UTC")),# Last sunday, counted- build(:pageview, timestamp: Timezone.convert(last_sunday, "UTC")),+ build(:pageview, timestamp: DateTime.shift_zone!(last_sunday, "UTC")),# This monday, not counted- build(:pageview, timestamp: Timezone.convert(this_monday, "UTC")),+ build(:pageview, timestamp: DateTime.shift_zone!(this_monday, "UTC")),# This monday, not counted- build(:pageview, timestamp: Timezone.convert(this_monday, "UTC"))+ build(:pageview, timestamp: DateTime.shift_zone!(this_monday, "UTC"))])perform_job(SendEmailReport, %{"site_id" => site.id, "interval" => "weekly"})@@ -79,18 +78,18 @@ defmodule Plausible.Workers.SendEmailReportTest doendtest "includes the correct stats" do- now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)- site = new_site(domain: "test-site.com", inserted_at: Timex.shift(now, days: -8))+ now = NaiveDateTime.utc_now(:second)+ site = new_site(domain: "test-site.com", inserted_at: NaiveDateTime.shift(now, day: -8))insert(:weekly_report, site: site, recipients: ["[email protected]"])populate_stats(site, [build(:pageview,user_id: 123,- timestamp: Timex.shift(now, days: -7),+ timestamp: NaiveDateTime.shift(now, day: -7),referrer_source: "Google"),- build(:pageview, user_id: 123, timestamp: Timex.shift(now, days: -7)),- build(:pageview, timestamp: Timex.shift(now, days: -7))+ build(:pageview, user_id: 123, timestamp: NaiveDateTime.shift(now, day: -7)),+ build(:pageview, timestamp: NaiveDateTime.shift(now, day: -7))])perform_job(SendEmailReport, %{"site_id" => site.id, "interval" => "weekly"})@@ -109,11 +108,11 @@ defmodule Plausible.Workers.SendEmailReportTest doendtest "renders correct signs (+/-) and trend colors for positive percentage changes" do- now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)- week_ago = now |> Timex.shift(days: -7)- two_weeks_ago = now |> Timex.shift(days: -14)+ now = NaiveDateTime.utc_now(:second)+ week_ago = now |> NaiveDateTime.shift(day: -7)+ two_weeks_ago = now |> NaiveDateTime.shift(day: -14)- site = new_site(inserted_at: Timex.shift(now, days: -15))+ site = new_site(inserted_at: NaiveDateTime.shift(now, day: -15))insert(:weekly_report, site: site, recipients: ["[email protected]"])populate_stats(site, [@@ -144,11 +143,11 @@ defmodule Plausible.Workers.SendEmailReportTest doendtest "renders correct signs (+/-) and trend colors for negative percentage changes" do- now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)- week_ago = now |> Timex.shift(days: -7)- two_weeks_ago = now |> Timex.shift(days: -14)+ now = NaiveDateTime.utc_now(:second)+ week_ago = now |> NaiveDateTime.shift(day: -7)+ two_weeks_ago = now |> NaiveDateTime.shift(day: -14)- site = new_site(inserted_at: Timex.shift(now, days: -15))+ site = new_site(inserted_at: NaiveDateTime.shift(now, day: -15))insert(:weekly_report, site: site, recipients: ["[email protected]"])populate_stats(site, [@@ -179,11 +178,11 @@ defmodule Plausible.Workers.SendEmailReportTest doendtest "renders 0% changes with a green color and without a sign" do- now = NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second)- week_ago = now |> Timex.shift(days: -7)- two_weeks_ago = now |> Timex.shift(days: -14)+ now = NaiveDateTime.utc_now(:second)+ week_ago = now |> NaiveDateTime.shift(day: -7)+ two_weeks_ago = now |> NaiveDateTime.shift(day: -14)- site = new_site(inserted_at: Timex.shift(now, days: -15))+ site = new_site(inserted_at: NaiveDateTime.shift(now, day: -15))insert(:weekly_report, site: site, recipients: ["[email protected]"])populate_stats(site, [@@ -218,10 +217,10 @@ defmodule Plausible.Workers.SendEmailReportTest doinsert(:monthly_report, site: site, recipients: ["[email protected]", "[email protected]"])last_month =- Timex.now(site.timezone)- |> Timex.shift(months: -1)- |> Timex.beginning_of_month()- |> Timex.format!("{Mfull}")+ DateTime.now!(site.timezone)+ |> DateTime.shift(month: -1)+ |> Plausible.Times.beginning_of_month()+ |> Calendar.strftime("%B")perform_job(SendEmailReport, %{"site_id" => site.id, "interval" => "monthly"})diff --git a/test/workers/send_site_setup_emails_test.exs b/test/workers/send_site_setup_emails_test.exsindex fbf614b3bb..8d2d0dc690 100644--- a/test/workers/send_site_setup_emails_test.exs+++ b/test/workers/send_site_setup_emails_test.exs@@ -101,6 +101,6 @@ defmodule Plausible.Workers.SendSiteSetupEmailsTest dodefp hours_ago(hours) doNaiveDateTime.utc_now()|> NaiveDateTime.truncate(:second)- |> Timex.shift(hours: -hours)+ |> NaiveDateTime.shift(hour: -hours)endend