From ddbb79fa1a20fb3596ae5a6cbc33c0f56b8b2bc7 Mon Sep 17 00:00:00 2001 From: ruslandoga <67764432+ruslandoga@users.noreply.github.com> Date: Sat, 16 Mar 2024 12:55:34 +0800 Subject: [PATCH] eh --- lib/plausible/sites.ex | 9 +++++---- lib/plausible/timezones.ex | 10 ++++++++-- test/plausible/site/sites_test.exs | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index 8ea8374c6..442ac2348 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -198,20 +198,21 @@ defmodule Plausible.Sites do @doc """ Returns the date of the first recorded stat in the timezone configured by the user. - This function does 2 transformations: + This function does 3 transformations: Date -> UTC DateTime at 00:00 -> Local %DateTime{} -> Local %Date ## Examples - iex> Plausible.Site.local_start_date(%Plausible.Site{stats_start_date: nil}) + iex> %Plausible.Site{stats_start_date: nil} = site = Plausible.Factory.insert(:site) + iex> Plausible.Sites.local_start_date(site) nil iex> site = %Plausible.Site{stats_start_date: ~D[2022-09-28], timezone: "Europe/Helsinki"} - iex> Plausible.Site.local_start_date(site) + iex> Plausible.Sites.local_start_date(site) ~D[2022-09-28] iex> site = %Plausible.Site{stats_start_date: ~D[2022-09-28], timezone: "America/Los_Angeles"} - iex> Plausible.Site.local_start_date(site) + iex> Plausible.Sites.local_start_date(site) ~D[2022-09-27] """ diff --git a/lib/plausible/timezones.ex b/lib/plausible/timezones.ex index 1a171c7a0..c213e6167 100644 --- a/lib/plausible/timezones.ex +++ b/lib/plausible/timezones.ex @@ -23,7 +23,7 @@ defmodule Plausible.Timezones do end end - @spec to_date_in_timezone(NaiveDateTime.t() | DateTime.t(), String.t()) :: Date.t() + @spec to_date_in_timezone(NaiveDateTime.t() | DateTime.t() | Date.t(), String.t()) :: Date.t() def to_date_in_timezone(dt, timezone) do dt |> to_datetime_in_timezone(timezone) |> DateTime.to_date() end @@ -44,7 +44,7 @@ defmodule Plausible.Timezones do #DateTime<2024-03-16 09:50:45.180928+08:00 +08 Etc/GMT-8> """ - @spec to_datetime_in_timezone(NaiveDateTime.t() | DateTime.t(), String.t()) :: + @spec to_datetime_in_timezone(NaiveDateTime.t() | DateTime.t() | Date.t(), String.t()) :: DateTime.t() def to_datetime_in_timezone(%NaiveDateTime{} = naive, timezone) do naive @@ -52,6 +52,12 @@ defmodule Plausible.Timezones do |> to_datetime_in_timezone(timezone) end + def to_datetime_in_timezone(%Date{} = date, timezone) do + date + |> DateTime.new!(~T[00:00:00], "Etc/UTC") + |> to_datetime_in_timezone(timezone) + end + def to_datetime_in_timezone(%DateTime{} = dt, timezone) do DateTime.shift_zone!(dt, timezone) end diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exs index e623ffdc5..e52f1ba59 100644 --- a/test/plausible/site/sites_test.exs +++ b/test/plausible/site/sites_test.exs @@ -2,6 +2,7 @@ defmodule Plausible.SitesTest do use Plausible.DataCase alias Plausible.Sites + doctest Sites, import: true describe "create a site" do test "creates a site" do